Merge pull request #90 from Esri/develop

December Release 2017

Author: ChrisBuscaglia

.idea/workspace.xml

@@ -168,9 +168,9 @@ define(['diag'], function (diag) {
             url = dataAccess.featureServiceUrl + "query?where=" + dataAccess.validCandidateCondition
                     + "&objectIds=&returnIdsOnly=true&returnCountOnly=false&outFields=" + dataAccess.fixedQueryParams
                     + "&callback=?";
-            $.getJSON(url, function handleCandidatesClosure(results) {
+            $.post(url, function handleCandidatesClosure(results) {
                 dataAccess.handleCandidates(results, randomizeSelection, deferred);
-            });
+            },'json');
 
             return deferred;
         },

PhotoSurvey.tbx

@@ -164,25 +164,32 @@ define(['parseConfigInfo'], function (parseConfigInfo) {
                 $.getJSON(arcgisUrl + webmapId + "/data?f=json&callback=?", function (data) {
                     var featureSvcData = {};
 
-                    if (data && data.operationalLayers && data.operationalLayers.length > 0) {
+                    if (data && data.operationalLayers && data.operationalLayers.length > 0 && data.tables && data.tables.length > 0) {
                         featureSvcData.opLayerParams = data.operationalLayers[0];
+                        featureSvcData.formUIParams = data.tables[0];
 
-                        // Get the app's webmap's feature service's data
-                        fetchConfigInfo.getFeatureSvcData(featureSvcData.opLayerParams.url).done(function (data) {
-                            if (!data || data.error) {
+                        // Get the app's webmap's feature service's data and the survey questions table data
+                        $.when(fetchConfigInfo.getFeatureSvcData(featureSvcData.opLayerParams.url),
+                                fetchConfigInfo.getFeatureSvcData(featureSvcData.formUIParams.url))
+                        .done(function (svcdata, uidata) {
+                            if (!svcdata || svcdata.error || !uidata || uidata.error) {
                                 deferred.reject();
                             }
-                            featureSvcData.featureSvcParams = data;
+                            featureSvcData.featureSvcParams = svcdata;
+                            featureSvcData.formUISvcParams = uidata;
                             deferred.resolve(featureSvcData);
+                        })
+                        .fail(function(){
+                            deferred.resolve({});
                         });
+
                     } else {
                         deferred.resolve({});
                     }
                 });
             } else {
                 deferred.resolve({});
             }
-
             return deferred;
         },
 
@@ -199,7 +206,6 @@ define(['parseConfigInfo'], function (parseConfigInfo) {
             if (!deferred) {
                 deferred = $.Deferred();
             }
-
             if (parseConfigInfo.isUsableString(featureSvcUrl)) {
                 $.getJSON(featureSvcUrl + "?f=json&callback=?", function (data) {
                     data.canBeUpdated = data.capabilities && data.capabilities.indexOf("Update") >= 0;

PhotoSurvey103.tbx

@@ -148,10 +148,20 @@ define(['lib/i18n.min!nls/resources.js', 'prepareAppConfigInfo', 'handleUserSign
 
                     // When the feature service and survey are ready, we can set up the module that reads from and writes to the service
                     prepareAppConfigInfo.surveyReady.done(function () {
+                        
+                        //Test if the user has set a filter on the candidates feature service layer and update the validCondition parameter to query candidates accordingly
+                        var validCondition;
+                        if (prepareAppConfigInfo.filterDefinition){
+                            validCondition = "(" + prepareAppConfigInfo.appParams.surveyorNameField + "+is+null+or+"
+                            + prepareAppConfigInfo.appParams.surveyorNameField + "='') " + "and " + prepareAppConfigInfo.filterDefinition;
+                        }
+                        else{
+                            validCondition = prepareAppConfigInfo.appParams.surveyorNameField + "+is+null+or+"
+                            + prepareAppConfigInfo.appParams.surveyorNameField + "=''";
+                        }
+
                         dataAccess.init(prepareAppConfigInfo.featureSvcParams.url, prepareAppConfigInfo.featureSvcParams.id,
-                                prepareAppConfigInfo.featureSvcParams.objectIdField,
-                                prepareAppConfigInfo.appParams.surveyorNameField + "+is+null+or+"
-                                + prepareAppConfigInfo.appParams.surveyorNameField + "=''", prepareAppConfigInfo.appParams.proxyProgram);
+                                prepareAppConfigInfo.featureSvcParams.objectIdField, validCondition, prepareAppConfigInfo.appParams.proxyProgram);
 
                         // Test if there are any surveys remaining to be done
                         dataAccess.getObjectCount().done(function (countRemaining) {
@@ -230,11 +240,26 @@ define(['lib/i18n.min!nls/resources.js', 'prepareAppConfigInfo', 'handleUserSign
                     });
                 }
 
+                // Create skip button if specified in config
+                if(prepareAppConfigInfo.appParams.showSkip){
+
+                    // Check if config file skipButtonText is not empty or null
+                    if(prepareAppConfigInfo.appParams.skipButtonText){
+                        $("#skipBtn")[0].innerHTML = prepareAppConfigInfo.appParams.skipButtonText;
+                    }
+                    else{
+                        $("#skipBtn")[0].innerHTML = i18n.tooltips.button_skip;
+                    }
+                }
+                else{
+                    $("#skipBtn").css("visibility", "hidden");
+                }    
+
+
                 // i18n updates
                 $("#previousImageBtn")[0].title = i18n.tooltips.button_previous_image;
                 $("#nextImageBtn")[0].title = i18n.tooltips.button_next_image;
 
-                $("#skipBtn")[0].innerHTML = i18n.tooltips.button_skip;
                 $("#submitBtn")[0].innerHTML = i18n.tooltips.button_submit;
 
                 $("#userProfileSelectionText")[0].innerHTML = i18n.labels.menuItem_profile;
@@ -412,6 +437,9 @@ define(['lib/i18n.min!nls/resources.js', 'prepareAppConfigInfo', 'handleUserSign
 
     // Provide the i18n strings to the survey
     survey.flag_important_question = i18n.tooltips.flag_important_question;
+    survey.error_text = i18n.messages.error_text;
+
+
 
     //------------------------------------------------------------------------------------------------------------------------//
     // Wire up app events
@@ -471,6 +499,7 @@ define(['lib/i18n.min!nls/resources.js', 'prepareAppConfigInfo', 'handleUserSign
 
         // Provide some visual feedback for the switch to a new survey
         $("#submitBtn").fadeTo(100, 0.0).blur();
+        $("#skipBtn").fadeTo(100, 0.0).blur();
         $("#surveyContainer").fadeTo(100, 0.0);
 
         // Get candidate property
@@ -533,6 +562,7 @@ define(['lib/i18n.min!nls/resources.js', 'prepareAppConfigInfo', 'handleUserSign
                 : 1.0));
             if (!isReadOnly) {
                 $("#submitBtn").fadeTo(1000, 1.0);
+                $("#skipBtn").fadeTo(1000, 1.0);
             }
 
         }, function () {
@@ -557,6 +587,14 @@ define(['lib/i18n.min!nls/resources.js', 'prepareAppConfigInfo', 'handleUserSign
         });
     });
 
+    $(document).on("click", ".prime", function(){
+        survey.updateForm($(this).val(), $(this).data("id"), prepareAppConfigInfo.survey);
+    });
+
+    $(document).on("change", ".primeD", function(){
+        survey.updateForm($(this).val(), $(this).data("id"), prepareAppConfigInfo.survey);
+    });
+
     $("#userSignoutSelection").on('click', function () {
         $(document).triggerHandler('signedOut:user');
     });