Skip to content

C
check
Commit 82cfc9b8 by vietdo
Options

#16382 アンケートコンテンツ・試験コンテンツ

parent 1ee56143
Showing with 88 additions and 3 deletions
abvw/common/js/common.js
...@@ -76,6 +76,7 @@ COMMON.ContentTypeKeys = { ...@@ -76,6 +76,7 @@ COMMON.ContentTypeKeys = {
Type_NoFile : 'none', Type_NoFile : 'none',
Type_Html: 'html', Type_Html: 'html',
Type_Enquete : 'enquete', Type_Enquete : 'enquete',
Type_Exam : 'exam',
Type_Link : 'url' Type_Link : 'url'
}; };
...@@ -2374,7 +2375,6 @@ COMMON.SetStartLog = function(strContentId) { ...@@ -2374,7 +2375,6 @@ COMMON.SetStartLog = function(strContentId) {
var isFound = false; var isFound = false;
var arrContentLogs = ClientData.ContentLogData(); var arrContentLogs = ClientData.ContentLogData();
for (var nIndex = 0; nIndex < arrContentLogs.length; nIndex++) { for (var nIndex = 0; nIndex < arrContentLogs.length; nIndex++) {
if (arrContentLogs[nIndex].contentid == strContentId) { if (arrContentLogs[nIndex].contentid == strContentId) {
......
abvw/js/contentview.js
...@@ -2125,7 +2125,9 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){ ...@@ -2125,7 +2125,9 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
} }
CONTENTVIEW.handleForContentTypeHTML(linkUrlTmp); CONTENTVIEW.handleForContentTypeHTML(linkUrlTmp);
} }
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Exam) {
CONTENTVIEW.handleForContentTypeExam(resourceUrl);
}
if (COMMON.isTouchDevice() == true) { if (COMMON.isTouchDevice() == true) {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) { if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
CONTENTVIEW_GENERAL.standardRatio = document.documentElement.clientWidth / window.innerWidth; CONTENTVIEW_GENERAL.standardRatio = document.documentElement.clientWidth / window.innerWidth;
...@@ -2345,6 +2347,30 @@ CONTENTVIEW.handleForContentTypeHTML = function(resourceUrl){ ...@@ -2345,6 +2347,30 @@ CONTENTVIEW.handleForContentTypeHTML = function(resourceUrl){
$container.show(); $container.show();
}; };
CONTENTVIEW.handleForContentTypeExam = function(resourceUrl){
//Create Dialog overlay
var $container = $('#dialog');
$container.html('');
$container.css('left','0%');
$container.css('width','100%');
$container.css('background-color','white');
//START TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
if(CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()){
$container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%;"></iframe>');
$container.css('overflow', 'scroll');
$container.css('-webkit-overflow-scrolling', 'touch');
}
else{
$container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%; height: 100%; "> </iframe>');
$container.css('overflow', 'hidden');
}
//END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
$container.show();
};
//Check type of content //Check type of content
CONTENTVIEW.isMediaAndHTMLContent = function(){ CONTENTVIEW.isMediaAndHTMLContent = function(){
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video || if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music || CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Video ||
...@@ -5671,7 +5697,7 @@ CONTENTVIEW.ready = function(initContentId){ ...@@ -5671,7 +5697,7 @@ CONTENTVIEW.ready = function(initContentId){
"webGetContent", "webGetContent",
"GET", "GET",
params, params,
function (data) { function (data) {console.log(data);
CONTENTVIEW_GENERAL.contentType = data.contentData.contentType; CONTENTVIEW_GENERAL.contentType = data.contentData.contentType;
if(ClientData.isStreamingMode()){ if(ClientData.isStreamingMode()){
...@@ -5726,8 +5752,67 @@ CONTENTVIEW.ready = function(initContentId){ ...@@ -5726,8 +5752,67 @@ CONTENTVIEW.ready = function(initContentId){
//END TRB00059 - EDITOR: Long - Date : 09/19/2013 - Summary : Add title for media and html type //END TRB00059 - EDITOR: Long - Date : 09/19/2013 - Summary : Add title for media and html type
} }
else{ else{
if(CONTENTVIEW_GENERAL.contentType == "exam" || CONTENTVIEW_GENERAL.contentType == "enquete") {
var isShowResult, isSendResult;
if(data.contentData.showResult == 1){
isShowResult = true;
} else {
isShowResult = false;
}
if(data.contentData.sendResult == 1){
isSendResult = true;
} else {
isSendResult = false;
}
var contentId = data.contentData.contentId;
var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&sid=" + CONTENTVIEW.getSessionId()+"&contentId="+contentId+"&isShowResult="+isShowResult+"&isSendResult="+isSendResult;
/* init footer toolbar */
$('#footer_toolbar_2').hide();
$('#footer_toolbar_1').show();
/* init pos bottom toolbar*/
CONTENTVIEW_INITOBJECT.initDisplayToolbarDevice();
// Lock screen
if(ClientData.serviceOpt_encryption() != 'Y') {
COMMON.LockScreen();
}
//START TRB00094 - Editor : Long - Date : 09/26/2013 - Summary : Setting log
CONTENTVIEW.StartTimerUpdateLog();
/* set start log */
COMMON.SetStartLog(CONTENTVIEW_GENERAL.contentID);
//END TRB00094 - Editor : Long - Date : 09/26/2013 - Summary : Setting log
CONTENTVIEW_GENERAL.disableAllControl();
//enable SpecifyControl
CONTENTVIEW.enableControlForMediaAndHtmlType();
　CONTENTVIEW.displayOverlayForSpecifyContentType(url);
$(window).resize(function () {
//Check if content is zooming
if(CONTENTVIEW.isZoomingContent){
//var $container = $("#dialog");
// var w = window.innerWidth;
//var h = window.innerHeight;
//$container.css('height', h);
//$container.css('width', w);
}
});
CONTENTVIEW.handleSliderBar();
$('#lblSlider').text('/ ' + 1);
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid() == false) {
$("#slider_page").slider("option", "disabled", true);
}
COMMON.disable('#txtSearch', '#txtSlider');
} else {
CONTENTVIEW_INITOBJECT.initPage(); CONTENTVIEW_INITOBJECT.initPage();
} }
}
//ストリーミングならデバイス側に初期表示済通知 //ストリーミングならデバイス側に初期表示済通知
if(ClientData.isStreamingMode()){ if(ClientData.isStreamingMode()){
......
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