Merge branch 'origin/develop_apply_design_chat' of…

Merge branch 'origin/develop_apply_design_chat' of gitlab.agentec.jp:abookCommunication/chat_webview into origin/develop_apply_design_chat

public_new/chat.html

@@ -130,6 +130,7 @@
     $("#loadingArea").load("./loading.html");
     $("#loadingArea").load("./loading.html");
     android.getLoginParameter();
     android.getLoginParameter();
     android.getGlobalParameter();
     android.getGlobalParameter();
+    android.saveSelectedUserList("");
 
 
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
       CHAT_SERVER_URL = chatServerUrl;
       CHAT_SERVER_URL = chatServerUrl;

public_new/chat_make_room.html

@@ -111,7 +111,7 @@
         </div>
         </div>
       </div>
       </div>
       <div class="chat_make_room">
       <div class="chat_make_room">
-        <ul class="overlay_src_msg">
+        <ul class="overlay_src_msg" style="padding-inline-start: 20px;">
         </ul>
         </ul>
       </div>
       </div>
 
 

public_new/js/chat-ui.js

@@ -1830,7 +1830,6 @@ CHAT_UI.refreshAllGroupForMakeRoom = function(groupId) {
 };
 };
 
 
 CHAT_UI.checkForMakeChat = function(checkMemberId) {
 CHAT_UI.checkForMakeChat = function(checkMemberId) {
-    var nameInfo = CHAT_DB.getNameCardData(checkMemberId);
     let findObj = CHAT.globalSelectedUserList.find(function(shopMemberId) {
     let findObj = CHAT.globalSelectedUserList.find(function(shopMemberId) {
         return shopMemberId == checkMemberId;
         return shopMemberId == checkMemberId;
     })
     })
@@ -1841,13 +1840,12 @@ CHAT_UI.checkForMakeChat = function(checkMemberId) {
         });
         });
     } else {
     } else {
         // add
         // add
-        CHAT.globalSelectedUserList.push(nameInfo.shopMemberId);
+        CHAT.globalSelectedUserList.push(checkMemberId);
     }
     }
-
     if($('.checkbox' + checkMemberId).prop('checked')){
     if($('.checkbox' + checkMemberId).prop('checked')){
-      $('.checkbox' + checkMemberId).attr('checked', true);
+        $('.checkbox' + checkMemberId).removeAttr('checked');
     }else{
     }else{
-      $('.checkbox' + checkMemberId).removeAttr('checked');
+      $('.checkbox' + checkMemberId).attr('checked', true);
     }
     }
     let cnt = CHAT.globalSelectedUserList.length;
     let cnt = CHAT.globalSelectedUserList.length;
     if (CHAT.globalSelectedUserList.length > 0) {
     if (CHAT.globalSelectedUserList.length > 0) {
@@ -1868,7 +1866,6 @@ CHAT_UI.showMakeRoomConfirmView = function() {
 
 
     var selectedUserList = CHAT_DB.loadSelectedUsers();
     var selectedUserList = CHAT_DB.loadSelectedUsers();
 
 
-    console.log("check = " + selectedUserList);
     selectedUserList.forEach(function(user){
     selectedUserList.forEach(function(user){
          let html = Mustache.render(userTemplate, {
          let html = Mustache.render(userTemplate, {
                      id: user.shopMemberId,
                      id: user.shopMemberId,

public_new/js/chat.js

@@ -326,15 +326,6 @@ $(function() {
         let roomListTitle = getLocalizedString("roomListTitle");
         let roomListTitle = getLocalizedString("roomListTitle");
         $('#chatTitle').text(roomListTitle);
         $('#chatTitle').text(roomListTitle);
     });
     });
-    $('#chatMakeRoom .search_form .cancel').click(function(){
-        CHAT.globalSelectedUserList.forEach(function(userId) {
-            if ($('.checkbox' + userId).prop('checked')) {
-              $('.checkbox' + checkMemberId).attr('checked', true);
-            } else {
-              $('.checkbox' + checkMemberId).removeAttr('checked');
-            }
-        });
-    });
 
 
     $('#chat_add_user .search_form .cancel').click(function(){
     $('#chat_add_user .search_form .cancel').click(function(){
         CHAT.globalSelectedUserList.forEach(function(userId) {
         CHAT.globalSelectedUserList.forEach(function(userId) {

public_new/template/template_make_room_group_user_list.html

@@ -6,7 +6,7 @@
             <div class="chat_item_l_chk">
             <div class="chat_item_l_chk">
                 <div class="checkbox">
                 <div class="checkbox">
                     <label>
                     <label>
-                        <input type="checkbox" id="checkbox{{shopMemberId}}" name="checkbox[]" class="checkbox-input" onchange="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
+                        <input type="checkbox" id="checkbox{{shopMemberId}}" name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onchange="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
                         <span class="checkbox-parts"></span>
                         <span class="checkbox-parts"></span>
                     </label>
                     </label>
                 </div>
                 </div>