omf_web 1.0.0 → 1.2.0

data/share/htdocs/graph/js/discrete_bar_chart.js

@@ -1,16 +1,12 @@
-// L.provide('OML.discrete_bar_chart', ["graph/abstract_chart", "#OML.abstract_chart", "graph/axis", "#OML.axis", "graph.css", 
-                                  // ["/resource/vendor/d3/d3.js", 
-                                   // "/resource/vendor/nv_d3/js/nv.d3.js",
-                                   // "/resource/vendor/nv_d3/css/nv.d3.css"
-                                  // ]], function () {
-L.provide('OML.discrete_bar_chart', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_chart"], function () {
 
-  OML.discrete_bar_chart = OML.abstract_nv_chart.extend({
+define(["graph/abstract_nv_chart"], function (abstract_nv_chart) {
+
+  var discrete_bar_chart = abstract_nv_chart.extend({
     decl_properties: [
-      ['label', 'key', {property: 'label'}], 
-      ['value', 'key', {property: 'value'}], 
+      ['label', 'key', {property: 'label'}],
+      ['value', 'key', {property: 'value'}],
     ],
-        
+
     defaults: function() {
       return this.deep_defaults({
         rotate_labels: -45,
@@ -18,61 +14,62 @@ L.provide('OML.discrete_bar_chart', ["graph/js/abstract_nv_chart", "#OML.abstrac
         //.staggerLabels(historicalBarChart[0].values.length > 8)
         tooltips: true,
         show_values: true,
-  
         margin: {
-          top: 20, right: 0, bottom: 50, left: 80 
-        }    
-      }, OML.discrete_bar_chart.__super__.defaults.call(this));      
+          top: 20, right: 0, bottom: 50, left: 80
+        }
+      }, discrete_bar_chart.__super__.defaults.call(this));
     },
 
     _create_model: function() {
-      return  nv.models.discreteBarChart();      
+      return  nv.models.discreteBarChart();
     },
-    
+
     _configure_mapping: function(m, chart) {
       var label_f = m.label;
       var value_f = m.value;
       chart.x(function(d) {
-        var v = label_f(d);        
+        var v = label_f(d);
         return v;
-      })
+      });
       chart.y(function(d) {
         var v = value_f(d);
         return v;
-      })
+      });
     },
-    
+
     _configure_options: function(opts, chart) {
-      OML.discrete_bar_chart.__super__._configure_options.call(this, opts, chart);
+      discrete_bar_chart.__super__._configure_options.call(this, opts, chart);
       chart
-        .rotateLabels(opts.rotate_labels)
+        //.rotateLabels(opts.rotate_labels)
         .staggerLabels(opts.stagger_labels)
         .tooltips(opts.tooltips)
         .showValues(opts.show_values)
         .margin(opts.margin)
         ;
-      this._configure_all_axis(opts, chart)
+      this._configure_all_axis(opts, chart);
     },
-    
+
     _configure_all_axis: function(opts, chart) {
       var oaxis = opts.axis || {};
       var a_defaults = this.axis_defaults;
-      
+
       // var xao = _.defaults(oaxis.x || {}, a_defaults);
       // this._configure_axis('x', chart.xAxis, xao);
       var yao = _.defaults(oaxis.y || {}, a_defaults);
       this._configure_axis('y', chart.yAxis, yao);
     },
-    
+
     _datum: function(data, chart) {
       return [{
                 key: "???",
                 values: data
               }];
-    }    
-    
-  })
-})
+    }
+
+  });
+
+  return discrete_bar_chart;
+});
 
 /*
   Local Variables:

data/share/htdocs/graph/js/histogram2.js

@@ -1,84 +1,72 @@
-L.provide('OML.histogram2', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_chart"], function () {
+define(["graph/abstract_nv_chart"], function (abstract_nv_chart) {
 
-  OML.histogram2 = OML.abstract_nv_chart.extend({
+  var histogram2 = abstract_nv_chart.extend({
     decl_properties: [
-      ['value', 'key', {property: 'value'}], 
-      ['group_by', 'key', {property: 'id', optional: true}],             
+      ['value', 'key', {property: 'value'}],
+      ['group_by', 'key', {property: 'id', optional: true}],
       ['fill_color', 'color', 'category10()'],
     ],
-        
+
     defaults: function() {
       return this.deep_defaults({
-        bins: null, // number of bins to use. The default bin function will 
-                  // divide the values into uniform bins using Sturges' formula. 
-        rotate_labels: -45,
+        bins: null, // number of bins to use. The default bin function will
+                  // divide the values into uniform bins using Sturges' formula.
+        //rotate_labels: -45,
+        rotate_labels: 0,
         tooltips: true,
         show_legend: true,
-        show_controls: true,        
+        show_controls: true,
         // reduceXTicks
         // showControls
-        // stacked', 
+        // stacked',
         // delay
-  
+
         margin: {
-          top: 20, right: 0, bottom: 50, left: 80 
-        }    
-      }, OML.histogram2.__super__.defaults.call(this));      
+          top: 20, right: 0, bottom: 50, left: 80
+        }
+      }, histogram2.__super__.defaults.call(this));
     },
 
     _create_model: function() {
-      return  nv.models.multiBarChart();      
+      return  nv.models.multiBarChart();
     },
-    
-    // _configure_mapping: function(m, chart) {
-      // // var x_index = m.x_axis;
-      // // var y_index = m.y_axis;
-      // // chart.x(function(d) {
-        // // var v = x_index(d);        
-        // // return v;
-      // // })
-      // // chart.y(function(d) {
-        // // var v = y_index(d);
-        // // return v;
-      // // })
-    // },
-    
+
     _configure_options: function(opts, chart) {
-      OML.histogram2.__super__._configure_options.call(this, opts, chart);
+      histogram2.__super__._configure_options.call(this, opts, chart);
       chart
         .rotateLabels(opts.rotate_labels)
         .tooltips(opts.tooltips)
         .showLegend(opts.show_legend)
-        .showControls(opts.show_control)        
+        .showControls(opts.show_control)
         .margin(opts.margin)
         ;
-      this._configure_xy_axis(opts, chart)
+      this._configure_xy_axis(opts, chart);
     },
-    
+
     _datum: function(data, chart) {
       var o = this.opts;
       var m = this.mapping;
 
-      // We first calculate a histogram across all data rows to establish 
+      // We first calculate a histogram across all data rows to establish
       // the bins. We then fix the bins, separate the data accoording to
       // the 'group-by' property and then calculate individual histograms
       // for each group with fixed bins.
       //
-      var hdata;      
+      var hdata;
       var histogram = d3.layout.histogram();
       histogram.value(m.value);
       var bins = o.bins ? histogram.bins(o.bins) : histogram.bins();
       // To calculate density, we would need to calibrate that across
       // all groups.
-      //if (o.density != 'undefined"') histogram.frequency(! o.density);
+      if (o.density) histogram.frequency(false);
       hdata = histogram(data);
-      
+
       var group_by = m.group_by;
       var datum;
       if (group_by != null) {
         var bins = hdata.map(function(b) {
           return b.x + b.dx;
-        })
+        });
         bins.splice(0, 0, hdata[0].x);
         histogram.bins(bins);
         var groups  = this.group_by(data, group_by);
@@ -86,10 +74,10 @@ L.provide('OML.histogram2', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_cha
           return {
             key: g.length > 0 ? group_by(g[0]) : '???',
             values: histogram(g).map(function(b) {
-              return {x: (b.x + 0.5 * b.dx), y: b.y}
+              return {x: (b.x + 0.5 * b.dx), y: b.y};
             })
-          }
-        })
+          };
+        });
       } else {
         datum = [{
           key: '???',
@@ -98,22 +86,24 @@ L.provide('OML.histogram2', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_cha
           })
         }];
       };
-      
+
       if (m.fill_color) {
         datum = datum.map(function(d) {
           d.color = m.fill_color(d.key);
           return d;
-        })
+        });
       }
-      
+
       if (o.show_legend) chart.showLegend(datum.length > 1);
       if (o.show_controls) chart.showControls(datum.length > 1);
 
       return datum;
     },
-    
-  })
-})
+
+  });
+
+  return histogram2;
+});
 
 /*
   Local Variables:

data/share/htdocs/graph/js/line_chart3.js

@@ -1,42 +1,48 @@
-// L.provide('OML.line_chart3', ["graph/abstract_chart", "#OML.abstract_chart", "graph/axis", "#OML.axis", "graph.css", 
-                                  // ["/resource/vendor/d3/d3.js", 
-                                   // "/resource/vendor/nv_d3/js/nv.d3.js",
-                                   // "/resource/vendor/nv_d3/js/models/line.js",
-                                   // "/resource/vendor/nv_d3/js/models/lineChart.js",                                   
-                                   // "/resource/vendor/nv_d3/css/nv.d3.css"
-                                  // ]], function () {
-L.provide('OML.line_chart3', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_chart"], function () {
 
-  OML.line_chart3 = OML.abstract_nv_chart.extend({
+require.config({
+  shim: {
+    "vendor/nv_d3/js/nv.d3": ["vendor/d3/d3", "css!vendor/nv_d3/css/nv.d3"],
+    "vendor/nv_d3/js/models/line": ["vendor/nv_d3/js/nv.d3"],
+    "vendor/nv_d3/js/models/lineChart": ["vendor/nv_d3/js/models/line"],
+  }
+});
+
+define(["graph/abstract_nv_chart",
+          "graph/abstract_chart", "graph/axis",
+          "css!graph_css/graph",
+          "vendor/nv_d3/js/models/lineChart"
+  ], function (abstract_nv_chart) {
+
+  var line_chart3 = abstract_nv_chart.extend({
     decl_properties: [
-      ['x_axis', 'key', {property: 'x'}], 
-      ['y_axis', 'key', {property: 'y'}], 
-      ['group_by', 'key', {property: 'id', optional: true}],             
-      ['stroke_width', 'int', 2], 
+      ['x_axis', 'key', {property: 'x'}],
+      ['y_axis', 'key', {property: 'y'}],
+      ['group_by', 'key', {property: 'id', optional: true}],
+      ['stroke_width', 'int', 2],
       ['stroke_color', 'color', 'category10()'],
       ['stroke_fill', 'color', 'blue']
     ],
-    
-    
+
+
     _create_model: function() {
       return nv.models.lineChart();
     },
-    
+
     _configure_mapping: function(m, chart) {
       var x_index = m.x_axis;
       var y_index = m.y_axis;
       chart.x(function(d) {
-        var v = x_index(d);        
+        var v = x_index(d);
         return v;
-      })
+      });
       chart.y(function(d) {
         var v = y_index(d);
         return v;
-      })
+      });
     },
-    
+
     _configure_options: function(opts, chart) {
-      OML.line_chart3.__super__._configure_options.call(this, opts, chart);
+      line_chart3.__super__._configure_options.call(this, opts, chart);
       // chart
         // .rotateLabels(opts.rotate_labels)
         // .staggerLabels(opts.stagger_labels)
@@ -44,16 +50,16 @@ L.provide('OML.line_chart3', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_ch
         // .showValues(opts.show_values)
         // .margin(opts.margin)
         // ;
-        
+
       this.opts.transition_duration = 0; // force no smooth transition
       this._configure_xy_axis(opts, chart)
     },
-        
+
     _datum: function(data, chart) {
       var self = this;
       var m = this.mapping;
       var o = this.opts;
-  
+
       var group_by = m.group_by;
       var data;
       if (group_by != null) {
@@ -62,13 +68,13 @@ L.provide('OML.line_chart3', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_ch
         data = [data];
       };
       chart.showLegend(data.length > 1);
-      
+
       return data.map(function(rows, i) {
         var name = m.group_by != null ? m.group_by(rows[0]) : 'unknown';
         var line = {
           values: rows,
           key: name,
-        }
+        };
         if (o.area) line.area = o.area;
         if (m.stroke_color) {
           line.color = m.stroke_color(name);
@@ -83,10 +89,10 @@ L.provide('OML.line_chart3', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_ch
         return line;
       });
     },
-    
-    
-  })
-})
+  });
+
+  return line_chart3;
+});
 
 /*
   Local Variables:

data/share/htdocs/graph/js/line_chart_with_focus.js

@@ -1,30 +1,31 @@
-L.provide('OML.line_chart_with_focus', ["graph/js/line_chart3", "#OML.line_chart3"], function () {
+define(["graph/line_chart3"], function (line_chart3) {
+
+  return line_chart3.extend({
 
-  OML.line_chart_with_focus = OML.line_chart3.extend({
-    
     _create_model: function() {
       return nv.models.lineWithFocusChart();
     },
-    
+
     _configure_xy_axis: function(opts, chart) {
       var oaxis = opts.axis || {};
       var a_defaults = this.axis_defaults;
-      
+
       var xao = _.defaults(oaxis.x || {}, a_defaults);
       xao['legend'] = null;
       this._configure_axis('x', chart.xAxis, xao);
       var xao2 = _.defaults(oaxis.x2 || {}, a_defaults);
       this._configure_axis('x2', chart.x2Axis, xao2);
-         
+
       var yao = _.defaults(oaxis.y || {}, a_defaults);
       this._configure_axis('y', chart.yAxis, yao);
       var yao2 = _.defaults(oaxis.y2 || {}, a_defaults);
       yao2['legend'] = null;
       this._configure_axis('y2', chart.y2Axis, yao2);
     },
-    
-  })
-})
+
+  });
+
+});
 
 /*
   Local Variables:

data/share/htdocs/graph/js/multi_barchart.js

@@ -1,61 +1,62 @@
-L.provide('OML.multi_barchart', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_chart"], function () {
+define(["graph/abstract_nv_chart"], function (abstract_nv_chart) {
+
+  var multi_barchart = abstract_nv_chart.extend({
 
-  OML.multi_barchart = OML.abstract_nv_chart.extend({
     decl_properties: [
-      ['label', 'key', {property: 'label'}], 
-      ['value', 'key', {property: 'value'}], 
-      ['group_by', 'key', {property: 'id', optional: true}],             
+      ['label', 'key', {property: 'label'}],
+      ['value', 'key', {property: 'value'}],
+      ['group_by', 'key', {property: 'id', optional: true}],
       ['fill_color', 'color', 'category10()'],
     ],
-        
+
     defaults: function() {
       return this.deep_defaults({
-        bins: null, // number of bins to use. The default bin function will 
-                  // divide the values into uniform bins using Sturges' formula. 
+        bins: null, // number of bins to use. The default bin function will
+                  // divide the values into uniform bins using Sturges' formula.
         rotate_labels: -45,
         tooltips: true,
         show_legend: true,
-        show_controls: true,        
+        show_controls: true,
         // reduceXTicks
         // showControls
-        // stacked', 
+        // stacked',
         // delay
-  
+
         margin: {
-          top: 20, right: 0, bottom: 50, left: 80 
-        }    
-      }, OML.multi_barchart.__super__.defaults.call(this));      
+          top: 20, right: 0, bottom: 50, left: 80
+        }
+      }, multi_barchart.__super__.defaults.call(this));
     },
 
     _create_model: function() {
-      return  nv.models.multiBarChart();      
+      return  nv.models.multiBarChart();
     },
-    
+
     _configure_mapping: function(m, chart) {
       var label_f = m.label;
       var value_f = m.value;
       chart.x(function(d) {
-        var v = label_f(d);        
+        var v = label_f(d);
         return v;
-      })
+      });
       chart.y(function(d) {
         var v = value_f(d);
         return v;
-      })
+      });
     },
-    
+
     _configure_options: function(opts, chart) {
-      OML.multi_barchart.__super__._configure_options.call(this, opts, chart);
+      multi_barchart.__super__._configure_options.call(this, opts, chart);
       chart
         .rotateLabels(opts.rotate_labels)
         .tooltips(opts.tooltips)
         .showLegend(opts.show_legend)
-        .showControls(opts.show_control)        
+        .showControls(opts.show_control)
         .margin(opts.margin)
         ;
-      this._configure_xy_axis(opts, chart)
+      this._configure_xy_axis(opts, chart);
     },
-    
+
     _datum: function(data, chart) {
       var o = this.opts;
       var m = this.mapping;
@@ -67,23 +68,25 @@ L.provide('OML.multi_barchart', ["graph/js/abstract_nv_chart", "#OML.abstract_nv
           return {
             key: group_by(gdata[0]),
             values: gdata
-          }
-        })
+          };
+        });
       } else {
         datum = [{
           key: '???',
           values: data
         }];
       }
-      
+
       if (o.show_legend) chart.showLegend(datum.length > 1);
       if (o.show_controls) chart.showControls(datum.length > 1);
 
       return datum;
     },
-    
-  })
-})
+
+  });
+
+  return multi_barchart;
+});
 
 /*
   Local Variables: