Changeset 9395 for branches/OaaS/HeuristicLab.Services.Optimization.Web/Content

Timestamp:

04/24/13 13:40:43 (11 years ago)

Author:

fschoepp

Message:

#1888:

• Added visual extensions (dynamic JavaScript) which will be used to render additional result parameters specific to scenarios (e. g. create a graphical representation of a TSP).
• Added relationship between jobs and experiments (otherwise, it's not possible to get the job's experiment).
• Updated Admin page to allow removal/addition of visual extensions.
• Added back-end logic to store/retrieve/delete visual extensions.
• Added visual extension functionality to the JavaScript views/controllers (job.*.js).
• Added tsp.js which is a visual extension for the "Genetic Algorithm - TSP" scenario. It adds a graphical representation of the TSP (just like the C# version does) to the results.

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Web/Content

Files:

• job.controller.js (modified) (3 diffs)
• job.model.js (modified) (1 diff)
• job.view.js (modified) (2 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Web/Content/job.controller.js

@@ -1 +1 @@
 var OAAS_CONTROLLER = (function (my, Backbone, OAAS_VIEW, OAAS_MODEL, _, $) {
+    my.JobVisualExtensionListener = function (model, element) {
+        var extension = new OAAS_MODEL.VisualExtension({ id: model.get('algorithmName') });
+        extension.fetch({ cache: true, success: function () {
+            //eval extension.js -> execute addVisualExtension(model, element): 
+            var js = extension.get('ScenarioJs');
+            if (js != null) {
+                (function (model, element) {
+                    addExtension = undefined;
+                    eval(js);
+                    if (addExtension)
+                        addExtension(model, element);
+                } (model, element));
+            }
+        }
+        });
+    },
     my.JobPageController = function () {
         this.create = function () {
@@ -23 +39 @@
                     var div = $('<div/>').appendTo($('#jobDetails'));
                     var rv = new OAAS_VIEW.ResultView({ model: runList, el: div });
+                    listener.listenTo(rv, 'renderVisualExtension', my.JobVisualExtensionListener);
                     rv.render();
                     var av = new OAAS_VIEW.AccordionView({ el: div });
@@ -30 +47 @@
             });
 
+
+
             jobList.poll();
         }

branches/OaaS/HeuristicLab.Services.Optimization.Web/Content/job.model.js

@@ -77 +77 @@
     });
 
+    my.VisualExtension = Backbone.Model.extend({
+        defaults: {
+            id: null,
+            js: null
+        },
+        url: function () {
+            return '/Job/VisualExtension?scenarioId=' + this.get('id');
+        }
+    });
+
     return my;
 } (OAAS_MODEL || {}, Backbone));

branches/OaaS/HeuristicLab.Services.Optimization.Web/Content/job.view.js

@@ -90 +90 @@
                 $('<h3></h3>').text(this.model.models[i].get('name')).appendTo(this.$el);
                 var rev = new my.ResultEntryView({ model: this.model.models[i], el: this.$el });
-                rev.render();
-            }
+                this.listenTo(rev, 'renderVisualExtension', this.renderVisualExtension);
+                rev.render();                          
+            }            
+        },
+        renderVisualExtension: function(model, element) {
+            // propagate to client listener
+            this.trigger('renderVisualExtension', model, element);
         }
     });
@@ -161 +166 @@
             var results = this.model.get('results');
             for (var i = 0; i < results.length; i++) {
-                this.renderModelEntry(results[i], i, body, 'results');
-            }
+                this.renderModelEntry(results[i], i, body, 'results');                
+            }
+            // get the visual extension, execute it!
+            this.trigger('renderVisualExtension', this.model, body);
 
             var inputs = this.model.get('params');