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

Timestamp:

12/04/12 16:29:49 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Support data validation and increase dendency separation.

Added json-schema validation before documents are saved. Acts both as
a safe-guard and as a reference of the data model.

Added directory for server related material. For now it contains scripts
to configure CouchDB and check validity of documents against the schema.

Started separating out parts that depend on the data model from parts
that do not.

Location:

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

Files:

• question.html (modified) (1 diff)
• question.js (modified) (4 diffs)
• questions.js (modified) (3 diffs)
• survey.html (modified) (1 diff)
• surveys.html (modified) (1 diff)
• surveys.js (modified) (4 diffs)
• viewSurvey.js (modified) (2 diffs)

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

@@ -3 +3 @@
         <h2>
             <span class="rftIcon rftIconSurvey"></span>
-            <span class="headerText">Question 123 [Editing]</span>
+            <span class="headerText"><span data-dojo-attach-point="titleNode">Question title</span> [Editing]</span>
         </h2>
     </div>

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

@@ -21 +21 @@
             if ( this._started ) { return; }
             this.inherited(arguments);
-            if (this.questionId) {
+            if ( !this.questionId ) {
+                throw new Error("Error: no reference to object set!");
+            }
+            this._setupEditor();
+            if (this.questionId === "new") {
+                this.question = { type: 'Question' };
+                this._refresh();
+            } else {
                 Deferred.when(store.get(this.questionId))
                 .then(lang.hitch(this, function(obj) {
@@ -27 +34 @@
                     this._refresh();
                 }));
-            } else {
-                throw new Error("Error: no reference to object set!");
             }
-            this._setupEditor();
         },
         onLeave: function() {
@@ -36 +40 @@
         },
         _refresh: function () {
+            this.titleNode.innerHTML = this.question.title || "";
             this._toolkit.set('value',this.question);
             this._preview.appendItems(this.question.content || []);
@@ -46 +51 @@
                 Router.go('/questions');
             },function(err){
-                Content.notify(err.reason,'error');
+                Content.notify(err,'error');
             });
             evt && event.stop( evt );

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

@@ -40 +40 @@
         },
         onNewQuestion: function() {
-            Deferred.when(store.add({type:'Question'}))
-            .then(lang.hitch(this,function(question){
-                this.onEditQuestion(question);
-            }));
+            Router.go("/question/new");
         },
         onDeleteQuestion: function(question) {
@@ -50 +47 @@
                 Content.notify("Question deleted.");
             },function(err){
-                Content.notify(err.reason,'error');
+                Content.notify(err,'error');
             });
         },
@@ -62 +59 @@
                 Content.notify("Question published.");
             },function(err){
-                Content.notify(err.reason,'error');
+                Content.notify(err,'error');
             });
         }

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

@@ -40 +40 @@
          data-dojo-attach-event="onSubmit:_onPropertiesOk">
 
-        <form data-dojo-type="dijit/form/Form"
-              data-dojo-attach-point="propertiesForm">
-            <label for="title">Title</label>
-            <input data-dojo-type="dijit/form/TextBox" name="title"/><br/>
-            <label for="description">Description</label>
-            <input data-dojo-type="dijit/form/Textarea" name="description"/><br/>
-        </form>
+        <div data-dojo-type="rft/ui/model/SurveyForm"
+              data-dojo-attach-point="propertiesForm"></div>
             
         <div>

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

@@ -36 +36 @@
     </div>
 
+    <div data-dojo-type="dijit/Dialog"
+         title="SurveyRun properties"
+         data-dojo-attach-point="surveyRunDialog">
+        <form data-dojo-type="rft/ui/model/SurveyRunForm" data-dojo-attach-point="surveyRunForm">
+            <button data-dojo-type="dijit/form/Button">OK</button>
+            <button data-dojo-type="dijit/form/Button">Cancel</button>
+        </form>
+    </div>
+
 </div>

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

@@ -23 +23 @@
                 Router.go('/survey/'+store.getIdentity(survey));
             },function(err){
-                Content.notify(err.reason,'error');
+                Content.notify(err,'error');
             });
         },
@@ -33 +33 @@
                 self.refreshPublished();
             },function(err){
-                Content.notify(err.reason,'error');
+                Content.notify(err,'error');
             });
         },
@@ -42 +42 @@
                 self.refreshDrafts();
             },function(err){
-                Content.notify(err.reason,'error');
+                Content.notify(err,'error');
             });
         },
@@ -52 +52 @@
         },
         _onRunSurvey:function(survey){
-
+            this.surveyRunDialog.show();
         },
         refresh: function() {

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

@@ -7 +7 @@
     '../store',
     '../app/Page',
-    '../ui/content/ContentWidgetFactory',
+    '../ui/model/QuestionWidgetFactory',
     'dojo/text!./viewSurvey.html'
-],function(array,declare,Deferred,event,lang,store,Page,ContentWidgetFactory,template){
+],function(array,declare,Deferred,event,lang,store,Page,QuestionWidgetFactory,template){
     return declare([Page],{
         templateString: template,
@@ -35 +35 @@
                     this.titleNode.innerHTML = survey.title +
                             (this.options.preview?' [preview]':'');
-                    var f = new ContentWidgetFactory();
+                    var f = new QuestionWidgetFactory();
                     this.survey = survey;
                     store.query(null,{keys:this.survey.questions,include_docs:true})