wth

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

diff --git a/Open-ILS/src/templates/conify/flattener_test.tt2 b/Open-ILS/src/templates/conify/flattener_test.tt2
index 55adcaa..ffc6613 100644 (file)
--- a/Open-ILS/src/templates/conify/flattener_test.tt2
+++ b/Open-ILS/src/templates/conify/flattener_test.tt2
@@ -1,70 +1,40 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = 'Flattener Test' %]
 <script type="text/javascript">
-
     dojo.require("openils.widget.FlattenerGrid");
-
-    // dojo.require("openils.FlattenerStore");
-    //dojo.require("openils.DebuggingIFRS");
     dojo.require("dojo.data.ItemFileReadStore");
 
-    //part_num, min_temp, max_temp, type, thick
-
-    var gridItems = [
-        { "part_num": 7, "min_temp": 0, "max_temp": 32,
-            "type": "ice", "thick": 5 },
-    ];
-    for (var i = 1; i <= 29; i++) {
-        var row = dojo.clone(gridItems[0]);
-        row.part_num += i;
-        row.min_temp -= i * 10;
-        row.max_temp -= i * 10;
-        row.thick += i;
-        row.type += "_" + i;
-
-        gridItems.push(row);
-    }
-
-    var gridStore = new dojo.data.ItemFileReadStore({
-        "data": {
-            "identifier": "part_num",
-            "label": "part_num",
-            "items": gridItems
+    var gridData = {
+        "data":{
+            "identifier":"part_num",
+            "label":"part_num",
+            "items":[
+                {"part_num":7,"min_temp":0,"max_temp":32,"type":"ice","thick":5},
+                {"part_num":8,"min_temp":-10,"max_temp":22,"type":"ice_1","thick":6},
+                {"part_num":9,"min_temp":-20,"max_temp":12,"type":"ice_2","thick":7},
+            ]
         }
-    });
+    };
+
+    var gridStore = new dojo.data.ItemFileReadStore(gridData);
 
     console.log("gridStore built");
 
 </script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane"
-         layoutAlign="top" class="oils-header-panel">
-        <div>Flattener Test</div>
-        <div>
-            <button dojoType="dijit.form.Button"
-                onClick="grid.showCreateDialog()">New Thing</button>
-            <button dojoType="dijit.form.Button"
-                onClick="grid.deleteSelected()">Delete Selected Thing</button>
-        </div>
-    </div>
-    <div class="oils-acq-basic-roomy">
-        blah, a dropdown or something here (optional)
-    </div>
-    <table
-        id="gridNode"
-        jsid="grid"
-        dojotype="openils.widget.FlattenerGrid"
-        autoHeight="10"
-        query="{part_num: '*'}" store="gridStore">
-        <thead>
-            <tr>
-                <th field="part_num">Part Number</th>
-                <th field="min_temp" width="100px">Minimum Temperature</th>
-                <th field="max_temp" width="100px">Maximum Temperature</th>
-                <th field="type" width="100px">Type</th>
-                <th field="thick" width="5em">Thickness</th>
-            </tr>
-        </thead>
-    </table>
-</div>
+<table
+    id="gridNode"
+    jsid="grid"
+    dojoType="openils.widget.FlattenerGrid"
+    autoHeight="10"
+    query="{part_num: '*'}" store="gridStore">
+    <thead>
+        <tr>
+            <th field="part_num">Part Number</th>
+            <th field="min_temp" width="100px">Minimum Temperature</th>
+            <th field="max_temp" width="100px">Maximum Temperature</th>
+            <th field="type" width="100px">Type</th>
+            <th field="thick" width="5em">Thickness</th>
+        </tr>
+    </thead>
+</table>
 [% END %]

diff --git a/Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js b/Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js
index a6215cb..eb1b563 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js
+++ b/Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js
@@ -1,9 +1,9 @@
-if (!dojo._hasResource["openils.widget.FlattenerGrid"]) {
+if (!dojo._hasResource["openils.widget.FlatGrid"]) {
     dojo.provide("openils.widget.FlattenerGrid");
 
-    dojo.require("dojox.grid.DataGrid");
     dojo.require("dijit.form.Button");
     dojo.require("dijit.layout.ContentPane");
+    dojo.require("dojox.grid.DataGrid");
 
     dojo.declare(
         "openils.widget.FlattenerGrid",