Changeset 303 for Dev/branches/rest-dojo-ui/client

Timestamp:

03/04/12 15:48:42 (13 years ago)

Author:

hendrikvanantwerpen

Message:

[Server] Refactored model classes with some meta-programming. Specific classes only define their fields and inherit from class RdfObject?. Changes to handle the new model objects correctly.
[Client] Added rft/store module for uniform resource access. Removed dependencies on 'uid' field name. Added support for references without loading full object nor exposing uri.
[Client] Added reset() to QuestionWidget?.
[RDFAPI] Fixed PHP warning.

Location:

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

Files:

• pages/questions.js (modified) (4 diffs)
• pages/sessions.html (modified) (1 diff)
• pages/survey.html (modified) (1 diff)
• pages/survey.js (modified) (2 diffs)
• pages/surveys.js (modified) (3 diffs)
• store.js (added)
• ui/QuestionWidget.js (modified) (2 diffs)
• ui/templates/QuestionWidget.html (modified) (1 diff)

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/dom-construct','dojo/store/JsonRest','dijit/layout/ContentPane','dijit/TitlePane',
+    'dojo/_base/Deferred','dojo/dom-construct','rft/store','dijit/TitlePane',
     'rft/ui/_Page','rft/ui/LineWithActionsWidget'],
-    function(declare,lang,array,event,Deferred,domConstruct,JsonRest,ContentPane,TitlePane,_Page,LineWithActionsWidget) {
+    function(declare,lang,array,event,Deferred,domConstruct,store,TitlePane,_Page,LineWithActionsWidget) {
         return declare('rft.pages.questions',[_Page],{
             constructor: function() {
@@ -9 +9 @@
             },
             onVisit: function() {
-                this._store = new JsonRest({
-                    target:"../server/api.php/data/Question/",
-                    idProperty: 'uid'
-                });
+                this._store = store.getStore('Question');                
                 this._refresh(true);
             },
             _refresh: function(initial) {
-                Deferred.when( this._store.query() ).then(lang.hitch(this,function(results){
+                Deferred.when( this._store.query() )
+                .then(lang.hitch(this,function(results){
                     array.forEach(results,lang.hitch(this,'_addQuestion'));
                     initial && this.accordion.selectChild(true);
@@ -22 +20 @@
             },
             _addQuestion: function(q) {
-                var uid = q.uid;
+                var uid = q.getUid();
                 var question = this.questions[uid];
                 if ( !question ) {
@@ -54 +52 @@
                 var placeNode = this.accordion.domNode;
                 var placePos = 'last';
-                array.some(widgets,lang.hitch(this,function(widget,idx) {
+                array.some(widgets,lang.hitch(this,function(widget) {
                     if ( widget.title == category ) {
                         containerWidget = widget;

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

@@ -24 +24 @@
             var submitHandler = lang.hitch(that,function(evt){
                 var newObj = this.form.get('value');
-                debugger;
                 // mixin newObj in obj.
                 // store.put(newObj);

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

@@ -1 +1 @@
 <div data-dojo-type="rft.pages.survey">
     <h1 data-rft-attach-point="header">(default)</h1>
+    <div>Created by <span data-rft-attach-point="creator"></span><div>
     <form data-dojo-type="dijit.form.Form" data-rft-attach-point="form" data-rft-attach-event="onSubmit:onSave">
         <div style="display: block; clear: both;">

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

@@ -1 @@
-define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/event','dojo/_base/Deferred','dojo/store/JsonRest','rft/ui/_Page'],
-    function(declare,lang,event,Deferred,JsonRest,_Page){
+define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/event','dojo/_base/Deferred','rft/store','rft/ui/_Page'],
+    function(declare,lang,event,Deferred,store,_Page){
         return declare('rft.pages.survey',[_Page],{
             object: null,
             postCreate: function() {
                 this.inherited(arguments);
-                this._store = new JsonRest({
-                    target:"../server/api.php/data/Survey/",
-                    idProperty: 'uid'
-                });
+                this._store = store.getStore('Survey');
             },
             onVisit: function() {
@@ -16 +13 @@
                         this.object = obj;
                         this.setFields(obj);
+                        return Deferred.when( obj.creator && store.dereference(obj.creator) );
+                    }))
+                    .then(lang.hitch(this,function(obj){
+                        this.creator.innerHTML = (obj && obj.email) || 'unknown';
                     }));
                 } else {

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

@@ -1 @@
-define(['dojo/_base/declare','dojo/_base/lang','dojo/store/JsonRest','dojo/data/ObjectStore','rft/content','rft/ui/_Page'],
-    function(declare,lang,JsonRest,ObjectStore,content,_Page){
+define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/Deferred','dojo/data/ObjectStore','rft/auth','rft/store','rft/content','rft/ui/_Page'],
+    function(declare,lang,Deferred,ObjectStore,auth,store,content,_Page){
         return declare('rft.pages.surveys',[_Page],{
             selectedObject: null,
             postCreate: function() {
-                this._store = new JsonRest({
-                    target:"../server/api.php/data/Survey/",
-                    idProperty: 'uid'
-                });
+                this._store = store.getStore('Survey');
             },
             onVisit: function() {
@@ -14 +11 @@
                 this.grid.on('rowclick',lang.hitch(this,function(evt){
                     this.selectedObject = evt.grid.getItem(evt.rowIndex);
-                    this.btnEdit.set('disabled',!!this.selectedObject);
+                    this.btnEdit.set('disabled',!this.selectedObject);
                 }));
 
                 this.grid.on('rowdblclick',lang.hitch(this,function(evt){
                     var obj = evt.grid.getItem(evt.rowIndex);
-                    content.goTo('/survey',{uid:obj.uid});
+                    content.goTo('/survey',{uid:obj.getUid()});
                 }));
-                
+                                
                 this.btnNew.on('click',lang.hitch(this,function(){
-                    this._store.add({},function(obj) {
-                        content.goTo('/survey',{uid:this.selectedObject.uid});
+                    Deferred.when( this._store.add({'creator':auth.getUser()}) )
+                    .then(function(obj) {
+                        content.goTo('/survey',{uid:obj.getUid()});
                     });
                 }));
@@ -30 +28 @@
                 this.btnEdit.on('click',lang.hitch(this,function(){
                     if ( this.selectedObject ) {
-                        content.goTo('/survey',{uid:this.selectedObject.uid});
+                        content.goTo('/survey',{uid:this.selectedObject.getUid()});
                     }
                     

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

@@ -1 @@
-define(['dojo/_base/declare','dojo/dom-construct','dijit/_WidgetBase',
+define(['dojo/_base/declare','dojo/_base/lang','dojo/dom-construct','dijit/_WidgetBase',
     'dijit/_TemplatedMixin','dijit/_WidgetsInTemplateMixin',
     'dojo/text!./templates/QuestionWidget.html','dijit/form/TextBox',
     'dijit/form/Textarea','./MultipleChoiceWidget'],
-    function(declare,domConstruct,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,templateString,TextBox,Textarea,MultipleChoiceWidget){
+    function(declare,lang,domConstruct,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,templateString,TextBox,Textarea,MultipleChoiceWidget){
         return declare('rft.ui.QuestionWidget',[_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin],{
             templateString: templateString,
             mode: 'view', // view || edit
             name: '',
+            value: null,
             _type: null,
             _widgetCache: null,
             constructor: function() {
                 this.inherited(arguments);
+                this.value = {};
                 this._widgetCache = {};
             },
             postCreate: function() {
+                this._resetValue = this.value;
                 this.typeSelector.set('disabled', this.mode == 'edit');
             },
             _setValueAttr: function(value) {
-                value.type && this._onTypeChange(value.type);
+                this.value = value;
+                this._onTypeChange(value.type || 'string');
                 this.ourForm.set('value',value);
             },
             _getValueAttr: function() {
-                return this.ourForm.get('value');
+                var value = this.ourForm.get('value');
+                lang.mixin(this.value,value);
+                return this._question;
             },
             _onTypeChange: function(type) {
@@ -60 +66 @@
                 }
                 return widget;
+            },
+            reset: function() {
+                this.ourForm.reset();
+                this._setValueAttr(this._resetValue);
             }
         });

Dev/branches/rest-dojo-ui/client/rft/ui/templates/QuestionWidget.html

@@ -2 +2 @@
     <form data-dojo-type="dijit.form.Form" data-dojo-attach-point="ourForm">
         <fieldset>
-            <input data-dojo-type="dijit.form.TextBox" name="uid" type="text" class="dijitHidden" />
             <label for="code" class="loginLabel">Code</label>
             <input data-dojo-type="dijit.form.TextBox" name="code" type="text" class="loginInput" />