Changeset 281

Timestamp:

02/22/12 12:54:44 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• [Client] Removed local Dojo copy and pull in via svn:external.
• [Client] Keep categories of questions in alphabetical order.
• [Client] Added skeleton QuestionWidget? for different question types.

Location:

Dev/branches/rest-dojo-ui

Files:

• client (modified) (1 prop)
• client/index.html (modified) (1 diff)
• client/rft/css/main.css (modified) (1 diff)
• client/rft/pages/questions.html (modified) (2 diffs)
• client/rft/pages/questions.js (modified) (5 diffs)
• client/rft/run.js (modified) (1 diff)
• client/rft/ui/QuestionWidget.html (added)
• client/rft/ui/QuestionWidget.js (added)
• client/rft/ui/TitleGroup.js (added)
• log.txt (deleted)

Dev/branches/rest-dojo-ui/client/index.html

@@ -4 +4 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <title>Research Facilitator Tool</title>
-        <link type="text/css" href="dijit/themes/claro/claro.css" rel="stylesheet" />
-        <link type="text/css" href="dojox/grid/resources/Grid.css" rel="stylesheet" />
-        <link type="text/css" href="dojox/grid/resources/claroGrid.css" rel="stylesheet" />
+        <link type="text/css" href="dojotoolkit/dijit/themes/claro/claro.css" rel="stylesheet" />
+        <link type="text/css" href="dojotoolkit/dojox/grid/resources/Grid.css" rel="stylesheet" />
+        <link type="text/css" href="dojotoolkit/dojox/grid/resources/claroGrid.css" rel="stylesheet" />
         <link type="text/css" href="rft/css/main.css" rel="stylesheet" />
-        <script type="text/javascript" src="dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: false, tlmSiblingOfDojo: false, isDebug: true, baseUrl: '', packages: ['dojo','dijit', 'dojox', 'rft']"></script>
+        <script type="text/javascript" src="dojotoolkit/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: false, tlmSiblingOfDojo: false, isDebug: true, baseUrl: '', packagePaths: {'dojotoolkit':['dojo','dijit', 'dojox'], '.':['rft']}"></script>
         <script type="text/javascript" src="rft/run.js"></script>
     </head>

Dev/branches/rest-dojo-ui/client/rft/css/main.css

@@ +1 @@
+html,body {
+    width: 100%;
+    height: 100%;
+}
+
 .mainHeader {
     display: inline-block;

Dev/branches/rest-dojo-ui/client/rft/pages/questions.html

@@ -2 +2 @@
     <h1>Questions</h1>
     <div data-dojo-type="dijit.form.Button" data-rft-attach-event="onClick:onNewQuestion">New question</div>
-    <div data-dojo-type="dijit.layout.AccordionContainer" data-dojo-props="doLayout: false" style="width: 100%; height: 100%;" data-rft-attach-point="accordion">
+    <div data-dojo-type="rft.ui.TitleGroup" data-rft-attach-point="accordion">
     </div>
     <div data-dojo-type="dijit.Dialog" title="Question" data-rft-attach-point="questionDialog">
@@ -17 +17 @@
                 <input data-dojo-type="dijit.form.TextBox" name="category" type="text" class="loginInput" />
             </fieldset>
+            <fieldset>
+                <div data-dojo-type="rft.ui.QuestionWidget" data-rft-attach-point="questionWidget" ></div>
+            </fieldset>
             <div style="float: right;">
                 <button type="button" data-dojo-type="dijit.form.Button" data-rft-attach-event="onClick:onCancelQuestion">Cancel</button>

Dev/branches/rest-dojo-ui/client/rft/pages/questions.js

@@ -1 +1 @@
 define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/array','dojo/_base/event',
-    'dojo/_base/Deferred','dojo/store/JsonRest','dijit/layout/ContentPane',
+    'dojo/_base/Deferred','dojo/store/JsonRest','dijit/layout/ContentPane','dijit/TitlePane',
     'rft/ui/_Page','rft/ui/LineWithActionsWidget'],
-    function(declare,lang,array,event,Deferred,JsonRest,ContentPane,_Page,LineWithActionsWidget) {
+    function(declare,lang,array,event,Deferred,JsonRest,ContentPane,TitlePane,_Page,LineWithActionsWidget) {
         return declare('rft.pages.questions',[_Page],{
             constructor: function() {
                 this.inherited(arguments);
-                this.containers = {};
                 this.questions = {};
             },
@@ -20 +19 @@
                     array.forEach(results,lang.hitch(this,'_addQuestion'));
                 }));
-            },
-            _getContainerForQuestion: function(q) {
-                var category = q.category || 'Unsorted';
-                var categoryContainer = this.containers[category];
-                if ( !categoryContainer ) {
-                    var ac = new ContentPane({
-                        title:category,
-                        doLayout: false
-                    });
-                    categoryContainer = this.containers[category] = {
-                        container: ac
-                    };
-                    ac.placeAt(this.accordion);
-                    ac.startup();
-                }
-                return categoryContainer.container;
             },
             _addQuestion: function(q) {
@@ -62 +45 @@
                 var container = this._getContainerForQuestion(q);
                 question.widget.placeAt(container.containerNode);
+                this._cleanupEmptyContainers();
+            },
+            _getContainerForQuestion: function(q) {
+                var category = q.category || 'Unsorted';
+                var widgets = this.accordion.getChildren();
+                var containerWidget;
+                var lastIndex = 'last';
+                array.some(widgets,lang.hitch(this,function(widget,idx) {
+                    if ( widget.title == category ) {
+                        containerWidget = widget;
+                        return true;
+                    } else if ( widget.title > category  ) {
+                        lastIndex = idx;
+                        return true;
+                    }
+                    return false;
+                }));
+                if ( !containerWidget ) {
+                    containerWidget = new TitlePane({
+                        title:category
+                    });
+                    containerWidget.startup();
+                    this.accordion.addChild(containerWidget,lastIndex);
+                }
+                return containerWidget;
+            },
+            _cleanupEmptyContainers: function() {
+                var widgets = this.accordion.getChildren();
+                array.forEach(widgets,lang.hitch(this,function(widget){
+                    if ( !widget.getChildren().length ) {
+                        this.accordion.removeChild(widget).destroy();
+                    }
+                }));
             },
             onNewQuestion: function() {
@@ -72 +88 @@
                 this.questionForm.reset();
                 this.questionForm.set('value',question);
+                this.questionWidget.set('value',question);
                 this.questionDialog.show();
             },
             onSaveQuestion: function(evt) {
                 var value = this.questionForm.get('value');
+                var subvalue = this.questionWidget.get('value');
+                lang.mixin(value,subvalue);
                 Deferred.when( this._store.put(value) )
                 .then(lang.hitch(this,function(){
@@ -88 +107 @@
                 this.questionDialog.hide();
                 this.questionForm.reset();
-                this._refresh();
             }
         });

Dev/branches/rest-dojo-ui/client/rft/run.js

@@ -1 +1 @@
 require([
+    'dojo/data/ObjectStore',
+    'dojo/store/JsonRest',
+    'dijit/MenuBar',
+    'dijit/MenuBarItem',
+    'dijit/PopupMenuBarItem',
+    'dijit/DropDownMenu',
+    'dijit/TitlePane',
+    'dijit/layout/ContentPane',
+    'dijit/layout/TabContainer',
+    'dijit/layout/AccordionContainer',
     'dijit/form/Form',
     'dijit/form/TextBox',
     'dijit/form/Button',
     'dijit/form/Textarea',
-    'dojo/store/JsonRest',
-    'dojo/data/ObjectStore',
+    'dijit/form/ComboBox',
+    'dijit/form/Select',
     'dojox/grid/DataGrid',
-    'dijit/layout/ContentPane',
-    'dijit/layout/TabContainer',
-    'dijit/layout/AccordionContainer',
-    'dijit/MenuBar',
-    'dijit/MenuBarItem',
-    'dijit/PopupMenuBarItem',
-    'dijit/DropDownMenu',
+    'dojox/widget/TitleGroup',
     'rft/ui/MenuBarLink',
     'rft/ui/MenuLink',
     'rft/ui/LineWithActionsWidget',
+    'rft/ui/QuestionWidget',
+    'rft/ui/TitleGroup',
     'rft/pages/questions' // could this be done dynamically?
 ]);