Changeset 343 for Dev/branches/rest-dojo-ui/client/rft/pages

Timestamp:

06/18/12 12:51:58 (13 years ago)

Author:

hendrikvanantwerpen

Message:

[Client] Changed store and pages to use CouchDB.
[Client] Disabled login for now, have to figure out some more details about CouchDB.

Location:

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

Files:

• questions.js (modified) (4 diffs)
• survey.js (modified) (4 diffs)
• surveys.js (modified) (3 diffs)

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

@@ -8 +8 @@
             },
             onVisit: function() {
-                this._store = store.getStore('Question');
                 this._list = new AccordionList({
                     actions: {
                         'Edit': lang.hitch(this,'_editQuestion')
                     },
-                    idProperty: this._store.idProperty,
+                    idProperty: store.idProperty,
                     categoryProperty: 'category',
                     titleProperty: 'title'
@@ -21 +20 @@
             },
             _refresh: function() {
-                Deferred.when(this._store.query())
+                Deferred.when(store.query('_design/default/_view/by_type',{key: 'Question'}))
                 .then(lang.hitch(this,function(items){
                     this._list.setItems(items);
@@ -27 +26 @@
             },
             onNewQuestion: function() {
-                Deferred.when( this._store.add({}) )
+                Deferred.when(store.add({type:'Question'}))
                 .then(lang.hitch(this,function(question){
                     this._editQuestion(question);
@@ -39 +38 @@
             onSaveQuestion: function(evt) {
                 var value = this.questionWidget.get('value');
-                Deferred.when( this._store.put(value) )
+                Deferred.when(store.put(value))
                 .then(lang.hitch(this,function(){
                     this.questionDialog.hide();

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

@@ -5 +5 @@
         return declare('rft.pages.survey',[_Page],{
             object: null,
-            postCreate: function() {
-                this.inherited(arguments);
-                this._surveyStore = store.getStore('Survey');
-                this._questionStore = store.getStore('Question');
-            },
             onVisit: function() {
                 if ( this.pageArgs.uid ) {
-                    Deferred.when(this._surveyStore.get(this.pageArgs.uid))
+                    Deferred.when(store.get(this.pageArgs.uid))
                     .then(lang.hitch(this,function(obj){
                         this.object = obj;
@@ -21 +16 @@
                         this.creator.innerHTML = (obj && obj.email) || 'unknown';
                     }));
-                    Deferred.when(this._questionStore.query())
+                    Deferred.when(store.query('_design/default/_view/by_type',{key:'Question'}))
                     .then(lang.hitch(this,function(items){
                         this._questionList = new AccordionList({
-                            store: this._surveyStore,
                             actions: {
                                 'Add': lang.hitch(this,'_addQuestion')
                             },
-                            idProperty: this._questionStore.idProperty,
                             categoryProperty: 'category',
                             titleProperty: 'title'
@@ -44 +37 @@
             onSave: function(evt) {
                 lang.mixin(this.object,this.form.get('value'));
-                Deferred.when( this._store.put(this.object) )
+                Deferred.when( store.put(this.object) )
                 .then(lang.hitch(this,function(obj){
                     this.object = obj;
@@ -53 +46 @@
                 }));
                 event.stop(evt);
+                evt.stopPropagation();
                 return false;
             },

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

@@ -3 +3 @@
         return declare('rft.pages.surveys',[_Page],{
             selectedObject: null,
-            postCreate: function() {
-                this._store = store.getStore('Survey');
-            },
             onVisit: function() {
-                this.grid.setStore(ObjectStore({objectStore: this._store}));
+                this.grid.setStore(
+                    ObjectStore({objectStore: store}),
+                    "_design/default/_view/by_type",{key:'Survey'});
                 
                 this.grid.on('rowclick',lang.hitch(this,function(evt){
@@ -16 +15 @@
                 this.grid.on('rowdblclick',lang.hitch(this,function(evt){
                     var obj = evt.grid.getItem(evt.rowIndex);
-                    content.goTo('/survey',{uid:obj.getUid()});
+                    content.goTo('/survey',{uid:store.getIdentity(obj)});
                 }));
                                 
                 this.btnNew.on('click',lang.hitch(this,function(){
-                    Deferred.when( this._store.add({'creator':auth.getUser()}) )
+                    Deferred.when( store.add({type:'Survey',creator:auth.getUser()}) )
                     .then(function(obj) {
-                        content.goTo('/survey',{uid:obj.getUid()});
+                        content.goTo('/survey',{uid:store.getIdentity(obj)});
                     });
                 }));
@@ -28 +27 @@
                 this.btnEdit.on('click',lang.hitch(this,function(){
                     if ( this.selectedObject ) {
-                        content.goTo('/survey',{uid:this.selectedObject.getUid()});
+                        content.goTo('/survey',{uid:store.getIdentity(this.selectedObject)});
                     }