Changeset 490 for Dev/trunk/src/client/qed-client/model

Timestamp:

03/08/14 22:51:23 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Mark content as dirty to prevent moving away from unsaved data.
• Better change propagation from lists and our own widgets.
• Generate notifications for errors and show correct message.
• Moved all path/url generation to the class stores, not everywhere we use it.
• Give user always a choice between Save and Save & Close.
• Better refresh behaviour on form changes and saves.
• Don't generate duplicate code error when existing object is the one you're storing.

Location:

Dev/trunk/src/client/qed-client/model

Files:

• classes/_Class.js (modified) (2 diffs)
• classes/_View.js (modified) (3 diffs)
• classes/responses.js (modified) (4 diffs)
• classes/surveys.js (modified) (1 diff)
• widgets/AccountListView.js (modified) (1 diff)
• widgets/CategoryListView.js (modified) (1 diff)
• widgets/QuestionEditorPreview.js (modified) (1 diff)
• widgets/QuestionListView.js (modified) (1 diff)
• widgets/SurveySummary.js (modified) (3 diffs)
• widgets/TabbedQuestionBrowser.js (modified) (1 diff)
• widgets/questions/MultipleChoiceInputConfigWidget.js (modified) (2 diffs)
• widgets/questions/ScaleInputConfigWidget.js (modified) (2 diffs)

Dev/trunk/src/client/qed-client/model/classes/_Class.js

@@ -27 +27 @@
         },
         load: function(id) {
-            return this._store.get(id).then(lang.hitch(this,'_doDeserialize'));
+            return this._store.get(id)
+            .then(lang.hitch(this,'_doDeserialize'),
+                  lang.hitch(this,'_deserializeError'));
         },
         save: function(obj) {
-            return this._store.put(this._doSerialize(obj));
+            return this._store.put(this._doSerialize(obj))
+            .otherwise(lang.hitch(this,'_deserializeError'));
         },
         remove: function(objOrId,rev) {
@@ -40 +43 @@
                 rev = this.getRev(objOrId);
             }
-            return this._store.remove(id,{headers:{'If-Match':'"'+rev+'"'}});
+            return this._store.remove(id,{headers:{'If-Match':'"'+rev+'"'}})
+            .otherwise(lang.hitch(this,'_deserializeError'));
         },
         getRev: function(obj) {
             return obj._rev;
+        },
+        getName: function() {
+            return this._type;
+        },
+        getObjectPath: function(idOrObj) {
+            return '/'+this._collection+'/'+(typeof idOrObj === "string" ?
+                                             idOrObj :
+                                             this.getId(idOrObj));
         }
     });

Dev/trunk/src/client/qed-client/model/classes/_View.js

@@ -1 +1 @@
 define([
     "../../store/JsonRest",
+    "dojo/Deferred",
     "dojo/_base/declare",
+    "dojo/_base/json",
     "dojo/_base/lang",
     "dojo/store/util/QueryResults"
-], function(JsonRest, declare, lang, queryResults) {
+], function(JsonRest, Deferred, declare, json, lang, queryResults) {
 
     var _View = declare([],{
@@ -18 +20 @@
             });
         },
+        _deserializeError: function(err) {
+            return new Deferred().reject(json.fromJson(err.responseText));
+        },
         _doDeserialize: function(obj) {
             obj = lang.clone(obj);
@@ -30 +35 @@
         getId: function(obj) {
             return obj._id;
+        },
+        getCollectionPath: function() {
+            return '/'+this._collection;
         }
     });

Dev/trunk/src/client/qed-client/model/classes/responses.js

@@ -43 +43 @@
                 handleAs: 'json',
                 contentType: false
-            }).then(lang.hitch(this,'_doDeserialize'),function(err){
-                return new Deferred().reject(json.fromJson(err.responseText));
-            });
+            }).then(lang.hitch(this,'_doDeserialize'),
+                    lang.hitch(this,'_deserializeError'));
         },
         postWithSecret: function(response,secret) {
@@ -55 +54 @@
                 contentType: 'application/json',
                 rawBody: body
-            }).then(lang.hitch(this,'_doDeserialize'),function(err){
-                return new Deferred().reject(json.fromJson(err.responseText));
-            });
+            }).then(lang.hitch(this,'_doDeserialize'),
+                    lang.hitch(this,'_deserializeError'));
         },
         putWithSecret: function(response,secret) {
@@ -67 +65 @@
                 contentType: 'application/json',
                 rawBody: body
-            }).then(lang.hitch(this,'_doDeserialize'),function(err){
-                return new Deferred().reject(json.fromJson(err.responseText));
-            });
+            }).then(lang.hitch(this,'_doDeserialize'),
+                    lang.hitch(this,'_deserializeError'));
         },
         removeWithSecret: function(response,secret) {
@@ -85 +82 @@
                 contentType: 'application/json',
                 rawBody: body
-            });
+            }).otherwise(lang.hitch(this,'_deserializeError'));
         }
     });

Dev/trunk/src/client/qed-client/model/classes/surveys.js

@@ -26 +26 @@
                 obj.publicationDate = stamp.toISOString(obj.publicationDate);
             }
+        },
+        getPreviewPath: function(idOrObj) {
+            return '/previewSurvey/'+(typeof idOrObj === "string"?
+                                      idOrObj :
+                                      this.getId(idOrObj));
         }
     });

Dev/trunk/src/client/qed-client/model/widgets/AccountListView.js

@@ -23 +23 @@
                 actions: {
                     "Remove" : {
-                        callback: lang.hitch(this, 'removeItem', item),
+                        callback: lang.hitch(this, 'removeItem', item, true),
                         properties: {
                             blockButton: false,

Dev/trunk/src/client/qed-client/model/widgets/CategoryListView.js

@@ -25 +25 @@
                 actions: {
                     "Remove" : {
-                        callback: lang.hitch(this, 'removeItem', id),
+                        callback: lang.hitch(this, 'removeItem', id, true),
                         properties: {
                             blockButton: false,

Dev/trunk/src/client/qed-client/model/widgets/QuestionEditorPreview.js

@@ -24 +24 @@
             });
             this.own(previewItem.on('destroy',
-                                    lang.hitch(this,'removeItem',id)));
+                                    lang.hitch(this,'removeItem',id,true)));
             previewItem.startup();
             return previewItem;

Dev/trunk/src/client/qed-client/model/widgets/QuestionListView.js

@@ -23 +23 @@
                 actions: {
                     "Remove" : {
-                        callback: lang.hitch(this, 'removeItem', id),
+                        callback: lang.hitch(this, 'removeItem', id, true),
                         properties: {
                             blockButton: false,

Dev/trunk/src/client/qed-client/model/widgets/SurveySummary.js

@@ -1 +1 @@
 define([
+    "../classes/surveys",
     "dijit/_TemplatedMixin",
     "dijit/_WidgetBase",
@@ -5 +6 @@
     "dojo/dom-attr",
     "dojo/text!./templates/SurveySummary.html"
-], function(_TemplatedMixin, _WidgetBase, declare, domAttr, template) {
+], function(surveys, _TemplatedMixin, _WidgetBase, declare, domAttr, template) {
     return declare([_WidgetBase,_TemplatedMixin],{
         templateString: template,
@@ -17 +18 @@
         _setValueAttr: function(survey) {
             this.titleNode.innerHTML = survey.title || "";
-            domAttr.set(this.titleNode, "href", survey._id && ("#!/survey/"+survey._id));
+            domAttr.set(this.titleNode, "href", survey && surveys.getObjectPath(survey));
             this.descriptionNode.innerHTML = survey.description;
             this.questionsNode.innerHTML = survey.questions.length;

Dev/trunk/src/client/qed-client/model/widgets/TabbedQuestionBrowser.js

@@ -24 +24 @@
             this.inherited(arguments);
             this._dataMap = {};
-        },
-        postCreate: function() {
-            this.inherited(arguments);
-            this._query = '_design/questions/_view/'+this.include;
         },
         startup: function() {

Dev/trunk/src/client/qed-client/model/widgets/questions/MultipleChoiceInputConfigWidget.js

@@ -37 +37 @@
                 value: item,
                 onDestroy: lang.hitch(this,function(evt){
-                    this.itemsWidget.removeItem(id);
-                    event.stop(evt);
+                    this.itemsWidget.removeItem(id,true);
+                    if ( evt ) { event.stop(evt); }
                     return false;
                 })
@@ -61 +61 @@
         },
         onAddItem: function(evt) {
-            this.itemsWidget.appendItem({});
-            event.stop(evt);
+            this.itemsWidget.appendItem({},true);
+            if ( evt ) { event.stop(evt); }
             return false;
         }

Dev/trunk/src/client/qed-client/model/widgets/questions/ScaleInputConfigWidget.js

@@ -61 +61 @@
                 id: id,
                 onDestroy: lang.hitch(this,function(evt){
-                    this.itemsWidget.removeItem(id);
-                    event.stop(evt);
+                    this.itemsWidget.removeItem(id,true);
+                    if ( evt ) { event.stop(evt); }
                     return false;
                 })
@@ -75 +75 @@
         },
         onAddNewItem: function(e) {
-            this.itemsWidget.appendItem({});
-            event.stop(e);
+            this.itemsWidget.appendItem({},true);
+            if ( e ) { event.stop(e); }
             return false;
         },