Merge branch 'feature/1.0_check_web_dev_50269' into feature/1.0_check_web_dev_50270

abvw/html/operation-select.html

@@ -13,7 +13,7 @@
           </ul>
           </ul>
         </div>
         </div>
         <div class="modal-footer">
         <div class="modal-footer">
-            <button type="button" class="btn btn-primary lang" lang="selection"></button>
+            <button type="button" class="btn btn-primary lang" lang="selection" onclick="OperationSelect.onClickSelect();"></button>
             <button type="button" class="btn btn-tertiary lang" lang="dspCancel" data-dismiss="modal"></button>
             <button type="button" class="btn btn-tertiary lang" lang="dspCancel" data-dismiss="modal"></button>
         </div>
         </div>
       </div>
       </div>

abvw/js/dashboard/dashboard.js

@@ -141,17 +141,7 @@ DASHBOARD.updateDataCommunications = function(dataDashboard) {
             if (dataDashboard['pushMesage']) {
             if (dataDashboard['pushMesage']) {
                 item.count = dataDashboard['pushMesage'];
                 item.count = dataDashboard['pushMesage'];
             } 
             } 
-        } 
-        // if (item.id == 'chat') {
-        //     if(ClientData.serviceOpt_chat_function() == 'Y' )
-        //     {
-        //         item.enabled = true;
-        //     }
-        //     else
-        //     {
-        //         item.enabled = false;
-        //     }
-        // }
+        }
     });
     });
 }
 }
 
 

abvw/js/operationSelect/operation-select.js

@@ -4,6 +4,7 @@
  * @since 1.0 check web
  * @since 1.0 check web
  */
  */
 var OperationSelect = {};
 var OperationSelect = {};
+OperationSelect.changeSelectCallback = function() {};
 
 
 OperationSelect.operationIdSelected="";
 OperationSelect.operationIdSelected="";
 OperationSelect.operationNameSelected="";
 OperationSelect.operationNameSelected="";
@@ -77,3 +78,31 @@ OperationSelect.init = function () {
     $("#operationSelectList :first-child").addClass("selected");
     $("#operationSelectList :first-child").addClass("selected");
 }
 }
 
 
+
+/**
+ * handle click event of select button
+ */
+ OperationSelect.onClickSelect = function () {
+    OperationSelect.chooseOperationSelect();
+};
+
+
+/**
+ * Get operation select and call back function in main page
+ */
+ OperationSelect.chooseOperationSelect = function () {
+    let param = {};
+    param.operationIdSelected = OperationSelect.operationIdSelected;
+    param.operationNameSelected = OperationSelect.operationNameSelected;
+    OperationSelect.closeModal();
+    if (OperationSelect.changeSelectCallback && typeof OperationSelect.changeSelectCallback === 'function') {
+        OperationSelect.changeSelectCallback(param);
+    }
+};
+
+/**
+ * close setting dialog
+ */
+ OperationSelect.closeModal = function () {
+    $('#task-list-modal .close').click();
+};
\ No newline at end of file