From 7107c87445175616c214fc1592ad77987c343fe4 Mon Sep 17 00:00:00 2001 From: Alistair Marshall Date: Sun, 29 Mar 2020 20:05:51 +0100 Subject: [PATCH 1/3] Change save button to save to file --- index.html | 7 ++--- js/cFIREsimOpen.js | 74 ++++++++++++++++++++++------------------------ 2 files changed, 37 insertions(+), 44 deletions(-) diff --git a/index.html b/index.html index f545415..356c07e 100644 --- a/index.html +++ b/index.html @@ -127,10 +127,7 @@

The Crowdsourced FIRE Simulator (cFIREsim) - Open Source
diff --git a/js/cFIREsimOpen.js b/js/cFIREsimOpen.js index ece6f4d..c65dcb4 100644 --- a/js/cFIREsimOpen.js +++ b/js/cFIREsimOpen.js @@ -1,3 +1,22 @@ +function download(filename, content) { + if (navigator.msSaveBlob) { // IE 10+ + navigator.msSaveBlob(new Blob([content], { + type: 'text/xml;charset=utf-8;' + }), filename); + } else { + var element = document.createElement('a'); + element.setAttribute('href', 'data:text/xml;charset=utf-8,' + encodeURIComponent(content)); + element.setAttribute('download', filename); + + element.style.display = 'none'; + document.body.appendChild(element); + + element.click(); + + document.body.removeChild(element); + } +} + $(document).ready(function() { //Full-screen modals @@ -22,29 +41,20 @@ $(document).ready(function() { } }); - //Populate Saved Sims dropdown if user is logged in - if ($("#username").html() != undefined) { - Simulation.getQueries(); - - //Open the Save Sim input field containing simName input and submit/cancel buttons - $('#saveSimBtn').click(function(e) { - $('#saveSimPopup').modal('show'); - }); - - //When Saved Sim is submitted, save to DB - $('#confirmSaveSim').click(function(e) { - e.stopImmediatePropagation(); - Simulation.saveSim($("#username").html()); - }); + //Open the Save Sim input field containing simName input and submit/cancel buttons + $('#saveSimBtn').click(function(e) { + $('#saveSimPopup').modal('show'); + }); - //Close Save Sim success popup - $('#closeSaveSuccess').click(function(e) { - $('#saveSimSuccess').hide(); - }); - } + //Open the Load Sim input field containing file input and submit/cancel buttons + $('#loadSimBtn').click(function(e) { + $('#loadSimPopup').modal('show'); + }); - $("#signInBtn").click(function() { - window.location.href = "../phpBB3/login.php"; + //When Saved Sim is submitted, save to DB + $('#confirmSaveSim').click(function(e) { + e.stopImmediatePropagation(); + Simulation.saveSim(); }); }); @@ -110,26 +120,12 @@ var Simulation = { scope.refreshRebalanceAnnuallyOptions(); }); }, - saveSim: function(username) { + saveSim: function() { var scope = angular.element($("#input")).scope(); scope.$apply(function() { var json_savedSim = JSON.stringify(scope.data, null, 2); - $.ajax({ - url: "getData.php", - type: "POST", - dataType: 'JSON', - data: { - param: "saveSim", - json: json_savedSim, - username: username, - simName: $('#simNameInput').val(), - }, - }).success(function() { - $('#saveSimPopup').modal('hide'); - console.log("Save Success!"); - $('#saveSimSuccess').fadeIn(300, "linear"); - Simulation.getQueries(); - }); + download($('#simNameInput').val()+'.FIREsim',json_savedSim) + $('#saveSimPopup').modal('hide'); }); }, runSimulation: function(form) { @@ -764,7 +760,7 @@ var Simulation = { /* //Random number generator for supplying a CSV of only 1 random cycle. Disabled for debugging purposes. function getRandomInt(min, max) { - return Math.floor(Math.random() * (max - min)) + min; + return Math.floor(Math.random() * (max - min)) + min; } var num = getRandomInt(0, results.length); */ From 0d43d2400a2d6c6a1caa8fa9f34052f2bb352d5f Mon Sep 17 00:00:00 2001 From: Alistair Marshall Date: Fri, 3 Apr 2020 20:03:54 +0100 Subject: [PATCH 2/3] Add ability to load saved simulation from json --- index.html | 113 +++++++++++++++++++++++++++++++++++++++++++++ js/cFIREsimOpen.js | 25 +++++++--- 2 files changed, 132 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 356c07e..6ae02ba 100644 --- a/index.html +++ b/index.html @@ -89,6 +89,98 @@ .ot_banner_output a { color: #23568f; } + + /** + * Reset button styles + * It takes some work to achieve a “blank slate” look. + */ + button { + padding: 0; + border: none; + font: inherit; + color: inherit; + background-color: transparent; + /* show a hand cursor on hover; some argue that we + should keep the default arrow cursor for buttons */ + cursor: pointer; + } + + /** + * Button component + */ + input[type=button], .custom-file-upload{ + /* default for
+ +