Skip to content

dream
dream
Commit c87ff0ce authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

update static version

parent 8ce4b422
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
dream/platform/static/dream/Output_viewBottleneckGraph.html
View file @ c87ff0ce
...@@ -9,15 +9,16 @@ ...@@ -9,15 +9,16 @@
<script src="../lib/jquery.js" type="text/javascript"></script> <script src="../lib/jquery.js" type="text/javascript"></script>
<script src="../lib/jquery.flot.js"></script> <script src="../lib/jquery.flot.js"></script>
<script src="../lib/jquery.flot.stack.js"></script> <script src="../lib/jquery.flot.stack.js"></script>
<script src="../lib/jquery.flot.orderBars.js"></script>
<script src="../lib/jquery.flot.time.js"></script> <script src="../lib/jquery.flot.time.js"></script>
<script src="mixin_gadget.js" type="text/javascript"></script> <script src="mixin_gadget.js" type="text/javascript"></script>
<script src="Output_viewBottleneckGraph.js" type="text/javascript"></script> <script src="Output_viewBottleneckGraph.js" type="text/javascript"></script>
</head> </head>
<body> <body>
<div class="graph_container" style="float:left; width: 100%; height:300px"></div> <div style="float:left; width:10%">
<div> <label for="choices" class="select_label">Please select bottleneck:</label>
<label for="choices">Please select bottleneck:</label>
<select class="choices" name="choices"></select> <select class="choices" name="choices"></select>
</div> </div>
<div class="graph_container" style="float:left; width:90%; height:300px"></div>
</body> </body>
</html> </html>
dream/platform/static/dream/Output_viewBottleneckGraph.js
View file @ c87ff0ce
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
}).push(function(simulation_json) { }).push(function(simulation_json) {
var json_data = JSON.parse(simulation_json); var json_data = JSON.parse(simulation_json);
gadget.props.data = json_data.result.result_list[options.result][options.action_definition.configuration.output_id]; gadget.props.data = json_data.result.result_list[options.result][options.action_definition.configuration.output_id];
if (options.action_definition.configuration.select_label) {
$(gadget.props.element.querySelector(".select_label")).text(options.action_definition.configuration.select_label);
}
}); });
}).declareMethod("startService", function() { }).declareMethod("startService", function() {
var first_option, datasets = this.props.data, graph_container = this.props.element.querySelector(".graph_container"), select = $(this.props.element.querySelector("select.choices")); var first_option, datasets = this.props.data, graph_container = this.props.element.querySelector(".graph_container"), select = $(this.props.element.querySelector("select.choices"));
......
dream/platform/static/dream/Output_viewGraph.html
View file @ c87ff0ce
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<script src="../lib/jquery.js" type="text/javascript"></script> <script src="../lib/jquery.js" type="text/javascript"></script>
<script src="../lib/jquery.flot.js"></script> <script src="../lib/jquery.flot.js"></script>
<script src="../lib/jquery.flot.stack.js"></script> <script src="../lib/jquery.flot.stack.js"></script>
<script src="../lib/jquery.flot.orderBars.js"></script>
<script src="../lib/jquery.flot.time.js"></script> <script src="../lib/jquery.flot.time.js"></script>
<script src="mixin_gadget.js" type="text/javascript"></script> <script src="mixin_gadget.js" type="text/javascript"></script>
<script src="Output_viewGraph.js" type="text/javascript"></script> <script src="Output_viewGraph.js" type="text/javascript"></script>
......
dream/platform/static/manifest.appcache
View file @ c87ff0ce
CACHE MANIFEST CACHE MANIFEST
# This manifest was generated by grunt-manifest HTML5 Cache Manifest Generator # This manifest was generated by grunt-manifest HTML5 Cache Manifest Generator
# Time: Thu Apr 23 2015 08:36:51 GMT+0200 (CEST) # Time: Wed May 27 2015 12:36:48 GMT+0200 (CEST)
CACHE: CACHE:
dream/InputModule_viewAddDocumentDialog.js dream/InputModule_viewAddDocumentDialog.js
...@@ -40,6 +40,7 @@ lib/handsontable.js ...@@ -40,6 +40,7 @@ lib/handsontable.js
lib/jio.js lib/jio.js
lib/jquery-ui.js lib/jquery-ui.js
lib/jquery.flot.js lib/jquery.flot.js
lib/jquery.flot.orderBars.js
lib/jquery.flot.stack.js lib/jquery.flot.stack.js
lib/jquery.flot.time.js lib/jquery.flot.time.js
lib/jquery.js lib/jquery.js
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7