Update frontend and forms

apps/map/templates/map/form.html

@@ -34,27 +34,67 @@
 
   <!-- Conditional logic for hiding and un-hiding fields. -->
   <script type="text/javascript">
+    // Button classes for tab navigation
+    $('.btnNext').click(function(){
+      $('.nav-tabs > .active').next('li').find('a').trigger('click');
+    });
+
+    $('.btnPrevious').click(function(){
+      $('.nav-tabs > .active').prev('li').find('a').trigger('click');
+    });
+
+
     // Here we define the fields we need to conditionally toggle.
     // TODO: Move this knowledge out of the template
     var conditionalFields = [{
       "field": "#id_land_ownership",
       "showHide": ["#div_id_land_ownership_details"],
-      "condition": "OTH"
+      "condition": ["OTH"]
+    },
+    {
+      "field": "#id_location_context",
+      "showHide": ["#div_id_type_of_ecosystem"],
+      "condition": ["RUR"]
     },
     {
       "field": "#id_power_technology",
       "showHide": ["#div_id_power_technology_other"],
-      "condition": "OT"
+      "condition": ["OT"]
+    },
+    { // 2.1 - Power Generation
+      "field": "#id_sector_of_economy",
+      "showHide": ["#power_generation_questions"],
+      "condition": ["WND","SOL","HYD"]
+    },
+    {
+      "field": "#id_generation_technology",
+      "showHide": ["#div_id_biomass_detail"],
+      "condition": ["BIOG", "OTHB"]
+    },
+    {
+      "field": "#id_generation_technology",
+      "showHide": ["#div_id_generation_technology_other"],
+      "condition": ["OTHR"]
+    },
+    { // 2.2 - Power Grids
+      "field": "#id_sector_of_economy",
+      "showHide": ["#power_grids_energy_storage_questions"],
+      "condition": ["PG"]
     },
     {
       "field": "#id_sector_of_economy",
-      "showHide": ["#div_id_generation_technology",
-                   "#div_id_biomass_detail",
-                   "#div_id_generation_technology_other",
-                   "#div_id_total_generation_capacity",
-                   "#div_id_total_investment",
-                   "#div_id_technical_or_economic_details"],
-      "condition": ["WND","SOL","HYD"]
+      "showHide": ["#mineral_commodity_questions"],
+      "condition": ["SM"]
+    },
+    { // 3.1
+      "field": "#id_positive_or_negative",
+      "showHide": ["#positive_case_questions"],
+      "condition": ["P"]
+    },
+    { // 3.2
+      "field": "#id_positive_or_negative",
+      "showHide": ["#negative_case_questions"],
+      "condition": ["N"]
     }];