publish static version

eae682ea · Jérome Perrin · 4a2779c8 · eae682ea · eae682ea · eae682ea
Commit eae682ea authored Feb 11, 2015 by Jérome Perrin
4 changed files
--- a/dream/platform/static/dream/Input_viewSimulation.js
+++ b/dream/platform/static/dream/Input_viewSimulation.js
@@ -56,10 +56,14 @@
            });
        }).push(function(data) {
            data = JSON.parse(data);
+            if (!data.result.result_list) {
+                data.result.result_list = [];
+            }
            // XXX option to always add ?
            if (data.general.reset_result_list) {
                data.result.result_list = [];
            }
+            data.result.result_list = [];
            data.result.result_list = data.result.result_list.concat(result_json.data.result.result_list);
            return gadget.aq_putAttachment({
                _id: gadget.props.jio_key,

--- a/dream/platform/static/dream/Output_viewDownloadExcelSpreadsheet.html
+++ b/dream/platform/static/dream/Output_viewDownloadExcelSpreadsheet.html
@@ -10,7 +10,7 @@
    <script src="../lib/jquery.js" type="text/javascript"></script>

    <script src="mixin_gadget.js" type="text/javascript"></script>
-    <script src="Output_viewDownloadExcelSpreadsheet.js" type="text/javascript"></script>
+    <script src="Output_viewDownloadFile.js" type="text/javascript"></script>
  </head>
  <body>
    <a class="download_link ui-btn ui-btn-inline ui-icon-action ui-btn-icon-right">Download</a>

--- a/dream/platform/static/dream/Output_viewDownloadExcelSpreadsheet.js
+++ b/dream/platform/static/dream/Output_viewDownloadExcelSpreadsheet.js
@@ -12,9 +12,10 @@
            _id: gadget.props.jio_key,
            _attachment: "body.json"
        }).push(function(simulation_json) {
-            var result = JSON.parse(simulation_json)[0].result, download_link = gadget.props.element.querySelector(".download_link");
-            download_link.download = "demandPlannerOutput.xls";
-            download_link.href = "data:application/excel;base64," + result["demandPlannerOutput.xls"];
+            var result = JSON.parse(simulation_json).result.result_list[options.result], output = result[options.action_definition.configuration.output_id], download_link = gadget.props.element.querySelector(".download_link");
+            /* XXX this does not work with Internet Explorer */
+            download_link.download = output.name;
+            download_link.href = "data:" + output.mime_type + ";base64," + output.data;
        });
    }).declareMethod("startService", function() {
        return new RSVP.Queue().push(function() {

--- a/dream/platform/static/dream/Output_viewSpreadsheet.js
+++ b/dream/platform/static/dream/Output_viewSpreadsheet.js
-/*global rJS, RSVP, initGadgetMixin, loopEventListener, $ */
-(function(window, rJS, RSVP, initGadgetMixin, loopEventListener, $) {
+/*global rJS, RSVP, initGadgetMixin, $ */
+(function(window, rJS, RSVP, initGadgetMixin, $) {
    "use strict";
    var gadget_klass = rJS(window);
    initGadgetMixin(gadget_klass);
@@ -19,9 +19,8 @@
            result_list[1].render(JSON.stringify(content), handsontable_options);
        });
    }).declareMethod("startService", function() {
-        var gadget = this;
        return this.getDeclaredGadget("tableeditor").push(function(tableeditor) {
            return tableeditor.startService();
        });
    });
-})(window, rJS, RSVP, initGadgetMixin, loopEventListener, $);
\ No newline at end of file
+})(window, rJS, RSVP, initGadgetMixin, $);
\ No newline at end of file