Merge branch 'features/#42559_room_dsplay_flag' into 'release_sp3'

ユーザ初対バグ修正

See merge request !73

public_new/chat_add_user.html

@@ -66,12 +66,12 @@
         </div>
       </div>
       <div class="tab_content" id="tab2_content">
-        <div class="breadcrumb" id="groupPathAreaForMakeRoom"></div>
+        <div class="breadcrumb" id="groupPathAreaForAddUser"></div>
         <div class="chat_list">
           <!-- 全グループ -->
           <ul class="p-0 chat_make_room_list">
             <li class="d-flex align-items-center" id="rootGroupArea">
-              <a href="#" class="w-100" id="rootGroupBtnForMakeRoom">
+              <a href="#" class="w-100" id="rootGroupBtnForAddUser">
                 <div class="chat_item d-flex flex-row align-items-center">
                   <div class="chat_item_l">
                     <div class="thumbnail">
@@ -89,7 +89,7 @@
               </a>
             </li>
             <li class="d-flex align-items-center" id="parentGroupArea">
-              <a href="#" class="w-100" id="parentGroupBtnForMakeRoom">
+              <a href="#" class="w-100" id="parentGroupBtnForAddUser">
                 <div class="chat_item d-flex flex-row align-items-center">
                   <div class="chat_item_l">
                     <div class="thumbnail">
@@ -106,8 +106,8 @@
                 </div>
               </a>
             </li>
-            <div id="childGroupListAreaForMakeRoom"></div>
-            <div id="userInGroupListForMakeRoom"></div>
+            <div id="childGroupListAreaForAddUser"></div>
+            <div id="userInGroupListForAddUser"></div>
           </ul>
         </div>
       </div>

public_new/js/chat-ui.js

@@ -2154,20 +2154,20 @@ CHAT_UI.refreshMyGroupForAddUser = function() {
 
     // グループの様式を読み込む
     var groupTemplate;
-    $.get({ url: "./template/template_make_room_group_list.html", async: false }
+    $.get({ url: "./template/template_add_user_group_list.html", async: false }
       , function(text) {
         groupTemplate = text;
     });
 
     // ユーザの様式を読み込む
     var userTemplate;
-    $.get({ url: "./template/template_make_room_user_list.html", async: false }
+    $.get({ url: "./template/template_add_user_user_list.html", async: false }
       , function(text) {
         userTemplate = text;
     });
 
     var groupUserTemplate;
-    $.get({ url: "./template/template_make_room_group_user_list.html", async: false }
+    $.get({ url: "./template/template_add_user_group_user_list.html", async: false }
       , function(text) {
         groupUserTemplate = text;
     });
@@ -2247,7 +2247,7 @@ CHAT_UI.refreshAllGroupForAddUser = function(paramGroupId) {
     $('.content').removeClass('none');
     $('.overlay_src_msg').empty();
 
-    $('#tabAllGroupOnAllUser').prop('checked', true);
+    $('#tabAllGroupOnAddUser').prop('checked', true);
 
     //オンライン状態であればサーバから情報更新。
     if (IS_ONLINE == 'true') {
@@ -2259,24 +2259,24 @@ CHAT_UI.refreshAllGroupForAddUser = function(paramGroupId) {
     }
 
     //画面エリアを初期化。
-    $('#parentGroupBtnForMakeRoom').off();
-    $('#rootGroupBtnForMakeRoom').off();
-    $('#childGroupListAreaForMakeRoom').html('');
-    $('#userInGroupListForMakeRoom').html('');
-    $('#groupPathAreaForMakeRoom').html('');
+    $('#parentGroupBtnForAddUser').off();
+    $('#rootGroupBtnForAddUser').off();
+    $('#childGroupListAreaForAddUser').html('');
+    $('#userInGroupListForAddUser').html('');
+    $('#groupPathAreaForAddUser').html('');
 
     //DBからグループ情報を取得。
     var result = CHAT_DB.getGroupInfoForAddUser(groupId);
 
     //上位グループ、トップグループ遷移ボタンのイベント追加。
     if (typeof result.parentGroupId !== 'undefined') {
-        $('#parentGroupBtnForMakeRoom').on('click', function() {
+        $('#parentGroupBtnForAddUser').on('click', function() {
             CHAT_UI.refreshAllGroupForAddUser(result.parentGroupId);
         });
     }
     if (typeof result.rootGroupId !== 'undefined') {
         if (paramGroupId == 0) { groupId = result.rootGroupId }
-        $('#rootGroupBtnForMakeRoom').on('click', function() {
+        $('#rootGroupBtnForAddUser').on('click', function() {
             CHAT_UI.refreshAllGroupForAddUser(result.rootGroupId);
         });
     }
@@ -2289,7 +2289,7 @@ CHAT_UI.refreshAllGroupForAddUser = function(paramGroupId) {
     }
     //該当グループのパースを表示。
     var groupPathTemplate;
-    $.get({ url: "./template/template_make_room_group_path.html", async: false }
+    $.get({ url: "./template/template_add_user_group_path.html", async: false }
       , function(text) {
         groupPathTemplate = text;
     });
@@ -2302,14 +2302,14 @@ CHAT_UI.refreshAllGroupForAddUser = function(paramGroupId) {
                 id: groupPath.groupId
             });
             let obj = jQuery.parseHTML(html);
-            $('#groupPathAreaForMakeRoom').append(obj);
+            $('#groupPathAreaForAddUser').append(obj);
         }
         groupPathCount++;
     })
 
     //該当グループの下位グループ表示。
     var groupTemplate;
-    $.get({ url: "./template/template_make_room_group_list.html", async: false }
+    $.get({ url: "./template/template_add_user_group_list.html", async: false }
       , function(text) {
         groupTemplate = text;
     });
@@ -2323,12 +2323,12 @@ CHAT_UI.refreshAllGroupForAddUser = function(paramGroupId) {
         let obj = $(jQuery.parseHTML(html)).on('click', function() {
 
         });
-        $('#childGroupListAreaForMakeRoom').append(obj);
+        $('#childGroupListAreaForAddUser').append(obj);
     })
 
     //該当グループの所属ユーザを表示。
     var userTemplate;
-    $.get({ url: "./template/template_make_room_user_list.html", async: false }
+    $.get({ url: "./template/template_add_user_user_list.html", async: false }
       , function(text) {
         userTemplate = text;
     });
@@ -2345,7 +2345,7 @@ CHAT_UI.refreshAllGroupForAddUser = function(paramGroupId) {
         userList: result.groupUserList
     });
     let obj = jQuery.parseHTML(html);
-    $('#userInGroupListForMakeRoom').append(obj);
+    $('#userInGroupListForAddUser').append(obj);
 };
 
 CHAT_UI.refreshForOnline = function() {

public_new/template/template_add_user_group_list.html

+<li class="d-flex align-items-center">
+    <a href="#" class="w-100" onclick="CHAT_UI.refreshAllGroupForAddUser({{id}});">
+        <div class="chat_item d-flex flex-row align-items-center">
+            <div class="chat_item_l">
+                <div class="thumbnail">
+                    <img src="icon/icon_folder.png" alt="フォルダ" />
+                </div>
+            </div>
+            <div class="chat_item_m px-0">
+                <div class="d-flex flex-column">
+                    <div class="chat_item_t">
+                        <span class="chat_item_ttl">{{name}}</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </a>
+</li>
\ No newline at end of file

public_new/template/template_add_user_group_path.html

+<a href="#" class="breadcrumb_item" onclick="CHAT_UI.refreshAllGroupForAddUser({{id}});"><span>{{name}}</span></a>
\ No newline at end of file

public_new/template/template_add_user_group_user_list.html

+<div class="category" onclick="CHAT_UI.toggleCategory(this);"><div class="category_name"><span>{{groupName}}</span></div></div>
+<ul class="p-0 chat_make_room_list">
+    {{#groupUserList}}
+    <li class="d-flex align-items-center">
+        <div class="chat_item d-flex flex-row align-items-center w-100" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});" >
+            <div class="chat_item_l_chk">
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" id="checkbox{{shopMemberId}}" name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
+                        <span class="checkbox-parts"></span>
+                    </label>
+                </div>
+            </div>
+            <div class="chat_item_l">
+                <div class="thumbnail">
+                    <div class="img_wrap"><img src="{{profileUrl}}" onError="this.src='./img/noImage.png'"/></div>
+                </div>
+            </div>
+            <div class="chat_item_m">
+                <div class="d-flex flex-column">
+                    <div class="chat_item_t">
+                        <span class="chat_item_ttl">{{shopMemberName}}</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </li>
+    {{/groupUserList}}
+</ul>
\ No newline at end of file