Merge pull request #346 from sephcoster/sprint22

Peer Branch Selection Exclusivity, Style Tweaks

Author: mehtadev17

frontend/src/js/helpers.js

@@ -109,8 +109,15 @@
         }
         addParam('peers', status);
         getPeerLinks();
-        $('#peerSelect').prop('checked', status );
 
+        // If Peer is checked, uncheck and disable Peers and branches as they will not be displayed for peer set.
+        $('#branchSelect').prop('disabled', status );
+        $('#superSelect').prop('disabled', status );
+        toggleBranches(false);
+        toggleSuper(false);
+
+        // Check the box
+        $('#peerSelect').prop('checked', status );
     }     
 
     // Uses jQuery BlockUI plugin to block UI on data loading
@@ -202,6 +209,8 @@
         // or layer type.
     }
 
+
+    // Adjudicate the variables associated with selected app layers across the application (names, paths, etc)
     function getLayerType( layer ){
         var type, keyPath, displayName;
 

frontend/src/js/map.js

@@ -580,10 +580,12 @@ select {
 
 #key {
   width: 230px;
+  background-color: #fff;
 }
 
 
 
+
 .show-hide-control {
   text-align: right;
   cursor: pointer;
@@ -690,6 +692,11 @@ select {
         display: none !important;
     }
 
+    #key {
+      padding: 5px;
+      border: 1px solid @black;
+    }
+
 }
 
 

frontend/src/less/mapusaurus/map.less

@@ -232,7 +232,8 @@ function togglePeers(status) {
     $("#lender-peers").addClass("green-highlight"), $("#download-data").attr("href", url)) : ($("#lender-peers-list").addClass("hidden"), 
     $("#lender-peers").removeClass("green-highlight"), $(".peers-of-true").addClass("hidden"), 
     $("#download-data").attr("href", origUrl)), addParam("peers", status), getPeerLinks(), 
-    $("#peerSelect").prop("checked", status);
+    $("#branchSelect").prop("disabled", status), $("#superSelect").prop("disabled", status), 
+    toggleBranches(!1), toggleSuper(!1), $("#peerSelect").prop("checked", status);
 }
 
 function blockStuff() {
@@ -426,7 +427,7 @@ window.console || (console = {
     log: function() {}
 });
 
-var cat, catId, geoQueryType = "selected", showDataContainer, destroyLarChart, cat, catId, geoQueryType = "selected";
+var showDataContainer, destroyLarChart, cat, catId, geoQueryType = "selected";
 
 $(document).ready(function() {
     var lhStatus, peerStatus, branchStatus;
@@ -450,12 +451,11 @@ $(document).ready(function() {
         toggleBranches(status);
     }), "undefined" != typeof loadParams.peers ? lhStatus === !0 ? ($("#peerSelect").prop("checked", !1), 
     console.log("Peer and Hierarchy cannot be checked at the same time. Unchecking Peers.")) : (peerStatus = "true" === loadParams.peers.values, 
-    $("#peerSelect").prop("checked", peerStatus), $("#superSelect").prop("disabled", peerStatus), 
-    togglePeers(peerStatus)) : addParam("peers", !1), $("#peerSelect").change(function() {
+    $("#peerSelect").prop("checked", peerStatus), togglePeers(peerStatus)) : addParam("peers", !1), 
+    $("#peerSelect").change(function() {
         var el = $("#peerSelect"), status = el.prop("checked");
         togglePeers(status), $("#superSelect").prop("disabled", status), initCalls(geoQueryType);
-    }), $("#actionTaken").text(getActionTaken($("#action-taken-selector option:selected").val())), 
-    $("#action-taken-selector").on("change", function() {
+    }), $("#action-taken-selector").on("change", function() {
         var act = $("#action-taken-selector option:selected").val();
         addParam("action", act), $("#actionTaken").text(getActionTaken(act)), initCalls(geoQueryType);
     }), generateTooltips();
@@ -487,14 +487,13 @@ $(document).ready(function() {
         "background-image": "url(/static/basestyle/img/icon_map-layers.png)",
         "background-size": "26px",
         "background-position": "0,0"
-    });
+    }), $("#actionTaken").text(getActionTaken($("#action-taken-selector option:selected").val()));
 });
 
 var msaArray = [], moveEndAction = {}, oldEndAction = geoQueryType;
 
 moveEndAction.selected = function() {
-    "selected" === oldEndAction ? console.log("No action required for 'selected' status. Nothing happens.") : (initCalls(geoQueryType), 
-    oldEndAction = "selected");
+    "selected" === oldEndAction || (initCalls(geoQueryType), oldEndAction = "selected");
 }, moveEndAction.all_msa = function() {
     var oldMsaArray = msaArray.slice(0);
     "all_msa" === oldEndAction ? $.when(getMsasInBounds()).done(function(data) {