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
33bd3942
Commit
33bd3942
authored
May 25, 2023
by
Hayato Kamimura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【規約同意】言語修正、ホーム画面遷移時の規約確認
parent
6de9129c
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
51 additions
and
20 deletions
+51
-20
abweb/common/json/lang/lang-en.json
+2
-1
abweb/common/json/lang/lang-ko.json
+2
-1
abweb/html/dashboard.html
+1
-0
abweb/html/index.html
+0
-11
abweb/js/agreementToTerms/agreementToTerms.js
+20
-7
abweb/js/dashboard/dashboard.js
+13
-0
abweb/js/topPage/topPage.js
+13
-0
No files found.
abweb/common/json/lang/lang-en.json
View file @
33bd3942
...
...
@@ -132,5 +132,5 @@
"agreementToTermsTitle"
:
"Terms of Service"
,
"agreeTerm"
:
"Agree"
,
"disagreeTerm"
:
"Disagree"
,
"msgDisagreeTerm"
:
"Log out and t
hen go
to the login screen. Are you okay?"
"msgDisagreeTerm"
:
"Log out and t
ransition
to the login screen. Are you okay?"
}
\ No newline at end of file
abweb/common/json/lang/lang-ko.json
View file @
33bd3942
...
...
@@ -127,7 +127,7 @@
"sitePolicy"
:
"사이트 정책"
,
"agreementToTermsTitle"
:
"이용규약"
,
"agreeTerm"
:
"동의"
,
"agreeTerm"
:
"동의
함
"
,
"disagreeTerm"
:
"동의 안함"
,
"msgDisagreeTerm"
:
"로그 아웃되어 로그인 화면으로 이동합니다. 실행 하시겠습니까?"
}
\ No newline at end of file
abweb/html/dashboard.html
View file @
33bd3942
...
...
@@ -31,6 +31,7 @@
<script
type=
"text/javascript"
src=
"../js/dashboardSetting/dashboardSetting.js"
></script>
<script
type=
"text/javascript"
src=
"../js/template/template.js"
></script>
<script
type=
"text/javascript"
src=
"../js/dashboard/dashboard.js"
></script>
<script
src=
"../js/agreementToTerms/agreementToTerms.js"
></script>
<script
type=
"text/javascript"
>
$
(
document
).
ready
(
function
(){
...
...
abweb/html/index.html
View file @
33bd3942
...
...
@@ -32,17 +32,6 @@
<script
src=
"../js/topPage/topPage.js?__UPDATEID__"
></script>
<script
src=
"../js/reportForm/reportForm.js?__UPDATEID__"
></script>
<script
src=
"../js/agreementToTerms/agreementToTerms.js"
></script>
<script
type=
"text/javascript"
>
$
(
document
).
ready
(
function
(){
if
(
window
.
performance
){
if
(
window
.
performance
.
navigation
.
type
===
1
){
agreementToTerms
.
destinationHtml
();
}
}
})
</script>
</head>
<body>
...
...
abweb/js/agreementToTerms/agreementToTerms.js
View file @
33bd3942
...
...
@@ -4,11 +4,17 @@ var agreementToTerms = {};
//言語、規約情報読み込み
agreementToTerms
.
initAgreement
=
function
(){
var
data
=
agreementToTerms
.
getTerms
();
$
(
"#agreementToTermsTitle"
).
text
(
I18N
.
i18nText
(
"agreementToTermsTitle"
));
$
(
"#agreeTerm"
).
text
(
I18N
.
i18nText
(
"agreeTerm"
));
$
(
"#disagreeTerm"
).
text
(
I18N
.
i18nText
(
"disagreeTerm"
));
$
(
"#termsVersion"
).
text
(
data
.
termsVersion
);
$
(
"#terms"
).
html
(
data
.
terms
.
replace
(
/
(\r\n
|
\n
|
\r)
/g
,
"<br>"
));
//規約同意のデータを取得できているか確認
if
(
Object
.
keys
(
data
).
length
){
$
(
"#agreementToTermsTitle"
).
text
(
I18N
.
i18nText
(
"agreementToTermsTitle"
));
$
(
"#agreeTerm"
).
text
(
I18N
.
i18nText
(
"agreeTerm"
));
$
(
"#disagreeTerm"
).
text
(
I18N
.
i18nText
(
"disagreeTerm"
));
$
(
"#termsVersion"
).
text
(
data
.
termsVersion
);
$
(
"#terms"
).
html
(
data
.
terms
.
replace
(
/
(\r\n
|
\n
|
\r)
/g
,
"<br>"
));
}
else
{
//未ログイン状態で規約同意画面に遷移した場合、ログインページに遷移する
COMMON
.
avwScreenMove
(
"login.html"
);
}
};
//遷移先の決定
...
...
@@ -69,8 +75,15 @@ agreementToTerms.agreeTerm = function(){
params
,
false
,
function
(
data
){
//ホーム画面に遷移
COMMON
.
avwScreenMove
(
"index.html"
);
var
agreeCheck
=
agreementToTerms
.
getTerms
();
//規約に同意できているか確認
if
(
Object
.
keys
(
agreeCheck
).
length
==
3
){
//ホーム画面に遷移
COMMON
.
avwScreenMove
(
"index.html"
);
}
else
{
//再度試す
agreementToTerms
.
agreeTerm
();
}
},
function
(
xmlHttpRequest
,
txtStatus
,
errorThrown
){
if
(
xmlHttpRequest
.
errorMessage
){
...
...
abweb/js/dashboard/dashboard.js
View file @
33bd3942
...
...
@@ -130,6 +130,19 @@ DASHBOARD.init = function () {
COMMON
.
showLoading
();
COMMON
.
checkAuth
(
false
);
//ページ再読み込み時の規約確認
if
(
window
.
performance
){
if
(
window
.
performance
.
navigation
.
type
===
1
){
agreementToTerms
.
destinationHtml
();
}
}
//ホーム画面に遷移した時の規約確認(規約が更新された場合は規約同意画面に遷移する)
var
terms
=
agreementToTerms
.
getTerms
();
if
(
Object
.
keys
(
terms
).
length
>=
4
){
agreementToTerms
.
destinationHtml
();
}
sessionStorage
.
activeHomePage
=
CONSTANT
.
PAGE_TAB
.
DASHBOARD
;
sessionStorage
.
removeItem
(
'operationId'
);
sessionStorage
.
removeItem
(
'RL_searchWord'
);
...
...
abweb/js/topPage/topPage.js
View file @
33bd3942
...
...
@@ -19,6 +19,19 @@ $(document).ready(function () {
* show page
*/
TOP
.
init
=
function
()
{
//ページ再読み込み時の規約確認
if
(
window
.
performance
){
if
(
window
.
performance
.
navigation
.
type
===
1
){
agreementToTerms
.
destinationHtml
();
}
}
//ホーム画面に遷移した時の規約確認(規約が更新された場合は規約同意画面に遷移する)
var
terms
=
agreementToTerms
.
getTerms
();
if
(
Object
.
keys
(
terms
).
length
>=
4
){
agreementToTerms
.
destinationHtml
();
}
const
urlParameterList
=
COMMON
.
getUrlParameter
();
if
(
urlParameterList
&&
urlParameterList
.
pageId
==
CONSTANT
.
PAGE_NAME
.
OPERATION_LIST
)
{
//index with param page
...
...
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