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
6e93f382
Commit
6e93f382
authored
Nov 16, 2022
by
NGUYEN HOANG SON
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update lang alert
sort message list by send date
parent
e926cb25
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
6 deletions
+21
-6
abweb/common/js/common.js
+2
-2
abweb/common/json/lang/lang-en.json
+4
-1
abweb/common/json/lang/lang-ja.json
+4
-1
abweb/common/json/lang/lang-ko.json
+4
-1
abweb/js/pushMessageList/pushMessageList.js
+7
-1
No files found.
abweb/common/js/common.js
View file @
6e93f382
...
@@ -118,8 +118,8 @@ COMMON.showConfirm = function (messageCode, confirmCallback, options = {}) {
...
@@ -118,8 +118,8 @@ COMMON.showConfirm = function (messageCode, confirmCallback, options = {}) {
*/
*/
COMMON
.
showAlert
=
function
(
messageCode
,
options
=
{})
{
COMMON
.
showAlert
=
function
(
messageCode
,
options
=
{})
{
const
defaultParams
=
{
const
defaultParams
=
{
titleCode
:
'
confirmation
'
,
titleCode
:
'
alert
'
,
confirmNoCode
:
'c
onfirmNo
'
confirmNoCode
:
'c
lose
'
}
}
const
params
=
Object
.
assign
(
options
,
defaultParams
);
const
params
=
Object
.
assign
(
options
,
defaultParams
);
let
message
=
''
;
let
message
=
''
;
...
...
abweb/common/json/lang/lang-en.json
View file @
6e93f382
...
@@ -118,5 +118,7 @@
...
@@ -118,5 +118,7 @@
"periodicInspectionPeriod"
:
"Periodic Inspection Period"
,
"periodicInspectionPeriod"
:
"Periodic Inspection Period"
,
"msgSendPushMessageSuccess"
:
"we sent a push message"
,
"msgSendPushMessageSuccess"
:
"we sent a push message"
,
"error"
:
"Error"
,
"error"
:
"Error"
,
"msgSendPushMessageConfirm"
:
"Do you want to send message?"
"msgSendPushMessageConfirm"
:
"Do you want to send message?"
,
"alert"
:
"Alert"
,
"close"
:
"Close"
}
}
\ No newline at end of file
abweb/common/json/lang/lang-ja.json
View file @
6e93f382
...
@@ -116,5 +116,7 @@
...
@@ -116,5 +116,7 @@
"periodicInspectionPeriod"
:
"定期点検期間"
,
"periodicInspectionPeriod"
:
"定期点検期間"
,
"msgSendPushMessageSuccess"
:
"プッシュメッセージ送信しました。"
,
"msgSendPushMessageSuccess"
:
"プッシュメッセージ送信しました。"
,
"error"
:
"エラー"
,
"error"
:
"エラー"
,
"msgSendPushMessageConfirm"
:
"Do you want to send message?"
"msgSendPushMessageConfirm"
:
"Do you want to send message?"
,
"alert"
:
"Alert"
,
"close"
:
"閉じる"
}
}
\ No newline at end of file
abweb/common/json/lang/lang-ko.json
View file @
6e93f382
...
@@ -115,5 +115,7 @@
...
@@ -115,5 +115,7 @@
"periodicInspectionPeriod"
:
"정기점검기간"
,
"periodicInspectionPeriod"
:
"정기점검기간"
,
"msgSendPushMessageSuccess"
:
"푸시메시지를 보냈습니다."
,
"msgSendPushMessageSuccess"
:
"푸시메시지를 보냈습니다."
,
"error"
:
"에러"
,
"error"
:
"에러"
,
"msgSendPushMessageConfirm"
:
"Do you want to send message?"
"msgSendPushMessageConfirm"
:
"Do you want to send message?"
,
"alert"
:
"Alert"
,
"close"
:
"Close"
}
}
\ No newline at end of file
abweb/js/pushMessageList/pushMessageList.js
View file @
6e93f382
...
@@ -18,7 +18,7 @@ PushMessageList.init = function () {
...
@@ -18,7 +18,7 @@ PushMessageList.init = function () {
href
:
'dashboard.html'
,
href
:
'dashboard.html'
,
},
},
{
{
titleLang
:
'
messageListTitle
'
,
titleLang
:
'
pushMessageList
'
,
},
},
];
];
TEMPLATE
.
loadMainNavsTitle
(
'#includedMainTitle'
,
'pushMessageList'
,
navs
,
null
);
TEMPLATE
.
loadMainNavsTitle
(
'#includedMainTitle'
,
'pushMessageList'
,
navs
,
null
);
...
@@ -71,6 +71,12 @@ PushMessageList.generateMessageListHtml = function (messageList) {
...
@@ -71,6 +71,12 @@ PushMessageList.generateMessageListHtml = function (messageList) {
$
(
'#messageList .not-found'
).
removeClass
(
'd-none'
);
$
(
'#messageList .not-found'
).
removeClass
(
'd-none'
);
return
;
return
;
}
}
//sort message list by send date
messageList
.
sort
(
function
(
a
,
b
)
{
if
(
a
.
pushSendDate
>
b
.
pushSendDate
)
return
-
1
;
if
(
a
.
pushSendDate
<
b
.
pushSendDate
)
return
1
;
return
0
;
});
$
(
'#messageList .not-found'
).
addClass
(
'd-none'
);
$
(
'#messageList .not-found'
).
addClass
(
'd-none'
);
for
(
var
i
=
0
;
i
<
messageList
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
messageList
.
length
;
i
++
)
{
let
message
=
messageList
[
i
];
let
message
=
messageList
[
i
];
...
...
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