Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
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
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • abook_web
  • check
  • Merge Requests
  • !8

Merged
Opened Oct 25, 2022 by NGUYEN HOANG SON@hoangson 
  • Report abuse
Report abuse

Feature/1.0 check web dev 50265

  • Discussion 8
  • Commits 29
  • Changes 73
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Takumi Imai
    @imai-t started a discussion on the diff Oct 25, 2022
    abvw/common/confirm-modal.html 0 → 100755
    4 <div class="modal-header bg-dark10">
    5 <h5 class="modal-title">確認</h5>
    6 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
    7 <span aria-hidden="true">&times;</span>
    8 </button>
    9 </div>
    10 <div class="modal-body">
    11 XXXXしますか?
    12 </div>
    13 <div class="modal-footer">
    14 <button type="button" class="btn btn-primary">はい</button>
    15 <button type="button" class="btn btn-tertiary" data-dismiss="modal">いいえ</button>
    16 </div>
    17 </div>
    18 </div>
    19 </div>
    • Takumi Imai @imai-t commented Oct 25, 2022
      Developer

      共通化できましたか?

      Edited Oct 25, 2022 by Takumi Imai
      共通化できましたか?
    Please register or sign in to reply
  • Takumi Imai
    @imai-t started a discussion on the diff Oct 25, 2022
    abvw/common/js/newdash/common.js 0 → 100755
    97
    98 }
    99 // 開閉
    100 $(this).toggleClass("hide");
    101 });
    102
    103 // トグル切り替え
    104 $(".toggle").on("click", function() {
    105 $(this).toggleClass("checked");
    106 if(!$('input[name="check"]').prop("checked")) {
    107 $(".toggle input").prop("checked", true);
    108 } else {
    109 $(".toggle input").prop("checked", false);
    110 }
    111 });
    112
    • Takumi Imai @imai-t commented Oct 25, 2022
      Developer

      上のコードは必要なのでしょうか

      上のコードは必要なのでしょうか
    Please register or sign in to reply
  • Takumi Imai
    @imai-t started a discussion on the diff Oct 25, 2022
    abvw/common/js/newdash/common.js 0 → 100755
    144 $('.view-content').addClass('view-block');
    145 });
    146
    147 // ローディング
    148 $(function(){
    149 function e() {
    150 setTimeout(function(){
    151 $.LoadingOverlay("hide");
    152 }, 2000);
    153 }
    154 $(".search-form-btn").on('click', function(){
    155 $.LoadingOverlay("show", {
    156 image : "img/loading.gif"
    157 });
    158 e();
    159 });
    • Takumi Imai @imai-t commented Oct 25, 2022
      Developer

      コメントは英語で書いてください

      コメントは英語で書いてください
    Please register or sign in to reply
  • Takumi Imai
    @imai-t started a discussion on the diff Oct 25, 2022
    abvw/html/dashboard.html 0 → 100755
    22 <script type="text/javascript" src="../common/js/newdash/common.js"></script>
    23
    24 <script src="../common/js/constant.js?__UPDATEID__"></script>
    25 <script src="../common/js/common.js?__UPDATEID__"></script>
    26
    27 <script type="text/javascript" src="../js/dashboardSetting/dashboard-setting.js"></script>
    28 <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
    29
    30 </head>
    31
    32 <body onload="DASHBOARD.init();">
    33
    34 <!-- header -->
    35 <!-- <?php include('common/header.html');?> -->
    36 <div id="includedHeader"></div>
    37 <!-- dashboard -->
    • Takumi Imai @imai-t commented Oct 25, 2022
      Developer

      不要なコメントは削除してください

      不要なコメントは削除してください
    Please register or sign in to reply
  • Takumi Imai
    @imai-t started a discussion on the diff Oct 25, 2022
    abvw/js/dashboard/dashboard.js 0 → 100644
    140 }
    141 });
    142 }
    143
    144 /** Update communication setting from dashboard data */
    145 DASHBOARD.updateDataCommunications = function(dataDashboard) {
    146 DASHBOARD.communicationItems.forEach(function(item) {
    147 if (item.id == 'messageList') {
    148 item.count = 0;
    149 if (dataDashboard['pushMesage']) {
    150 item.count = dataDashboard['pushMesage'];
    151 }
    152 }
    153 // else if (item.id == 'chat') {
    154 // item.enabled = CHK.isChat;
    155 // }
    • Takumi Imai @imai-t commented Oct 25, 2022
      Developer

      不要なコメントは消してください

      不要なコメントは消してください
    Please register or sign in to reply
  • Takumi Imai
    @imai-t started a discussion on the diff Oct 25, 2022
    Last updated by Takumi Imai Oct 28, 2022
    abvw/common/header.html 0 → 100755
    26 <div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile">
    27 <h6 class="dropdown-header lang" lang="dspLogin" ></h6>
    28 <a class="dropdown-item " href="account-setting.html" >
    29 <img src="../common/img/menu_icon_account_setting.svg" alt="アカウント設定" class="navbar-dropdown-icon">
    30 <span class="lang" style=" color: #6c757d;" lang="account_setting"></span>
    31 </a>
    32 <a class="dropdown-item " href="#" data-toggle="modal" data-target="#confirm-modal">
    33 <img src="../common/img/menu_icon_logout.svg" alt="ログアウト" class="navbar-dropdown-icon">
    34 <span class="lang" style=" color: #6c757d;" lang="dspLogout"></span>
    35
    36 </a>
    37 </div>
    38 </div>
    39 </div>
    40 </nav>
    41 </header>
    • Takumi Imai @imai-t commented Oct 25, 2022
      Developer

      共通化できましたか?

      共通化できましたか?
    • NGO THI HONG @thihong commented Oct 27, 2022
      Developer

      Can you elaborate on where to standardize?

      Can you elaborate on where to standardize?
    • Takumi Imai @imai-t commented Oct 28, 2022
      Developer

      Commonize all headers

      Commonize all headers
    Please register or sign in to reply
  • NGO THI HONG @thihong

    added 6 commits

    • 79ba6233 - implement pickup html
    • ca8b685f - Merge branch 'feature/1.0_check_web_dev_50265' into feature/1.0_check_web_dev_50272
    • 2488c6d9 - Merge branch 'feature/1.0_check_web_dev_50265' into feature/1.0_check_web_dev_50272
    • a4f21958 - implement pickup js
    • 06be6385 - update pickup js
    • 86177773 - Merge branch 'feature/1.0_check_web_dev_50272' into feature/1.0_check_web_dev_50265

    Compare with previous version

    Oct 27, 2022

    added 6 commits

    • 79ba6233 - implement pickup html
    • ca8b685f - Merge branch 'feature/1.0_check_web_dev_50265' into feature/1.0_check_web_dev_50272
    • 2488c6d9 - Merge branch 'feature/1.0_check_web_dev_50265' into feature/1.0_check_web_dev_50272
    • a4f21958 - implement pickup js
    • 06be6385 - update pickup js
    • 86177773 - Merge branch 'feature/1.0_check_web_dev_50272' into feature/1.0_check_web_dev_50265

    Compare with previous version

    added 6 commits * 79ba6233 - implement pickup html * ca8b685f - Merge branch &#x27;feature&#x2F;1.0_check_web_dev_50265&#x27; into feature&#x2F;1.0_check_web_dev_50272 * 2488c6d9 - Merge branch &#x27;feature&#x2F;1.0_check_web_dev_50265&#x27; into feature&#x2F;1.0_check_web_dev_50272 * a4f21958 - implement pickup js * 06be6385 - update pickup js * 86177773 - Merge branch &#x27;feature&#x2F;1.0_check_web_dev_50272&#x27; into feature&#x2F;1.0_check_web_dev_50265 [Compare with previous version](https://gitlab.agentec.jp/abook_web/check/merge_requests/8/diffs?diff_id=9752&start_sha=546683ce12ccea2b2517a46959d35b6475ea8310)
    Toggle commit list
  • NGO THI HONG @thihong

    added 1 commit

    • c4e06868 - Change comment as English comment

    Compare with previous version

    Oct 27, 2022

    added 1 commit

    • c4e06868 - Change comment as English comment

    Compare with previous version

    added 1 commit * c4e06868 - Change comment as English comment [Compare with previous version](https://gitlab.agentec.jp/abook_web/check/merge_requests/8/diffs?diff_id=9753&start_sha=8617777345459eed4fe421415bcaa7e588bd70e4)
    Toggle commit list
  • NGO THI HONG @thihong

    added 1 commit

    • 517c4112 - Update header css

    Compare with previous version

    Oct 28, 2022

    added 1 commit

    • 517c4112 - Update header css

    Compare with previous version

    added 1 commit * 517c4112 - Update header css [Compare with previous version](https://gitlab.agentec.jp/abook_web/check/merge_requests/8/diffs?diff_id=9765&start_sha=c4e06868d7cb3866baee0ecb3828ee7ed384bf33)
    Toggle commit list
  • Takumi Imai @imai-t

    mentioned in commit 8402599e

    Oct 31, 2022

    mentioned in commit 8402599e

    mentioned in commit 8402599ec4409e0ffbd6dd37dec0093434f11a01
    Toggle commit list
  • Takumi Imai @imai-t

    merged

    Oct 31, 2022

    merged

    merged
    Toggle commit list
  • Write
  • Preview
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 sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
3
3 participants
Reference: abook_web/check!8
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.