Bug Fixes for querying the POI layer and extended properties

Fixed the following bugs:
- POIs are not being filtered out correctly on the map (49111)
- LOIs are cleared out after updating job properties (49060)
- Extended properties should not enforce required field for not
implemented functionality (45969)

js/app/WorkflowManager.js

@@ -643,6 +643,11 @@ define([
             var self = lang.hitch(this);
             this.wmConfigurationTask.getVisibleJobTypes(username, function (response) {
                 self.visibleJobTypes = response.jobTypes;
+                // init framework
+                self.initFrameworkUI();
+            }, function (error) {
+                // init framework
+                self.initFrameworkUI();
             });
         },
 
@@ -727,6 +732,7 @@ define([
                 var queryName = self.filter.content.setQueryNameFromId(self.queryIDInURL);
                 if (queryName) {
                     self.savedQuery = queryName;
+                    queryID = self.queryIDInURL;
                 }
                 self.queryIDInURL = null;
             }
@@ -1135,7 +1141,7 @@ define([
 
                 // set map aoi
                 topic.publish(appTopics.map.clearGraphics, null);
-                var loi = data.aoi ? data.aoi : data.poi;
+                var loi = data.aoi ? data.aoi : data.loi;
                 self.selectJobLOI(args.jobId, loi, args.zoomToFeature);
 
                 //set draw tool buttons
@@ -1849,6 +1855,7 @@ define([
             var self = lang.hitch(this);
             this.myMap = new EsriMap({
                 mapConfig : config.map,
+                poiLayerID : config.app.jobLOILayer.POILayerID,
                 aoiLayerID : config.app.jobLOILayer.AOILayerID,
                 mapTopics : appTopics.map,
                 mapId : self.mapPanel.id,
@@ -2013,7 +2020,7 @@ define([
                     console.log(errMsg, error);
                     self.errorHandler(errMsg, error);
             });
-            })
+            });
 
             topic.subscribe(appTopics.filter.jobSearch, function(sender, args) {
                 if (args.value == "") {
@@ -2602,10 +2609,8 @@ define([
                     self.initUserPrivileges(data.privileges);
                     // user queries
                     self.userQueries = data.userQueries;
-                    //Load Visible Job Types
+                    //Load Visible Job Types and then initialize UI framework afterward
                     self.initVisibleJobTypes(data.userName);
-                    // initialize UI framework
-                    self.initFrameworkUI();
                 }
 
             }, function(error) {

js/app/WorkflowManager/AttachmentItem.js

@@ -154,4 +154,4 @@ function (
             return url;
         }
     });
-});
+});

js/app/WorkflowManager/ExtendedPropertiesItem.js

@@ -229,10 +229,9 @@ function (
 
         setRequired: function (index) {
             // toggle the required asterisk
-
             var field = this.field;
             var data = field.get('value');
-            if (this.required) {
+            if (this.isRequiredField()) {
                 this.fieldRequired.style.display = "";
             } else {
                 this.fieldRequired.style.display = "none";
@@ -244,7 +243,7 @@ function (
 
             var field = this.field;
             var data = field.get('value');
-            if (((data == null || data == "") && this.required) || field.state == "Error") {
+            if (((data == null || data == "") && this.isRequiredField()) || field.state == "Error") {
                 field.set('state', "Error");
             } else {
                 field.set('state', "");
@@ -446,9 +445,9 @@ function (
             }
             var state = field.state;
             //flagging
-            if (((data == null || data == "") && this.required) || state == "Error") {
+            if (((data == null || data == "") && this.isRequiredField()) || state == "Error") {
                 this.setHighlight();
-                if (!(data === undefined) && (data == null || data == "") && this.required) {
+                if (!(data === undefined) && (data == null || data == "") && this.isRequiredField()) {
                     topic.publish(appTopics.extendedProperties.invalidUpdate, this, { missingField: true });
                 } else {
                     topic.publish(appTopics.extendedProperties.invalidUpdate, this, { invalidField: true });
@@ -473,6 +472,14 @@ function (
                 }
             }
         },
+
+        isRequiredField : function() {
+            // The field is only required if it's not an unsupported type (file, folder, geofile)
+            return this.required && this.displayType != Enum.ExtendedPropertyDisplayType.FILE 
+                && this.displayType != Enum.ExtendedPropertyDisplayType.FOLDER 
+                && this.displayType != Enum.ExtendedPropertyDisplayType.GEO_FILE;
+        },
+
         generateRandomIndex : function() {
             // generate a random number from 1 to specified max value (1000000000000)
             return Math.floor((Math.random() * 1000000000000) + 1);

js/app/WorkflowManager/Properties.js

@@ -242,7 +242,7 @@ function (
             this.jobStartDateControl.set("value", job.startDate);
             this.jobDueDateControl.set("value", job.dueDate);
 
-            if (job.aoi || job.poi) {
+            if (job.aoi || job.loi) {
                 this.propertiesFormLOI.innerHTML = this.i18n_LoiDefined;
             } else {
                 this.propertiesFormLOI.innerHTML = this.i18n_LoiUndefined;
@@ -766,7 +766,9 @@ function (
                 para.clearDueDate = true;
             }
 
-            //AOI
+            //AOI / LOI
+            para.aoi = this.currentJob.aoi;
+            para.loi = this.currentJob.loi;
             if ((this.currentJob.aoi != this.propertiesFormLOI.innerHTML) && (this.propertiesFormLOI.innerHTML == "")) {
                 para.clearAOI = true;
             };

js/app/WorkflowManager/libs/workflowmanager/WMJobTask.js

@@ -26,10 +26,14 @@ define("workflowmanager/WMJobTask", [
                 response.startDate = util.convertToDate(response.startDate);
                 response.startedDate = util.convertToDate(response.startedDate);
                 response.dueDate = util.convertToDate(response.dueDate);
-                if (response.aoi)
+                if (response.aoi) {
                     response.aoi = new esri.geometry.Polygon(response.aoi);
-                if (response.poi)
-                    response.poi = new esri.geometry.Multipoint(response.poi);
+                    response.loi = new esri.geometry.Polygon(response.aoi);
+                }
+                if (response.poi) {
+                    response.loi = new esri.geometry.Multipoint(response.poi);
+                    delete response.poi;    // response should not include the poi, just loi
+                }
                 successCallBack(response);
             }, errorCallBack);
         },

js/widget/gis/EsriMap.js

@@ -271,9 +271,9 @@ define([
             var poiReq = null;
             if (self.poiQueryTask) {
                 var poiQuery = new Query();
-                poiQuery .returnGeometry = true;
-                poiQuery .outSpatialReference = self.map.spatialReference;
-                poiQuery .where = self.poiJobIdField + "=" + jobId;
+                poiQuery.returnGeometry = true;
+                poiQuery.outSpatialReference = self.map.spatialReference;
+                poiQuery.where = self.poiJobIdField + "=" + jobId;
                 poiReq = self.poiQueryTask.execute(poiQuery);
             }
 
@@ -626,6 +626,8 @@ define([
         getUpdatedFeatures: function (jobIds) {
             this.selectedJobIds = jobIds;
             var layerDefinitions = [];
+            if (this.poiLayerID != null)
+                layerDefinitions[this.poiLayerID] = this.poiJobIdField + " in (" + jobIds.join() + ")";
             layerDefinitions[this.aoiLayerID] = this.jobIdField + " in (" + jobIds.join() + ")";
             this.aoiDynamicLayer.setLayerDefinitions(layerDefinitions);   
             this.setMapExtent();