Skip to content

C
check
Commit 527af281 by Masaru Abe
Options

CheckWeb版対応　途中版

parent 6142d01d
Showing with 1083 additions and 313 deletions
abvw/common/css/default.css
@charset('utf-8'); @charset "utf-8";
/* /*
* { * {
font-family: "メイリオ", "ＭＳ Ｐゴシック", "ヒラギノ角ゴ Pro W3", "Osaka", "sans-serif"; font-family: "メイリオ", "ＭＳ Ｐゴシック", "ヒラギノ角ゴ Pro W3", "Osaka", "sans-serif";
font-size: 12pt; font-size: 12pt;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }
*/ */
/** /**
* システムエラーメッセージスタイル * システムエラーメッセージスタイル
*/ */
.toast-container { .toast-container {
z-index: 90001; z-index: 90001;
} }
.toast-item { .toast-item {
border-radius: 10px; border-radius: 10px;
} }
.toast-position-middle-center { .toast-position-middle-center {
margin-left: -250px; margin-left: -250px;
width: 500px; width: 500px;
} }
abvw/common/js/avweb.js
...@@ -980,6 +980,30 @@ AVWEB.getApiUrl = function(accountPath) { ...@@ -980,6 +980,30 @@ AVWEB.getApiUrl = function(accountPath) {
}; };
/** shop配下のアクションを呼ぶURLを作成 */
AVWEB.getShopApiUrl = function(accountPath) {
// Shop url 構築
var apiUrl = ClientData.conf_apiUrl(); //sysSettings.apiUrl;
if(accountPath) {
apiUrl = AVWEB.format(apiUrl, accountPath);
}
return apiUrl.substring(0, apiUrl.length - 6) + "shop";
};
/** checkapi配下のアクションを呼ぶURLを作成 */
AVWEB.getCheckApiUrl = function(accountPath) {
// checkapi url 構築
var apiUrl = ClientData.conf_apiUrl(); //sysSettings.apiUrl;
if(accountPath) {
apiUrl = AVWEB.format(apiUrl, accountPath);
}
return apiUrl.substring(0, apiUrl.length - 6) + "checkapi";
};
/* get url */ /* get url */
AVWEB.getURL = function(apiName) { AVWEB.getURL = function(apiName) {
//var sysSettings = AVWEB.avwSysSetting(); //var sysSettings = AVWEB.avwSysSetting();
...@@ -1009,3 +1033,9 @@ AVWEB.format = function(fmt) { ...@@ -1009,3 +1033,9 @@ AVWEB.format = function(fmt) {
return fmt; return fmt;
}; };
abvw/common/js/common.js
...@@ -124,7 +124,8 @@ COMMON.ScreenIds = { ...@@ -124,7 +124,8 @@ COMMON.ScreenIds = {
ContentViewOpenUri : 'contentview_openuri.html?__UPDATEID__', ContentViewOpenUri : 'contentview_openuri.html?__UPDATEID__',
ContentViewStreaming : 'contentview_streaming.html?__UPDATEID__', ContentViewStreaming : 'contentview_streaming.html?__UPDATEID__',
ContentViewGetits : 'contentview_getits.html?__UPDATEID__', ContentViewGetits : 'contentview_getits.html?__UPDATEID__',
ContentViewCheck : 'contentview_check.html?__UPDATEID__' ContentViewCheck : 'contentview_check.html?__UPDATEID__',
HomeCheck : 'home_check.html?__UPDATEID__'
}; };
COMMON.Keys = { COMMON.Keys = {
...@@ -378,6 +379,7 @@ COMMON.Keys = { ...@@ -378,6 +379,7 @@ COMMON.Keys = {
conf_apiUrl : 'conf_apiUrl', conf_apiUrl : 'conf_apiUrl',
conf_apiLoginUrl : 'conf_apiLoginUrl', conf_apiLoginUrl : 'conf_apiLoginUrl',
conf_apiResourceDlUrl : 'conf_apiResourceDlUrl', conf_apiResourceDlUrl : 'conf_apiResourceDlUrl',
conf_checkApiUrl : 'conf_checkApiUrl',
storeUrl : 'storeUrl', storeUrl : 'storeUrl',
siteUrl : 'siteUrl', siteUrl : 'siteUrl',
...@@ -1745,6 +1747,13 @@ var ClientData = { ...@@ -1745,6 +1747,13 @@ var ClientData = {
return SessionStorageUtils.get(COMMON.Keys.conf_apiResourceDlUrl); return SessionStorageUtils.get(COMMON.Keys.conf_apiResourceDlUrl);
} }
}, },
conf_checkApiUrl : function(data) {
if (arguments.length > 0) {
SessionStorageUtils.set(COMMON.Keys.conf_checkApiUrl, data);
} else {
return SessionStorageUtils.get(COMMON.Keys.conf_checkApiUrl);
}
},
storeUrl : function(data) { storeUrl : function(data) {
if (arguments.length > 0) { if (arguments.length > 0) {
...@@ -3338,3 +3347,195 @@ COMMON.isAuthoringPreview = function() { ...@@ -3338,3 +3347,195 @@ COMMON.isAuthoringPreview = function() {
} }
}; };
// download resouce content id
COMMON.downloadResourceById = function(contentId){
var params = {
sid: ClientData.userInfo_sid(),
contentId: contentId,
getType: '2'
};
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", "get", params,
function (data) {
//Get resourceurl
if( data.contentData.content ){
var resourceUrl = COMMON.getResourceByIdFromAPI(data.contentData.content.resourceId);
// open url to download file
if (COMMON.isSafariNotOnIpad()) {
window.onbeforeunload = null;
window.open(resourceUrl, "_self"); // open url to download file on safari not for ipad
var toogleTime = setTimeout(function () { COMMON.ToogleLogoutNortice() }, 200);
}
else {
window.open(resourceUrl); //open url to download file on orther browser
}
} else {
alert("ダウンロード出来ません。");
}
},
function (xhr, b, c) { }
);
};
//Download resource
COMMON.getResourceByIdFromAPI = function(resourceId){
return AVWEB.getURL("webResourceDownload") + "&sid=" + ClientData.userInfo_sid() + "&resourceId=" + resourceId + "&isDownload=true";
};
// check is browser safari on Mac and Window devide ( not Ipad )
COMMON.isSafariNotOnIpad = function() {
if (!window.chrome) {
var ua = navigator.userAgent.toLowerCase();
if (!/ipad/.test(ua) && /safari/.test(ua)) {
return true;
}
}
return false;
};
//link content
COMMON.viewLinkContentById = function(contentId, isWindowOpen){
var params = {
sid: ClientData.userInfo_sid(),
contentId: contentId,
getType: '2'
};
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", "get", params,
function (data) {
//Get linkUrl
var linkUrl = data.contentData.content.url;
if( !linkUrl ){
return;
}
if (isWindowOpen) {
window.open(linkUrl, "_blank", "new window, scrollbars=yes");
} else {
location.href = linkUrl;
}
},
function (xhr, b, c) { });
};
COMMON.resizeResourceThumbnail = function(mg, width, height) {
var newWidth;
var newHeight;
var delta = Math.min(width / mg.width, height / mg.height);
newHeight = parseInt(delta * mg.height);
newWidth = parseInt(delta * mg.width);
var result = [ newWidth, newHeight ];
return result;
};
// get icon of content type
COMMON.getIconTypeContent = function(contentType) {
var src = '';
switch (contentType) {
case COMMON.ContentTypeKeys.Type_PDF:
{
src = 'img/bookshelf/icon_01.png';
break;
}
case COMMON.ContentTypeKeys.Type_Enquete:
{
src = 'img/bookshelf/icon_09.png';
break;
}
case COMMON.ContentTypeKeys.Type_Exam:
{
src = 'img/bookshelf/icon_10.png';
break;
}
case COMMON.ContentTypeKeys.Type_Html:
{
src = 'img/bookshelf/icon_05.png';
break;
}
case COMMON.ContentTypeKeys.Type_Image:
{
src = 'img/bookshelf/icon_02.png';
break;
}
case COMMON.ContentTypeKeys.Type_Music:
{
src = 'img/bookshelf/icon_06.png';
break;
}
case COMMON.ContentTypeKeys.Type_NoFile:
{
src = 'img/bookshelf/icon_07.png';
break;
}
case COMMON.ContentTypeKeys.Type_Others:
{
src = 'img/bookshelf/icon_03.png';
break;
}
case COMMON.ContentTypeKeys.Type_Video:
{
src = 'img/bookshelf/icon_04.png';
break;
}
case COMMON.ContentTypeKeys.Type_Link:
{
src = 'img/bookshelf/icon_08.png';
break;
}
case COMMON.ContentTypeKeys.Type_PanoMovie:
{
src = 'img/bookshelf/icon_11.png';
break;
}
case COMMON.ContentTypeKeys.Type_PanoImage:
{
src = 'img/bookshelf/icon_12.png';
break;
}
case COMMON.ContentTypeKeys.Type_ObjectVR:
{
src = 'img/bookshelf/icon_13.png';
break;
}
default: break;
}
return src;
};
// get ThumbnailForOtherType
COMMON.getThumbnailForOtherType = function(contentType){
var src = '';
if(contentType == COMMON.ContentTypeKeys.Type_Image){
src = COMMON.ThumbnailForOtherType.Thumbnail_ImageType;
}
else if(contentType == COMMON.ContentTypeKeys.Type_Music){
src = COMMON.ThumbnailForOtherType.Thumbnail_MusicType;
}
else if(contentType == COMMON.ContentTypeKeys.Type_Video){
src = COMMON.ThumbnailForOtherType.Thumbnail_VideoType;
}
else if(contentType == COMMON.ContentTypeKeys.Type_NoFile){
src = COMMON.ThumbnailForOtherType.Thumbnail_NoFileType;
}
else if(contentType == COMMON.ContentTypeKeys.Type_Others){
src = COMMON.ThumbnailForOtherType.Thumbnail_OthersType;
}
else if(contentType == COMMON.ContentTypeKeys.Type_Html){
src = COMMON.ThumbnailForOtherType.Thumbnail_HtmlType;
}
else if(contentType == COMMON.ContentTypeKeys.Type_Link){
src = COMMON.ThumbnailForOtherType.Thumbnail_LinkType;
}
return src;
};
abvw/common/json/sys/conf.json
{ {
"apiUrl" : "https://web180.abook.bz/acms/{0}/abvapi", "1apiUrl" : "http://localhost:8080/acms/{0}/abvapi",
"apiLoginUrl" : "https://web180.abook.bz/acms/nuabvapi", "1apiLoginUrl" : "http://localhost:8080/acms/nuabvapi",
"apiResourceDlUrl" : "https://web180.abook.bz/acms/{0}/dl", "1apiResourceDlUrl" : "http://localhost:8080/acms/{0}/dl",
"1checkApiUrl" : "http://localhost:8080/acms/{0}/checkapi",
"apiUrl" : "https://abook189.abook.bz/acms/{0}/abvapi",
"apiLoginUrl" : "https://abook189.abook.bz/acms/nuabvapi",
"apiResourceDlUrl" : "https://abook189.abook.bz/acms/{0}/dl",
"checkApiUrl" : "https://abook189.abook.bz/acms/{0}/checkapi",
"bookShelfCount" : 15, "bookShelfCount" : 15,
"bookListCount" : 15, "bookListCount" : 15,
"screenlockTimeDefault" : 30, "screenlockTimeDefault" : 30,
......
abvw/css/check/normalize.css 0 → 100644
/*! normalize.css v8.0.0 | MIT License | github.com/necolas/normalize.css */
/* Document
========================================================================== */
/**
* 1. Correct the line height in all browsers.
* 2. Prevent adjustments of font size after orientation changes in iOS.
*/
html {
line-height: 1.15; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/* Sections
========================================================================== */
/**
* Remove the margin in all browsers.
*/
body {
margin: 0;
}
/**
* Correct the font size and margin on `h1` elements within `section` and
* `article` contexts in Chrome, Firefox, and Safari.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/* Grouping content
========================================================================== */
/**
* 1. Add the correct box sizing in Firefox.
* 2. Show the overflow in Edge and IE.
*/
hr {
box-sizing: content-box; /* 1 */
height: 0; /* 1 */
overflow: visible; /* 2 */
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
pre {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/* Text-level semantics
========================================================================== */
/**
* Remove the gray background on active links in IE 10.
*/
a {
background-color: transparent;
}
/**
* 1. Remove the bottom border in Chrome 57-
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
*/
abbr[title] {
border-bottom: none; /* 1 */
text-decoration: underline; /* 2 */
text-decoration: underline dotted; /* 2 */
}
/**
* Add the correct font weight in Chrome, Edge, and Safari.
*/
b,
strong {
font-weight: bolder;
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
code,
kbd,
samp {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/**
* Add the correct font size in all browsers.
*/
small {
font-size: 80%;
}
/**
* Prevent `sub` and `sup` elements from affecting the line height in
* all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sub {
bottom: -0.25em;
}
sup {
top: -0.5em;
}
/* Embedded content
========================================================================== */
/**
* Remove the border on images inside links in IE 10.
*/
img {
border-style: none;
}
/* Forms
========================================================================== */
/**
* 1. Change the font styles in all browsers.
* 2. Remove the margin in Firefox and Safari.
*/
button,
input,
optgroup,
select,
textarea {
font-family: inherit; /* 1 */
font-size: 100%; /* 1 */
line-height: 1.15; /* 1 */
margin: 0; /* 2 */
}
/**
* Show the overflow in IE.
* 1. Show the overflow in Edge.
*/
button,
input { /* 1 */
overflow: visible;
}
/**
* Remove the inheritance of text transform in Edge, Firefox, and IE.
* 1. Remove the inheritance of text transform in Firefox.
*/
button,
select { /* 1 */
text-transform: none;
}
/**
* Correct the inability to style clickable types in iOS and Safari.
*/
button,
[type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
}
/**
* Remove the inner border and padding in Firefox.
*/
button::-moz-focus-inner,
[type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
border-style: none;
padding: 0;
}
/**
* Restore the focus styles unset by the previous rule.
*/
button:-moz-focusring,
[type="button"]:-moz-focusring,
[type="reset"]:-moz-focusring,
[type="submit"]:-moz-focusring {
outline: 1px dotted ButtonText;
}
/**
* Correct the padding in Firefox.
*/
fieldset {
padding: 0.35em 0.75em 0.625em;
}
/**
* 1. Correct the text wrapping in Edge and IE.
* 2. Correct the color inheritance from `fieldset` elements in IE.
* 3. Remove the padding so developers are not caught out when they zero out
* `fieldset` elements in all browsers.
*/
legend {
box-sizing: border-box; /* 1 */
color: inherit; /* 2 */
display: table; /* 1 */
max-width: 100%; /* 1 */
padding: 0; /* 3 */
white-space: normal; /* 1 */
}
/**
* Add the correct vertical alignment in Chrome, Firefox, and Opera.
*/
progress {
vertical-align: baseline;
}
/**
* Remove the default vertical scrollbar in IE 10+.
*/
textarea {
overflow: auto;
}
/**
* 1. Add the correct box sizing in IE 10.
* 2. Remove the padding in IE 10.
*/
[type="checkbox"],
[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
* Correct the cursor style of increment and decrement buttons in Chrome.
*/
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
height: auto;
}
/**
* 1. Correct the odd appearance in Chrome and Safari.
* 2. Correct the outline style in Safari.
*/
[type="search"] {
-webkit-appearance: textfield; /* 1 */
outline-offset: -2px; /* 2 */
}
/**
* Remove the inner padding in Chrome and Safari on macOS.
*/
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
* 1. Correct the inability to style clickable types in iOS and Safari.
* 2. Change font properties to `inherit` in Safari.
*/
::-webkit-file-upload-button {
-webkit-appearance: button; /* 1 */
font: inherit; /* 2 */
}
/* Interactive
========================================================================== */
/*
* Add the correct display in Edge, IE 10+, and Firefox.
*/
details {
display: block;
}
/*
* Add the correct display in all browsers.
*/
summary {
display: list-item;
}
/* Misc
========================================================================== */
/**
* Add the correct display in IE 10+.
*/
template {
display: none;
}
/**
* Add the correct display in IE 10.
*/
[hidden] {
display: none;
}
abvw/css/check/template.css 0 → 100644
@charset "UTF-8";
html {
font-size: 62.5%;
font-family: "メイリオ", "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "小塚ゴシック Pr6N R", "Arial", "ＭＳ Ｐゴシック", "MS PGothic", sans-serif; }
body {
overflow: hidden;
font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", "sans-serif";
}
a {
display: block;
text-decoration: none; }
div.container {
overflow: auto;
-webkit-overflow-scrolling: touch;
height: calc(100vh - 122px);
margin: 140px 22px 22px; }
div.container ul.addition_list {
width: 100%;
list-style: none;
padding: 0; }
div.container ul.addition_list >li {
background: #ffffff;
border: 1px solid #cccccc;
padding: 18px 20px 18px 50px;
margin-top: -1px;
cursor: pointer; }
div.container ul.addition_list li .code {
display: inline-block;
padding: 5px 10px;
color: #fff;
margin-bottom: 5px;
text-align: center; }
div.container ul.addition_list li p {
font-size: 2rem;
font-weight: bold;
line-height: 150%;
margin: 5px 0;
color: #000000;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;}
div.container ul.inspection_list {
width: 100%;
list-style: none;
padding: 0; }
div.container ul.inspection_list li .code {
font-size: 1.1rem;
color: #333333; }
div.container ul.inspection_list li p {
font-size: 1.8rem;
font-weight: bold;
line-height: 150%;
margin: 5px 0 0;
color: #000000; }
div.container ul.inspection_list li.check {
background: url("../img/check.png") no-repeat;
background-position: 10px center; }
div.container ul.inspection_list li.read {
background: url("../img/read.png") no-repeat;
background-position: 10px center; }
\ No newline at end of file
abvw/home_check.html 0 → 100644
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Cache-Control" content="no-store">
<meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1">
<meta name="viewport" content="">
<title></title>
<!--
<link rel="stylesheet" type="text/css" href="css/check/normalize.css?__UPDATEID__">
<link rel="stylesheet" type="text/css" href="css/check/template.css?__UPDATEID__">
<link rel="stylesheet" type="text/css" href="css/check/check.css?__UPDATEID__">
-->
<link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" />
<!--
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
-->
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/list.css?__UPDATEID__" />
<!-- CSSビュー -->
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/uuid.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/Limit_Access_Content.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/check/home_check.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/tab.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.cookie.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/html2canvas.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/promise-6.1.0.min.js?__UPDATEID__" ></script>
<style>
button.addition {
background: #ffffff url("/acms/check/images/addition.png") no-repeat;
background-position: 20% center;
}
div.container ul.addition_list >li {
background: #ffffff;
border: 1px solid #cccccc;
padding: 18px 20px;
margin-top: -1px;
cursor: auto;
display: flex;
}
div.container ul.addition_list li.check .code {
background-color: #1B1BD2;
}
div.container ul.addition_list li.read .code {
background-color: #FF7700;
}
div.container ul.addition_list li p.workContent {
font-weight: normal;
font-size: 1.5rem;
}
/*
.ui-widget {
font-size: 2.8em;
}
*/
#checkDetail {
position: fixed;
}
.nav li a {
padding: 0;
}
.nav li a p.nav_icon {
margin-left: 5px;
}
/*
header {
position: relative;
display: flex;
padding: 0 10px;
border: 2px solid #095395;
border-radius: 1px;
width: auto;
height: 60px;
margin: 15px 12px;
align-items: center;
justify-content: center;
}
*/
#checkListSearch {
display: flex;
width: 100%;
padding: 0 0;
}
#checkListSearch #searchWordDiv {
width: 70%;
}
#checkListSearch #searchBtn {
width: 30%;
}
#listValues {
margin: 15px 12px 0px;
}
#listValues li td {
align-items: center;
justify-content: center;
}
#listIcon {
width: 30px;
height: 30px;
}
#contentType {
font-weight: bold;
font-size: 2rem;
letter-spacing: 0.5rem;
color: #095395;
margin-left: 10px;
width: 30%;
}
.codeAndExpiration {
margin-bottom: 5px;
font-size: 16px;
font-weight: bold;
color: #37648C;
list-style-type: none;
margin: 0;
padding: 0;
}
.codeAndExpiration div {
font-weight: bold;
font-size: 1.7rem;
color: #37648C;
margin-top: 5px;
}
.nullValue {
text-align: center;
font-size: 24px;
color: #D50000;
}
.actionBtnDiv {
align-items: center;
justify-content: center;
display: none;
cursor: pointer;
}
.actionBtnDiv img {
width: 67px;
height: 67px;
border: none;
border-radius: 3px;
}
.actionBtnDiv p {
font-size: 14px !important;
color: #095395 !important;
text-align: center;
}
.taskInfoDiv {
width: 100%;
margin: 0 0.5em;
}
.actionBtn {
margin: 0 12px;
}
.actionBtn p {
margin-left: -3px !important;
}
/*
header .headerFormForMobile {
width: 100%;
}
header .headerFormForMobile >.childDiv {
display: flex;
align-items: center;
justify-content: center;
}
header button.addition {
background: #0068CB url(/acms/check/images/addition.png) no-repeat;
background-position: calc(20% - 0.3vw) center;
}
*/
.ui-dialog-popup {
border: 1px solid #dddddd;
background: #ffffff url(../images/datepicker/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
color: #444444;
padding: 0;
}
</style>
</head>
<body id="home_check" oncontextmenu="return false">
<div id="ws-body" >
<a href="#" id="dspLogout" ><img src="img/common/icon_logout.png" width="30" height="30"></a>
<!--
<header>
<div id="top">
<h1>作 業 一 覧</h1>
<form id="search">
<input class="text" type="text">
<input class="submit" type="submit" value="検索">
</form>
<p>合計　<span>3</span>　カ所</p>
<input class="button" type="button" value="＋　作業追加">
</div>
</header>
-->
<div id="listValues" class="container">
<ul class="addition_list"></ul>
<div id="nullValue" class="nullValue" style="display: none;">該当作業はありません。</div>
<div id="noWork" class="nullValue" style="display: none;"></div>
</div>
<div id="actionBtnDiv" class="actionBtnDiv">
<div class="actionBtn">
<img src="img/check/taskFormBtnIcon.png">
<p>作業報告</p>
</div>
<div class="actionBtn">
<img src="img/check/taskFormBtnIcon.png">
<p>作業指示</p>
</div>
<div class="actionBtn">
<img src="img/check/taskDocumentBtnIcon.png">
<p>資料参照</p>
</div>
</div>
<div id="content-grid" style="display: none;">
</div>
</div>
<div id="viewer" style="display:none;" >
</div>
<iframe style="height:0px;width:0px;visibility:hidden;display:none;" src="about:blank">
this frame prevents back forward cache
</iframe>
</body>
</html>
abvw/js/bookmark.js
...@@ -1037,6 +1037,6 @@ BOOKMARK.downloadFunction = function(e) { ...@@ -1037,6 +1037,6 @@ BOOKMARK.downloadFunction = function(e) {
var contentId = $(this).attr('contentid'); var contentId = $(this).attr('contentid');
// Download content // Download content
HEADER.downloadResourceById(contentId); COMMON.downloadResourceById(contentId);
}; };
abvw/js/check/checkview.js
...@@ -77,9 +77,15 @@ CHECKVIEW.processLogin = function(urlPath, contentKey) { ...@@ -77,9 +77,15 @@ CHECKVIEW.processLogin = function(urlPath, contentKey) {
// set number new push message to 0 // set number new push message to 0
ClientData.pushInfo_newMsgNumber(0); ClientData.pushInfo_newMsgNumber(0);
//ClientData.userInfo_sid(ClientData.userInfo_sid_local()); // set info user login
ClientData.userInfo_accountPath(urlPath);
ClientData.userInfo_accountPath_session(urlPath);
//ClientData.userInfo_loginId(loginId);
//ClientData.userInfo_loginId_session(loginId);
ClientData.userInfo_userName(LOGIN.userInfo_userName);
ClientData.userInfo_sid(LOGIN.userinfo_sid); ClientData.userInfo_sid(LOGIN.userinfo_sid);
ClientData.userInfo_sid_local(LOGIN.userinfo_sid);
$('#main-error-message').css('display', 'none'); $('#main-error-message').css('display', 'none');
//contentKey復号化 //contentKey復号化
...@@ -134,7 +140,7 @@ CHECKVIEW.decodeContentKey = function(contentKey) { ...@@ -134,7 +140,7 @@ CHECKVIEW.decodeContentKey = function(contentKey) {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login); AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
} else { } else {
// アラートメッセージ表示 // アラートメッセージ表示
LOGIN.showAlertScreen(I18N.i18nText('msgContentNotExist'), "abvw/" + COMMON.ScreenIds.Home); LOGIN.showAlertScreen(I18N.i18nText('msgContentNotExist'), "");
} }
}); });
...@@ -158,7 +164,10 @@ CHECKVIEW.showContentView = function(strContentId) { ...@@ -158,7 +164,10 @@ CHECKVIEW.showContentView = function(strContentId) {
contentType = data.contentData.contentType; contentType = data.contentData.contentType;
if (contentType == COMMON.ContentTypeKeys.Type_Others) { if (contentType == COMMON.ContentTypeKeys.Type_Others) {
// Download content // Download content
HEADER.downloadResourceById(strContentId); COMMON.downloadResourceById(strContentId);
} else if (contentType == COMMON.ContentTypeKeys.Type_Link) {
// link content
COMMON.viewLinkContentById(strContentId, false);
} else { } else {
// Go to Conten view page // Go to Conten view page
// アラート表示組み込めるか // アラート表示組み込めるか
...@@ -181,7 +190,7 @@ CHECKVIEW.showContentView = function(strContentId) { ...@@ -181,7 +190,7 @@ CHECKVIEW.showContentView = function(strContentId) {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login); AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
} else { } else {
// アラートメッセージ表示 // アラートメッセージ表示
CHECKVIEW.showAlertScreen(I18N.i18nText('msgContentNotExist'), "abvw/" + COMMON.ScreenIds.Home); LOGIN.showAlertScreen(I18N.i18nText('msgContentNotExist'), "");
} }
}); });
...@@ -205,3 +214,4 @@ CHECKVIEW.debugLog = function(msg){ ...@@ -205,3 +214,4 @@ CHECKVIEW.debugLog = function(msg){
//$("#debug").html(msg); //$("#debug").html(msg);
}; };
abvw/js/contentsearch.js
...@@ -237,7 +237,7 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, offset, ...@@ -237,7 +237,7 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, offset,
+ ' </a>' + ' </a>'
+ ' <div class="text">' + ' <div class="text">'
+ ' <a id="title' + post.contentId + '" class="name dialog" contentid="' + post.contentId + '">' + ' <a id="title' + post.contentId + '" class="name dialog" contentid="' + post.contentId + '">'
+ ' <img class="listIcon" src="' + HEADER.getIconTypeContent(post.contentType) + '" width="20" height="20">' + ' <img class="listIcon" src="' + COMMON.getIconTypeContent(post.contentType) + '" width="20" height="20">'
+ ' <div class="contentsearch_title">' + post.contentTitle + '</div>' + ' <div class="contentsearch_title">' + post.contentTitle + '</div>'
+ ' </a>' + ' </a>'
+ ' <div class="info">' + ' <div class="info">'
...@@ -760,12 +760,12 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId) { ...@@ -760,12 +760,12 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId) {
// For testing without other Type. // For testing without other Type.
if (contentType == COMMON.ContentTypeKeys.Type_Others) { if (contentType == COMMON.ContentTypeKeys.Type_Others) {
// Download content // Download content
HEADER.downloadResourceById(contentId); COMMON.downloadResourceById(contentId);
// redraw content remove new icon // redraw content remove new icon
CONTENTSEARCH.drawEditImage(contentId); CONTENTSEARCH.drawEditImage(contentId);
} else if (contentType == COMMON.ContentTypeKeys.Type_Link) { } else if (contentType == COMMON.ContentTypeKeys.Type_Link) {
// link content // link content
HEADER.viewLinkContentById(contentId); COMMON.viewLinkContentById(contentId, true);
// redraw content remove new icon // redraw content remove new icon
CONTENTSEARCH.drawEditImage(contentId); CONTENTSEARCH.drawEditImage(contentId);
} else { } else {
...@@ -829,7 +829,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v ...@@ -829,7 +829,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v
if (readArr == null || readArr <= 0 || readArr == 'undefined') { if (readArr == null || readArr <= 0 || readArr == 'undefined') {
imgThumb.onload = function() { imgThumb.onload = function() {
var resizeImg = CONTENTSEARCH.resizeResourceThumbnail(imgThumb, c.width, c.height); var resizeImg = COMMON.resizeResourceThumbnail(imgThumb, c.width, c.height);
ctx.drawImage(imgThumb, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]); ctx.drawImage(imgThumb, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]);
imgIconNew.onload = function() { imgIconNew.onload = function() {
ctx.drawImage(imgIconNew, c.width / 2 - resizeImg[0] / 2, c.height - resizeImg[1]); ctx.drawImage(imgIconNew, c.width / 2 - resizeImg[0] / 2, c.height - resizeImg[1]);
...@@ -842,7 +842,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v ...@@ -842,7 +842,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v
if (contentThumbnail == '' || contentThumbnail == null) { if (contentThumbnail == '' || contentThumbnail == null) {
if (!COMMON.isPdfContent(contentType)) { if (!COMMON.isPdfContent(contentType)) {
var src = HEADER.getThumbnailForOtherType(contentType); var src = COMMON.getThumbnailForOtherType(contentType);
if (src != '') { if (src != '') {
imgThumb.src = src; imgThumb.src = src;
} }
...@@ -856,7 +856,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v ...@@ -856,7 +856,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v
for ( var nIndex1 = 0; nIndex1 < ClientData.ReadingContentIds().length; nIndex1++) { for ( var nIndex1 = 0; nIndex1 < ClientData.ReadingContentIds().length; nIndex1++) {
if (ClientData.ReadingContentIds()[nIndex1].contentid == contId) { if (ClientData.ReadingContentIds()[nIndex1].contentid == contId) {
imgThumb.onload = function() { imgThumb.onload = function() {
var resizeImg = CONTENTSEARCH.resizeResourceThumbnail(imgThumb, c.width, c.height); var resizeImg = COMMON.resizeResourceThumbnail(imgThumb, c.width, c.height);
ctx.drawImage(imgThumb, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]); ctx.drawImage(imgThumb, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]);
$("#loadingIcon" + contId).fadeOut('slow', function() { $("#loadingIcon" + contId).fadeOut('slow', function() {
$('#content-thumbnail' + contId).fadeIn('slow'); $('#content-thumbnail' + contId).fadeIn('slow');
...@@ -865,7 +865,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v ...@@ -865,7 +865,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v
if (contentThumbnail == '' || contentThumbnail == null) { if (contentThumbnail == '' || contentThumbnail == null) {
if (!COMMON.isPdfContent(contentType)) { if (!COMMON.isPdfContent(contentType)) {
var src = HEADER.getThumbnailForOtherType(contentType); var src = COMMON.getThumbnailForOtherType(contentType);
if (src != '') { if (src != '') {
imgThumb.src = src; imgThumb.src = src;
} }
...@@ -888,7 +888,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v ...@@ -888,7 +888,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v
if (versionArr[nIndex2].contentid == contId) { if (versionArr[nIndex2].contentid == contId) {
if (versionArr[nIndex2].resourceversion != resourceVer) { if (versionArr[nIndex2].resourceversion != resourceVer) {
imgThumb.onload = function() { imgThumb.onload = function() {
var resizeImg = CONTENTSEARCH.resizeResourceThumbnail(imgThumb, c.width, c.height); var resizeImg = COMMON.resizeResourceThumbnail(imgThumb, c.width, c.height);
ctx.drawImage(imgThumb, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]); ctx.drawImage(imgThumb, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]);
imgIconEdit.onload = function() { imgIconEdit.onload = function() {
ctx.drawImage(imgIconEdit, c.width / 2 - resizeImg[0] / 2, c.height - resizeImg[1]); ctx.drawImage(imgIconEdit, c.width / 2 - resizeImg[0] / 2, c.height - resizeImg[1]);
...@@ -903,7 +903,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v ...@@ -903,7 +903,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v
if (contentThumbnail == '' || contentThumbnail == null) { if (contentThumbnail == '' || contentThumbnail == null) {
if (!COMMON.isPdfContent(contentType)) { if (!COMMON.isPdfContent(contentType)) {
var src = HEADER.getThumbnailForOtherType(contentType); var src = COMMON.getThumbnailForOtherType(contentType);
if (src != '') { if (src != '') {
imgThumb.src = src; imgThumb.src = src;
} }
...@@ -925,7 +925,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v ...@@ -925,7 +925,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v
if (metaArr[nIndex2].contentid == contId) { if (metaArr[nIndex2].contentid == contId) {
if (metaArr[nIndex2].metaversion != metaVer) { if (metaArr[nIndex2].metaversion != metaVer) {
imgThumb.onload = function() { imgThumb.onload = function() {
var resizeImg = CONTENTSEARCH.resizeResourceThumbnail(imgThumb, c.width, c.height); var resizeImg = COMMON.resizeResourceThumbnail(imgThumb, c.width, c.height);
ctx.drawImage(imgThumb, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]); ctx.drawImage(imgThumb, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]);
imgIconEdit.onload = function() { imgIconEdit.onload = function() {
ctx.drawImage(imgIconEdit, c.width / 2 - resizeImg[0] / 2, c.height - resizeImg[1]); ctx.drawImage(imgIconEdit, c.width / 2 - resizeImg[0] / 2, c.height - resizeImg[1]);
...@@ -938,7 +938,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v ...@@ -938,7 +938,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v
// thumbnail. // thumbnail.
if (contentThumbnail == '' || contentThumbnail == null) { if (contentThumbnail == '' || contentThumbnail == null) {
if (!COMMON.isPdfContent(contentType)) { if (!COMMON.isPdfContent(contentType)) {
var src = HEADER.getThumbnailForOtherType(contentType); var src = COMMON.getThumbnailForOtherType(contentType);
if (src != '') { if (src != '') {
imgThumb.src = src; imgThumb.src = src;
} }
...@@ -955,7 +955,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v ...@@ -955,7 +955,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v
} }
} else { } else {
imgThumb.onload = function() { imgThumb.onload = function() {
var resizeImg = CONTENTSEARCH.resizeResourceThumbnail(imgThumb, c.width, c.height); var resizeImg = COMMON.resizeResourceThumbnail(imgThumb, c.width, c.height);
ctx.drawImage(imgThumb, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]); ctx.drawImage(imgThumb, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]);
imgIconNew.onload = function() { imgIconNew.onload = function() {
ctx.drawImage(imgIconNew, c.width / 2 - resizeImg[0] / 2, c.height - resizeImg[1]); ctx.drawImage(imgIconNew, c.width / 2 - resizeImg[0] / 2, c.height - resizeImg[1]);
...@@ -968,7 +968,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v ...@@ -968,7 +968,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer, v
if (contentThumbnail == '' || contentThumbnail == null) { if (contentThumbnail == '' || contentThumbnail == null) {
if (!COMMON.isPdfContent(contentType)) { if (!COMMON.isPdfContent(contentType)) {
var src = HEADER.getThumbnailForOtherType(contentType); var src = COMMON.getThumbnailForOtherType(contentType);
if (src != '') { if (src != '') {
imgThumb.src = src; imgThumb.src = src;
} }
...@@ -989,7 +989,7 @@ CONTENTSEARCH.drawEditImage = function(id) { ...@@ -989,7 +989,7 @@ CONTENTSEARCH.drawEditImage = function(id) {
} else { } else {
var contentType = CONTENTSEARCH.returnContentType(id); var contentType = CONTENTSEARCH.returnContentType(id);
var src = HEADER.getThumbnailForOtherType(contentType); var src = COMMON.getThumbnailForOtherType(contentType);
if (src != '') { if (src != '') {
imgSrc = src; imgSrc = src;
} }
...@@ -1001,7 +1001,7 @@ CONTENTSEARCH.drawEditImage = function(id) { ...@@ -1001,7 +1001,7 @@ CONTENTSEARCH.drawEditImage = function(id) {
var ctx = c.getContext('2d'); var ctx = c.getContext('2d');
ctx.clearRect(0, 0, c.width, c.height); ctx.clearRect(0, 0, c.width, c.height);
img.onload = function() { img.onload = function() {
var resizeImg = CONTENTSEARCH.resizeResourceThumbnail(img, c.width, c.height); var resizeImg = COMMON.resizeResourceThumbnail(img, c.width, c.height);
ctx.drawImage(img, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]); ctx.drawImage(img, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]);
$("#loadingIcon" + id).fadeOut('slow', function() { $("#loadingIcon" + id).fadeOut('slow', function() {
$('#content-thumbnail' + id).fadeIn('slow'); $('#content-thumbnail' + id).fadeIn('slow');
...@@ -1219,19 +1219,6 @@ CONTENTSEARCH.enableSort = function() { ...@@ -1219,19 +1219,6 @@ CONTENTSEARCH.enableSort = function() {
} }
}; };
CONTENTSEARCH.resizeResourceThumbnail = function(mg, width, height) {
var newWidth;
var newHeight;
var delta = Math.min(width / mg.width, height / mg.height);
newHeight = parseInt(delta * mg.height);
newWidth = parseInt(delta * mg.width);
var result = [ newWidth, newHeight ];
return result;
};
CONTENTSEARCH.removeHoverCss = function() { CONTENTSEARCH.removeHoverCss = function() {
if (COMMON.isTouchDevice()) { if (COMMON.isTouchDevice()) {
$('#control-sort-title').removeClass('nottouchdevice'); $('#control-sort-title').removeClass('nottouchdevice');
...@@ -1331,6 +1318,6 @@ CONTENTSEARCH.downloadSubmenuFunction = function(e) { ...@@ -1331,6 +1318,6 @@ CONTENTSEARCH.downloadSubmenuFunction = function(e) {
var contentId = $(this).attr('contentid'); var contentId = $(this).attr('contentid');
// Download content // Download content
HEADER.downloadResourceById(contentId); COMMON.downloadResourceById(contentId);
}; };
abvw/js/contentview.js
...@@ -2159,6 +2159,7 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){ ...@@ -2159,6 +2159,7 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
if( resourceUrl == null ){ if( resourceUrl == null ){
resourceUrl = CONTENTVIEW.downloadResourceById(CONTENTVIEW_GENERAL.contentID); resourceUrl = CONTENTVIEW.downloadResourceById(CONTENTVIEW_GENERAL.contentID);
} }
//CONTENTVIEW_GENERAL.contentType = COMMON.ContentTypeKeys.Type_Html; //CONTENTVIEW_GENERAL.contentType = COMMON.ContentTypeKeys.Type_Html;
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music){
CONTENTVIEW.handleForContentTypeMusic(resourceUrl); CONTENTVIEW.handleForContentTypeMusic(resourceUrl);
...@@ -5844,12 +5845,24 @@ CONTENTVIEW.screenBack = function(){ ...@@ -5844,12 +5845,24 @@ CONTENTVIEW.screenBack = function(){
//元の位置に戻す //元の位置に戻す
window.scrollTo(0,CONTENTSEARCH.scrollTop); window.scrollTo(0,CONTENTSEARCH.scrollTop);
} else if( $('#home_check').length ){
HOME_CHECK.cssInit();
//$("#header-ws").show();
$("#ws-body").show();
//$("#topcontrol").show();
//document.title = I18N.i18nText('txtSearchResult') + ' | ' + I18N.i18nText('sysAppTitle');
//元の位置に戻す
window.scrollTo(0,HOME_CHECK.scrollTop);
} }
//プッシュメッセージ再開
// check new push message if( $('#header-ws').length ){
if (COMMON.isAnonymousLogin() == false ) { //プッシュメッセージ再開
// continue check new push message // check new push message
setTimeout(HEADER.getPushMessageNew, HEADER.getTimeWaitCheckNewPushMessage()); if (COMMON.isAnonymousLogin() == false ) {
// continue check new push message
setTimeout(HEADER.getPushMessageNew, HEADER.getTimeWaitCheckNewPushMessage());
}
} }
}; };
...@@ -6326,10 +6339,10 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){ ...@@ -6326,10 +6339,10 @@ CONTENTVIEW.panoContentLink = function(targetContentId, page){
} }
else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){ else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){
if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){ if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(targetContentId); COMMON.viewLinkContentById(targetContentId, true);
}else if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Others){ }else if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Others){
HEADER.downloadResourceById(targetContentId); COMMON.downloadResourceById(targetContentId);
}else{ }else{
ClientData.common_preContentId(targetContentId); ClientData.common_preContentId(targetContentId);
ClientData.common_prePageNo(page); ClientData.common_prePageNo(page);
......
abvw/js/contentview_CreateObjects.js
...@@ -1457,7 +1457,7 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im ...@@ -1457,7 +1457,7 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
} }
else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){ else if(data.contentData.alertMessageLevel == CONTENTVIEW_CREATEOBJECT.alertMessageLevel.None){
if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){ if(data.contentData.contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(contentId); COMMON.viewLinkContentById(contentId, true);
}else{ }else{
ClientData.common_preContentId(contentId); ClientData.common_preContentId(contentId);
ClientData.common_prePageNo(pageNo); ClientData.common_prePageNo(pageNo);
...@@ -1560,10 +1560,10 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg, contentType){ ...@@ -1560,10 +1560,10 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg, contentType){
$('#dialog a#contentAlertOk').click(function(){ $('#dialog a#contentAlertOk').click(function(){
if(contentType == COMMON.ContentTypeKeys.Type_Link){ if(contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); COMMON.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId, true);
}else if(contentType == COMMON.ContentTypeKeys.Type_Others){ }else if(contentType == COMMON.ContentTypeKeys.Type_Others){
HEADER.downloadResourceById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); COMMON.downloadResourceById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
}else{ }else{
ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo); ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
...@@ -1638,10 +1638,10 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(contentType){ ...@@ -1638,10 +1638,10 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(contentType){
function (data) { function (data) {
if (data.result == 'success') { if (data.result == 'success') {
if(contentType == COMMON.ContentTypeKeys.Type_Link){ if(contentType == COMMON.ContentTypeKeys.Type_Link){
HEADER.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); COMMON.viewLinkContentById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId, true);
}else if(contentType == COMMON.ContentTypeKeys.Type_Others){ }else if(contentType == COMMON.ContentTypeKeys.Type_Others){
HEADER.downloadResourceById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); COMMON.downloadResourceById(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
}else{ }else{
ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId); ClientData.common_preContentId(CONTENTVIEW_CREATEOBJECT.moveContentParam.preContentId);
ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo); ClientData.common_prePageNo(CONTENTVIEW_CREATEOBJECT.moveContentParam.prePageNo);
......
abvw/js/contentview_Events.js
...@@ -1346,8 +1346,13 @@ CONTENTVIEW_EVENTS.imgHome_click = function(e) { ...@@ -1346,8 +1346,13 @@ CONTENTVIEW_EVENTS.imgHome_click = function(e) {
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
COMMON.RegisterLog(); COMMON.RegisterLog();
//window.location.href = COMMON.ScreenIds.Home; // ホームへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.Home); if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove(COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove(COMMON.ScreenIds.Home);
}
}; };
CONTENTVIEW_EVENTS.closePopUpCopyMemo = function() { CONTENTVIEW_EVENTS.closePopUpCopyMemo = function() {
......
abvw/js/contentview_InitObjects.js
...@@ -642,7 +642,7 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){ ...@@ -642,7 +642,7 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){
} }
//Display overlay dialog for specify content type //Display overlay dialog for specify content type
CONTENTVIEW.displayOverlayForSpecifyContentType(); CONTENTVIEW.displayOverlayForSpecifyContentType(null);
//Resize window //Resize window
$(window).resize(function () { $(window).resize(function () {
......
abvw/js/detail.js
...@@ -204,11 +204,11 @@ DETAIL.contentdetail_dspRead_Click_callback = function(outputId) { ...@@ -204,11 +204,11 @@ DETAIL.contentdetail_dspRead_Click_callback = function(outputId) {
if (ClientData.contentInfo_contentType() == COMMON.ContentTypeKeys.Type_Others) { if (ClientData.contentInfo_contentType() == COMMON.ContentTypeKeys.Type_Others) {
// Get content detail // Get content detail
HEADER.downloadResourceById(ClientData.contentInfo_contentId()); COMMON.downloadResourceById(ClientData.contentInfo_contentId());
} }
else if(ClientData.contentInfo_contentType() == COMMON.ContentTypeKeys.Type_Link){ else if(ClientData.contentInfo_contentType() == COMMON.ContentTypeKeys.Type_Link){
// Get content detail // Get content detail
HEADER.viewLinkContentById(ClientData.contentInfo_contentId()); COMMON.viewLinkContentById(ClientData.contentInfo_contentId(), true);
} }
else { else {
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView); //AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
...@@ -252,7 +252,7 @@ DETAIL.showContentNotPDF = function(displayData) { ...@@ -252,7 +252,7 @@ DETAIL.showContentNotPDF = function(displayData) {
if(displayData.contentThumbnail == '' || displayData.contentThumbnail == null || displayData.contentThumbnail == 'undefined'){ if(displayData.contentThumbnail == '' || displayData.contentThumbnail == null || displayData.contentThumbnail == 'undefined'){
if(!COMMON.isPdfContent(tempContentType)){ if(!COMMON.isPdfContent(tempContentType)){
var src = HEADER.getThumbnailForOtherType(contentType); var src = COMMON.getThumbnailForOtherType(contentType);
if( src != '' ){ if( src != '' ){
displayData.contentThumbnail = src; displayData.contentThumbnail = src;
} }
......
abvw/js/header.js
...@@ -1036,195 +1036,3 @@ HEADER.setStatusSort = function(currentid, isAsc) { ...@@ -1036,195 +1036,3 @@ HEADER.setStatusSort = function(currentid, isAsc) {
$('#menu_sort li').removeClass('current'); $('#menu_sort li').removeClass('current');
$(currentid).addClass(isAsc ? 'ascending_sort' : 'descending_sort').parent().addClass("current"); $(currentid).addClass(isAsc ? 'ascending_sort' : 'descending_sort').parent().addClass("current");
}; };
// get icon of content type
HEADER.getIconTypeContent = function(contentType) {
var src = '';
switch (contentType) {
case COMMON.ContentTypeKeys.Type_PDF:
{
src = 'img/bookshelf/icon_01.png';
break;
}
case COMMON.ContentTypeKeys.Type_Enquete:
{
src = 'img/bookshelf/icon_09.png';
break;
}
case COMMON.ContentTypeKeys.Type_Exam:
{
src = 'img/bookshelf/icon_10.png';
break;
}
case COMMON.ContentTypeKeys.Type_Html:
{
src = 'img/bookshelf/icon_05.png';
break;
}
case COMMON.ContentTypeKeys.Type_Image:
{
src = 'img/bookshelf/icon_02.png';
break;
}
case COMMON.ContentTypeKeys.Type_Music:
{
src = 'img/bookshelf/icon_06.png';
break;
}
case COMMON.ContentTypeKeys.Type_NoFile:
{
src = 'img/bookshelf/icon_07.png';
break;
}
case COMMON.ContentTypeKeys.Type_Others:
{
src = 'img/bookshelf/icon_03.png';
break;
}
case COMMON.ContentTypeKeys.Type_Video:
{
src = 'img/bookshelf/icon_04.png';
break;
}
case COMMON.ContentTypeKeys.Type_Link:
{
src = 'img/bookshelf/icon_08.png';
break;
}
case COMMON.ContentTypeKeys.Type_PanoMovie:
{
src = 'img/bookshelf/icon_11.png';
break;
}
case COMMON.ContentTypeKeys.Type_PanoImage:
{
src = 'img/bookshelf/icon_12.png';
break;
}
case COMMON.ContentTypeKeys.Type_ObjectVR:
{
src = 'img/bookshelf/icon_13.png';
break;
}
default: break;
}
return src;
};
// download resouce content id
HEADER.downloadResourceById = function(contentId){
var params = {
sid: ClientData.userInfo_sid(),
contentId: contentId,
getType: '2'
};
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", "get", params,
function (data) {
//Get resourceurl
if( data.contentData.content ){
var resourceUrl = HEADER.getResourceByIdFromAPI(data.contentData.content.resourceId);
// open url to download file
if (HEADER.isSafariNotOnIpad()) {
window.onbeforeunload = null;
window.open(resourceUrl, "_self"); // open url to download file on safari not for ipad
var toogleTime = setTimeout(function () { COMMON.ToogleLogoutNortice() }, 200);
}
else {
window.open(resourceUrl); //open url to download file on orther browser
}
} else {
alert("ダウンロード出来ません。");
}
},
function (xhr, b, c) { }
);
};
//Download resource
HEADER.getResourceByIdFromAPI = function(resourceId){
return AVWEB.getURL("webResourceDownload") + "&sid=" + ClientData.userInfo_sid() + "&resourceId=" + resourceId + "&isDownload=true";
};
// check is browser safari on Mac and Window devide ( not Ipad )
HEADER.isSafariNotOnIpad = function() {
if (!window.chrome) {
var ua = navigator.userAgent.toLowerCase();
if (!/ipad/.test(ua) && /safari/.test(ua)) {
return true;
}
}
return false;
};
//link content
HEADER.viewLinkContentById = function(contentId){
var params = {
sid: ClientData.userInfo_sid(),
contentId: contentId,
getType: '2'
};
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", "get", params,
function (data) {
//Get linkUrl
var linkUrl = data.contentData.content.url;
if( !linkUrl ){
return;
}
window.open(linkUrl, "_blank", "new window, scrollbars=yes");
/*
//httpで始まる場合は別ウィンドウで開く
if (linkUrl.toLowerCase().indexOf('http') === 0) {
window.open(linkUrl, "_blank", "new window, scrollbars=yes");
}
else if( linkUrl.toLowerCase().indexOf('mailto') === 0 ){
//window.open(linkUrl, "_self");
location.href=linkUrl;
}
else {
// open url to download file
if (HEADER.isSafariNotOnIpad()) {
window.onbeforeunload = null;
window.open(linkUrl, "_self"); // open url to download file on safari not for ipad
var toogleTime = setTimeout(function () { COMMON.ToogleLogoutNortice() }, 200);
}
else {
window.open(linkUrl); //open url to download file on orther browser
}
}
*/
},
function (xhr, b, c) { });
};
// get ThumbnailForOtherType
HEADER.getThumbnailForOtherType = function(contentType){
var src = '';
if(contentType == COMMON.ContentTypeKeys.Type_Image){
src = COMMON.ThumbnailForOtherType.Thumbnail_ImageType;
}
else if(contentType == COMMON.ContentTypeKeys.Type_Music){
src = COMMON.ThumbnailForOtherType.Thumbnail_MusicType;
}
else if(contentType == COMMON.ContentTypeKeys.Type_Video){
src = COMMON.ThumbnailForOtherType.Thumbnail_VideoType;
}
else if(contentType == COMMON.ContentTypeKeys.Type_NoFile){
src = COMMON.ThumbnailForOtherType.Thumbnail_NoFileType;
}
else if(contentType == COMMON.ContentTypeKeys.Type_Others){
src = COMMON.ThumbnailForOtherType.Thumbnail_OthersType;
}
else if(contentType == COMMON.ContentTypeKeys.Type_Html){
src = COMMON.ThumbnailForOtherType.Thumbnail_HtmlType;
}
else if(contentType == COMMON.ContentTypeKeys.Type_Link){
src = COMMON.ThumbnailForOtherType.Thumbnail_LinkType;
}
return src;
};
abvw/js/history.js
...@@ -643,12 +643,12 @@ HISTORY.readSubmenuFunction_callback = function(contentId) { ...@@ -643,12 +643,12 @@ HISTORY.readSubmenuFunction_callback = function(contentId) {
if (contentType == COMMON.ContentTypeKeys.Type_Others) { if (contentType == COMMON.ContentTypeKeys.Type_Others) {
// Download content // Download content
HEADER.downloadResourceById(contentId); COMMON.downloadResourceById(contentId);
// redraw content remove new icon // redraw content remove new icon
HISTORY.drawEditImage(contentId); HISTORY.drawEditImage(contentId);
} else if (contentType == COMMON.ContentTypeKeys.Type_Link) { } else if (contentType == COMMON.ContentTypeKeys.Type_Link) {
// link content // link content
HEADER.viewLinkContentById(contentId); COMMON.viewLinkContentById(contentId, true);
// redraw content remove new icon // redraw content remove new icon
HISTORY.drawEditImage(contentId); HISTORY.drawEditImage(contentId);
} else { } else {
...@@ -709,7 +709,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version ...@@ -709,7 +709,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version
if (readArr == null || readArr <= 0 || readArr == 'undefined') { if (readArr == null || readArr <= 0 || readArr == 'undefined') {
imgThumb.onload = function() { imgThumb.onload = function() {
var resizeImg = HISTORY.resizeResourceThumbnail(imgThumb, c.width, c.height); var resizeImg = COMMON.resizeResourceThumbnail(imgThumb, c.width, c.height);
ctx.drawImage(imgThumb, c.width / 2 - resizeImg[0] / 2, 0, resizeImg[0], resizeImg[1]); ctx.drawImage(imgThumb, c.width / 2 - resizeImg[0] / 2, 0, resizeImg[0], resizeImg[1]);
imgIconNew.onload = function() { imgIconNew.onload = function() {
ctx.drawImage(imgIconNew, c.width / 2 - resizeImg[0] / 2, 0); ctx.drawImage(imgIconNew, c.width / 2 - resizeImg[0] / 2, 0);
...@@ -720,7 +720,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version ...@@ -720,7 +720,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version
if (contentThumbnail == '' || contentThumbnail == null) { if (contentThumbnail == '' || contentThumbnail == null) {
if (!COMMON.isPdfContent(contentType)) { if (!COMMON.isPdfContent(contentType)) {
var src = HEADER.getThumbnailForOtherType(contentType); var src = COMMON.getThumbnailForOtherType(contentType);
if (src != '') { if (src != '') {
imgThumb.src = src; imgThumb.src = src;
} }
...@@ -734,13 +734,13 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version ...@@ -734,13 +734,13 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version
for ( var nIndex1 = 0; nIndex1 < ClientData.ReadingContentIds().length; nIndex1++) { for ( var nIndex1 = 0; nIndex1 < ClientData.ReadingContentIds().length; nIndex1++) {
if (ClientData.ReadingContentIds()[nIndex1].contentid == contId) { if (ClientData.ReadingContentIds()[nIndex1].contentid == contId) {
imgThumb.onload = function() { imgThumb.onload = function() {
var resizeImg = HISTORY.resizeResourceThumbnail(imgThumb, c.width, c.height); var resizeImg = COMMON.resizeResourceThumbnail(imgThumb, c.width, c.height);
ctx.drawImage(imgThumb, c.width / 2 - resizeImg[0] / 2, 0, resizeImg[0], resizeImg[1]); ctx.drawImage(imgThumb, c.width / 2 - resizeImg[0] / 2, 0, resizeImg[0], resizeImg[1]);
HISTORY.showContentThumbnail(contId); HISTORY.showContentThumbnail(contId);
}; };
if (contentThumbnail == '' || contentThumbnail == null) { if (contentThumbnail == '' || contentThumbnail == null) {
if (!COMMON.isPdfContent(contentType)) { if (!COMMON.isPdfContent(contentType)) {
var src = HEADER.getThumbnailForOtherType(contentType); var src = COMMON.getThumbnailForOtherType(contentType);
if (src != '') { if (src != '') {
imgThumb.src = src; imgThumb.src = src;
} }
...@@ -762,7 +762,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version ...@@ -762,7 +762,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version
if (versionArr[nIndex2].contentid == contId) { if (versionArr[nIndex2].contentid == contId) {
if (versionArr[nIndex2].resourceversion != resourceVer) { if (versionArr[nIndex2].resourceversion != resourceVer) {
imgThumb.onload = function() { imgThumb.onload = function() {
var resizeImg = HISTORY.resizeResourceThumbnail(imgThumb, c.width, c.height); var resizeImg = COMMON.resizeResourceThumbnail(imgThumb, c.width, c.height);
ctx.drawImage(imgThumb, c.width / 2 - resizeImg[0] / 2, 0, resizeImg[0], resizeImg[1]); ctx.drawImage(imgThumb, c.width / 2 - resizeImg[0] / 2, 0, resizeImg[0], resizeImg[1]);
HISTORY.showContentThumbnail(contId); HISTORY.showContentThumbnail(contId);
imgIconEdit.onload = function() { imgIconEdit.onload = function() {
...@@ -773,7 +773,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version ...@@ -773,7 +773,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version
// thumbnail. // thumbnail.
if (contentThumbnail == '' || contentThumbnail == null) { if (contentThumbnail == '' || contentThumbnail == null) {
if (!COMMON.isPdfContent(contentType)) { if (!COMMON.isPdfContent(contentType)) {
var src = HEADER.getThumbnailForOtherType(contentType); var src = COMMON.getThumbnailForOtherType(contentType);
if (src != '') { if (src != '') {
imgThumb.src = src; imgThumb.src = src;
} }
...@@ -794,7 +794,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version ...@@ -794,7 +794,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version
if (metaArr[nIndex2].contentid == contId) { if (metaArr[nIndex2].contentid == contId) {
if (metaArr[nIndex2].metaversion != metaVer) { if (metaArr[nIndex2].metaversion != metaVer) {
imgThumb.onload = function() { imgThumb.onload = function() {
var resizeImg = HISTORY.resizeResourceThumbnail(imgThumb, c.width, c.height); var resizeImg = COMMON.resizeResourceThumbnail(imgThumb, c.width, c.height);
ctx.drawImage(imgThumb, c.width / 2 - resizeImg[0] / 2, 0, resizeImg[0], resizeImg[1]); ctx.drawImage(imgThumb, c.width / 2 - resizeImg[0] / 2, 0, resizeImg[0], resizeImg[1]);
HISTORY.showContentThumbnail(contId); HISTORY.showContentThumbnail(contId);
imgIconEdit.onload = function() { imgIconEdit.onload = function() {
...@@ -805,7 +805,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version ...@@ -805,7 +805,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version
// thumbnail. // thumbnail.
if (contentThumbnail == '' || contentThumbnail == null) { if (contentThumbnail == '' || contentThumbnail == null) {
if (!COMMON.isPdfContent(contentType)) { if (!COMMON.isPdfContent(contentType)) {
var src = HEADER.getThumbnailForOtherType(contentType); var src = COMMON.getThumbnailForOtherType(contentType);
if (src != '') { if (src != '') {
imgThumb.src = src; imgThumb.src = src;
} }
...@@ -831,7 +831,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version ...@@ -831,7 +831,7 @@ HISTORY.checkUserHasReadContent = function(contId, resourceVer, metaVer, version
}; };
if (contentThumbnail == '' || contentThumbnail == null) { if (contentThumbnail == '' || contentThumbnail == null) {
if (!COMMON.isPdfContent(contentType)) { if (!COMMON.isPdfContent(contentType)) {
var src = HEADER.getThumbnailForOtherType(contentType); var src = COMMON.getThumbnailForOtherType(contentType);
if (src != '') { if (src != '') {
imgThumb.src = src; imgThumb.src = src;
} }
...@@ -852,7 +852,7 @@ HISTORY.drawEditImage = function(id) { ...@@ -852,7 +852,7 @@ HISTORY.drawEditImage = function(id) {
} else { } else {
var contentType = HISTORY.returnContentType(id); var contentType = HISTORY.returnContentType(id);
var src = HEADER.getThumbnailForOtherType(contentType); var src = COMMON.getThumbnailForOtherType(contentType);
if (src != '') { if (src != '') {
imgSrc = src; imgSrc = src;
} }
...@@ -865,7 +865,7 @@ HISTORY.drawEditImage = function(id) { ...@@ -865,7 +865,7 @@ HISTORY.drawEditImage = function(id) {
var ctx = c.getContext('2d'); var ctx = c.getContext('2d');
ctx.clearRect(0, 0, c.width, c.height); ctx.clearRect(0, 0, c.width, c.height);
img.onload = function() { img.onload = function() {
var resizeImg = HISTORY.resizeResourceThumbnail(img, c.width, c.height); var resizeImg = COMMON.resizeResourceThumbnail(img, c.width, c.height);
ctx.drawImage(img, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]); ctx.drawImage(img, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]);
$("#loadingIcon" + id).fadeOut('slow', function() { $("#loadingIcon" + id).fadeOut('slow', function() {
$('#content-thumbnail' + id).fadeIn('slow'); $('#content-thumbnail' + id).fadeIn('slow');
...@@ -1299,7 +1299,7 @@ HISTORY.renderContentAfterSort = function(contentSortArr) { ...@@ -1299,7 +1299,7 @@ HISTORY.renderContentAfterSort = function(contentSortArr) {
+ ' </a>' + ' </a>'
+ ' <div class="text">' + ' <div class="text">'
+ ' <a id="title' + post.contentid + '" class="name dialog" contentid="' + post.contentid + '">' + ' <a id="title' + post.contentid + '" class="name dialog" contentid="' + post.contentid + '">'
+ ' <img class="listIcon" src="' + HEADER.getIconTypeContent(post.contenttype) + '" width="20" height="20" align="left">' + ' <img class="listIcon" src="' + COMMON.getIconTypeContent(post.contenttype) + '" width="20" height="20" align="left">'
+ ' <div class="history_title">' + COMMON.htmlEncode(post.contenttitle) + '</div>' + ' <div class="history_title">' + COMMON.htmlEncode(post.contenttitle) + '</div>'
+ ' </a>' + ' </a>'
+ ' <div class="info">' + ' <div class="info">'
...@@ -1376,19 +1376,6 @@ HISTORY.formatOriginalPublishDate = function(date) { ...@@ -1376,19 +1376,6 @@ HISTORY.formatOriginalPublishDate = function(date) {
// return titleKana; // return titleKana;
//}; //};
HISTORY.resizeResourceThumbnail = function(mg, width, height) {
var newWidth;
var newHeight;
var delta = Math.min(width / mg.width, height / mg.height);
newHeight = parseInt(delta * mg.height);
newWidth = parseInt(delta * mg.width);
var result = [ newWidth, newHeight ];
return result;
};
HISTORY.removeHoverCss = function() { HISTORY.removeHoverCss = function() {
if (COMMON.isTouchDevice()) { if (COMMON.isTouchDevice()) {
$('#control-sort-title').removeClass('nottouchdevice'); $('#control-sort-title').removeClass('nottouchdevice');
...@@ -1481,7 +1468,7 @@ HISTORY.downloadFunction = function(e) { ...@@ -1481,7 +1468,7 @@ HISTORY.downloadFunction = function(e) {
var contentId = $(this).attr('contentid'); var contentId = $(this).attr('contentid');
// Download content // Download content
HEADER.downloadResourceById(contentId); COMMON.downloadResourceById(contentId);
}; };
abvw/js/login.js
...@@ -203,6 +203,10 @@ LOGIN.processLogin = function() { ...@@ -203,6 +203,10 @@ LOGIN.processLogin = function() {
data.requirePasswordChange = 0; data.requirePasswordChange = 0;
} }
console.log("data.requirePasswordChange:" + data.requirePasswordChange);
console.log("ClientData.serviceOpt_abook_check:" + ClientData.serviceOpt_abook_check());
if (data.requirePasswordChange == 0) { if (data.requirePasswordChange == 0) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
...@@ -211,7 +215,11 @@ LOGIN.processLogin = function() { ...@@ -211,7 +215,11 @@ LOGIN.processLogin = function() {
LOGIN.showContentViewByOpenUrl(paramContentID); LOGIN.showContentViewByOpenUrl(paramContentID);
} else { } else {
// ホームへ移動 // ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home); if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
} }
} else if (data.requirePasswordChange == 1) { } else if (data.requirePasswordChange == 1) {
...@@ -245,7 +253,11 @@ LOGIN.processLogin = function() { ...@@ -245,7 +253,11 @@ LOGIN.processLogin = function() {
LOGIN.showContentViewByOpenUrl(paramContentID); LOGIN.showContentViewByOpenUrl(paramContentID);
} else { } else {
// ホームへ移動 // ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home); if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
} }
} else if (numDay > 30) { } else if (numDay > 30) {
LOGIN.OpenChangePasswordDialog(); LOGIN.OpenChangePasswordDialog();
...@@ -261,7 +273,11 @@ LOGIN.processLogin = function() { ...@@ -261,7 +273,11 @@ LOGIN.processLogin = function() {
LOGIN.showContentViewByOpenUrl(paramContentID); LOGIN.showContentViewByOpenUrl(paramContentID);
} else { } else {
// ホームへ移動 // ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home); if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
} }
} }
...@@ -290,7 +306,11 @@ LOGIN.processLogin = function() { ...@@ -290,7 +306,11 @@ LOGIN.processLogin = function() {
LOGIN.showContentViewByOpenUrl(paramContentID); LOGIN.showContentViewByOpenUrl(paramContentID);
} else { } else {
// ホームへ移動 // ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home); if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
} }
} else if (numDay > 30) { } else if (numDay > 30) {
...@@ -313,7 +333,11 @@ LOGIN.processLogin = function() { ...@@ -313,7 +333,11 @@ LOGIN.processLogin = function() {
LOGIN.showContentViewByOpenUrl(paramContentID); LOGIN.showContentViewByOpenUrl(paramContentID);
} else { } else {
// ホームへ移動 // ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home); if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
} }
} }
...@@ -360,7 +384,13 @@ LOGIN.changePasswordProcess = function() { ...@@ -360,7 +384,13 @@ LOGIN.changePasswordProcess = function() {
$('#dialog-error-message').css('display', 'none'); $('#dialog-error-message').css('display', 'none');
LOGIN.CloseChangePasswordDialog(); LOGIN.CloseChangePasswordDialog();
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
} else { } else {
$('#dialog-error-message').html(I18N.i18nText('msgPwdOldWrong')); $('#dialog-error-message').html(I18N.i18nText('msgPwdOldWrong'));
$('#dialog-error-message').show(); $('#dialog-error-message').show();
...@@ -426,7 +456,12 @@ LOGIN.skipPassFunction = function() { ...@@ -426,7 +456,12 @@ LOGIN.skipPassFunction = function() {
ClientData.userInfo_pwdSkipDt(date); ClientData.userInfo_pwdSkipDt(date);
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}; };
...@@ -486,6 +521,8 @@ LOGIN.saveServiceUserOption = function() { ...@@ -486,6 +521,8 @@ LOGIN.saveServiceUserOption = function() {
ClientData.serviceOpt_encryption(option.value); ClientData.serviceOpt_encryption(option.value);
} else if (option.serviceOptionId == 137) { } else if (option.serviceOptionId == 137) {
ClientData.serviceOpt_html_custom_log(option.value); ClientData.serviceOpt_html_custom_log(option.value);
} else if (option.serviceOptionId == 161) {
ClientData.serviceOpt_abook_check(option.value);
} }
}); });
}; };
...@@ -613,11 +650,19 @@ LOGIN.initLoginAnonymousUser = function() { ...@@ -613,11 +650,19 @@ LOGIN.initLoginAnonymousUser = function() {
LOGIN.showContentViewByOpenUrl(paramContentID); LOGIN.showContentViewByOpenUrl(paramContentID);
} else { } else {
// ホームへ移動 // ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home); if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
} }
} else { } else {
// ホームへ移動 // ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home); if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
} }
}); });
...@@ -747,7 +792,7 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) { ...@@ -747,7 +792,7 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
contentType = data.contentData.contentType; contentType = data.contentData.contentType;
if (contentType == COMMON.ContentTypeKeys.Type_Others) { if (contentType == COMMON.ContentTypeKeys.Type_Others) {
// Download content // Download content
HEADER.downloadResourceById(strContentId); COMMON.downloadResourceById(strContentId);
} else { } else {
// Go to Conten view page // Go to Conten view page
if(ClientData.isGetitsMode()){ if(ClientData.isGetitsMode()){
...@@ -791,7 +836,11 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) { ...@@ -791,7 +836,11 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login); AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
} else { } else {
// アラートメッセージ表示 // アラートメッセージ表示
LOGIN.showAlertScreen(I18N.i18nText('msgContentNotExist'), "abvw/" + COMMON.ScreenIds.Home); if (ClientData.serviceOpt_abook_check() == 'Y') {
LOGIN.showAlertScreen(I18N.i18nText('msgContentNotExist'), "abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
LOGIN.showAlertScreen(I18N.i18nText('msgContentNotExist'), "abvw/" + COMMON.ScreenIds.Home);
}
} }
}); });
...@@ -810,7 +859,11 @@ LOGIN.alertMessageCancelFunction_callback = function() { ...@@ -810,7 +859,11 @@ LOGIN.alertMessageCancelFunction_callback = function() {
if (ClientData.isGetitsMode() == true) { if (ClientData.isGetitsMode() == true) {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login); AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
} else { } else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home); if (ClientData.serviceOpt_abook_check() == 'Y') {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.HomeCheck);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
} }
}; };
...@@ -906,6 +959,8 @@ LOGIN.ready = function() { ...@@ -906,6 +959,8 @@ LOGIN.ready = function() {
// モード初期化 // モード初期化
ClientData.isGetitsMode(false); ClientData.isGetitsMode(false);
ClientData.isStreamingMode(false); ClientData.isStreamingMode(false);
ClientData.isCheckViewMode(false);
ClientData.isCheckMode(false);
ClientData.storeUrl(""); ClientData.storeUrl("");
// getitsサーバー設定確認 // getitsサーバー設定確認
...@@ -940,6 +995,7 @@ LOGIN.ready = function() { ...@@ -940,6 +995,7 @@ LOGIN.ready = function() {
ClientData.conf_apiUrl(sysSettings.apiUrl); ClientData.conf_apiUrl(sysSettings.apiUrl);
ClientData.conf_apiLoginUrl(sysSettings.apiLoginUrl); ClientData.conf_apiLoginUrl(sysSettings.apiLoginUrl);
ClientData.conf_apiResourceDlUrl(sysSettings.apiResourceDlUrl); ClientData.conf_apiResourceDlUrl(sysSettings.apiResourceDlUrl);
ClientData.conf_checkApiUrl(sysSettings.checkApiUrl);
} }
if (ClientData.isGetitsMode() == true) { if (ClientData.isGetitsMode() == true) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment