add error popup and some triggers #35

rl-institut · May 14, 2019 · 6cad150 · 6cad150
1 parent 15a2312
commit 6cad150
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/static/stemp_abw/foundation/css/app.css b/static/stemp_abw/foundation/css/app.css
diff --git a/static/stemp_abw/js/data_functions.js b/static/stemp_abw/js/data_functions.js
@@ -24,6 +24,7 @@ function ctrlScenario(element_id) {
     },
     error: function(page) {
         console.log('error');
+        showErrorPopup();
     }
   }).done(function(returned_data) {
     if (element_id == 'select-scn-frm') {
@@ -59,6 +60,7 @@ function ctrlScenarioPost(element_id, data) {
     },
     error: function(page) {
         console.log('error');
+        showErrorPopup();
     }
   }).done(function(returned_data) {
     data = JSON.parse(returned_data);
@@ -87,6 +89,7 @@ function ctrlSimulate() {
       },
       error: function(page) {
           console.log('error');
+          showErrorPopup();
       }
   }).done(function(returned_data){
       //updateSimProgressBar(25);
@@ -146,6 +149,10 @@ function getSimulationResults() {
                 Highcharts.charts[idx2].hideLoading();
             };
         },
+        error: function(page) {
+            console.log('error');
+            showErrorPopup();
+        },
         cache: false
     });
 }
diff --git a/static/stemp_abw/js/ui_helpers.js b/static/stemp_abw/js/ui_helpers.js
@@ -102,4 +102,9 @@ $('.openEnergyTab').on('click', openEnergyTab);
 //
 //$('.tabs-title').click( function () {
 //  $('#' + $(this).attr('id') + ' > a').removeClass('tab-highlighted');
-//});
+//});
+
+// Show a popup with error message
+function showErrorPopup() {
+  $('#errorMessage').foundation('open');
+}
diff --git a/templates/stemp_abw/map.html b/templates/stemp_abw/map.html
@@ -455,6 +455,11 @@ <h2 class="tabs-title__head">Ergebnisse</h2>
       </div>
     </footer>
 
+    <div class="tiny reveal" id="errorMessage" data-reveal>
+      <h2>Fehler</h2>
+      <p>Es ist ein Fehler aufgetreten. Bitte starten Sie das Tool neu.</p>
+    </div>
+
     <!-- START POP-UP RESULTS -->
     <div class="large reveal" id="resultsModal" data-reveal>
       <button class="close-button" data-close aria-label="Close modal" type="button">