Leaf 4209 - Revert some changes related to the Group API subsystem

LEAF_Nexus/js/employeeSelector.js

@@ -19,6 +19,7 @@ function employeeSelector(containerID) {
   this.intervalID = null;
   this.selectHandler = null;
   this.resultHandler = null;
+  this.selectHandlers = [];
   this.selectLink = null;
   this.selectionData = new Object();
   this.optionNoLimit = 0;
@@ -108,6 +109,7 @@ employeeSelector.prototype.select = function (id) {
   if (this.selectHandler != null) {
     this.selectHandler();
   }
+  this.selectHandlers.forEach(selectHandler => selectHandler());
 };
 
 employeeSelector.prototype.setSelectHandler = function (func) {
@@ -118,6 +120,15 @@ employeeSelector.prototype.setResultHandler = function (func) {
   this.resultHandler = func;
 };
 
+employeeSelector.prototype.addSelectHandler = function (func) {
+    if(typeof func == 'function') {
+        this.selectHandlers.push(func);
+    }
+    else {
+        console.error('argument supplied to addSelectHandler must be a function');
+    }
+};
+
 employeeSelector.prototype.setSelectLink = function (link) {
   this.selectLink = link;
 };

LEAF_Nexus/js/nationalEmployeeSelector.js

@@ -19,6 +19,7 @@ function nationalEmployeeSelector(containerID) {
   this.intervalID = null;
   this.selectHandler = null;
   this.resultHandler = null;
+  this.selectHandlers = [];
   this.selectLink = null;
   this.selectionData = new Object();
   this.optionNoLimit = 0;
@@ -161,6 +162,7 @@ nationalEmployeeSelector.prototype.select = function (id) {
   if (this.selectHandler != null) {
     this.selectHandler();
   }
+  this.selectHandlers.forEach(selectHandler => selectHandler());
 };
 
 nationalEmployeeSelector.prototype.setSelectHandler = function (func) {
@@ -171,6 +173,15 @@ nationalEmployeeSelector.prototype.setResultHandler = function (func) {
   this.resultHandler = func;
 };
 
+nationalEmployeeSelector.prototype.addSelectHandler = function (func) {
+    if(typeof func == 'function') {
+        this.selectHandlers.push(func);
+    }
+    else {
+        console.error('argument supplied to addSelectHandler must be a function');
+    }
+};
+
 nationalEmployeeSelector.prototype.setSelectLink = function (link) {
   this.selectLink = link;
 };

LEAF_Nexus/js/orgchartForm.js

@@ -63,7 +63,7 @@ orgchartForm.prototype.getForm = function (UID, categoryID, indicatorID) {
         success: function (response) {
           dialog.setContent(response);
           $("input:visible:first, select:visible:first").focus();
-          $("input:visible:first, select:visible:first").keypress(function (
+          $("input:visible:first, select:visible:first").on("keydown", function (
             event
           ) {
             if (event.which == 13) {
@@ -100,11 +100,17 @@ orgchartForm.prototype.getForm = function (UID, categoryID, indicatorID) {
         success: function (response) {
           dialog.setContent(response);
           $("input:visible:first, select:visible:first").focus();
-          $("input:visible:first, select:visible:first").keypress(function (
+          $("input:visible:first, select:visible:first").on("keydown", function (
             event
           ) {
             if (event.which == 13) {
-              $("#" + dialog.btnSaveID).trigger("click");
+              let elChosenDrop = null;
+              if(event.target.classList.contains('chosen-search-input')) {
+                elChosenDrop = document.querySelector('.chosen-with-drop');
+              }
+              if(elChosenDrop === null) { //if a chosen dropdown box is still open, the first enter will just close it.
+                $("#" + dialog.btnSaveID).trigger("click");
+              }
             }
           });
         },
@@ -137,7 +143,7 @@ orgchartForm.prototype.getForm = function (UID, categoryID, indicatorID) {
         success: function (response) {
           dialog.setContent(response);
           $("input:visible:first, select:visible:first").focus();
-          $("input:visible:first, select:visible:first").keypress(function (
+          $("input:visible:first, select:visible:first").on("keydown", function (
             event
           ) {
             if (event.which == 13) {

LEAF_Nexus/templates/view_position.tpl

@@ -394,9 +394,9 @@ $(function() {
     orgchartForm = new orgchartForm('orgchartForm');
     orgchartForm.initialize();
     orgchartForm.addUpdateEvent(19, function(response) {
-    	if(($('.employee').size() - 1) < $('#data_19_2_<!--{$positionID}-->').html()) {
-    		window.location.reload();
-    	}
+        if(($('.employee').length - 1) < $('#data_19_2_<!--{$positionID}-->').html()) {
+            window.location.reload();
+        }
     });
     // include file="site_elements/orgchartForm_updateOutlook.js.tpl"
 

LEAF_Request_Portal/admin/css/mod_templates.css

@@ -27,7 +27,7 @@
 
 .CodeMirror,
 .cm-s-default {
-    height: auto !important;
+    height: 85vh !important;
     border-radius: 0 0 0 5px;
 }
 
@@ -69,7 +69,7 @@
 
 .CodeMirror-merge,
 .CodeMirror-merge .CodeMirror {
-    height: 60vh !important;
+    height: 85vh !important;
 }
 
 .CodeMirror-merge-2pane .CodeMirror-merge-pane {
@@ -450,7 +450,6 @@
 
 .CodeMirror-scroll {
     margin-right: 0;
-    height: 60vh;
     min-height: 563px;
 }
 

LEAF_Request_Portal/admin/css/mod_templates_reports.css

@@ -1,3 +1,4 @@
+/* TODO: Consolidate with mod_templates.css */
 .ui-dialog .ui-dialog-content {
     box-sizing: border-box;
 }
@@ -27,7 +28,7 @@
 
 .CodeMirror,
 .cm-s-default {
-    height: auto !important;
+    height: 85vh !important;
     border-radius: 0 0 0 5px;
 }
 
@@ -83,7 +84,7 @@
 
 .CodeMirror-merge,
 .CodeMirror-merge {
-    height: 60vh !important;
+    height: 85vh !important;
 }
 
 .CodeMirror-merge-2pane .CodeMirror-merge-pane {
@@ -525,7 +526,6 @@
 
 .CodeMirror-scroll {
     margin-right: 0;
-    height: 60vh;
 }
 
 .CodeMirror-sizer {

LEAF_Request_Portal/admin/templates/mod_form.tpl

@@ -10,12 +10,10 @@
 
 <script>
 const orgchartPath = '<!--{$orgchartPath}-->';
-let vueData = {
-    indicatorID: 0,
-    updateIndicatorList: false
-}
-function updateVueData(indicatorID) {
-    vueData.indicatorID = parseInt(indicatorID);
+let ifThenIndicatorID = 0; //used by conditions editor app.  set to specific indicatorID when the app is used, and reset to 0 when closed
+/* update ifThen indicator ID and dispatch a click event to a hidden button on the conditions editor app to update the childID */
+function updateVueData(indicatorID = 0) {
+    ifThenIndicatorID = parseInt(indicatorID);
     document.getElementById('btn-vue-update-trigger').dispatchEvent(new Event("click"));
 }
 
@@ -335,8 +333,7 @@ function openContent(url) {
         dataType: 'text',  // IE9 issue
         success: function(res) {
             $('#formEditor_form').empty().html(res);
-            vueData.indicatorID = 0;
-            document.getElementById('btn-vue-update-trigger').dispatchEvent(new Event("click"));
+            updateVueData(0);
         },
         error: function(res) {
             $('#formEditor_form').empty().html(res);
@@ -958,8 +955,6 @@ function newQuestion(parentIndicatorID = null) {
                 CSRFToken: '<!--{$CSRFToken}-->'},
             success: function(res) {
                 if(res != null) {
-                    vueData.updateIndicatorList = true;
-                    document.getElementById('btn-vue-update-trigger').dispatchEvent(new Event("click"));
                     if($('#sort').val() != '') {
                         $.ajax({
                             type: 'POST',
@@ -1052,7 +1047,12 @@ function makeGrid(columns) {
                 }
                 $(gridBodyElement + ' > div:eq(' + i + ')').css('padding-bottom', '11px');
                 if($(gridBodyElement + ' > div:eq(' + i + ') > span.dropdown').length === 0){
-                    $(gridBodyElement + ' > div:eq(' + i + ')').append('<span class="dropdown"><div>One option per line</div><textarea aria-label="Dropdown options, one option per line" style="width: 153px; resize: none;"value="">' + options + '</textarea></span>');
+                    $(gridBodyElement + ' > div:eq(' + i + ')').append(
+                        `<span class="dropdown">
+                            <div>One option per line</div>
+                            <textarea aria-label="Dropdown options, one option per line" style="width: 153px; resize: none;"value="">${options}</textarea>
+                        </span>`
+                    );
                 }
             }
             if(gridJSON[i].type.toString() === 'dropdown_file') {
@@ -1665,8 +1665,6 @@ function getForm(indicatorID, series) {
         }
 
     	$.when.apply(undefined, calls).then(function() {
-            vueData.updateIndicatorList = true;
-            document.getElementById('btn-vue-update-trigger').dispatchEvent(new Event("click"));
    	    	openContent('ajaxIndex.php?a=printview&categoryID='+ currCategoryID);
    	    	dialog.hide();
    	     });
@@ -1698,31 +1696,6 @@ function gridDropdown(dropDownOptions){
     return returnArray;
 }
 
-/**
- * Purpose: Create Array for Multi-Select Options
- * @param multiSelectOptions
- * @returns {[]|*}
- */
-function gridMultiselect(multiSelectOptions){
-    if(multiSelectOptions == null || multiSelectOptions.length === 0){
-        return multiSelectOptions;
-    }
-    let uniqueNames = multiSelectOptions.split("\n");
-    let returnArray = [];
-    uniqueNames = uniqueNames.filter(function(elem, index, self) {
-        return index == self.indexOf(elem);
-    });
-
-    $.each(uniqueNames, function(i, el){
-        if(el === "no") {
-            uniqueNames[i] = "No";
-        }
-        returnArray.push(uniqueNames[i]);
-    });
-
-    return returnArray;
-}
-
 /**
  * Purpose: Create Array for Multi-Answer Text
  * @param multiAnswerValue