CheckWeb版対応

edb929e7 · Masaru Abe · 527af281 · edb929e7 · edb929e7 · edb929e7
Commit edb929e7 authored Jan 29, 2019 by Masaru Abe
Showing with 101 additions and 39 deletions

abvw/common/js/common.js
+0 -8

abvw/common/json/sys/conf.json
+0 -2

abvw/home_check.html
+47 -4

abvw/js/check/home_check.js
+54 -10

abvw/js/contentview_Events.js
+0 -14

abvw/js/login.js
+0 -1

No files found.
--- a/abvw/common/js/common.js
+++ b/abvw/common/js/common.js
@@ -379,7 +379,6 @@ COMMON.Keys = {
    conf_apiUrl : 'conf_apiUrl',
    conf_apiLoginUrl : 'conf_apiLoginUrl',
    conf_apiResourceDlUrl : 'conf_apiResourceDlUrl',
-    conf_checkApiUrl : 'conf_checkApiUrl',
    storeUrl : 'storeUrl',
    siteUrl : 'siteUrl',
@@ -1747,13 +1746,6 @@ var ClientData = {
            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) {
        if (arguments.length > 0) {

--- a/abvw/common/json/sys/conf.json
+++ b/abvw/common/json/sys/conf.json
@@ -2,11 +2,9 @@
 	"1apiUrl"                : "http://localhost:8080/acms/{0}/abvapi",
 	"1apiLoginUrl"           : "http://localhost:8080/acms/nuabvapi",
 	"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,
 	"bookListCount"         : 15,
 	"screenlockTimeDefault" : 30,

--- a/abvw/home_check.html
+++ b/abvw/home_check.html
@@ -200,6 +200,33 @@
          color: #444444;
          padding: 0;
        }
+        .headerBar {
+          z-index: 9999 !important;
+          position: relative;
+          background: #0068cb;
+          margin: 0;
+          padding: 0;
+          font-size: 14px;
+          width: auto;
+          height: 50px;
+          display: flex;
+        }
+        .headerBar .titleInfo {
+          width: 100%;
+          font-size: 16px;
+          font-weight: bold;
+          text-align: center;
+          color: rgb(255, 255, 255);
+          margin: auto;
+        }
+        .headerBar .headerBtn {
+          margin: auto;
+          padding: 5px;
+        }
      </style>
 </head>
@@ -207,7 +234,26 @@
 <div id="ws-body" >
-    <a href="#" id="dspLogout" ><img src="img/common/icon_logout.png" width="30" height="30"></a>
+    <div id="projectBar" class="headerBar">
+        <div class="headerBtn">
+           <a href="#" id="dspLogout" ><img src="img/check/ic_exit_to_app_white_48dp.png" width="40" height="40"></a>
+        </div>
+        <div class="titleInfo" >
+           プロジェクト一覧
+        </div>
+        <div class="headerBtn">
+           <a href="#" id="dspCommonContent" ><img src="img/check/ic_common_content_on.png" width="40" height="40"></a>
+        </div>
+     </div>
+     <div id="contentBar" class="headerBar" style="display: none;">
+         <div class="headerBtn">
+             <a href="#" id="dspBack" ><img src="img/check/first_back_icon.png" width="40" height="40"></a>
+         </div>
+         <div class="titleInfo" >
+           関連資料
+         </div>
+     </div>
    <!--
    <header>
@@ -245,9 +291,6 @@
    </div>
    <div id="content-grid" style="display: none;">
    </div>
 </div>

--- a/abvw/js/check/home_check.js
+++ b/abvw/js/check/home_check.js
@@ -28,6 +28,11 @@ $(document).ready(function() {
    document.title = I18N.i18nText('dspHome') + ' | ' + I18N.i18nText('sysAppTitle');
+    $('#dspCommonContent').click(HOME_CHECK.viewCommonContent);
+    $('#dspCommonContent').show();
+    $('#dspBack').click(HOME_CHECK.backProjectList);
    // プロジェクト一覧　初期表示
    HOME_CHECK.initProjectView();
@@ -43,6 +48,10 @@ $(document).ready(function() {
 });
+HOME_CHECK.viewCommonContent = function() {
+    HOME_CHECK.initContentView(null, "2");
+};
 // Initial Project Screen
 HOME_CHECK.initProjectView = function() {
@@ -54,7 +63,7 @@ HOME_CHECK.initProjectView = function() {
 };
 // Initial Content Screen
-HOME_CHECK.initContentView = function() {
+HOME_CHECK.initContentView = function(relatedContentList, projectUse) {
    var sortType = HOME_CHECK.DEFAULT_SORT_TYPE;
    var sortOrder = HOME_CHECK.DEFAULT_SORT_ORDER;
@@ -64,6 +73,17 @@ HOME_CHECK.initContentView = function() {
    var groupId = '';
    var sid = ClientData.userInfo_sid();
+    var contentIds = '';
+    if (relatedContentList) {
+        $.each(relatedContentList, function(i, post) {
+            if (contentIds != ''){
+                contentIds = contentIds + ',' +  post.contentId;
+            } else {
+                contentIds = post.contentId;
+            }
+        });
+    }
    var offsetPage = 0;
    var limitPage = 999; //暫定
@@ -86,13 +106,16 @@ HOME_CHECK.initContentView = function() {
    $('#listValues').hide();
    $('#content-grid').show();
+    $('#projectBar').hide();
+    $('#contentBar').show();
    // Refresh GridView
    HOME_CHECK.refreshGrid();
    //HOME.resetShowNextRecordCount();
    // Render Gridview
-    HOME_CHECK.renderContent(sid, searchText, searchDivision, sortType, sortOrder, offsetPage, limitPage, genreId, groupId);
+    HOME_CHECK.renderContent(sid, searchText, searchDivision, sortType, sortOrder, offsetPage, limitPage, genreId, groupId, contentIds, projectUse);
    // Go To Details Page
    $('.button-details').live('click', HOME_CHECK.readSubmenuFunction);
@@ -101,8 +124,6 @@ HOME_CHECK.initContentView = function() {
        //HOME_CHECK.home_isMove = true;
    });
 };
 // refresh GridView
@@ -113,7 +134,7 @@ HOME_CHECK.refreshGrid = function() {
 };
 // /Render Content
-HOME_CHECK.renderContent = function(id, text, division, type, order, offset, limit, cateid, grpid) {
+HOME_CHECK.renderContent = function(id, text, division, type, order, offset, limit, cateid, grpid, contentIds, projectUse) {
    var params = {
        sid : id,
        searchText : text,
@@ -123,7 +144,9 @@ HOME_CHECK.renderContent = function(id, text, division, type, order, offset, lim
        recordFrom : offset,
        recordTo : limit,
        genreId : cateid,
-        groupId : grpid
+        groupId : grpid,
+        contentIds : contentIds,
+        projectUse : projectUse
    };
    HOME_CHECK.abapi('webContentList', params, 'POST', function(data) {
@@ -246,6 +269,13 @@ HOME_CHECK.renderContent = function(id, text, division, type, order, offset, lim
    });
 };
 // Get Thumnail base on contentid
 HOME_CHECK.returnThumbnail = function(contentid) {
    var iArrCnt = HOME_CHECK.thumbnailArr.length;
@@ -704,11 +734,15 @@ HOME_CHECK.renderAddProject = function(post) {
        HOME_CHECK.createSession(post.projectId, post.projectType, post.projectReportType); 
    });
    $(actionBtnDiv.children()[1]).hide();
+    if (post.relatedContentList.length > 0) {
        $(actionBtnDiv.children()[2]).on("click", function() {
-        //CHK.reportMode = "1";
+            HOME_CHECK.initContentView(post.relatedContentList);
-        //HOME_CHECK.createSession(post.projectId); 
-        HOME_CHECK.initContentView();
        });
+    } else {
+        $(actionBtnDiv.children()[2]).find('img').attr("src","img/check/ic_common_content_off.png");
+        $(actionBtnDiv.children()[2]).prop("disabled", true);
+    }
 	listLi.append(actionBtnDiv);
@@ -789,7 +823,7 @@ HOME_CHECK.returnProjectType = function(projectId) {
 // Call API
 HOME_CHECK.checkApi = function(name, params, method, callback) {
-	var checkApiUrl = ClientData.conf_checkApiUrl(); // sysSettings.checkApiUrl;
+    var checkApiUrl = AVWEB.getCheckApiUrl(ClientData.userInfo_accountPath())
 	AVWEB.avwCmsApiWithUrl(checkApiUrl, ClientData.userInfo_accountPath(), name, method, params, callback, null);
 };
@@ -800,6 +834,16 @@ HOME_CHECK.abapi = function(name, param, method, callback) {
+HOME_CHECK.backProjectList = function() {
+    $('#listValues').show();
+    $('#content-grid').hide();
+    $('#projectBar').show();
+    $('#contentBar').hide();
+}
--- a/abvw/js/contentview_Events.js
+++ b/abvw/js/contentview_Events.js
@@ -1307,26 +1307,12 @@ CONTENTVIEW_EVENTS.imgBack_click = function() {
        	CONTENTVIEW.screenMove();
        } else {
-            /*check back */
-            //if (ClientData.BookmarkScreen()) {
-            //	AVWEB.avwScreenMove(ClientData.BookmarkScreen());
-            //} else {
-            //    window.history.back();
-            //}
            //元の画面に戻って画面復帰
            CONTENTVIEW.screenBack();
        }
    } else {
-        /*check back */
-        //if (ClientData.BookmarkScreen()) {
-        //	AVWEB.avwScreenMove(ClientData.BookmarkScreen());
-        //} else {
-        //   window.history.back();
-        //}
    	//元の画面に戻って画面復帰
    	CONTENTVIEW.screenBack();
    }
 };

--- a/abvw/js/login.js
+++ b/abvw/js/login.js
@@ -995,7 +995,6 @@ LOGIN.ready = function() {
 		ClientData.conf_apiUrl(sysSettings.apiUrl);
 		ClientData.conf_apiLoginUrl(sysSettings.apiLoginUrl);
 		ClientData.conf_apiResourceDlUrl(sysSettings.apiResourceDlUrl);
-		ClientData.conf_checkApiUrl(sysSettings.checkApiUrl);
 	}
 	if (ClientData.isGetitsMode() == true) {