Skip to content

C
check
Commit 10c2cc5b by Kang Donghun
Options

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

# Conflicts:
#   abweb/common/js/header.js
#   abweb/html/accountSetting.html
#   abweb/html/pickup.html
#   abweb/js/setting/settings.js
#   abweb/js/template/template.js
parents e70749f2 60c59c01
Showing with 54 additions and 32 deletions
abweb/common/json/lang/lang-en.json
......@@ -53,7 +53,7 @@
"dashboardSettings":"Dashboard Settings",
"pickup":"Pick up",
"communication":"Communication",
"workList":"Work list",
"workList":"Operation list",
"profile":"Profile",
"accountSetting":"Account setting",
"newRegistrationTitle":"New Registration",
......@@ -115,5 +115,6 @@
"categorySelection":"Category Selection",
"categoryAll":"All",
"reportForm": "Report",
"periodicInspectionPeriod": "Periodic Inspection Period"
"periodicInspectionPeriod": "Periodic Inspection Period",
"msgSendPushMessageSuccess":"we sent a push message"
}
\ No newline at end of file
abweb/common/json/lang/lang-ja.json
......@@ -113,5 +113,6 @@
"categorySelection":"カテゴリー選択",
"categoryAll":"すべて",
"reportForm": "報告",
"periodicInspectionPeriod": "定期点検期間"
"periodicInspectionPeriod": "定期点検期間",
"msgSendPushMessageSuccess":"プッシュメッセージ送信しました。"
}
\ No newline at end of file
abweb/common/json/lang/lang-ko.json
......@@ -112,5 +112,6 @@
"categorySelection":"Category Selection",
"categoryAll":"All",
"reportForm": "보고서",
"periodicInspectionPeriod": "정기점검기간"
"periodicInspectionPeriod": "정기점검기간",
"msgSendPushMessageSuccess":"푸시메시지를 보냈습니다."
}
\ No newline at end of file
abweb/html/accountSetting.html
......@@ -19,10 +19,11 @@
<script type="text/javascript" src="../common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../common/js/constant.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../common/js/validation.js"></script>
<script type="text/javascript" src="../js/setting/settings.js?__UPDATEID__"></script>
</head>
......@@ -63,26 +64,26 @@
</tbody>
</table>
</div>
</div>
<div class="col-md-6 col-12 mb-4">
<div class="card p-4 password">
<h2 class="fs-10 font-weight-bold mb-3 lang" lang="dspPwdUpd">パスワード変更</h2>
<form>
<div class="form-group mb-3">
<label id="lblPwdCur" class="lang" lang="txtPwdCurr">現在のパスワード</label>
<input type="password" class="form-control" id="txtPwdCur" maxlength="16" aria-describedby="current">
</div>
<div class="form-group mb-3">
<label id="lblPwdNew" class="lang" lang="txtPwdNew">新しいパスワード</label>
<input type="password" class="form-control" id="txtPwdNew" maxlength="16" aria-describedby="new">
</div>
<div class="form-group mb-4">
<label id="lblPwdNewRe" class="lang" lang="txtPwdNewRe">新しいパスワード</label>
<input type="password" class="form-control" id="txtPwdNewRe" maxlength="16" aria-describedby="confirm">
</div>
<p class="error lang" id="main-error-message" style="display:none;">パスワードまたはIDに誤りがあります</p>
<button type="submit" class="btn btn-primary lang" lang="dspChange" id="dspPwdUpd1">変更</button>
</form>
<div class="col-md-6 col-12 mb-4">
<div class="card p-4 password">
<h2 class="fs-10 font-weight-bold mb-3 lang" lang="dspPwdUpd">パスワード変更</h2>
<form>
<div class="form-group mb-3">
<label id="lblPwdCur" class="lang" lang="txtPwdCurr">現在のパスワード</label>
<input type="password" class="form-control" id="txtPwdCur" maxlength="16" aria-describedby="current">
</div>
<div class="form-group mb-3">
<label id="lblPwdNew" class="lang" lang="txtPwdNew">新しいパスワード</label>
<input type="password" class="form-control" id="txtPwdNew" maxlength="16" aria-describedby="new">
</div>
<div class="form-group mb-4">
<label id="lblPwdNewRe" class="lang" lang="txtPwdNewRe">新しいパスワード</label>
<input type="password" class="form-control" id="txtPwdNewRe" maxlength="16" aria-describedby="confirm">
</div>
<p class="error lang" id="main-error-message" style="display:none;">パスワードまたはIDに誤りがあります</p>
<button type="submit" class="btn btn-primary lang" lang="dspChange" id="dspPwdUpd1">変更</button>
</form>
</div>
</div>
</div>
</div>
......
abweb/html/dashboard.html
......@@ -46,7 +46,7 @@
<div id="includedMainTitle"></div>
<!-- sub title -->
<h2 class="fs-8 font-weight-bold lang" id="#pickupHeader" lang="pickup"></h2>
<h2 class="fs-8 font-weight-bold lang" id="pickupHeader" lang="pickup"></h2>
<!-- card -->
<ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id ="pickupItems" >
......
abweb/html/dashboardSetting.html
......@@ -11,7 +11,7 @@
<div class="modal-body">
<table class="w-100" id="dashboardSettingItems">
<colgroup>
<col span="1" class="w-120px">
<col span="1" class="w-250px">
</colgroup>
<tbody>
<tr>
......
abweb/js/operationSelect/operationSelect.js
......@@ -73,6 +73,14 @@ OperationSelect.init = function (selectedCallback) {
*/
OperationSelect.createOperationSelectList = function (operationList) {
$('#operationSelectList').empty();
// sort operation list by operationId
operationList = operationList.sort(function (a, b) {
if (a.operationId < b.operationId) return 1;
if (a.operationId > b.operationId) return -1;
return 0;
});
if (typeof operationList === 'undefined' || operationList.length < 1) return;
for (let i = 0; i < operationList.length; i++) {
let messageli = $("<li class='card mb-2' name = 'operationId_" + operationList[i].operationId + "' ></li>");
......
abweb/js/reportList/reportList.js
......@@ -16,7 +16,6 @@ RL.init = function () {
RL.checkQuickReport();
RL.loadCommon();
RL.initTaskReportList();
COMMON.closeLoading();
};
/**
......@@ -68,7 +67,9 @@ RL.initTaskReportList = function () {
params.operationId = sessionStorage.OL_operationId;
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST;
$('#reportList').load(url, params);
$('#reportList').load(url, params, function () {
COMMON.closeLoading();
});
} else {
COMMON.displayAlert('error');
COMMON.avwScreenMove('index.html');
......
abweb/js/sendMessage/sendMessage.js
......@@ -79,6 +79,7 @@ SendMessage.onClickSend = function () {
* @param {int} sendType - 0: Group, 1: All
*/
SendMessage.postMessage = function (message, operationId, sendType) {
COMMON.showLoading();
let param = {
sid: COMMON.getSid(),
message: message,
......@@ -89,9 +90,13 @@ SendMessage.postMessage = function (message, operationId, sendType) {
SendMessage.baseApiUrl,
param,
false,
function (json) {},
function (json) {
COMMON.closeLoading();
alert(I18N.i18nText('msgSendPushMessageSuccess'));
},
function () {
console.log('SendMessage.postMessage error');
COMMON.closeLoading();
},
);
};
......
abweb/js/template/template.js
......@@ -5,7 +5,8 @@
var TEMPLATE = {};
/** template load header */
TEMPLATE.loadHeader = function (elmentId) {
TEMPLATE.loadHearder = function (elmentId) {
COMMON.showLoading();
$(elmentId).load('../common/html/header.html', function () {
$('#iconHomeDashboard').removeClass('active');
$('#iconHomeWorkList').removeClass('active');
......
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