Skip to content

C
check
Commit 3a7adaef by NGO THI HONG
Options

Add language

parent 7a24614a
Showing with 113 additions and 47 deletions
abvw/common/header.html
......@@ -8,29 +8,32 @@
<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">
<div class="fs-7 d-sm-block d-none lang" lang="titleDashboard"></div>
<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">
<div class="fs-7 d-sm-block d-none">作業一覧</div>
<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">
<div class="fs-7 d-sm-block d-none">プロフィール</div>
<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">login-id</h6>
<a class="dropdown-item" href="account-setting.html">
<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">
アカウント設定</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#confirm-modal">
<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">
ログアウト</a>
<span class="lang" style=" color: #6c757d;" lang="dspLogout"></span>
</a>
</div>
</div>
</div>
......
abvw/common/json/lang/lang-en.json
......@@ -34,5 +34,25 @@
"sysLockScrPwdInput":"Input password",
"msgPWDNeedChange":"Change password is required. Please back Setting view.",
"msgAnonymousLoginErr":"Can not login. (Error code: {0})",
"msgAnonymousLoginErr2":"Can not login. "
"msgAnonymousLoginErr2":"Can not login. ",
"dashboard":"Dashboard",
"dashboardSettings":"Dashboard Settings",
"pickup":"Pick up",
"communication":"Communication",
"workList":"Work list",
"profile":"Profile",
"account_setting":"Account setting",
"newRegistrationTitle":"New Registration",
"continousWorkTitle":"Continous Work",
"processWorkTitle":"Process work",
"reportWarningTitle":"Report With Warning",
"workWithWarningsTitle":"Work with warnings",
"messageListTitle":"Message List",
"sendMessageTitle":"Send Message",
"distanceSupportTitle":"DistanceSupport",
"chatTitle":"Chat",
"makeDashboardAsHome":"Make dashboard your home screen",
"btnKeep":"Keep"
}
\ No newline at end of file
abvw/common/json/lang/lang-ja.json
......@@ -34,5 +34,24 @@
"sysLockScrPwdInput":"パスワードを入力してください",
"msgPWDNeedChange":"パスワードの変更が必要です。設定変更画面に戻って変更してください。",
"msgAnonymousLoginErr":"ログインできません。(エラーコード：{0})",
"msgAnonymousLoginErr2":"ログインできません。"
"msgAnonymousLoginErr2":"ログインできません。",
"dashboard":"ダッシュボード",
"dashboardSettings":"ダッシュボード設定",
"pickup":"ピックアップ",
"communication":"コミュニケーション",
"workList":"作業一覧",
"profile":"プロフィール",
"account_setting":"アカウント設定",
"newRegistrationTitle":"新規報告",
"continousWorkTitle":"工程管理",
"processWorkTitle":"工程作業",
"reportWarningTitle":"警告を含む報告",
"workWithWarningsTitle":"警告を含む作業",
"messageListTitle":"メッセージ一覧",
"sendMessageTitle":"メッセージ送信",
"distanceSupportTitle":"遠隔支援",
"chatTitle":"チャット",
"makeDashboardAsHome":"ダッシュボードをホーム画面にする",
"btnKeep":"保存"
}
\ No newline at end of file
abvw/common/json/lang/lang-ko.json
......@@ -34,5 +34,24 @@
"sysLockScrPwdInput":"패스워드를 입력해 주십시오.",
"msgPWDNeedChange":"패스워드를 변경해야 합니다. 환경설정에서 패스워드를 변경해 주십시오.",
"msgAnonymousLoginErr":"로그인할 수 없습니다. (에러코드 : {0})",
"msgAnonymousLoginErr2":"로그인할 수 없습니다."
"msgAnonymousLoginErr2":"로그인할 수 없습니다.",
"dashboard":"Dashboard",
"dashboardSettings":"Dashboard Settings",
"pickup":"Pick up",
"communication":"Communication",
"workList":"Work list",
"profile":"Profile",
"account_setting":"Account setting",
"newRegistrationTitle":"New Registration",
"continousWorkTitle":"Continous Work",
"processWorkTitle":"Process work",
"reportWarningTitle":"Report With Warning",
"workWithWarningsTitle":"Work with warnings",
"messageListTitle":"Message List",
"sendMessageTitle":"Send Message",
"distanceSupportTitle":"DistanceSupport",
"chatTitle":"Chat",
"makeDashboardAsHome":"Make dashboard your home screen",
"btnKeep":"Keep"
}
\ No newline at end of file
abvw/html/dashboard-setting.html
......@@ -3,7 +3,7 @@
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header bg-dark10">
<h5 class="modal-title multi-lang" data-msg="dashboardSettingHeaderTitle">ダッシュボード設定</h5>
<h5 class="modal-title lang" lang="dashboardSettings"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
......@@ -15,27 +15,27 @@
</colgroup>
<tbody>
<tr>
<th class="fs-9 p-2 text-secondary multi-lang" data-msg="dashboardSettingNewReportTitle">新規報告</th>
<th class="fs-9 p-2 text-secondary lang" lang="newRegistrationTitle"></th>
<td class="p-2"><div id="settingNewReport" data-key="newReport" class="toggle ml-auto"><input type="checkbox" name="chk-new"></div></td>
</tr>
<tr>
<th class="fs-9 p-2 text-secondary multi-lang" data-msg="dashboardSettingContinousWorkTitle">工程作業</th>
<th class="fs-9 p-2 text-secondary lang" lang="processWorkTitle"></th>
<td class="p-2"><div id="settingContinousWork" data-key="continousWork" class="toggle ml-auto"><input type="checkbox" name="chk-proccess"></div></td>
</tr>
<tr>
<th class="fs-9 p-2 text-secondary multi-lang" data-msg="dashboardSettingReportWarningTitle">警告を含む作業</th>
<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>
</tr>
<tr>
<th class="fs-9 p-2 text-secondary multi-lang" data-msg="dashboardSettingDashboardHomeTitle">ダッシュボードをホーム画面にする</th>
<th class="fs-9 p-2 text-secondary lang" lang="makeDashboardAsHome"></th>
<td class="p-2"><div id="settingDashboardHome" data-key="dashboardHome" class="toggle ml-auto"><input type="checkbox" name="chk-home"></div></td>
</tr>
</tbody>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary multi-lang" data-msg="dashboardSettingSaveButton" onclick="DashboardSetting.onClickSave();">保存</button>
<button type="button" class="btn btn-tertiary multi-lang" data-msg="dashboardSettingCancelButton" data-dismiss="modal">キャンセル</button>
<button type="button" class="btn btn-primary lang" lang="btnKeep" onclick="DashboardSetting.onClickSave();"></button>
<button type="button" class="btn btn-tertiary lang" lang="dspCancel" data-dismiss="modal"></button>
</div>
</div>
</div>
......
abvw/html/dashboard.html
......@@ -26,13 +26,7 @@
<script type="text/javascript" src="../js/dashboardSetting/dashboard-setting.js"></script>
<script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
<script>
$(function(){
$("#includedHeader").load("../common/header.html");
$("#includedDashboardSetting").load("dashboard-setting.html");
$("#includedConfirmModal").load("../common/confirm-modal.html");
});
</script>
</head>
<body onload="DASHBOARD.init();">
......@@ -45,21 +39,21 @@
<div class="container">
<!-- title -->
<div class="d-flex align-items-center">
<h1 class="fs-14 font-weight-bold pt-4 pb-3 mb-0 mr-auto">ダッシュボード</h1>
<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">
</a>
</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" >
</ul>
<!-- sub title -->
<h2 class="fs-8 font-weight-bold">コミュニケーション</h2>
<h2 class="fs-8 font-weight-bold lang" lang="communication"></h2>
<!-- card -->
<ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id="communicationItems">
......@@ -67,6 +61,7 @@
</div>
</main>
<!-- dashboard setting model -->
<div id="includedDashboardSetting"></div>
<!-- confirm -->
......
abvw/js/dashboard/dashboard.js
......@@ -6,17 +6,17 @@ var DASHBOARD = {};
// pickup dashboard configuration
DASHBOARD.pickupItems = [
{id: 'newReport', href: "javascript:DASHBOARD.goPickup('newReport');", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_new.svg'}, msg: 'newRegistrationTitle', defaultMessage:'New report'},
{id: 'continousWork', href: "javascript:DASHBOARD.goPickup('continousWork');", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_proccess.svg'}, msg: 'continousWorkTitle' , defaultMessage:'Continuous Work'},
{id: 'reportWarning', href: "javascript:DASHBOARD.goPickup('reportWarning');", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_alert.svg'}, msg: 'reportWarningTitle' , defaultMessage:'Warning report'},
{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' },
];
// comunication dashboard configuration
DASHBOARD.communicationItems = [
{id: 'messageList', href: "javascript:DASHBOARD.goMessageList();", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_message_list.svg'}, msg: 'messageListTitle' , defaultMessage:'Message list'},
{id: 'sendMessage', href: "javascript:DASHBOARD.goSendMessage();", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_send_message.svg'}, msg: 'sendMessageTitle' , defaultMessage:'Message'},
{id: 'distanceSupport', href: "javascript:DASHBOARD.goDistanceSupport();", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_remote.svg'}, msg: 'distanceSupportTitle' , defaultMessage:'Distance Support'},
{id: 'chat', href: "javascript:DASHBOARD.goChat();", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_chat.svg'}, msg: 'chatTitle' , defaultMessage:'Chat'},
{id: 'messageList', href: "javascript:DASHBOARD.goMessageList();", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_message_list.svg'}, msg: 'messageListTitle' },
{id: 'sendMessage', href: "javascript:DASHBOARD.goSendMessage();", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_send_message.svg'}, msg: 'sendMessageTitle' },
{id: 'distanceSupport', href: "javascript:DASHBOARD.goDistanceSupport();", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_remote.svg'}, msg: 'distanceSupportTitle' },
{id: 'chat', href: "javascript:DASHBOARD.goChat();", count: 0, enabled: true, img: {src: '../common/img/dahboard_icon_chat.svg'}, msg: 'chatTitle' },
];
// Default dashboard setting data
......@@ -91,8 +91,8 @@ DASHBOARD.initHtmlItem = function(item) {
let html = $('<li class="card mb-2 position-relative" id="' + item.id + '">'
+ '<a href="' + item.href + '" class="d-block text-dark text-decoration-none mb-1 p-3 text-center">'
+ '<div class="bg-lightblue p-2 d-inline-block rounded-circle mb-3">'
+ '<img src="' + item.img.src + '" alt="' + DASHBOARD.getMsg(item.msg, item.defaultMessage) +'" class="img-fluid"> </div>'
+ '<div class="fs-10 multi-lang" data-msg="' + item.msg + '">' + DASHBOARD.getMsg(item.msg , item.defaultMessage) + '</div>'
+ '<img src="' + item.img.src + '" alt="' + I18N.i18nText(item.msg) +'" class="img-fluid"> </div>'
+ '<div class="fs-10 lang" lang="' + item.msg + '">' + I18N.i18nText(item.msg ) + '</div>'
+ countSpan
+ '</a>'
+ '</li>');
......@@ -101,16 +101,29 @@ DASHBOARD.initHtmlItem = function(item) {
// Initialization dashboard screen
DASHBOARD.init = function() {
I18N.initi18n();
DashboardSetting.init();
DASHBOARD.loadCommon();
DashboardSetting.getSettingData(function (settings) {
DASHBOARD.getDashboardData(function (dataDashboard) {
DASHBOARD.updateDataPickups(settings, dataDashboard);
DASHBOARD.initPickups();
DASHBOARD.updateDataCommunications(dataDashboard);
DASHBOARD.initCommunications();
DASHBOARD.initCommunications();
});
});
});
}
// load common data
DASHBOARD.loadCommon = function() {
$("#includedHeader").load("../common/header.html" , function() {
I18N.initi18n();
});
$("#includedDashboardSetting").load("dashboard-setting.html", function() {
DashboardSetting.init();
I18N.initi18n();
});
$("#includedConfirmModal").load("../common/confirm-modal.html", function() {
I18N.initi18n();
});
}
// Update pickup config from setting dashboard data
......@@ -151,8 +164,3 @@ DASHBOARD.goPickup = function(pickupId) {
DASHBOARD.goMessageList = function() {
COMMON.goUrlWithCurrentParams('message-list.html', {});
}
// get message language
DASHBOARD.getMsg = function(message, defaultMessage) {
return defaultMessage;
}
\ No newline at end of file
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