Identifies if child nodes are selected and uses an 'id' rather than t…

…he node name to identify the selected node. re #4357
archesproject · Dec 19, 2018 · a0d204c · a0d204c
1 parent e5adc68
commit a0d204c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/arches/app/media/js/views/mobile-survey-designer.js b/arches/app/media/js/views/mobile-survey-designer.js
@@ -31,29 +31,34 @@ define([
         mobilesurvey: viewModel.mobilesurvey,
         items: [{
             name: viewModel.mobilesurvey.name,
+            id: 'root',
             selected: ko.observable(true),
             istopnode: true,
             expanded: ko.observable(true),
             childNodes: ko.observableArray([{
                 name: 'Map Extent',
+                id: 'mapextent',
                 selected: ko.observable(false),
                 istopnode: false,
                 childNodes: ko.observableArray([]),
                 expanded: ko.observable(false)
             },
             {
-                name: 'Offline Maps',
+                name: 'Map Sources',
+                id: 'mapsources',
                 selected: ko.observable(false),
                 istopnode: false,
                 childNodes: ko.observableArray([]),
                 expanded: ko.observable(false)
             },
             {
                 name: 'Models',
+                id: 'models',
                 selected: ko.observable(false),
                 istopnode: false,
                 childNodes: ko.observableArray([{
                     name: 'Model 1',
+                    id: 'model1',
                     selected: ko.observable(false),
                     istopnode: false,
                     childNodes: ko.observableArray([]),
@@ -63,13 +68,15 @@ define([
             },
             {
                 name: 'Data',
+                id: 'data',
                 selected: ko.observable(false),
                 istopnode: false,
                 childNodes: ko.observableArray([]),
                 expanded: ko.observable(false)
             },
             {
                 name: 'People',
+                id: 'people',
                 selected: ko.observable(false),
                 istopnode: false,
                 childNodes: ko.observableArray([]),

diff --git a/arches/app/media/js/views/mobile-survey-manager/mobile-survey-tree.js b/arches/app/media/js/views/mobile-survey-manager/mobile-survey-tree.js
@@ -43,7 +43,7 @@ define([
                 nodes = this.items
             }
             nodes.forEach(function(node){
-                ko.unwrap(node.name) === ko.unwrap(selectednode.name) ? node.selected(true) : node.selected(false);
+                ko.unwrap(node.id) === ko.unwrap(selectednode.id) ? node.selected(true) : node.selected(false);
                 nodes = node.childNodes();
                 if (nodes.length > 0) {
                     self.selectItem(selectednode, nodes);
@@ -54,14 +54,14 @@ define([
         isChildSelected: function(node){
             var isChildSelected = function(parent) {
                 var childSelected = false;
-                // if (!parent.istopnode) {
-                //     parent.childNodes().forEach(function(child) {
-                //         if (child && child.selected() || isChildSelected(child)) {
-                //             childSelected = true;
-                //         }
-                //     });
-                //     return childSelected;
-                // }
+                if (!parent.istopnode) {
+                    parent.childNodes().forEach(function(child) {
+                        if (child && child.selected() || isChildSelected(child)) {
+                            childSelected = true;
+                        }
+                    });
+                    return childSelected;
+                }
             };
 
             return ko.computed(function() {