Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
c4e06868
Commit
c4e06868
authored
Oct 27, 2022
by
NGO THI HONG
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change comment as English comment
parent
86177773
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
51 additions
and
43 deletions
+51
-43
abvw/common/confirm-modal.html
+4
-5
abvw/common/header.html
+0
-1
abvw/common/js/newdash/common.js
+30
-31
abvw/common/json/lang/lang-en.json
+6
-2
abvw/common/json/lang/lang-ja.json
+6
-1
abvw/common/json/lang/lang-ko.json
+5
-1
abvw/html/dashboard.html
+0
-2
No files found.
abvw/common/confirm-modal.html
View file @
c4e06868
...
...
@@ -2,17 +2,16 @@
<div
class=
"modal-dialog modal-dialog-centered"
role=
"document"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header bg-dark10"
>
<h5
class=
"modal-title
"
>
確認
</h5>
<h5
class=
"modal-title
lang"
lang=
"confirmation"
>
</h5>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-label=
"Close"
>
<span
aria-hidden=
"true"
>
×
</span>
</button>
</div>
<div
class=
"modal-body"
>
XXXXしますか?
<div
class=
"modal-body"
id=
"msgModel"
>
</div>
<div
class=
"modal-footer"
>
<button
type=
"button"
class=
"btn btn-primary"
>
はい
</button>
<button
type=
"button"
class=
"btn btn-tertiary
"
data-dismiss=
"modal"
>
いいえ
</button>
<button
type=
"button"
class=
"btn btn-primary
lang"
lang=
"confirmYes
"
>
はい
</button>
<button
type=
"button"
class=
"btn btn-tertiary
lang"
lang=
"confirmNo"
data-dismiss=
"modal"
>
</button>
</div>
</div>
</div>
...
...
abvw/common/header.html
View file @
c4e06868
...
...
@@ -32,7 +32,6 @@
<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"
>
<span
class=
"lang"
style=
" color: #6c757d;"
lang=
"dspLogout"
></span>
</a>
</div>
</div>
...
...
abvw/common/js/newdash/common.js
View file @
c4e06868
$
(
function
(){
hide_del_btn
();
});
// 追加ボタン押下
/** Handle press the Add button */
$
(
'.add'
).
on
(
'click'
,
function
(){
var
base
=
$
(
this
).
parent
().
parent
().
parent
(
'.tb-item'
);
base
.
find
(
'.del'
).
show
();
//
入力フォームをクローン
//
clone input form
base
.
clone
(
true
).
insertAfter
(
base
);
//
追加した要素にスクロール
//
Scroll to added element
$
(
"html,body"
).
animate
({
scrollTop
:
base
.
next
().
offset
().
top
});
//
入力フォームアコーディオン表示
//
Input form accordion display
base
.
parent
().
parent
(
'.tb'
).
find
(
'.ac-tb-form'
).
show
();
});
// 削除ボタン押下
/** Handle press the Delete button */
$
(
'.del'
).
on
(
'click'
,
function
(){
var
base
=
$
(
this
).
parent
().
parent
().
parent
(
'.tb-item'
);
var
tbwrap
=
base
.
parent
(
'.tb-wrap'
);
var
tb
=
tbwrap
.
parent
(
'.tb'
);
//
エリアの削除
//
Delete area
base
.
remove
();
//
ボタンの表示非表示切り替え
//
Hidden delete button
hide_del_btn
();
//
フォームエリア表示切り替え
//
Form area display switch
tbWrapClear
(
tbwrap
);
//
折りたたみアイコン非表示
//
Hide collapse icon
if
(
tb
.
find
(
'.ac-tb-form'
).
is
(
':hidden'
)){
tb
.
find
(
'.fold-area'
).
addClass
(
'hide'
);
}
});
/
/ 閉じるボタン押下
/
** handle Press the close button */
$
(
'.close-window'
).
on
(
'click'
,
function
(){
window
.
close
();
});
/
/ 表領域のフォームが一つの時、削除ボタンを非表示
/
** Hide delete button when there is only one tablespace form */
function
hide_del_btn
(){
$
(
'.tb-wrap'
).
each
(
function
(
i
,
elem
){
var
len
=
$
(
elem
).
find
(
'.tb-item'
).
length
;
//
表の項目が一つの場合
//
When there is one item in the table
if
(
len
<=
1
){
$
(
elem
).
find
(
'.del'
).
hide
();
$
(
this
).
children
(
'.tb-item'
).
removeClass
(
'visually-hidden'
);
//
入力フォームアコーディオン非表示
//
Input form accordion hidden
$
(
this
).
parent
().
find
(
'.ac-tb-form'
).
hide
();
}
});
}
// アコーディオンを閉めている際にフォームを削除した場合
// 子要素がすべて非表示の場合、親要素を非表示とする
/** Handle when deleting while closing the accordion */
function
tbWrapClear
(
tbwrap
){
// If you delete the form while closing the accordion
// Hide parent element if all child elements are hidden
if
(
tbwrap
.
children
(
':not(.visually-hidden)'
).
length
==
0
){
tbwrap
.
addClass
(
"visually-hidden"
);
}
...
...
@@ -65,7 +63,7 @@ function tbWrapClear(tbwrap){
}
}
/
/ 入力フォームアコーディオン
/
** input form accordion */
$
(
'.ac-tb-form'
).
on
(
'click'
,
function
(){
var
tb
=
$
(
this
).
parent
().
parent
().
parent
(
'.tb'
);
var
elems
=
tb
.
find
(
'.tb-wrap'
).
find
(
'.tb-item'
);
...
...
@@ -79,28 +77,28 @@ $('.ac-tb-form').on('click',function(){
});
$
(
this
).
text
(
'開く'
);
//
フォームエリア表示切り替え
//
Form area display switch
tbWrapClear
(
tbwrap
);
//
折りたたみアイコン表示
//
Collapse icon view
tb
.
find
(
'.fold-area'
).
removeClass
(
'hide'
);
}
else
{
elems
.
removeClass
(
'visually-hidden'
);
$
(
this
).
text
(
'閉じる'
);
//
フォームエリア表示切り替え
//
Form area display switch
tbWrapClear
(
tbwrap
);
//
折りたたみアイコン非表示
//
Hide collapse icon
tb
.
find
(
'.fold-area'
).
addClass
(
'hide'
);
}
//
開閉
//
opening and closing
$
(
this
).
toggleClass
(
"hide"
);
});
/
/ トグル切り替え
/
** toggle switch */
$
(
".toggle"
).
on
(
"click"
,
function
()
{
$
(
this
).
toggleClass
(
"checked"
);
if
(
!
$
(
'input[name="check"]'
).
prop
(
"checked"
))
{
...
...
@@ -111,24 +109,25 @@ $(".toggle").on("click", function() {
});
/
/ メニュー表示
/
** Menu display */
$
(
'.c-dropdown-trigger'
).
on
(
"click"
,
function
(){
$
(
'[data-target="'
+
$
(
this
).
attr
(
'id'
)
+
'"]'
).
toggleClass
(
'show'
);
$
(
'.mask'
).
removeClass
(
'hide'
);
});
// メニューを閉じる
/** Close menu */
$
(
'.mask'
).
on
(
"click"
,
function
(){
$
(
'.mask'
).
addClass
(
'hide'
);
$
(
'.c-dropdown-menu'
).
removeClass
(
'show'
);
});
/
/ カードリスト選択
/
** Select card list */
$
(
'.select-card-list .card .select-label'
).
on
(
"click"
,
function
(){
$
(
this
).
closest
(
'.select-card-list'
).
find
(
'.card'
).
removeClass
(
'selected'
);
$
(
this
).
closest
(
'.card'
).
addClass
(
'selected'
);
});
/
/ リスト表示切替(リスト表示)
/
** List display switching (list display) */
$
(
'.view-menu .view-list-btn'
).
on
(
"click"
,
function
(){
$
(
'.view-block-btn'
).
removeClass
(
'active'
);
$
(
'.view-list-btn'
).
addClass
(
'active'
);
...
...
@@ -136,7 +135,7 @@ $('.view-menu .view-list-btn').on("click",function(){
$
(
'.view-content'
).
addClass
(
'view-list'
);
});
/
/ リスト表示切替(グリッド表示)
/
** List display switching (grid display) */
$
(
'.view-menu .view-block-btn'
).
on
(
"click"
,
function
(){
$
(
'.view-list-btn'
).
removeClass
(
'active'
);
$
(
'.view-block-btn'
).
addClass
(
'active'
);
...
...
@@ -144,7 +143,7 @@ $('.view-menu .view-block-btn').on("click",function(){
$
(
'.view-content'
).
addClass
(
'view-block'
);
});
/
/ ローディング
/
** loading */
$
(
function
(){
function
e
()
{
setTimeout
(
function
(){
...
...
abvw/common/json/lang/lang-en.json
View file @
c4e06868
...
...
@@ -50,7 +50,7 @@
"workWithWarningsTitle"
:
"Work with warnings"
,
"messageListTitle"
:
"Message List"
,
"sendMessageTitle"
:
"Send Message"
,
"distanceSupportTitle"
:
"DistanceSupport"
,
"distanceSupportTitle"
:
"Distance
Support"
,
"chatTitle"
:
"Chat"
,
"makeDashboardAsHome"
:
"Set dashboard to home screen"
,
"btnKeep"
:
"Keep"
,
...
...
@@ -58,6 +58,9 @@
"display"
:
" display"
,
"reportLevelReport"
:
"Report"
,
"reportLevelAnswer"
:
"Answer"
,
"msgNotFound"
:
"There is no applicable work."
"msgNotFound"
:
"There is no applicable work."
,
"confirmation"
:
"confirmation"
,
"confirmYes"
:
"Yes"
,
"confirmNo"
:
"No"
}
\ No newline at end of file
abvw/common/json/lang/lang-ja.json
View file @
c4e06868
...
...
@@ -58,5 +58,9 @@
"display"
:
" 件表示"
,
"reportLevelReport"
:
"報告"
,
"reportLevelAnswer"
:
"回答"
,
"msgNotFound"
:
"該当する作業がありません。"
"msgNotFound"
:
"該当する作業がありません。"
,
"confirmation"
:
"確認"
,
"confirmYes"
:
"はい"
,
"confirmNo"
:
"いいえ"
}
\ No newline at end of file
abvw/common/json/lang/lang-ko.json
View file @
c4e06868
...
...
@@ -58,5 +58,8 @@
"display"
:
" display"
,
"reportLevelReport"
:
"Report"
,
"reportLevelAnswer"
:
"Answer"
,
"msgNotFound"
:
"There is no applicable work."
"msgNotFound"
:
"There is no applicable work."
,
"confirmation"
:
"confirmation"
,
"confirmYes"
:
"Yes"
,
"confirmNo"
:
"No"
}
\ No newline at end of file
abvw/html/dashboard.html
View file @
c4e06868
...
...
@@ -32,7 +32,6 @@
<body
onload=
"DASHBOARD.init();"
>
<!-- header -->
<!-- <?php include('common/header.html');?> -->
<div
id=
"includedHeader"
></div>
<!-- dashboard -->
<main>
...
...
@@ -65,7 +64,6 @@
<div
id=
"includedDashboardSetting"
></div>
<!-- confirm -->
<!-- <?php include('common/confirm-modal.html');?> -->
<div
id=
"includedConfirmModal"
></div>
</body>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment