design patch and add error log

f934c42d · Kang Donghun · 43194926 · f934c42d · f934c42d · f934c42d
Commit f934c42d authored Nov 10, 2022 by Kang Donghun
9 changed files
--- a/abweb/common/css/newdash/app.css
+++ b/abweb/common/css/newdash/app.css
@@ -2,7 +2,7 @@
 * Font Awesome Free 5.15.2 by @fontawesome - https://fontawesome.com
 * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
 */
- .fa,.fab,.fad,.fal,.far,.fas {
+.fa,.fab,.fad,.fal,.far,.fas {
    -moz-osx-font-smoothing: grayscale;
    -webkit-font-smoothing: antialiased;
    display: inline-block;
@@ -6609,7 +6609,7 @@ pre code {
    overflow-y: scroll
 }
-.container,.container-fluid,.container-lg,.container-md,.container-sm,.container-xl {
+.container-wrap,.container-wrap-fluid,.container-wrap-lg,.container-wrap-md,.container-wrap-sm,.container-wrap-xl {
    width: 100%;
    padding-right: 15px;
    padding-left: 15px;
@@ -6618,25 +6618,25 @@ pre code {
 }
 @media (min-width: 576px) {
-    .container,.container-sm {
+    .container-wrap,.container-wrap-sm {
        max-width:540px
    }
 }
 @media (min-width: 768px) {
-    .container,.container-md,.container-sm {
+    .container-wrap,.container-wrap-md,.container-wrap-sm {
        max-width:720px
    }
 }
 @media (min-width: 992px) {
-    .container,.container-lg,.container-md,.container-sm {
+    .container-wrap,.container-wrap-lg,.container-wrap-md,.container-wrap-sm {
        max-width:960px
    }
 }
 @media (min-width: 1200px) {
-    .container,.container-lg,.container-md,.container-sm,.container-xl {
+    .container-wrap,.container-wrap-lg,.container-wrap-md,.container-wrap-sm,.container-wrap-xl {
        max-width:1140px
    }
 }
@@ -10430,7 +10430,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
    padding: .5rem 1rem
 }
-.navbar,.navbar .container,.navbar .container-fluid,.navbar .container-lg,.navbar .container-md,.navbar .container-sm,.navbar .container-xl {
+.navbar,.navbar .container-wrap,.navbar .container-wrap-fluid,.navbar .container-wrap-lg,.navbar .container-wrap-md,.navbar .container-wrap-sm,.navbar .container-wrap-xl {
    display: flex;
    flex-wrap: wrap;
    align-items: center;
@@ -10512,7 +10512,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
 }
 @media (max-width: 575.98px) {
-    .navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl {
+    .navbar-expand-sm>.container-wrap,.navbar-expand-sm>.container-wrap-fluid,.navbar-expand-sm>.container-wrap-lg,.navbar-expand-sm>.container-wrap-md,.navbar-expand-sm>.container-wrap-sm,.navbar-expand-sm>.container-wrap-xl {
        padding-right:0;
        padding-left: 0
    }
@@ -10537,7 +10537,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
        padding-left: .5rem
    }
-    .navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl {
+    .navbar-expand-sm>.container-wrap,.navbar-expand-sm>.container-wrap-fluid,.navbar-expand-sm>.container-wrap-lg,.navbar-expand-sm>.container-wrap-md,.navbar-expand-sm>.container-wrap-sm,.navbar-expand-sm>.container-wrap-xl {
        flex-wrap: nowrap
    }
@@ -10556,7 +10556,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
 }
 @media (max-width: 767.98px) {
-    .navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl {
+    .navbar-expand-md>.container-wrap,.navbar-expand-md>.container-wrap-fluid,.navbar-expand-md>.container-wrap-lg,.navbar-expand-md>.container-wrap-md,.navbar-expand-md>.container-wrap-sm,.navbar-expand-md>.container-wrap-xl {
        padding-right:0;
        padding-left: 0
    }
@@ -10581,7 +10581,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
        padding-left: .5rem
    }
-    .navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl {
+    .navbar-expand-md>.container-wrap,.navbar-expand-md>.container-wrap-fluid,.navbar-expand-md>.container-wrap-lg,.navbar-expand-md>.container-wrap-md,.navbar-expand-md>.container-wrap-sm,.navbar-expand-md>.container-wrap-xl {
        flex-wrap: nowrap
    }
@@ -10600,7 +10600,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
 }
 @media (max-width: 991.98px) {
-    .navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl {
+    .navbar-expand-lg>.container-wrap,.navbar-expand-lg>.container-wrap-fluid,.navbar-expand-lg>.container-wrap-lg,.navbar-expand-lg>.container-wrap-md,.navbar-expand-lg>.container-wrap-sm,.navbar-expand-lg>.container-wrap-xl {
        padding-right:0;
        padding-left: 0
    }
@@ -10625,7 +10625,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
        padding-left: .5rem
    }
-    .navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl {
+    .navbar-expand-lg>.container-wrap,.navbar-expand-lg>.container-wrap-fluid,.navbar-expand-lg>.container-wrap-lg,.navbar-expand-lg>.container-wrap-md,.navbar-expand-lg>.container-wrap-sm,.navbar-expand-lg>.container-wrap-xl {
        flex-wrap: nowrap
    }
@@ -10644,7 +10644,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
 }
 @media (max-width: 1199.98px) {
-    .navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl {
+    .navbar-expand-xl>.container-wrap,.navbar-expand-xl>.container-wrap-fluid,.navbar-expand-xl>.container-wrap-lg,.navbar-expand-xl>.container-wrap-md,.navbar-expand-xl>.container-wrap-sm,.navbar-expand-xl>.container-wrap-xl {
        padding-right:0;
        padding-left: 0
    }
@@ -10669,7 +10669,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
        padding-left: .5rem
    }
-    .navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl {
+    .navbar-expand-xl>.container-wrap,.navbar-expand-xl>.container-wrap-fluid,.navbar-expand-xl>.container-wrap-lg,.navbar-expand-xl>.container-wrap-md,.navbar-expand-xl>.container-wrap-sm,.navbar-expand-xl>.container-wrap-xl {
        flex-wrap: nowrap
    }
@@ -10692,7 +10692,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
    justify-content: flex-start
 }
-.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl {
+.navbar-expand>.container-wrap,.navbar-expand>.container-wrap-fluid,.navbar-expand>.container-wrap-lg,.navbar-expand>.container-wrap-md,.navbar-expand>.container-wrap-sm,.navbar-expand>.container-wrap-xl {
    padding-right: 0;
    padding-left: 0
 }
@@ -10710,7 +10710,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
    padding-left: .5rem
 }
-.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl {
+.navbar-expand>.container-wrap,.navbar-expand>.container-wrap-fluid,.navbar-expand>.container-wrap-lg,.navbar-expand>.container-wrap-md,.navbar-expand>.container-wrap-sm,.navbar-expand>.container-wrap-xl {
    flex-wrap: nowrap
 }
@@ -11038,7 +11038,7 @@ ul.card-list > li:not(.selected):not(.not-found):hover{
 }
 .select-card-list .arrow-icon {
-    background-image: url("/abweb/common/img/icon_arrow_down.svg");
+    background-image: url("../img/icon_arrow_down.svg");
    background-size: contain;
    background-repeat: no-repeat;
    width: 14px;
@@ -16643,7 +16643,7 @@ a.text-white:focus,a.text-white:hover {
        size: a3
    }
-    .container,body {
+    .container-wrap,body {
        min-width: 992px!important
    }
@@ -20590,7 +20590,7 @@ button {
    list-style: none;
 }
 .list-menu button .arrow-icon{
-    background-image: url("/abweb/common/img/icon_arrow_right.svg");
+    background-image: url("../img/icon_arrow_right.svg");
    background-size: contain;
    width: 17px;
    height: 17px;
@@ -20689,7 +20689,7 @@ button {
 .type-icon .report:before{
    content: '';
-    background-image: url("/abweb/common/img/type_icon_report.svg");
+    background-image: url("../img/type_icon_report.svg");
    background-size: contain;
    background-repeat: no-repeat;
    background-position: center;
@@ -20699,7 +20699,7 @@ button {
 }
 .type-icon .questionary:before{
    content: '';
-    background-image: url("/abweb/common/img/type_icon_questionary.svg");
+    background-image: url("../img/type_icon_questionary.svg");
    background-size: contain;
    background-repeat: no-repeat;
    background-position: center;
@@ -20709,7 +20709,7 @@ button {
 }
 .type-icon .inspection:before{
    content: '';
-    background-image: url("/abweb/common/img/type_icon_inspection.svg");
+    background-image: url("../img/type_icon_inspection.svg");
    background-size: contain;
    background-repeat: no-repeat;
    background-position: center;
@@ -20719,7 +20719,7 @@ button {
 }
 .type-icon .proccess:before{
    content: '';
-    background-image: url("/abweb/common/img/type_icon_proccess.svg");
+    background-image: url("../img/type_icon_proccess.svg");
    background-size: contain;
    background-repeat: no-repeat;
    background-position: center;

--- a/abweb/common/js/common.js
+++ b/abweb/common/js/common.js
@@ -293,6 +293,7 @@
     let params = {};
     params.sid = COMMON.getSid;
     const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.AUTH_SESSION;
+     console.log("kdh check url : " + url);
     COMMON.cmsAjax(url, params, async, null, function () {
         COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
     });

--- a/abweb/common/js/web/common.js
+++ b/abweb/common/js/web/common.js
+$(function(){
+  hide_del_btn();
+});
+// 追加ボタン押下
+$('.add').on('click',function(){
+  var base = $(this).parent().parent().parent('.tb-item');
+  base.find('.del').show();
+  // 入力フォームをクローン
+  base.clone(true).insertAfter(base);
+  // 追加した要素にスクロール
+  $("html,body").animate({scrollTop:base.next().offset().top});
+  // 入力フォームアコーディオン表示
+  base.parent().parent('.tb').find('.ac-tb-form').show();
+});
+// 削除ボタン押下
+$('.del').on('click',function(){
+  var base = $(this).parent().parent().parent('.tb-item');
+  var tbwrap = base.parent('.tb-wrap');
+  var tb = tbwrap.parent('.tb');
+  // エリアの削除
+  base.remove();
+  // ボタンの表示非表示切り替え
+  hide_del_btn();
+  // フォームエリア表示切り替え
+  tbWrapClear(tbwrap);
+  // 折りたたみアイコン非表示  
+  if(tb.find('.ac-tb-form').is(':hidden')){
+    tb.find('.fold-area').addClass('hide');
+  }
+});
+// 閉じるボタン押下
+$('.close-window').on('click',function(){
+  window.close();
+});
+// 表領域のフォームが一つの時、削除ボタンを非表示
+function hide_del_btn(){
+  $('.tb-wrap').each(function(i, elem){
+      var len = $(elem).find('.tb-item').length;
+      //表の項目が一つの場合
+      if(len <= 1){
+         $(elem).find('.del').hide();
+         $(this).children('.tb-item').removeClass('visually-hidden');
+         // 入力フォームアコーディオン非表示
+         $(this).parent().find('.ac-tb-form').hide();
+      }
+    });
+}
+// アコーディオンを閉めている際にフォームを削除した場合
+// 子要素がすべて非表示の場合、親要素を非表示とする
+function tbWrapClear(tbwrap){
+  if(tbwrap.children(':not(.visually-hidden)').length == 0){
+    tbwrap.addClass("visually-hidden");
+  }
+  else {
+    tbwrap.removeClass("visually-hidden");
+  }
+}
+// 入力フォームアコーディオン
+$('.ac-tb-form').on('click',function(){
+  var tb = $(this).parent().parent().parent('.tb');
+  var elems = tb.find('.tb-wrap').find('.tb-item');
+  var tbwrap = tb.find('.tb-wrap');
+  if(!$(this).hasClass('hide')){
+    elems.each(function(i) {
+      i = i + 1;
+      if( i != elems.size()){
+        $(this).addClass('visually-hidden');
+      }
+    });
+    $(this).text('開く');
+    // フォームエリア表示切り替え
+    tbWrapClear(tbwrap);
+    // 折りたたみアイコン表示
+    tb.find('.fold-area').removeClass('hide');
+  }else{
+    elems.removeClass('visually-hidden');
+    $(this).text('閉じる');
+    // フォームエリア表示切り替え
+    tbWrapClear(tbwrap);
+    // 折りたたみアイコン非表示
+    tb.find('.fold-area').addClass('hide');
+  }
+  // 開閉
+  $(this).toggleClass("hide");
+});
+// トグル切り替え
+$(".toggle").on("click", function() {
+  $(this).toggleClass("checked");
+  if(!$('input[name="check"]').prop("checked")) {
+    $(".toggle input").prop("checked", true);
+  } else {
+    $(".toggle input").prop("checked", false);
+  }
+});
+// メニュー表示
+$('.c-dropdown-trigger').on("click",function(){
+  $('[data-target="' + $(this).attr('id') + '"]').toggleClass('show');
+  $('.mask').removeClass('hide');
+});
+// メニューを閉じる
+$('.mask').on("click",function(){
+  $('.mask').addClass('hide');
+  $('.c-dropdown-menu').removeClass('show');
+});
+// カードリスト選択
+$('.select-card-list .card .select-label').on("click",function(){
+  $(this).closest('.select-card-list').find('.card').removeClass('selected');
+  $(this).closest('.card').addClass('selected');
+});
+// リスト表示切替(リスト表示)
+$('.view-menu .view-list-btn').on("click",function(){
+  $('.view-block-btn').removeClass('active');
+  $('.view-list-btn').addClass('active');
+  $('.view-content').removeClass('view-block');
+  $('.view-content').addClass('view-list');
+});
+// リスト表示切替(グリッド表示)
+$('.view-menu .view-block-btn').on("click",function(){
+  $('.view-list-btn').removeClass('active');
+  $('.view-block-btn').addClass('active');
+  $('.view-content').removeClass('view-list');
+  $('.view-content').addClass('view-block');
+});
+// ローディング
+$(function(){
+  function e() {
+    setTimeout(function(){
+      $.LoadingOverlay("hide");
+    }, 2000);
+  }
+  $(".search-form-btn").on('click', function(){
+    $.LoadingOverlay("show", {
+      image       : "img/loading.gif"
+    });
+    e();
+  });
+});
--- a/abweb/html/dashboard.html
+++ b/abweb/html/dashboard.html
@@ -42,7 +42,7 @@
    <div id="includedMainTitle"></div>
    <!-- dashboard -->
    <main>
-        <div class="container">
+        <div class="container-wrap">
            <!-- sub title -->
            <h2 class="fs-8 font-weight-bold lang" id="#pickupHeader" lang="pickup"></h2>

--- a/abweb/html/pickup.html
+++ b/abweb/html/pickup.html
@@ -50,7 +50,7 @@
    <div id="includedMainTitle"></div>
    <!-- pickup -->
    <main>
-        <div class="container">
+        <div class="container-wrap">
            <!-- tab -->
            <ul class="nav nav-tabs line" id="myTab" role="tablist">
                <li class="nav-item" id="liTabNewReport">

--- a/abweb/html/push-message-detail.html
+++ b/abweb/html/push-message-detail.html
@@ -42,7 +42,7 @@
    <div id="includedMainTitle"></div>
    <!-- message detail -->
    <main>
-        <div class="container">
+        <div class="container-wrap">
            <div class="row">
                <div class="col-12">
                    <div class="card p-4">

--- a/abweb/html/push-message-list.html
+++ b/abweb/html/push-message-list.html
@@ -42,7 +42,7 @@
    <div id="includedMainTitle"></div>
    <!-- message list -->
    <main>
-        <div class="container">
+        <div class="container-wrap">
            <!-- message -->
            <ul class="card-list message-list p-0" id="messageList">
                <li class="card mb-2 not-found d-none">

--- a/abweb/html/send-message.html
+++ b/abweb/html/send-message.html
@@ -44,7 +44,7 @@
    <div id="includedMainTitle"></div>
    <!-- send message -->
    <main>
-        <div class="container">
+        <div class="container-wrap">
            <!-- content -->
            <div class="py-2">
              <div class="row">

--- a/abweb/js/login/login.js
+++ b/abweb/js/login/login.js
@@ -533,7 +533,8 @@ LOGIN.ready = function() {
 	I18N.initi18n();
 	var sysSettings = COMMON.sysSetting(); // get info in conf.json
+	console.log("kdh check apiUrl  : " + sysSettings.apiUrl);
+	console.log("kdh check checkApiUrl  : " + sysSettings.checkApiUrl);
 	// check an getits setting
 	if (sysSettings.apiUrl == "") {