Skip to content

C
check
Commit 39f76b03 by Takumi Imai
Options

Merge branch 'feature/1.0_check_web_dev' into 'feature/1.0_check_web' 

Feature/1.0 check web dev

See merge request !124
parents 1dbc8433 95bd5b9c
Showing with 13 additions and 14 deletions
abweb/js/dashboard/dashboard.js
...@@ -8,7 +8,7 @@ var DASHBOARD = {}; ...@@ -8,7 +8,7 @@ var DASHBOARD = {};
DASHBOARD.pickupItems = [ DASHBOARD.pickupItems = [
{ id: 'newReport', href: "javascript:DASHBOARD.goPickup('newReport');", count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_new.svg' }, msg: 'newRegistrationTitle' }, { id: 'newReport', href: "javascript:DASHBOARD.goPickup('newReport');", count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_new.svg' }, msg: 'newRegistrationTitle' },
{ id: 'continousWork', href: "javascript:DASHBOARD.goPickup('continousWork');", count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_proccess.svg' }, msg: 'continousWorkTitle' }, { id: 'continousWork', href: "javascript:DASHBOARD.goPickup('continousWork');", count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_proccess.svg' }, msg: 'continousWorkTitle' },
{ id: 'warningReport', href: "javascript:DASHBOARD.goPickup('reportWarning');", count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_alert.svg' }, msg: 'reportWarningTitle' }, { id: 'warningReport', href: "javascript:DASHBOARD.goPickup('warningReport');", count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_alert.svg' }, msg: 'reportWarningTitle' },
]; ];
/** comunication dashboard configuration */ /** comunication dashboard configuration */
...@@ -23,9 +23,8 @@ DASHBOARD.defaultDashboard = { ...@@ -23,9 +23,8 @@ DASHBOARD.defaultDashboard = {
newReport: 0, newReport: 0,
continousWork: 0, continousWork: 0,
warningReport: 0, warningReport: 0,
pushMesage: 0 pushMesage: 0,
} },
}; };
DASHBOARD.getDataApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.DASHBOARD; DASHBOARD.getDataApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.DASHBOARD;
...@@ -36,7 +35,7 @@ DASHBOARD.getDataApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientDat ...@@ -36,7 +35,7 @@ DASHBOARD.getDataApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientDat
*/ */
DASHBOARD.getDashboardData = function (callback) { DASHBOARD.getDashboardData = function (callback) {
let param = { let param = {
sid: COMMON.getSid() sid: COMMON.getSid(),
}; };
COMMON.cmsAjax( COMMON.cmsAjax(
DASHBOARD.getDataApiUrl, DASHBOARD.getDataApiUrl,
...@@ -132,14 +131,12 @@ DASHBOARD.init = function () { ...@@ -132,14 +131,12 @@ DASHBOARD.init = function () {
COMMON.checkAuth(false); COMMON.checkAuth(false);
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD; sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
sessionStorage.removeItem("operationId"); sessionStorage.removeItem('operationId');
sessionStorage.removeItem("RL_searchWord"); sessionStorage.removeItem('RL_searchWord');
DASHBOARD.loadCommon(); DASHBOARD.loadCommon();
DashboardSetting.getSettingData(function (settings) { DashboardSetting.getSettingData(function (settings) {
DASHBOARD.getDashboardData(function (dataDashboard) DASHBOARD.getDashboardData(function (dataDashboard) {
{ if (!dataDashboard.dashboard || jQuery.isEmptyObject(dataDashboard.dashboard)) dataDashboard.dashboard = DASHBOARD.defaultDashboard.dashboard;
if(!dataDashboard.dashboard || jQuery.isEmptyObject(dataDashboard.dashboard ) )
dataDashboard.dashboard = DASHBOARD.defaultDashboard.dashboard;
DASHBOARD.updateDataPickups(settings, dataDashboard); DASHBOARD.updateDataPickups(settings, dataDashboard);
DASHBOARD.initPickups(); DASHBOARD.initPickups();
DASHBOARD.updateDataCommunications(dataDashboard); DASHBOARD.updateDataCommunications(dataDashboard);
......
abweb/js/pickup/pickup.js
...@@ -216,7 +216,7 @@ PICKUP.settingActivePickup = function (pickupActive) { ...@@ -216,7 +216,7 @@ PICKUP.settingActivePickup = function (pickupActive) {
$('#tab-content-ContinousWork').addClass('active show'); $('#tab-content-ContinousWork').addClass('active show');
return; return;
} }
if (pickupActive == 'reportWarning') { if (pickupActive == 'warningReport') {
$('#liTabReportWithWarning a').addClass('active'); $('#liTabReportWithWarning a').addClass('active');
$('#tab-content-ReportWithWarnings').addClass('active show'); $('#tab-content-ReportWithWarnings').addClass('active show');
return; return;
...@@ -607,7 +607,9 @@ PICKUP.initWarningReportWithAnswerReportType = function (report, reportType, rep ...@@ -607,7 +607,9 @@ PICKUP.initWarningReportWithAnswerReportType = function (report, reportType, rep
report.operationId + report.operationId +
"'," + "'," +
PICKUP.REPORT_TYPE.WITHREPLY + PICKUP.REPORT_TYPE.WITHREPLY +
',\'' + report.taskKey +"', null,null," + ",'" +
report.taskKey +
"', null,null," +
reportType + reportType +
");\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" + ");\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" +
"<div class='position-absolute translate-middle top-50 left-0 ml-3'><div class='type-icon'>" + "<div class='position-absolute translate-middle top-50 left-0 ml-3'><div class='type-icon'>" +
...@@ -714,7 +716,7 @@ PICKUP.createReportWithWarningList = function (operationListOld) { ...@@ -714,7 +716,7 @@ PICKUP.createReportWithWarningList = function (operationListOld) {
if (operationList[i].taskType == PICKUP.REPLYREPORT_TASK_TYPE.REPORT) { if (operationList[i].taskType == PICKUP.REPLYREPORT_TASK_TYPE.REPORT) {
operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i], PICKUP.REPLYREPORT_TASK_TYPE.REPORT, msgLevelReport); operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i], PICKUP.REPLYREPORT_TASK_TYPE.REPORT, msgLevelReport);
} else { } else {
operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i],PICKUP.REPLYREPORT_TASK_TYPE.ANSWER, msgLevelAnswer); operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i], PICKUP.REPLYREPORT_TASK_TYPE.ANSWER, msgLevelAnswer);
} }
break; break;
case PICKUP.REPORT_TYPE.WORKFLOW: // continouswork case PICKUP.REPORT_TYPE.WORKFLOW: // continouswork
......
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