Commit a70417d1 by Takumi Imai

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

parents bd645ea3 99b9347d
......@@ -11038,7 +11038,7 @@ ul.card-list > li:not(.selected):not(.not-found):hover{
}
.select-card-list .arrow-icon {
background-image: url("../img/icon_arrow_down.svg");
background-image: url("/abvw/common/img/icon_arrow_down.svg");
background-size: contain;
background-repeat: no-repeat;
width: 14px;
......@@ -20590,7 +20590,7 @@ button {
list-style: none;
}
.list-menu button .arrow-icon{
background-image: url("../img/icon_arrow_right.svg");
background-image: url("/abvw/common/img/icon_arrow_right.svg");
background-size: contain;
width: 17px;
height: 17px;
......
......@@ -2,39 +2,39 @@
<nav class="navbar navbar-dark shadow-sm px-sm-auto px-0">
<div class="container">
<a href="dashboard.html" class="navbar-brand">
<img src="../common/img/logo.svg" alt="ロゴ" class="img-fluid">
<img src="../common/img/logo.svg" type="image" alt="" class="img-fluid lang" lang="logo">
</a>
<ul class="mr-sm-auto ml-sm-0 ml-auto mb-0 pl-0 d-flex">
<li class="active nav-link">
<a href="dashboard.html" class="d-block text-center text-decoration-none">
<img src="../common/img/nav_icon_dashboard.svg" alt="ダッシュボード" class="p-sm-1 p-0 img-fluid">
<img src="../common/img/nav_icon_dashboard.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="dashboard">
<div class="fs-7 d-sm-block d-none lang" lang="dashboard"></div>
</a>
</li>
<li class="nav-link">
<a href="task-list.html" class="d-block text-center text-decoration-none">
<img src="../common/img/nav_icon_task.svg" alt="作業一覧" class="p-sm-1 p-0 img-fluid">
<img src="../common/img/nav_icon_task.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="workList">
<div class="fs-7 d-sm-block d-none lang" lang="workList"></div>
</a>
</li>
</ul>
<div class="dropdown">
<a href="#" class="nav-link text-center" id="dropdown-profile" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<img src="../common/img/nav_icon_profile.svg" alt="プロフィール" class="p-sm-1 p-0 img-fluid profile-img">
<img src="../common/img/nav_icon_profile.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid profile-img lang" lang="profile">
<div class="fs-7 d-sm-block d-none lang" lang="profile"></div>
</a>
<div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile">
<h6 class="dropdown-header lang" lang="dspLogin" ></h6>
<a class="dropdown-item " href="account-setting.html" >
<img src="../common/img/menu_icon_account_setting.svg" alt="アカウント設定" class="navbar-dropdown-icon">
<img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="account_setting">
<span class="lang" style=" color: #6c757d;" lang="account_setting"></span>
</a>
<a class="dropdown-item " href="#" data-toggle="modal" data-target="#confirm-modal">
<img src="../common/img/menu_icon_logout.svg" alt="ログアウト" class="navbar-dropdown-icon">
<img src="../common/img/menu_icon_logout.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="dspLogout">
<span class="lang" style=" color: #6c757d;" lang="dspLogout"></span>
</a>
</div>
</div>
</div>
</nav>
</header>
\ No newline at end of file
</header>
......@@ -123,11 +123,19 @@ I18N.replaceText = function(jsonLangData) {
if(tn == 'input') {
if(obj.attr('type') == 'button' || obj.attr('type') == 'submit') {
obj.val(langText);
} else {
}else {
obj.text(langText);
}
} else {
obj.text(langText);
if (obj.attr('type') == 'image') {
obj.attr('alt', langText);
obj.attr('title', langText);
}
else
{
obj.text(langText);
}
}
}
}
......
......@@ -72,7 +72,21 @@
"sendDate":"Send Date",
"sender":"Sender",
"content":"Content",
"buttonOperationSelect":"Operation",
"labelSendTypeTitle":"Type",
"labelSendTypeGroup":"Group",
"labelSendTypeAll":"All",
"txtMessageContent":"Message",
"buttonTemplateSelection":"Template",
"buttonSend":"Send",
"msgContentRequired":"Content is required",
"msgOperationRequired":"Operation is required",
"msgSendTypeRequired":"Send type is required",
"operationSelection":"Operation select",
"selection":"Selection"
"selection":"Selection",
"templateSelection":"Template selection",
"logo":"logo",
"listDisplay":"List display",
"gridDisplay":"Grid display"
}
\ No newline at end of file
......@@ -72,6 +72,20 @@
"sendDate":"送信日時",
"sender":"送信者",
"content":"内容",
"buttonOperationSelect":"作業名",
"labelSendTypeTitle":"送信先",
"labelSendTypeGroup":"グループ内",
"labelSendTypeAll":"作業全体",
"txtMessageContent":"メッセージ",
"buttonTemplateSelection":"テンプレート選択",
"buttonSend":"送信",
"msgContentRequired":"Content is required",
"msgOperationRequired":"Operation is required",
"msgSendTypeRequired":"Send type is required",
"operationSelection":"作業選択",
"selection":"選択"
"selection":"選択",
"templateSelection":"テンプレート選択",
"logo":"ロゴ",
"listDisplay":"リスト表示",
"gridDisplay":"グリッド表示"
}
\ No newline at end of file
......@@ -72,6 +72,20 @@
"sendDate":"Send Date",
"sender":"Sender",
"content":"Content",
"buttonOperationSelect":"Operation",
"labelSendTypeTitle":"Type",
"labelSendTypeGroup":"Group",
"labelSendTypeAll":"All",
"txtMessageContent":"Message",
"buttonTemplateSelection":"Template",
"buttonSend":"Send",
"msgContentRequired":"Content is required",
"msgOperationRequired":"Operation is required",
"msgSendTypeRequired":"Send type is required",
"operationSelection":"Operation select",
"selection":"Selection"
"selection":"Selection",
"templateSelection":"Template selection",
"logo":"logo",
"listDisplay":"list display",
"gridDisplay":"Grid display"
}
\ No newline at end of file
......@@ -24,7 +24,7 @@
</tr>
<tr>
<th class="fs-9 p-2 text-secondary lang" lang="workWithWarningsTitle"></th>
<td class="p-2"><div id="settingReportWarning" data-key="reportWarning" class="toggle ml-auto"><input type="checkbox" name="chk-alert"></div></td>
<td class="p-2"><div id="settingWarningReport" data-key="warningReport" class="toggle ml-auto"><input type="checkbox" name="chk-alert"></div></td>
</tr>
<tr>
<th class="fs-9 p-2 text-secondary lang" lang="makeDashboardAsHome"></th>
......
......@@ -26,9 +26,14 @@
<script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
<script type="text/javascript">
$(document).ready(function(){
DASHBOARD.init();
});
</script>
</head>
<body onload="DASHBOARD.init();">
<body>
<!-- header -->
<div id="includedHeader"></div>
......@@ -39,7 +44,7 @@
<div class="d-flex align-items-center">
<h1 class="fs-14 font-weight-bold pt-4 pb-3 mb-0 mr-auto lang" lang="dashboard"></h1>
<a href="#" data-toggle="modal" data-target="#dashboard-setting-modal" >
<img src="../common/img/icon_dashboard_setting.svg" alt="ダッシュボード設定" class="p-1 w-40px">
<img src="../common/img/icon_dashboard_setting.svg" type="image" alt="" class="p-1 w-40px lang" lang="dashboardSettings">
</a>
</div>
......
<!-- view display type menu -->
<div class="view">
<a href="#" class="text-decoration-none view-btn view-list-btn">
<img src="../common/img/icon_view_list.svg" alt="" class="list-block-icon mx-1 lang" lang="listDisplay" type="image" data-toggle="tooltip" data-placement="bottom" title="">
</a>
<a href="#" class="text-decoration-none view-btn view-block-btn active">
<img src="../common/img/icon_view_block.svg" alt="" class="list-block-icon mx-1 lang" lang="gridDisplay" type="image" data-toggle="tooltip" data-placement="bottom" title="">
</a>
</div>
\ No newline at end of file
<!-- select template modal -->
<div class="modal fade" id="select-template-modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-dialog-centered modal-dialog-scrollable" role="document">
<div class="modal-content">
<div class="modal-header bg-dark10">
<h5 class="modal-title lang" lang="templateSelection"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<ul class="card-list select-card-list" id="notificationSelectList">
</ul>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary lang" lang="selection"></button>
<button type="button" class="btn btn-tertiary lang" lang="dspCancel" data-dismiss="modal"></button>
</div>
</div>
</div>
</div>
\ No newline at end of file
......@@ -76,14 +76,7 @@
<nav aria-label="view" class="view-menu mt-2" id="viewMenuNewReport">
<div class="d-flex justify-content-between align-items-center">
<div class="fs-9" id="count-NewReport"></div>
<div class="view">
<a href="#" class="text-decoration-none view-btn view-list-btn">
<img src="../common/img/icon_view_list.svg" alt="リスト表示" class="list-block-icon mx-1" data-toggle="tooltip" data-placement="bottom" title="リスト表示">
</a>
<a href="#" class="text-decoration-none view-btn view-block-btn active">
<img src="../common/img/icon_view_block.svg" alt="グリッド表示" class="list-block-icon mx-1" data-toggle="tooltip" data-placement="bottom" title="グリッド表示">
</a>
</div>
<div id="includedNewReportMenuDisplay"></div>
</div>
</nav>
<!-- task list -->
......@@ -96,14 +89,7 @@
<nav aria-label="view" class="view-menu mt-2" id="viewMenuContinuousWork">
<div class="d-flex justify-content-between align-items-center">
<div class="fs-9" id="count-ContinuousWork"></div>
<div class="view">
<a href="#" class="text-decoration-none view-btn view-list-btn">
<img src="../common/img/icon_view_list.svg" alt="リスト表示" class="list-block-icon mx-1" data-toggle="tooltip" data-placement="bottom" title="リスト表示">
</a>
<a href="#" class="text-decoration-none view-btn view-block-btn active">
<img src="../common/img/icon_view_block.svg" alt="グリッド表示" class="list-block-icon mx-1" data-toggle="tooltip" data-placement="bottom" title="グリッド表示">
</a>
</div>
<div id="includedContinuousWorkMenuDisplay"></div>
</div>
</nav>
<!-- task list -->
......@@ -115,15 +101,8 @@
<!-- view menu -->
<nav aria-label="view" class="view-menu mt-2" id="viewMenuReportWithWarnings">
<div class="d-flex justify-content-between align-items-center">
<div class="fs-9" d="count-ReportWithWarnings"></div>
<div class="view">
<a href="#" class="text-decoration-none view-btn view-list-btn">
<img src="../common/img/icon_view_list.svg" alt="リスト表示" class="list-block-icon mx-1" data-toggle="tooltip" data-placement="bottom" title="リスト表示">
</a>
<a href="#" class="text-decoration-none view-btn view-block-btn active">
<img src="../common/img/icon_view_block.svg" alt="グリッド表示" class="list-block-icon mx-1" data-toggle="tooltip" data-placement="bottom" title="グリッド表示">
</a>
</div>
<div class="fs-9" id="count-ReportWithWarnings"></div>
<div id="includedReportWithWarningsMenuDisplay"></div>
</div>
</nav>
<!-- task list -->
......
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>ダッシュボード</title>
<title class="lang" lang="messageDetail"></title>
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
......@@ -24,11 +24,17 @@
<script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/pushMessageDetail/push-message-detail.js"></script>
<script type="text/javascript">
$(document).ready(function(){
PushMessageDetail.init();
});
</script>
</head>
<body onload="PushMessageDetail.init();">
<body>
<!-- header -->
<div id="includedHeader"></div>
......@@ -40,7 +46,7 @@
<nav aria-label="breadcrumb">
<ol class="breadcrumb px-0 mb-0">
<li class="breadcrumb-item"><a href="dashboard.html" class="text-decoration-none text-underline lang" lang="dashboard"></a></li>
<li class="breadcrumb-item"><a href="message-list.html" class="text-decoration-none text-underline lang" lang="messageListTitle"></a></li>
<li class="breadcrumb-item"><a href="push-message-list.html" class="text-decoration-none text-underline lang" lang="messageListTitle"></a></li>
<li class="breadcrumb-item active lang" lang="messageDetail" aria-current="page"><span></span></li>
</ol>
</nav>
......
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>ダッシュボード</title>
<title class="lang" lang="messageListTitle"></title>
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
......@@ -24,12 +24,17 @@
<script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/pushMessageList/push-message-list.js"></script>
<script type="text/javascript">
$(document).ready(function(){
PushMessageList.init();
});
</script>
</head>
<body onload="PushMessageList.init();">
<body>
<!-- header -->
<div id="includedHeader"></div>
......
<!DOCTYPE html>
<html lang="ja-JP">
<head>
<meta charset="utf-8">
<title class="lang" lang="sendMessageTitle"></title>
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/newdash/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/newdash/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/newdash/style.css">
<!-- vender css -->
<link rel="stylesheet" type="text/css" href="../common/css/newdash/fontawesome_relative_path.css">
<script type="text/javascript" src="/abvw/common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="/abvw/common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="/abvw/common/js/web/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/newdash/app.js"></script>
<script type="text/javascript" src="../common/js/newdash/common.js"></script>
<script type="text/javascript" src="/abvw/common/js/validation.js?__UPDATEID__"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/operationSelect/operation-select.js"></script>
<script type="text/javascript" src="../js/notification-content/notification-content.js"></script>
<script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/sendMessage/send-message.js"></script>
<script type="text/javascript">
$(document).ready(function(){
SendMessage.init();
});
</script>
</head>
<body>
<!-- header -->
<div id="includedHeader"></div>
<!-- send message -->
<main>
<div class="container">
<!-- breadcrumb -->
<nav aria-label="breadcrumb">
<ol class="breadcrumb px-0 mb-0">
<li class="breadcrumb-item"><a href="dashboard.html" class="text-decoration-none text-underline lang" lang="dashboard"></a></li>
<li class="breadcrumb-item active lang" lang="sendMessageTitle" aria-current="page"><span></span></li>
</ol>
</nav>
<!-- title -->
<h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 lang" lang="sendMessageTitle"></h1>
<!-- content -->
<div class="py-2">
<div class="row">
<div class="col-12">
<form action="#">
<div class="form-group form-row">
<div class="col-lg-1 col-md-2 col-3 control-label">
<button type="button" class="btn btn-sm btn-tertiary lang" lang="buttonOperationSelect" data-toggle="modal" data-target="#task-list-modal"></button>
</div>
<div class="col-lg-11 col-md-10 col-9">
<div id="operationSelected" data-operation-id=""></div>
</div>
</div>
<div class="form-group form-row">
<label for="address" class="col-lg-1 col-md-2 col-3 control-label lang" lang="labelSendTypeTitle"></label>
<div class="col-lg-11 col-md-10 col-9">
<div class="btn-group btn-group-toggle" data-toggle="buttons">
<label class="btn btn-sm btn-primary custom active" for="sendTypeGroup">
<input type="radio" name="sendType" id="sendTypeGroup" value="0" autocomplete="off" checked></label>
<label class="btn btn-sm btn-primary custom" for="sendTypeAll">
<input type="radio" name="sendType" id="sendTypeAll" value="1" autocomplete="off"></label>
</div>
</div>
</div>
<div class="form-group mb-4">
<div class="d-flex justify-content-between">
<label for="message-content" class="lang" lang="txtMessageContent"></label>
<a href="#" data-toggle="modal" data-target="#select-template-modal" class="lang" lang="buttonTemplateSelection"></a>
</div>
<textarea name="message-content" class="form-control" id="messageContent" cols="30" rows="10"></textarea>
</div>
</form>
</div>
</div>
<button type="submit" class="btn btn-primary lang" lang="buttonSend" onclick="SendMessage.onClickSend();"></button>
</div>
</div>
</main>
<!-- task list modal -->
<div id="includeOperationSelect"></div>
<!-- select template modal -->
<div id="includeTemplateModal"></div>
</body>
</html>
\ No newline at end of file
......@@ -8,7 +8,7 @@ var DASHBOARD = {};
DASHBOARD.pickupItems = [
{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: 'reportWarning', 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('reportWarning');", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_alert.svg'}, msg: 'reportWarningTitle' },
];
/** comunication dashboard configuration */
......@@ -23,7 +23,7 @@ DASHBOARD.communicationItems = [
DASHBOARD.defaultDashboard = {
newReport: 0,
continousWork: 0,
reportWarning: 0,
warningReport: 0,
pushMesage: 0,
}
......@@ -115,7 +115,7 @@ DASHBOARD.init = function() {
/** load common data */
DASHBOARD.loadCommon = function() {
TEMPLATE.loadHearder("#includedHeader");
TEMPLATE.loadDashboardSetting("#includedDashboardSetting");
TEMPLATE.loadDashboardSetting("#includedDashboardSetting", DASHBOARD.changeSettingCallback);
TEMPLATE.loadConfirmModal("#includedConfirmModal");
}
......@@ -152,5 +152,19 @@ DASHBOARD.goPickup = function(pickupId) {
/** Direct to Message list screen */
DASHBOARD.goMessageList = function() {
COMMON.goUrlWithCurrentParams('message-list.html', {});
COMMON.goUrlWithCurrentParams('push-message-list.html', {});
}
/**
* Direct to send message screen
*/
DASHBOARD.goSendMessage = function() {
COMMON.goUrlWithCurrentParams('send-message.html', {});
}
/**
* callback when setting changed
*/
DASHBOARD.changeSettingCallback = function() {
location.reload();
}
......@@ -5,46 +5,87 @@
*/
var DashboardSetting = {};
DashboardSetting.changeSettingCallback = function() {};
/**
* Html element array, map with json key from setting data API
*/
DashboardSetting.elementItems = {
newReport: { id: 'settingNewReport', name: 'chk-new', enabled: true },
continousWork: { id: 'settingContinousWork', name: 'chk-proccess', enabled: true },
reportWarning: { id: 'settingReportWarning', name: 'chk-alert', enabled: true },
warningReport: { id: 'settingWarningReport', name: 'chk-alert', enabled: true },
dashboardHome: { id: 'settingDashboardHome', name: 'chk-home', enabled: false },
};
DashboardSetting.baseApiUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + 'dashboardSetting/';
/**
* default setting JSON
* default setting
*/
DashboardSetting.defaultSettingJson = {
DashboardSetting.defaultSetting = {
newReport: 1,
continousWork: 1,
reportWarning: 1,
warningReport: 1,
dashboardHome: 0,
}
/** dummy setting json reponse */
DashboardSetting.dummySettingJson = {
dashboardSettingList: [
{
"id": 1,
"settingName": "New Report",
"settingValue": 1
},
{
"id": 2,
"settingName": "Continous Work",
"settingValue": 1
},
{
"id": 3,
"settingName": "Warning Report",
"settingValue": 1
},
{
"id": 4,
"settingName": "Dashboard Home",
"settingValue": 0
}
],
}
/**
* get setting data from cms
* @param {function} callback
* @param {function} callback - callback with settings
*/
DashboardSetting.getSettingData = function (callback) {
let param = {
sid: COMMON.getSid(),
};
const url = DashboardSetting.baseApiUrl + 'getAllSettingData';
const url = DashboardSetting.baseApiUrl;
COMMON.cmsAjax(url, param, false, function (json) {
let settings = {};
//map id with key when save setting
const mapKeys = {
1: 'newReport',
2: 'continousWork',
3: 'warningReport',
4: 'dashboardHome'
};
if (json && json.dashboardSettingList) {
for (const item of json.dashboardSettingList) {
if (mapKeys.hasOwnProperty(item.id)) {
const settingKey = mapKeys[item.id];
settings[settingKey] = item.settingValue;
}
}
}
if (callback) {
callback(json);
callback(settings);
}
}, function() {
console.log('DashboardSetting.getSettingData error');
if (callback) {
callback(DashboardSetting.defaultSettingJson);
}
});
};
......@@ -79,11 +120,14 @@ DashboardSetting.saveSetting = function () {
param.sid = COMMON.getSid();
for (const key in DashboardSetting.elementItems) {
const element = DashboardSetting.elementItems[key];
param[key] = element.enabled;
param[key] = element.enabled ? 1 : 0;
}
const url = DashboardSetting.baseApiUrl + 'saveSetting';
const url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + 'saveDashboardSetting/';
COMMON.cmsAjax(url, param, false, function (json) {
DashboardSetting.closeModal();
if (DashboardSetting.changeSettingCallback && typeof DashboardSetting.changeSettingCallback === 'function') {
DashboardSetting.changeSettingCallback();
}
}, function() {
console.log('DashboardSetting.saveSetting error');
DashboardSetting.closeModal();
......@@ -110,12 +154,14 @@ DashboardSetting.bindToggleClick = function () {
/**
* init data, action when screen onload
* @param {function} changeCallback - callback when settings changed
*/
DashboardSetting.init = function () {
DashboardSetting.init = function (changeCallback) {
DashboardSetting.getSettingData(function (settings) {
DashboardSetting.applySettings(settings);
});
DashboardSetting.bindToggleClick();
DashboardSetting.changeSettingCallback = changeCallback;
};
/**
......
/**
* Operation Select js in operation-select.html
*
* @since 1.0 check web
*/
var NotificationSelect = {};
NotificationSelect.nameSelected="";
NotificationSelect.valueSelected="";
/**
* default operation select data JSON
*/
NotificationSelect.defaultNotificationSelectJson = [];
/**
* get operation select data from cms
* @param {function} callback
*/
NotificationSelect.getNotificationSelectData = function (callback) {
let param = {
sid: COMMON.getSid(),
};
const url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + 'pushMessageTemplate/';
COMMON.cmsAjax(url, param, false, function (json) {
if (callback) {
callback(json);
}
}, function() {
console.log('NotificationSelect.getNotificationSelectData error');
if (callback) {
callback(NotificationSelect.defaultNotificationSelectJson);
}
});
};
/**
* handle click operation setting
*/
NotificationSelect.selectOperationClick = function () {
$('.select-card-list .card .select-label').on('click', function () {
$(this).closest('.select-card-list').find('.card').removeClass('selected');
$(this).closest('.card').addClass('selected');
NotificationSelect.nameSelected = $(this).text();
NotificationSelect.valueSelected = $(this).closest('.accordion').find('.card-body').text();
});
};
/**
* init data, action when screen onload
*/
NotificationSelect.init = function () {
NotificationSelect.getNotificationSelectData(function (data) {
NotificationSelect.createNotificationSelectList(data);
});
NotificationSelect.selectOperationClick();
};
/**
* Implement notification select html
* @returns
*/
NotificationSelect.createNotificationSelectList = function(data) {
$("#notificationSelectList").empty();
if (typeof data === 'undefined' || data.length < 1) return;
let classSelected = "selected";
for (let i = 0; i < data.length; i++) {
let divName = $("<div class='pl-5 py-3 h-100 w-100 align-self-center select-label'>" + data[i].name + "</div>");
let divIcon = $("<div class='flex-shrink-1 mx-3 align-self-center'>"
+ "<button class='btn btn-link border collapsed' type='button' data-toggle='collapse' data-target='#collapse" + i + "' aria-expanded='true' aria-controls='collapse" + i + "'>"
+ "<div class='arrow-icon'></div>"
+ "</button></div>");
let ahrefName = $("<a href='#' class='d-flex text-decoration-none'></a>");
let divParentName = $("<div class='card mb-2 " + classSelected + "' id='heading" + i + "'></div>");
classSelected = "";
let divValue = $("<div id='collapse" + i + "' class='collapse' aria-labelledby='heading" + i + "' data-parent='#accordion" + i + "'></div>");
let divBodyValue = $("<div class='card-body'>" + data[i].value + "</div>");
let messageli = $("<li class='accordion' id='accordion" + i + "'></li>");
ahrefName.append(divName);
ahrefName.append(divIcon);
divParentName.append(ahrefName);
divValue.append(divBodyValue);
messageli.append(divParentName);
messageli.append(divValue);
$("#notificationSelectList").append(messageli);
}
}
......@@ -50,11 +50,12 @@ OperationSelect.selectOperationClick = function () {
/**
* init data, action when screen onload
*/
OperationSelect.init = function () {
OperationSelect.init = function (selectedCallback) {
OperationSelect.getOperationSelectData(function (data) {
OperationSelect.createOperationSelectList(data);
});
OperationSelect.selectOperationClick();
OperationSelect.changeSelectCallback = selectedCallback;
};
/**
......
......@@ -47,7 +47,7 @@ PICKUP.defaultPickupList = {
operationList:[]
}
PICKUP.baseApiUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + 'pickup/';
PICKUP.baseApiUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE ;
PICKUP.getNewReportListApiUrl = PICKUP.baseApiUrl + 'newReport';
PICKUP.getContinuousWorkListApiUrl = PICKUP.baseApiUrl + 'workingFlow';
PICKUP.getReportWithWarningsListApiUrl = PICKUP.baseApiUrl + 'warningWithReport';
......@@ -116,6 +116,10 @@ PICKUP.init = function() {
console.log("PICKUP.init");
TEMPLATE.loadHearder("#includedHeader");
TEMPLATE.loadConfirmModal("#includedConfirmModal");
TEMPLATE.loadDisplaymenu("#includedNewReportMenuDisplay");
TEMPLATE.loadDisplaymenu("#includedContinuousWorkMenuDisplay");
TEMPLATE.loadDisplaymenu("#includedReportWithWarningsMenuDisplay");
PICKUP.initSettingActivePickup();
PICKUP.settingPickup();
}
......@@ -135,12 +139,12 @@ PICKUP.settingPickup = function() {
if(settings.continousWork)
{
$("#liTabContinousWork").removeClass('d-none');
PICKUP.initContinuosWorkTab();
//PICKUP.initContinuosWorkTab();
}
if(settings.reportWarning)
{
$("#liTabReportWithWarning").removeClass('d-none');
PICKUP.initReportWithWarningsTab();
//PICKUP.initReportWithWarningsTab();
}
});
}
......
......@@ -3,6 +3,7 @@ var PushMessageDetail = {};
PushMessageDetail.baseApiUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + 'pushMessageDetail/';
PushMessageDetail.dummyMessageDetailJson = {
pushMessageId: 1,
pushMessage: "内容が入ります。内容が入ります。内容が入ります。内容が入ります。",
pushSendDate: "2022/07/06 14:14",
operationName: "絞り検索",
......@@ -10,9 +11,7 @@ PushMessageDetail.dummyMessageDetailJson = {
}
PushMessageDetail.init = function() {
$("#includedHeader").load("../common/header.html" , function() {
I18N.initi18n();
});
TEMPLATE.loadHearder("#includedHeader");
let urlParam = COMMON.getUrlParameter();
if (typeof urlParam !== 'object' || typeof urlParam.pushMessageId === 'undefined') {
return;
......@@ -28,15 +27,12 @@ PushMessageDetail.getMessageDetail = function(pushMessageId, callback) {
pushMessageId: pushMessageId
};
const url = PushMessageDetail.baseApiUrl;
COMMON.cmsAjax(url, param, false, function (json) {
if (callback) {
callback(json);
COMMON.cmsAjax(url, param, true, function (json) {
if (callback && json && json.pushMessage) {
callback(json.pushMessage);
}
}, function() {
console.log('PushMessageDetail.getMessageDetail error');
if (callback) {
callback(PushMessageDetail.dummyMessageDetailJson);
}
});
}
......
......@@ -9,9 +9,7 @@ PushMessageList.baseApiUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_account
* Init when html onload
*/
PushMessageList.init = function() {
$("#includedHeader").load("../common/header.html" , function() {
I18N.initi18n();
});
TEMPLATE.loadHearder("#includedHeader");
PushMessageList.getMessageList(function(messageList) {
PushMessageList.generateMessageListHtml(messageList.pushMessageList);
});
......@@ -26,15 +24,12 @@ PushMessageList.getMessageList = function (callback) {
sid: COMMON.getSid(),
};
const url = PushMessageList.baseApiUrl;
COMMON.cmsAjax(url, param, false, function (json) {
COMMON.cmsAjax(url, param, true, function (json) {
if (callback) {
callback(json);
}
}, function() {
console.log('PushMessageList.getMessageList error');
if (callback) {
callback(PushMessageList.dummyMessageListJson);
}
});
};
......
/**
* Send Message js in send-message.html
*
* @since 1.0 check web
*/
var SendMessage = {};
SendMessage.baseApiUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + 'sendPushMessage/';
/**
* Get input content
* @returns string
*/
SendMessage.getCurrentMessageContent = function() {
return $('#messageContent').val();
}
/**
* Get operation id selected
* @returns string
*/
SendMessage.getCurrentOperationId = function() {
return $('#operationSelected').attr('data-operation-id');
}
/**
* Get send type selected
* @returns string
*/
SendMessage.getCurrentSendType = function() {
return $('input[name="sendType"]:checked').val();
}
/**
* Check data required when send message request to cms
* @returns boolean
*/
SendMessage.checkValidation = function() {
const message = SendMessage.getCurrentMessageContent();
if (!ValidationUtil.CheckRequiredForText(message)) {
alert(I18N.i18nText('msgContentRequired'));
return false;
}
const operationId = SendMessage.getCurrentOperationId();
if (!ValidationUtil.IsNumber(operationId)) {
alert(I18N.i18nText('msgOperationRequired'));
return false;
}
const sendType = SendMessage.getCurrentSendType();
if (!ValidationUtil.IsNumber(sendType)) {
alert(I18N.i18nText('msgSendTypeRequired'));
return false;
}
return true;
};
/**
* handle click event of send button
*/
SendMessage.onClickSend = function() {
if (!SendMessage.checkValidation()) {
return;
}
const message = SendMessage.getCurrentMessageContent();
const operationId = SendMessage.getCurrentOperationId();
const sendType = SendMessage.getCurrentSendType();
SendMessage.postMessage(message, operationId, sendType);
};
/**
* post message data to cms
* @param {string} message
* @param {long} operationId
* @param {int} sendType - 0: Group, 1: All
*/
SendMessage.postMessage = function(message, operationId, sendType) {
let param = {
sid: COMMON.getSid(),
message: message,
operationId: operationId,
sendType: sendType
};
COMMON.cmsAjax(SendMessage.baseApiUrl, param, false, function (json) {
}, function() {
console.log('SendMessage.postMessage error');
});
};
SendMessage.operationSelectedCallback = function(operationId, operationName) {
$('#operationSelected').attr('data-operation-id', operationId);
$('#operationSelected').text(operationName);
}
SendMessage.templateSelectedCallback = function(template) {
$('#messageContent').val(template);
}
/**
* init data, action when screen onload
*/
SendMessage.init = function () {
TEMPLATE.loadHearder("#includedHeader");
TEMPLATE.loadOperationSelect('#includeOperationSelect', SendMessage.operationSelectedCallback);
TEMPLATE.loadNotificationSelect('#includeTemplateModal', SendMessage.templateSelectedCallback);
//load lang for elements none class lang
I18N.initi18n();
$("label[for='sendTypeGroup']").append(I18N.i18nText('labelSendTypeGroup'));
$("label[for='sendTypeAll']").append(I18N.i18nText('labelSendTypeAll'));
};
\ No newline at end of file
......@@ -11,10 +11,14 @@ TEMPLATE.loadHearder = function(elmentId) {
});
}
/** template load dashboard setting */
TEMPLATE.loadDashboardSetting = function(elmentId) {
/**
* template load dashboard setting
* @param {string} elmentId - element to load setting html
* @param {*} changeCallback - callback when setting changed
*/
TEMPLATE.loadDashboardSetting = function(elmentId, changeCallback) {
$(elmentId).load("dashboard-setting.html", function() {
DashboardSetting.init();
DashboardSetting.init(changeCallback);
I18N.initi18n();
});
}
......@@ -27,9 +31,16 @@ TEMPLATE.loadConfirmModal = function(elmentId) {
}
/** Template load operation select */
TEMPLATE.loadOperationSelect = function(elmentId) {
TEMPLATE.loadOperationSelect = function(elmentId, selectCallback) {
$(elmentId).load("operation-select.html", function() {
OperationSelect.init();
OperationSelect.init(selectCallback);
I18N.initi18n();
});
}
/** Template load display menu */
TEMPLATE.loadDisplaymenu = function(elmentId) {
$(elmentId).load("display-menu.html", function() {
I18N.initi18n();
});
}
......@@ -42,3 +53,11 @@ TEMPLATE.loadOperationSelect = function(elmentId) {
$("#confirm-modal").modal();
});
};
/** Template load notification content*/
TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) {
$(elmentId).load("notification-content.html", function() {
NotificationSelect.init(selectCallback);
I18N.initi18n();
});
}
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