Changeset 311 for Dev/branches/rest-dojo-ui/client/rft

Timestamp:

03/13/12 14:10:32 (13 years ago)

Author:

hendrikvanantwerpen

Message:

[Client] Use toaster to show errors from server
[Client] Create widget for mainmenu, cleaner loading of index.html now.
[Server] Renamed answerset datetime to more meaningful creationdate

Location:

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

Files:

• api.js (modified) (1 diff)
• content.js (modified) (3 diffs)
• pages/survey.js (modified) (2 diffs)
• run.js (modified) (1 diff)
• store.js (modified) (3 diffs)
• ui/AccordionList.js (modified) (1 diff)
• ui/MainMenu.js (added)
• ui/Notifications.js (added)
• ui/templates/MainMenu.html (added)
• ui/templates/MultipleChoiceWidget.html (modified) (1 diff)

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

@@ -1 @@
-define(['dojo/_base/xhr','dojo/_base/json','dojo/_base/Deferred','./auth'],function(xhr,json,Deferred){
-    return {
-        post: function(path,args) {
-            return xhr.post({
-                url: "../server/api.php/"+path,
-                handleAs: "json",
-                headers: {
-                    "Content-Type": "application/json"
-                },
-                rawBody: json.toJson(args)
-            });
-        }
-    };
-});
+define(['dojo/_base/xhr','dojo/_base/json','dojo/_base/connect'],
+    function(xhr,json,connect){
+        return new (function(){
+            var self = this;
+            this.post = function(path,args) {
+                var dfd = xhr.post({
+                    url: "../server/api.php/"+path,
+                    handleAs: "json",
+                    headers: {
+                        "Content-Type": "application/json"
+                    },
+                    rawBody: json.toJson(args)
+                });
+                dfd.then(
+                    function(){},
+                    self.defaultErrorHandler);
+                return dfd;
+            };
+            this.defaultErrorHandler = function(error) {
+                var msg = "An error occured!";
+                try {
+                    msg = json.fromJson(error.responseText).errorMsg;
+                } catch (ex) {
+                    msg = error.message;
+                }
+                self.notify(msg,'error');
+            };
+            this.notify =  function(text,type) {
+                connect.publish('/rft/notify',{
+                    text: text,
+                    type: type
+                });
+            };
+        })();
+    });

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

@@ -21 +21 @@
 define(['dojo/_base/declare','dojo/_base/connect','dojo/_base/xhr','dojo/_base/json',
     'dojo/_base/lang','dojo/_base/Deferred','dojo/hash','dojo/dom-attr','dojo/dom-construct',
-    'dojo/io-query','dijit','rft/util','rft/ui/_Page'],
+    'dojo/io-query','dijit','./util','./ui/_Page'],
     function(declare,connect,xhr,json,lang,Deferred,hash,attr,domConstruct,uriQuery,dijit,util,_Page){
         return new (function() {
@@ -145 +145 @@
                     return _goTo(new HRI(path,args));
                 }
-            }
+            };
 
             self.goTo = function(path,args) {
@@ -157 +157 @@
                     return {};
                 }
-            }
+            };
 
             connect.subscribe('/dojo/hashchange', function(){

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

@@ -1 @@
-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){
+define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/event','dojo/_base/Deferred','rft/store','rft/ui/_Page','rft/api'],
+    function(declare,lang,event,Deferred,store,_Page,api){
         return declare('rft.pages.survey',[_Page],{
             object: null,
@@ -31 +31 @@
                     this.object = obj;
                     this.setFields(obj);
+                    api.notify("Object saved");
+                }),lang.hitch(this,function(){
+                    api.notify("Object save failed",'error');
                 }));
                 event.stop(evt);

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

@@ -25 +25 @@
     'dojox/grid/DataGrid',
     'dojox/widget/TitleGroup',
+    'rft/ui/MainMenu',
     'rft/ui/MenuBarLink',
     'rft/ui/MenuLink',
+    'rft/ui/Notifications',
     'rft/ui/LineWithActionsWidget',
     'rft/ui/QuestionWidget',

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

@@ -1 @@
-define(['dojo/_base/lang','dojo/_base/array','dojo/_base/Deferred','dojo/store/JsonRest'],
-    function(lang,array,Deferred,JsonRest){
+define(['dojo/_base/lang','dojo/_base/array','dojo/_base/Deferred','dojo/store/JsonRest','./api'],
+    function(lang,array,Deferred,JsonRest,api){
     
         var OBJ_TYPE = '__objectType';
@@ -20 +20 @@
                 idProperty: OBJ_UID
             });
+            var errHandler = api.defaultErrorHandler;
             return lang.delegate(jsonStore,{
                 query: function(query, directives){
@@ -26 +27 @@
                             return new RftObject(typeof result == "object" ? result : object);
                         });
-                    });
+                    },errHandler);
                 },
                 get: function(id, directives){
                     return Deferred.when( jsonStore.get(id,directives), function(result){
                         return new RftObject(typeof result == "object" ? result : object);
-                    });
+                    },errHandler);
                 },
                 add: function(object, directives){
                     return Deferred.when( jsonStore.add(object,directives), function(result){
                         return new RftObject(typeof result == "object" ? result : object);
-                    });
+                    },errHandler);
                 },
                 put: function(object, directives){
                     return Deferred.when( jsonStore.put(object,directives), function(result) {
                         return new RftObject(typeof result == "object" ? result : object);
-                    });
+                    },errHandler);
                 },
                 remove: function(id, directives){

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

@@ -2 +2 @@
     'dojo/_base/Deferred','dojo/dom-construct','dijit/_WidgetBase',
     'dijit/_TemplatedMixin','dijit/_WidgetsInTemplateMixin','dijit/TitlePane',
-    'rft/ui/LineWithActionsWidget','dojo/text!rft/ui/templates/AccordionList.html'],
+    'rft/ui/LineWithActionsWidget','dojo/text!./templates/AccordionList.html'],
     function(declare,lang,array,
         Deferred,domConstruct,_WidgetBase,

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

@@ -1 +1 @@
 <div class="${baseClass}">
     <div data-dojo-attach-point="rows">
-        <tr><td>a</td>
     </div>
     <div data-dojo-attach-point="buttons" class="row">