Skip to content

C
check
Commit d549b87b by takashi sasaki
Options

Merge branch 'feature/1.1.0_dev_kamimura' into 'feature/1.1.0_dev' 

Feature/1.1.0 dev kamimura

See merge request !134
parents c344bc51 af1e056c
Showing with 371 additions and 17 deletions
abweb/common/json/lang/lang-en.json
......@@ -127,5 +127,10 @@
"errorOccured": "Communication error.",
"selectData": "Choice",
"errorSendMsg": "Send failed.",
"sitePolicy": "Site Policy"
"sitePolicy": "Site Policy",
"agreementToTermsTitle": "Terms of Service",
"agreeTerm": "Agree",
"disagreeTerm": "Disagree",
"msgDisagreeTerm": "Log out and then go to the login screen. Are you okay?"
}
\ No newline at end of file
abweb/common/json/lang/lang-ja.json
......@@ -125,5 +125,10 @@
"errorOccured": "通信エラーです。",
"selectData": "選択",
"errorSendMsg": "送信に失敗しました。",
"sitePolicy": "サイトポリシー"
"sitePolicy": "サイトポリシー",
"agreementToTermsTitle": "利用規約",
"agreeTerm": "同意する",
"disagreeTerm": "同意しない",
"msgDisagreeTerm": "ログアウトされ、ログイン画面に遷移します。よろしいでしょうか？"
}
\ No newline at end of file
abweb/common/json/lang/lang-ko.json
......@@ -124,5 +124,10 @@
"errorOccured": "통신 오류입니다.",
"selectData": "선택",
"errorSendMsg": "전송에 실패했습니다.",
"sitePolicy": "사이트 정책"
"sitePolicy": "사이트 정책",
"agreementToTermsTitle": "이용규약",
"agreeTerm": "동의",
"disagreeTerm": "동의 안함",
"msgDisagreeTerm": "로그 아웃되어 로그인 화면으로 이동합니다. 실행 하시겠습니까?"
}
\ No newline at end of file
abweb/css/agreementToTerms/agreementToTerms.css 0 → 100644
/*===========================================================
規約同意 2023.05.01.
=============================================================*/
*, :after, :before {
box-sizing: border-box;
}
html, body {
width: 100%;
height: 100%;
background-color: #EBF4FB;
}
html {
font-family: sans-serif;
line-height: 1.15;
-webkit-text-size-adjust: 100%;
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
body {
display: -ms-flexbox;
display: flex;
-ms-flex-align: center;
align-items: center;
margin: 0;
font-family: Helvetica Neue,Helvetica,Arial,游ゴシック体,Yu Gothic,YuGothic,Hiragino Kaku Gothic ProN,Meiryo,Open Sans,sans-serif;
font-size: 1rem;
font-weight: 400;
line-height: 1.5;
color: #69707A;
text-align: left;
}
::-webkit-scrollbar {
width: 8px;
height: 8px;
}
::-webkit-scrollbar-thumb{
background: #c5c5c563;
border-radius: 2px;
}
::-webkit-scrollbar-thumb:hover{
background: #c5c5c5;
}
.tos-wrapper {
position: relative;
display: flex;
flex-direction: column;
width: 100%;
max-width: 960px;
padding: 2rem;
margin: auto;
word-wrap: break-word;
background: #fff;
background-clip: border-box;
border: 1px solid rgba(0,0,0,.125);
border-radius: .25rem;
box-shadow: 0 2px 10px 0 rgb(0 0 0 / 8%);
}
.tos-wrapper .title {
display: flex;
justify-content: space-between;
align-items: baseline;
margin-bottom: 1rem;
}
.tos-wrapper .title h2 {
margin-bottom: 0;
font-size: 20px;
font-weight: 700;
color: #343a40;
}
.tos-wrapper .title .tos-version {
margin-bottom: 0;
font-size: 12px;
color: #333;
}
.tos-wrapper .tos-text {
position: relative;
margin: 0.5rem auto 2rem;
padding: 1rem 1.5rem;
width: 90%;
height: 480px;
text-align: left;
background: #f8f9fa;
word-break: break-word;
overflow-y: auto;
}
.tos-wrapper .tos-text p {
margin-bottom: 1rem;
font-size: 14px;
line-height: 2;
}
.tos-wrapper .btn-wrapper {
position: relative;
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
margin: 1rem auto;
}
.tos-wrapper .btn-wrapper button.btn {
display: block;
width: 160px;
height: auto;
margin: 10px auto;
padding: 10px 0;
text-decoration: none;
text-align: center;
font-size: 14px;
font-weight: bold;
line-height: 20px;
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
border-radius: 6px;
}
.tos-wrapper .btn-wrapper button.btn.btn-agree {
color: #fff;
background-color: #0053f0;
border-color: #0053f0
}
.tos-wrapper .btn-wrapper button.btn.btn-agree.focus,
.tos-wrapper .btn-wrapper button.btn.btn-agree:focus,
.tos-wrapper .btn-wrapper button.btn.btn-agree:hover {
color: #fff;
background-color: #0046ca;
border-color: #0041bd
}
.tos-wrapper .btn-wrapper button.btn.btn-agree.focus,
.tos-wrapper .btn-wrapper button.btn.btn-agree:focus {
box-shadow: 0 0 0 .2rem rgba(38,109,242,.5)
}
.tos-wrapper .btn-wrapper button.btn.btn-disagree {
color: #fff;
background-color: #6c757d;
border-color: #6c757d
}
.tos-wrapper .btn-wrapper button.btn.btn-disagree.focus,
.tos-wrapper .btn-wrapper button.btn.btn-disagree:focus,
.tos-wrapper .btn-wrapper button.btn.btn-disagree:hover {
color: #fff;
background-color: #5a6268;
border-color: #545b62
}
.tos-wrapper .btn-wrapper button.btn.btn-disagree.focus,
.tos-wrapper .btn-wrapper button.btn.btn-disagree:focus {
box-shadow: 0 0 0 .2rem rgba(130,138,145,.5)
}
@media screen and (max-width: 576px) {
.tos-wrapper {
width: 95%;
max-width: 480px;
padding: 1rem;
}
.tos-wrapper .tos-text {
margin: 0.5rem auto 1.5rem;
padding: 0.5rem 1rem;
}
.tos-wrapper .btn-wrapper button.btn {
width: 120px;
font-size: 12px;
}
}
\ No newline at end of file
abweb/html/agreementToTerms.html 0 → 100644
<!DOCTYPE html>
<html lang="ja">
<head>
<meta http-equiv="Content-Language" content="ja">
<meta name="google" content="notranslate">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Cache-Control" content="no-store">
<meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<title class="lang" lang="dspLogin">利用規約同意画面</title>
<!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css">
<link rel="stylesheet" type="text/css" href="../css/agreementToTerms/agreementToTerms.css">
<!-- vender css -->
<link rel="stylesheet" type="text/css" href="../common/css/fontawesome_relative_path.css">
<script type="text/javascript" src="../common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../common/js/constant.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/header.js"></script>
<script type="text/javascript" src="../js/login/login.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/agreementToTerms/agreementToTerms.js"></script>
<script type="text/javascript">
$(document).ready(function(){
agreementToTerms.initAgreement();
})
</script>
</head>
<body>
<div id="loader"></div>
<div class="tos-wrapper">
<div class="title">
<h2 id="agreementToTermsTitle">利用規約</h2>
<p class="tos-version" id="termsVersion"></p>
</div>
<div class="tos-text">
<p id="terms"></p>
</div>
<div class="btn-wrapper">
<button class="btn btn-agree" id="agreeTerm" onclick="agreementToTerms.agreeTerm()">同意する</a>
<button class="btn btn-disagree" id="disagreeTerm" onclick="agreementToTerms.disagreeTerm()">同意しない</a>
</div>
</div>
</body>
</html>
\ No newline at end of file
abweb/html/index.html
......@@ -31,6 +31,18 @@
<script src="../js/dashboard/dashboard.js?__UPDATEID__"></script>
<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/html/login.html
......@@ -35,6 +35,7 @@
<script type="text/javascript" src="../common/js/validation.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/login/login.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/agreementToTerms/agreementToTerms.js"></script>
<script type="text/javascript">
......
abweb/js/agreementToTerms/agreementToTerms.js 0 → 100644
//サービスオプション「規約同意」
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").text(data.terms);
};
//遷移先の決定
agreementToTerms.destinationHtml = function(){
var data = agreementToTerms.getTerms();
if(data.httpStatus == CONSTANT.HTTP_STATUS.OK){
//公開中バージョンに未同意の場合
if(data.termsVersion || data.terms){
//利用規約画面に遷移
COMMON.avwScreenMove("agreementToTerms.html");
}else{
//規約同意が設定されていない or 公開中バージョンに同意している
//ホーム画面に遷移
COMMON.avwScreenMove("index.html");
}
}else {
COMMON.closeLoading();
COMMON.showAlert('errorOccurred');
}
};
//利用規約情報の取得
agreementToTerms.getTerms = function(){
var apiData = {};
var params = {
sid: COMMON.getSid(),
};
const url = COMMON.format(ClientData.conf_apiUrl(), ClientData.userInfo_accountPath()) + "/getTerms/";
COMMON.cmsAjax(
url,
params,
false,
function(data){
apiData = data;
},
function(xmlHttpRequest, txtStatus, errorThrown){
if(xmlHttpRequest.errorMessage){
COMMON.showAlert(null, {message: xmlHttpRequest.errorMessage});
}else{
COMMON.showAlert("errorOccured");
}
},
);
return apiData;
};
//利用規約情報同意の送信
agreementToTerms.agreeTerm = function(){
var apiData = agreementToTerms.getTerms();
params = {
sid: COMMON.getSid(),
termsVersion: apiData.termsVersion,
};
const url = COMMON.format(ClientData.conf_apiUrl(), ClientData.userInfo_accountPath()) + "/agreeTerms/";
COMMON.cmsAjax(
url,
params,
false,
function(data){
//ホーム画面に遷移
COMMON.avwScreenMove("index.html");
},
function(xmlHttpRequest, txtStatus, errorThrown){
if(xmlHttpRequest.errorMessage){
COMMON.showAlert(null, {message: xmlHttpRequest.errorMessage});
}else{
COMMON.showAlert("errorOccured");
}
}
)
};
//利用規約に同意しない
agreementToTerms.disagreeTerm = function(){
if(confirm(I18N.i18nText("msgDisagreeTerm"))){
//ログアウトし、ログイン画面に遷移する
HEADER.processLogout();
}
};
\ No newline at end of file
abweb/js/login/login.js
......@@ -218,8 +218,8 @@ LOGIN.processLogin = function () {
if (data.requirePasswordChange == 0) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// move to home.html page
COMMON.avwScreenMove('index.html');
//利用規約に同意しているかの確認
agreementToTerms.destinationHtml();
} else if (data.requirePasswordChange == 1) {
$('#getToken').val(data.token);
if (LOGIN.force_pw_change_on_login == 2) {
......@@ -247,8 +247,8 @@ LOGIN.processLogin = function () {
var numDay = date.subtractByDays(skpPwdDt);
if (numDay <= 30) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// move to home.html page
COMMON.avwScreenMove('index.html');
//利用規約に同意しているかの確認
agreementToTerms.destinationHtml();
} else if (numDay > 30) {
LOGIN.OpenChangePasswordDialog();
$('#btnSkip').show();
......@@ -259,8 +259,8 @@ LOGIN.processLogin = function () {
// no need to change password
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// move to home.html page
COMMON.avwScreenMove('index.html');
//利用規約に同意しているかの確認
agreementToTerms.destinationHtml();
}
} else if (data.requirePasswordChange == 2) {
$('#getToken').val(data.token);
......@@ -282,8 +282,8 @@ LOGIN.processLogin = function () {
if (numDay <= 30) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// move to home.html page
COMMON.avwScreenMove('index.html');
//利用規約画面に遷移
agreementToTerms.destinationHtml();
} else if (numDay > 30) {
LOGIN.OpenChangePasswordDialog();
$('.ui-dialog-titlebar').hide();
......@@ -301,8 +301,8 @@ LOGIN.processLogin = function () {
} else {
// No need to change password
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// move to home.html page
COMMON.avwScreenMove('index.html');
//利用規約に同意しているかの確認
agreementToTerms.destinationHtml();
}
}
} else {
......@@ -359,8 +359,8 @@ LOGIN.changePasswordProcess = function () {
$('#dialog-error-message').css('display', 'none');
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// move to home.html page
COMMON.avwScreenMove('index.html');
//利用規約に同意しているかの確認
agreementToTerms.destinationHtml();
} else if (result.httpStatus == '401') {
COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
} else if (result.httpStatus == '403') {
......@@ -416,8 +416,8 @@ LOGIN.skipPassFunction = function () {
ClientData.userInfo_pwdSkipDt(date);
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// move to home.html page
COMMON.avwScreenMove('index.html');
//利用規約に同意しているかの確認
agreementToTerms.destinationHtml();
};
// Open Change Password Dialog
......
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