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
5310be93
Commit
5310be93
authored
2 years ago
by
NGO THI HONG
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update direct home screen
parent
26fbd48e
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
82 additions
and
57 deletions
+82
-57
abvw/common/header.html
+2
-1
abvw/html/display-menu.html
+0
-10
abvw/html/index.html
+2
-2
abvw/html/main-footer.html
+1
-1
abvw/html/pickup.html
+30
-5
abvw/js/dashboard/dashboard.js
+3
-3
abvw/js/pickup/pickup.js
+30
-28
abvw/js/template/template.js
+0
-6
abvw/js/topPage/topPage.js
+14
-1
No files found.
abvw/common/header.html
View file @
5310be93
...
...
@@ -29,7 +29,8 @@
<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"
>
<!-- <a class="dropdown-item " href="#" data-toggle="modal" data-target="#confirm-modal"> -->
<a
class=
"dropdown-item "
href=
"login.html"
>
<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>
...
...
This diff is collapsed.
Click to expand it.
abvw/html/display-menu.html
deleted
100644 → 0
View file @
26fbd48e
<!-- 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
This diff is collapsed.
Click to expand it.
abvw/html/index.html
View file @
5310be93
...
...
@@ -21,9 +21,9 @@
<script
src=
"/abvw/common/js/constant.js?__UPDATEID__"
></script>
<script
src=
"/abvw/common/js/common.js?__UPDATEID__"
></script>
<script
src=
"/abvw/js/operationList/operationList.js?__UPDATEID__"
></script>
<script
src=
"/abvw/js/topPage/topPage.js?__UPDATEID__"
></script>
<script
src=
"/abvw/js/dashboardSetting/check-dashboard-setting.js?__UPDATEID__"
></script>
<script
src=
"/abvw/js/dashboardSetting/dashboard-setting.js?__UPDATEID__"
></script>
<script
src=
"/abvw/js/dashboard/dashboard.js?__UPDATEID__"
></script>
<script
src=
"/abvw/js/topPage/topPage.js?__UPDATEID__"
></script>
<script
src=
"/abvw/common/js/footer.js?__UPDATEID__"
></script>
<script
src=
"/abvw/common/js/app.js?__UPDATEID__"
defer
></script>
...
...
This diff is collapsed.
Click to expand it.
abvw/html/main-footer.html
View file @
5310be93
...
...
@@ -2,7 +2,7 @@
<nav
class=
"d-flex justify-content-around"
>
<!--ダッシュボード-->
<a
id=
"dashboardBottomNav"
class=
"d-block w-100 text-center py-2 text-decoration-none text-secondary bottom-nav"
href=
"
javascript:FOOTER.goDashboard();
"
>
<a
id=
"dashboardBottomNav"
class=
"d-block w-100 text-center py-2 text-decoration-none text-secondary bottom-nav"
href=
"
dashboard.html
"
>
<img
src=
"/abvw/img/dashboard/icon_dashboard_inactive.svg"
data-inactive-src=
"/abvw/img/dashboard/icon_dashboard_inactive.svg"
data-src=
"/abvw/img/dashboard/icon_dashboard.svg"
alt=
"buttonDashboard"
class=
"p-1"
>
<div
class=
"fs-7 multi-lang"
data-msg=
"buttonDashboard"
></div>
</a>
...
...
This diff is collapsed.
Click to expand it.
abvw/html/pickup.html
View file @
5310be93
...
...
@@ -30,10 +30,14 @@
<script
type=
"text/javascript"
src=
"../js/template/template.js"
></script>
<script
type=
"text/javascript"
src=
"../js/pickup/pickup.js"
></script>
<script
type=
"text/javascript"
>
$
(
document
).
ready
(
function
(){
PICKUP
.
init
();
});
</script>
</head>
<body
onload=
"PICKUP.init();"
>
<body
>
<!-- header -->
<div
id=
"includedHeader"
></div>
<!-- pickup -->
...
...
@@ -76,7 +80,14 @@
<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
id=
"includedNewReportMenuDisplay"
></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 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>
</div>
</nav>
<!-- task list -->
...
...
@@ -89,7 +100,14 @@
<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
id=
"includedContinuousWorkMenuDisplay"
></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 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>
</div>
</nav>
<!-- task list -->
...
...
@@ -102,7 +120,14 @@
<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"
id=
"count-ReportWithWarnings"
></div>
<div
id=
"includedReportWithWarningsMenuDisplay"
></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 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>
</div>
</nav>
<!-- task list -->
...
...
This diff is collapsed.
Click to expand it.
abvw/js/dashboard/dashboard.js
View file @
5310be93
...
...
@@ -127,8 +127,8 @@ DASHBOARD.updateDataPickups = function(settings, dataDashboard) {
item
.
enabled
=
enabled
;
}
item
.
count
=
0
;
if
(
dataDashboard
[
item
.
id
])
{
item
.
count
=
dataDashboard
[
item
.
id
];
if
(
dataDashboard
.
dashboard
[
item
.
id
])
{
item
.
count
=
dataDashboard
.
dashboard
[
item
.
id
];
}
});
}
...
...
@@ -139,7 +139,7 @@ DASHBOARD.updateDataCommunications = function(dataDashboard) {
if
(
item
.
id
==
'messageList'
)
{
item
.
count
=
0
;
if
(
dataDashboard
[
'pushMesage'
])
{
item
.
count
=
dataDashboard
[
'pushMesage'
];
item
.
count
=
dataDashboard
.
dashboard
[
'pushMesage'
];
}
}
});
...
...
This diff is collapsed.
Click to expand it.
abvw/js/pickup/pickup.js
View file @
5310be93
...
...
@@ -48,9 +48,9 @@ PICKUP.defaultPickupList = {
}
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'
;
PICKUP
.
getNewReportListApiUrl
=
PICKUP
.
baseApiUrl
+
'newReport
/
'
;
PICKUP
.
getContinuousWorkListApiUrl
=
PICKUP
.
baseApiUrl
+
'workingFlow
/
'
;
PICKUP
.
getReportWithWarningsListApiUrl
=
PICKUP
.
baseApiUrl
+
'warningWithReport
/
'
;
/**
* Call get new report list api get data
...
...
@@ -116,9 +116,6 @@ 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
();
...
...
@@ -139,12 +136,12 @@ PICKUP.settingPickup = function() {
if
(
settings
.
continousWork
)
{
$
(
"#liTabContinousWork"
).
removeClass
(
'd-none'
);
//
PICKUP.initContinuosWorkTab();
PICKUP
.
initContinuosWorkTab
();
}
if
(
settings
.
reportWarning
)
if
(
settings
.
warningReport
)
{
$
(
"#liTabReportWithWarning"
).
removeClass
(
'd-none'
);
//
PICKUP.initReportWithWarningsTab();
PICKUP
.
initReportWithWarningsTab
();
}
});
}
...
...
@@ -230,7 +227,7 @@ PICKUP.showCountDisplayPickupItem = function(elementId, count) {
*/
PICKUP
.
initNewReportTab
=
function
()
{
PICKUP
.
getNewreportListData
(
function
(
json
)
{
PICKUP
.
createNewReportList
(
json
.
operationList
);
PICKUP
.
createNewReportList
(
json
.
operation
t
List
);
});
}
...
...
@@ -240,7 +237,7 @@ PICKUP.initNewReportTab = function() {
*/
PICKUP
.
initContinuosWorkTab
=
function
()
{
PICKUP
.
getContinuousWorkListData
(
function
(
json
)
{
PICKUP
.
createContinousWorkList
(
json
.
operationList
);
PICKUP
.
createContinousWorkList
(
json
.
operation
t
List
);
});
}
...
...
@@ -249,7 +246,7 @@ PICKUP.initNewReportTab = function() {
*/
PICKUP
.
initReportWithWarningsTab
=
function
()
{
PICKUP
.
getReportWithWarningsListData
(
function
(
json
)
{
PICKUP
.
createReportWithWarningList
(
json
.
operationList
);
PICKUP
.
createReportWithWarningList
(
json
.
operation
t
List
);
});
}
...
...
@@ -272,16 +269,17 @@ PICKUP.sortNewReportList = function(operationList) {
* @returns
*/
PICKUP
.
createNewReportList
=
function
(
operationListOld
)
{
if
(
typeof
operationListOld
===
'undefined'
||
operationListOld
.
length
<
1
)
{
PICKUP
.
showNotFoundPickupItem
(
"#newReport-list"
);
$
(
'#viewMenuNewReport'
).
addClass
(
'd-none'
);
return
;
}
let
operationList
=
PICKUP
.
sortNewReportList
(
operationListOld
);
$
(
'#viewMenuNewReport'
).
removeClass
(
'd-none'
);
$
(
"#newReport-list"
).
empty
();
PICKUP
.
countNewReportList
=
0
;
if
(
typeof
operationList
===
'undefined'
||
operationList
.
length
<
1
)
{
PICKUP
.
showNotFoundPickupItem
(
"#newReport-list"
);
$
(
'#viewMenuNewReport'
).
addClass
(
'd-none'
);
return
;
}
$
(
'#newReport-list'
).
addClass
(
'task-list view-content view-block'
);
let
classIcon
;
for
(
let
i
=
0
;
i
<
operationList
.
length
;
i
++
)
{
...
...
@@ -393,17 +391,19 @@ PICKUP.sortContinousWorkList = function(operationList) {
* @returns
*/
PICKUP
.
createContinousWorkList
=
function
(
operationListOld
)
{
let
operationList
=
PICKUP
.
sortContinousWorkList
(
operationListOld
);
$
(
'#viewMenuContinuousWork'
).
removeClass
(
'd-none'
);
$
(
"#continousWork-list"
).
empty
();
PICKUP
.
countContinousWorkReport
=
0
;
if
(
typeof
operationList
===
'undefined'
||
operationList
.
length
<
1
)
{
if
(
typeof
operationListOld
===
'undefined'
||
operationListOld
.
length
<
1
)
{
PICKUP
.
showNotFoundPickupItem
(
"#continousWork-list"
);
$
(
'#viewMenuContinuousWork'
).
addClass
(
'd-none'
);
return
;
}
let
operationList
=
PICKUP
.
sortContinousWorkList
(
operationListOld
);
$
(
'#viewMenuContinuousWork'
).
removeClass
(
'd-none'
);
$
(
"#continousWork-list"
).
empty
();
PICKUP
.
countContinousWorkReport
=
0
;
$
(
'#continousWork-list'
).
addClass
(
'task-list view-content view-block'
);
for
(
let
i
=
0
;
i
<
operationList
.
length
;
i
++
)
{
...
...
@@ -603,16 +603,18 @@ PICKUP.initWarningReportWithContinuousReportType = function(report) {
* @returns
*/
PICKUP
.
createReportWithWarningList
=
function
(
operationListOld
)
{
if
(
typeof
operationListOld
===
'undefined'
||
operationListOld
.
length
<
1
)
{
PICKUP
.
showNotFoundPickupItem
(
"#reportWithWarnings-list"
);
$
(
'#viewMenuReportWithWarnings'
).
addClass
(
'd-none'
);
return
;
}
let
operationList
=
PICKUP
.
sortWarningList
(
operationListOld
);
$
(
'#viewMenuReportWithWarnings'
).
removeClass
(
'd-none'
);
$
(
"#reportWithWarnings-list"
).
empty
();
PICKUP
.
countReportWithWarning
=
0
;
if
(
typeof
operationList
===
'undefined'
||
operationList
.
length
<
1
)
{
PICKUP
.
showNotFoundPickupItem
(
"#reportWithWarnings-list"
);
$
(
'#viewMenuReportWithWarnings'
).
addClass
(
'd-none'
);
return
;
}
$
(
'#reportWithWarnings-list'
).
addClass
(
'task-list view-content view-block'
);
const
msgLevelReport
=
I18N
.
i18nText
(
'reportLevelReport'
);
...
...
This diff is collapsed.
Click to expand it.
abvw/js/template/template.js
View file @
5310be93
...
...
@@ -38,12 +38,6 @@ TEMPLATE.loadOperationSelect = function(elmentId) {
});
}
/** Template load display menu */
TEMPLATE
.
loadDisplaymenu
=
function
(
elmentId
)
{
$
(
elmentId
).
load
(
"display-menu.html"
,
function
()
{
I18N
.
initi18n
();
});
}
/**
* show confirm model
...
...
This diff is collapsed.
Click to expand it.
abvw/js/topPage/topPage.js
View file @
5310be93
...
...
@@ -23,10 +23,23 @@ $(document).ready(function () {
*/
TOP
.
init
=
function
()
{
COMMON
.
showLoading
();
FOOTER
.
initFooter
();
//app should get data after initFooter
TOP
.
goToHomePage
();
COMMON
.
closeLoading
();
};
/** Direct home page setting */
TOP
.
goToHomePage
=
function
(
pageId
)
{
DashboardSetting
.
getSettingData
(
function
(
settings
)
{
if
(
settings
.
dashboardHome
==
1
)
{
COMMON
.
avwScreenMove
(
"dashboard.html"
);
}
else
{
FOOTER
.
initFooter
();
//app should get data after initFooter
}
});
}
/**
* Show page by arbitrary id
*
...
...
This diff is collapsed.
Click to expand it.
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