Skip to content

C
check
Commit e3e221f1 by Masaru Abe
Options

バックアップリストア対応

parent 0f78c21c
Showing with 123 additions and 33 deletions
abvw/.htaccess
SetEnvIf Referer "^http://web3\.agentec\.jp/web_test/" RefererCheck #SetEnvIf Referer "^http://web3\.agentec\.jp/web_test/" RefererCheck
Order deny,allow #Order deny,allow
Deny from all #Deny from all
Allow from env=RefererCheck #Allow from env=RefererCheck
<Files ~ "\.(js|json)$"> <Files ~ "\.(js|json)$">
Header add Pragma "no-cache" Header add Pragma "no-cache"
Header set Cache-Control no-cache Header set Cache-Control no-cache
......
abvw/common/json/lang/lang-en.json
...@@ -156,5 +156,6 @@ ...@@ -156,5 +156,6 @@
"txtUrlValidDate": "validated period", "txtUrlValidDate": "validated period",
"txtMaxDownloadCount": "number of max dl", "txtMaxDownloadCount": "number of max dl",
"msgShareUrlPassword": "When you set a password, please input below.", "msgShareUrlPassword": "When you set a password, please input below.",
"msgStreamingOpenError": "It is the contents that I cannot read in the streaming." "msgStreamingOpenError": "It is the contents that I cannot read in the streaming.",
"txtBkContentStatus": "Content Status"
} }
abvw/common/json/lang/lang-ko.json
...@@ -156,5 +156,6 @@ ...@@ -156,5 +156,6 @@
"txtUrlValidDate": "URL유효기간", "txtUrlValidDate": "URL유효기간",
"txtMaxDownloadCount": "최대DL횟수", "txtMaxDownloadCount": "최대DL횟수",
"msgShareUrlPassword": "암호를 설정할경우 다음의 입력란에 입력하십시오.", "msgShareUrlPassword": "암호를 설정할경우 다음의 입력란에 입력하십시오.",
"msgStreamingOpenError": "스트리밍에서는 열람 할 수 없는 컨텐츠입니다." "msgStreamingOpenError": "스트리밍에서는 열람 할 수 없는 컨텐츠입니다.",
"txtBkContentStatus": "콘텐츠 상태"
} }
abvw/js/header.js
...@@ -620,7 +620,8 @@ HEADER.DoBackup = function(isBackupMarking, isBackupMemo, isBackupBookmark, isBa ...@@ -620,7 +620,8 @@ HEADER.DoBackup = function(isBackupMarking, isBackupMemo, isBackupBookmark, isBa
//READステータス追加 //READステータス追加
if(ClientData.ReadingContentIds().length > 0){ if(ClientData.ReadingContentIds().length > 0){
for(var nIndex = 0; nIndex < ClientData.ReadingContentIds().length; nIndex++){ for(var nIndex = 0; nIndex < ClientData.ReadingContentIds().length; nIndex++){
HEADER.setContentStatus(ClientData.ReadingContentIds()[nIndex].contentid, 0 ); //存在しない場合追加
HEADER.addContentStatusRead(ClientData.ReadingContentIds()[nIndex].contentid);
} }
} }
...@@ -1218,8 +1219,39 @@ HEADER.setContentStatus = function(contentId, status) { ...@@ -1218,8 +1219,39 @@ HEADER.setContentStatus = function(contentId, status) {
var newArray = []; var newArray = [];
ClientData.ContentStatusData(newArray); ClientData.ContentStatusData(newArray);
ClientData.ContentStatusData(arrContentStatus); ClientData.ContentStatusData(arrContentStatus);
}; };
//JSONバックアップ前にWebでリード済のステータスがJSONになければ追加
HEADER.addContentStatusRead = function(contentId) {
var arr = ClientData.ContentStatusData();
var hitFlg = false;
for (var nIndex1 = 0; nIndex1 < arr.length; nIndex1++) {
if(arr[nIndex1].contentId == contentId){
hitFlg = true;
break;
}
}
if(hitFlg == false ){
var obj = new ContentStatusEntity();
obj.contentId = contentId;
obj.status = 0; //read
// Add object to client
arr.push(obj);
//バックアップ対象フラグセット
ClientData.isChangedContentStatus(true);
//初期化したほうが良い？
var newArray = [];
ClientData.ContentStatusData(newArray);
ClientData.ContentStatusData(arr);
}
};
HEADER.getContentStatus = function(contentId) { HEADER.getContentStatus = function(contentId) {
var arr = ClientData.ContentStatusData(); var arr = ClientData.ContentStatusData();
for (var nIndex1 = 0; nIndex1 < arr.length; nIndex1++) { for (var nIndex1 = 0; nIndex1 < arr.length; nIndex1++) {
......
abvw/js/home.js
...@@ -1913,13 +1913,13 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -1913,13 +1913,13 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
//コンテンツ状態バックアップ対応 //コンテンツ状態バックアップ対応
var bkContentStatus = HEADER.getContentStatus(contId); var bkContentStatus = HEADER.getContentStatus(contId);
console.log("contId:" + contId + " bkStatus:" + bkContentStatus); //console.log("contId:" + contId + " bkStatus:" + bkContentStatus);
var contentStatus = null; var contentStatus = null;
if( bkContentStatus == 0){ if( bkContentStatus == 0){
contentStatus = 0; //READ contentStatus = 0; //READ
} else if( bkContentStatus == 1 || bkContentStatus == 2 || bkContentStatus == 3 ){ } else if( bkContentStatus == 1 || bkContentStatus == 2 || bkContentStatus == 4 ){
contentStatus = 1; //NEW contentStatus = 1; //NEW
} else if(bkContentStatus == 5){ } else if(bkContentStatus == 3){
contentStatus = 2; //UPDATE contentStatus = 2; //UPDATE
} }
...@@ -1941,10 +1941,8 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -1941,10 +1941,8 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
$('#content-thumbnail' + contId).fadeIn('slow'); $('#content-thumbnail' + contId).fadeIn('slow');
}); });
} }
}; };
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
if(contentThumbnail == '' || contentThumbnail == null){ if(contentThumbnail == '' || contentThumbnail == null){
if(!COMMON.isPdfContent(contentType)){ if(!COMMON.isPdfContent(contentType)){
var src = HEADER.getThumbnailForOtherType(contentType); var src = HEADER.getThumbnailForOtherType(contentType);
...@@ -1956,12 +1954,14 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -1956,12 +1954,14 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
imgThumb.src = contentThumbnail; imgThumb.src = contentThumbnail;
} }
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //未読はここで終了
} return;
else {
} else {
//Check if user has read this content or not //Check if user has read this content or not
for (var nIndex1 = 0; nIndex1 < ClientData.ReadingContentIds().length; nIndex1++) { for (var nIndex1 = 0; nIndex1 < readArr.length; nIndex1++) {
if (ClientData.ReadingContentIds()[nIndex1].contentid == contId) { if (readArr[nIndex1].contentid == contId) {
//console.log("ClientData.ReadingContentIds:" + contId + " status:" + contentStatus);
imgThumb.onload = function () { imgThumb.onload = function () {
var resizeImg = HOME.resizeResourceThumbnail(imgThumb, c.width, c.height); var resizeImg = HOME.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]);
...@@ -1987,10 +1987,8 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -1987,10 +1987,8 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
$('#content-thumbnail' + contId).fadeIn('slow'); $('#content-thumbnail' + contId).fadeIn('slow');
}); });
} }
}; };
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
if(contentThumbnail == '' || contentThumbnail == null){ if(contentThumbnail == '' || contentThumbnail == null){
if(!COMMON.isPdfContent(contentType)){ if(!COMMON.isPdfContent(contentType)){
var src = HEADER.getThumbnailForOtherType(contentType); var src = HEADER.getThumbnailForOtherType(contentType);
...@@ -2001,12 +1999,11 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -2001,12 +1999,11 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
}else{ }else{
imgThumb.src = contentThumbnail; imgThumb.src = contentThumbnail;
} }
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
readFlg = true; readFlg = true;
break; break;
} } else {
else { /*
imgThumb.onload = function () { imgThumb.onload = function () {
var resizeImg = HOME.resizeResourceThumbnail(imgThumb, c.width, c.height); var resizeImg = HOME.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]);
...@@ -2024,10 +2021,8 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -2024,10 +2021,8 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
$('#content-thumbnail' + contId).fadeIn('slow'); $('#content-thumbnail' + contId).fadeIn('slow');
}); });
} }
}; };
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
if(contentThumbnail == '' || contentThumbnail == null){ if(contentThumbnail == '' || contentThumbnail == null){
if(!COMMON.isPdfContent(contentType)){ if(!COMMON.isPdfContent(contentType)){
var src = HEADER.getThumbnailForOtherType(contentType); var src = HEADER.getThumbnailForOtherType(contentType);
...@@ -2040,6 +2035,7 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -2040,6 +2035,7 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
} }
break; break;
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
*/
} }
} }
} }
...@@ -2047,8 +2043,7 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -2047,8 +2043,7 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
//Check if resource version has change //Check if resource version has change
if (readFlg) { if (readFlg) {
if (versionArr == null || versionArr <= 0 || versionArr == 'undefined') { if (versionArr == null || versionArr <= 0 || versionArr == 'undefined') {
} } else {
else {
for (var nIndex2 = 0; nIndex2 < versionArr.length; nIndex2++) { for (var nIndex2 = 0; nIndex2 < versionArr.length; nIndex2++) {
if (versionArr[nIndex2].contentid == contId) { if (versionArr[nIndex2].contentid == contId) {
if (versionArr[nIndex2].resourceversion != resourceVer) { if (versionArr[nIndex2].resourceversion != resourceVer) {
...@@ -2072,6 +2067,10 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -2072,6 +2067,10 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
}); });
}; };
imgIconEdit.src = COMMON.DEFAULT_IMG_CONTENT_EDIT; imgIconEdit.src = COMMON.DEFAULT_IMG_CONTENT_EDIT;
//バックアップデータのステータス更新
HEADER.setContentStatus(contId,3);
} }
}; };
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
...@@ -2086,17 +2085,16 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -2086,17 +2085,16 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
}else{ }else{
imgThumb.src = contentThumbnail; imgThumb.src = contentThumbnail;
} }
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
break; //break;
} }
break;
} }
} }
} }
if (metaArr == null || metaArr <= 0 || metaArr == 'undefined') { if (metaArr == null || metaArr <= 0 || metaArr == 'undefined') {
} } else {
else {
for (var nIndex2 = 0; nIndex2 < metaArr.length; nIndex2++) { for (var nIndex2 = 0; nIndex2 < metaArr.length; nIndex2++) {
if (metaArr[nIndex2].contentid == contId) { if (metaArr[nIndex2].contentid == contId) {
if (metaArr[nIndex2].metaversion != metaVer) { if (metaArr[nIndex2].metaversion != metaVer) {
...@@ -2120,6 +2118,10 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -2120,6 +2118,10 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
}); });
}; };
imgIconEdit.src = COMMON.DEFAULT_IMG_CONTENT_EDIT; imgIconEdit.src = COMMON.DEFAULT_IMG_CONTENT_EDIT;
//バックアップデータのステータス更新
HEADER.setContentStatus(contId,3);
} }
}; };
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
...@@ -2136,12 +2138,55 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -2136,12 +2138,55 @@ HOME.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
} }
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
//break;
}
break; break;
} }
} }
} }
//readFlg = false;
} else {
imgThumb.onload = function () {
var resizeImg = HOME.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]);
if(contentStatus == null || contentStatus == 1){
imgIconNew.onload = function () {
ctx.drawImage(imgIconNew, c.width / 2 - resizeImg[0] / 2, c.height - resizeImg[1]);
$("#loadingIcon" + contId).fadeOut('slow', function () {
$('#content-thumbnail' + contId).fadeIn('slow');
});
};
imgIconNew.src = COMMON.DEFAULT_IMG_CONTENT_NEW;
} else if(contentStatus == 2){
imgIconEdit.onload = function () {
ctx.drawImage(imgIconEdit, c.width / 2 - resizeImg[0] / 2, c.height - resizeImg[1]);
$("#loadingIcon" + contId).fadeOut('slow', function () {
$('#content-thumbnail' + contId).fadeIn('slow');
});
};
imgIconEdit.src = COMMON.DEFAULT_IMG_CONTENT_EDIT;
} else {
$("#loadingIcon" + contId).fadeOut('slow', function () {
$('#content-thumbnail' + contId).fadeIn('slow');
});
}
};
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
if(contentThumbnail == '' || contentThumbnail == null){
if(!COMMON.isPdfContent(contentType)){
var src = HEADER.getThumbnailForOtherType(contentType);
if( src != '' ){
imgThumb.src = src;
}
}
}else{
imgThumb.src = contentThumbnail;
} }
readFlg = false; //break;
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
} }
}; };
......
abvw/js/settings.js
...@@ -713,6 +713,8 @@ SETTINGS.dspOptReset_Click = function(e) { ...@@ -713,6 +713,8 @@ SETTINGS.dspOptReset_Click = function(e) {
$('#chkBkMemo').attr('checked', 'checked'); $('#chkBkMemo').attr('checked', 'checked');
// set default backup bookmark // set default backup bookmark
$('#chkBkShiori').attr('checked', 'checked'); $('#chkBkShiori').attr('checked', 'checked');
// set default backup contentStatus
$('#chkBkContentStatus').attr('checked', 'checked');
// reset page transition no.4 // reset page transition no.4
$('#txtValueAnimation').val(1); $('#txtValueAnimation').val(1);
...@@ -1044,6 +1046,13 @@ SETTINGS.initScreen = function() { ...@@ -1044,6 +1046,13 @@ SETTINGS.initScreen = function() {
$("#chkBkShiori").attr('checked', 'checked'); $("#chkBkShiori").attr('checked', 'checked');
} }
if (ClientData.userOpt_bkContentStatusFlag() == 0) {
$("#chkBkContentStatus").removeAttr('checked');
}
else {
$("#chkBkContentStatus").attr('checked', 'checked');
}
// load config page transition & page transition period No.4 // load config page transition & page transition period No.4
$('#cboAnimation').val(ClientData.userOpt_pageTransition()); $('#cboAnimation').val(ClientData.userOpt_pageTransition());
......
abvw/settings.html
...@@ -153,13 +153,15 @@ ...@@ -153,13 +153,15 @@
<label id="txtOptBkCfm" for="chkOptBkCfm" lang="txtOptBkCfm" class="lang"><!--毎回ログアウトの時、バックアップするかどうかは必ず確認する--></label> <label id="txtOptBkCfm" for="chkOptBkCfm" lang="txtOptBkCfm" class="lang"><!--毎回ログアウトの時、バックアップするかどうかは必ず確認する--></label>
</label> </label>
<br /> <br />
<label class="option_backup"> <!--<label class="option_backup">-->
<p class="option_backup" style="font-size: 13px;margin-left:50px">
<label id="txtBkDefault" lang="txtBkDefault" class="lang"><!--バックアップのデフォルト : --></label> <label id="txtBkDefault" lang="txtBkDefault" class="lang"><!--バックアップのデフォルト : --></label>
<input type="checkbox" id="chkBkMarking" class="chkbx" checked="checked" /><label id="txtBkMarking" for="chkBkMarking" lang="txtBkMarking" class="lang"><!--マーキング--></label> <input type="checkbox" id="chkBkMarking" class="chkbx" checked="checked" /><label id="txtBkMarking" for="chkBkMarking" lang="txtBkMarking" class="lang"><!--マーキング--></label>
<input type="checkbox" id="chkBkMemo" class="chkbx" checked="checked" /><label id="txtBkMemo" for="chkBkMemo" lang="txtBkMemo" class="lang"><!--メモ--></label> <input type="checkbox" id="chkBkMemo" class="chkbx" checked="checked" /><label id="txtBkMemo" for="chkBkMemo" lang="txtBkMemo" class="lang"><!--メモ--></label>
<input type="checkbox" id="chkBkShiori" class="chkbx" checked="checked" /><label id="txtBkShiori" for="chkBkShiori" lang="txtBkShiori" class="lang"><!--しおり--></label> <input type="checkbox" id="chkBkShiori" class="chkbx" checked="checked" /><label id="txtBkShiori" for="chkBkShiori" lang="txtBkShiori" class="lang"><!--しおり--></label>
<input type="checkbox" id="chkBkContentStatus" class="chkbx" checked="checked" /><label id="txtBkContentStatus" for="chkBkContentStatus" lang="txtBkContentStatus" class="lang"><!--コンテンツ状態--></label> <input type="checkbox" id="chkBkContentStatus" class="chkbx" checked="checked" /><label id="txtBkContentStatus" for="chkBkContentStatus" lang="txtBkContentStatus" class="lang"><!--コンテンツ状態--></label>
</label> </p>
<!--</label>-->
</p> </p>
<p class="backupbtn"><a class="backup lang" lang="dspOptBk" id="dspOptBk" href="#" style="display:none;"><!--バックアップ--></a><a href="#" id="dspOptRes" lang="dspOptRes" class="lang" style="visibility:hidden;"><!--リストア--></a></p> <p class="backupbtn"><a class="backup lang" lang="dspOptBk" id="dspOptBk" href="#" style="display:none;"><!--バックアップ--></a><a href="#" id="dspOptRes" lang="dspOptRes" class="lang" style="visibility:hidden;"><!--リストア--></a></p>
<p class="savebtn"><a class="save lang" href="#" id="dspSave" lang="dspSave"><!--保存する--></a><a class="default lang" href="#" id="dspOptReset" lang="dspOptReset"><!--初期設定に戻る--></a><div style="clear:both;"></div></p> <p class="savebtn"><a class="save lang" href="#" id="dspSave" lang="dspSave"><!--保存する--></a><a class="default lang" href="#" id="dspOptReset" lang="dspOptReset"><!--初期設定に戻る--></a><div style="clear:both;"></div></p>
......
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