Changeset 383

Timestamp:

07/27/12 16:26:11 (13 years ago)

Author:

jkraaijeveld

Message:

• Cleaned up some code in the WidgetFactory?
• Started out on multiple choice input widget, not much progress yet but figured I'd commit everything before holiday anyway

Location:

Dev/branches/rest-dojo-ui/client/rft/ui

Files:

• InnerWidgetFactory.js (modified) (5 diffs)
• MultipleChoiceListView.js (added)
• OrderedList.js (modified) (1 diff)

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

@@ -1 @@
-define( ['dojo', 'dijit', 'dojo/_base/lang', 'dojox/layout/TableContainer',
-                 'dijit/layout/StackContainer'],
-        function(dojo, dijit, lang, TableContainer, StackContainer) {
+define( [
+        'dojo', 
+        'dojo/_base/lang', 
+        'dijit', 
+        'dijit/layout/StackContainer',
+        'dojox/form/CheckedMultiSelect',
+        'dojox/layout/TableContainer',
+        'rft/ui/MultipleChoiceListView'],
+        function(dojo, lang, dijit, StackContainer, CheckedMultiSelect, TableContainer, ListView) {
                 dojo.provide('rft.ui.InnerWidgetFactory');
                 dojo.declare('rft.ui.InnerWidgetFactory', [],{
@@ -29 +35 @@
                                 integerWidget.setObject(options);
                                 return integerWidget;
+                        },
+                        createMultipleChoiceInputWidget: function(options) {
+                                var mcWidget = new rft.ui.MultipleChoiceInput();
+                                mcWidget.setObject(options);
+                                return mcWidget;
                         }
                 });
@@ -72 +83 @@
                 });
 
+                //Use CheckedMultiSelect
+                dojo.declare('rft.ui.MultipleChoiceInput',  StackContainer, {
+                        _multiSelect: null,
+                        postCreate: function() {
+                                this.inherited(arguments);
+                                this._multiSelect = new CheckedMultiSelect();
+                                this._multiSelect.addOption({ label: "Hurr durr", value: 1 });
+                                this._multiSelect.addOption({ label: "This is a choice", value: 1 });
+                                this._multiSelect.addOption({ label: "This too", value: 1 });
+                                this._multiSelect.addOption({ label: "So because there are more", value: 1 });
+                                this._multiSelect.addOption({ label: "This must be multiple choice.", value: 1 });
+                                this.addChild(this._multiSelect);
+                        },
+
+                        setObject: function() {
+                                return;
+                        },
+
+                        edit: function() {
+                                return;
+                        }
+
+                });
+
                 dojo.declare('rft.ui.IntegerInput', StackContainer, {
                         _numberSpinner:  null,
@@ -79 +114 @@
                         postCreate: function() {
                                 this.inherited(arguments);
-                                this._numberSpinner = new dijit.form.NumberSpinner( { title: "Answer", value: 0 });     
-                                this._numberSpinner.startup();
+                                this._numberSpinner = new dijit.form.NumberSpinner( { title: "Answer", value: 0, constraints: { min: -100, max: 100 } });       
                                 this._simpleTable = new TableContainer({ cols: 1, customClass: "labelsAndValues", labelWidth : 150} );
                                 this._simpleTable.addChild(this._numberSpinner);
-                                
                                 this._editTable = new TableContainer({ cols: 1, customClass: "labelsAndValues"} );
-
+                                this._simpleTable.startup();
                                 this.addChild(this._simpleTable);
                         },
@@ -136 +169 @@
                         },
                         getObject: function() {
-
-                                return { widgetType: 'IntegerInput',
-                                                 contents: 
-                                                 { 
-                                                        value: this._numberSpinner.value,
-                                                    smallDelta: this._numberSpinner.smallDelta,
-                                                        constraints: this._numberSpinner.constraints,
-                                                        invalidMessage: this._numberSpinner.invalidMessage,
-                                                        title: this._numberSpinner.title
-                                                 }
+                                return { 
+                                        widgetType: 'IntegerInput',
+                                        contents: { 
+                                                value: this._numberSpinner.value,
+                                            smallDelta: this._numberSpinner.smallDelta,
+                                                constraints: this._numberSpinner.constraints,
+                                                invalidMessage: this._numberSpinner.invalidMessage,
+                                                title: this._numberSpinner.title
+                                        }
                                 };
                         }

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

@@ -96 +96 @@
                     this.source.insertNodes(false, [item]);
                 }
-            }
-
+            },
+            getItems: function() {
+                return this.source.getAllNodes()
+                .map(function(node){
+                    return this.source.getItem(node.id).data;
+                },this);
+            },
         });
     });