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

Timestamp:

12/09/12 16:49:22 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Put all model dependent code in one place. More separation of general and domain code.

Location:

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

Files:

• index.js (modified) (1 diff)
• question.js (modified) (1 diff)
• questions.js (modified) (1 diff)
• session.js (modified) (1 diff)
• sessions.js (modified) (1 diff)
• survey.js (modified) (4 diffs)
• surveys.js (modified) (3 diffs)
• templates (added)
• templates/index.html (moved) (moved from Dev/branches/rest-dojo-ui/client/rft/pages/index.html)
• templates/question.html (moved) (moved from Dev/branches/rest-dojo-ui/client/rft/pages/question.html)
• templates/questions.html (moved) (moved from Dev/branches/rest-dojo-ui/client/rft/pages/questions.html)
• templates/session.html (moved) (moved from Dev/branches/rest-dojo-ui/client/rft/pages/session.html)
• templates/sessions.html (moved) (moved from Dev/branches/rest-dojo-ui/client/rft/pages/sessions.html)
• templates/survey.html (moved) (moved from Dev/branches/rest-dojo-ui/client/rft/pages/survey.html) (1 diff)
• templates/surveys.html (moved) (moved from Dev/branches/rest-dojo-ui/client/rft/pages/surveys.html) (1 diff)
• templates/viewSurvey.html (moved) (moved from Dev/branches/rest-dojo-ui/client/rft/pages/viewSurvey.html)
• viewSurvey.js (modified) (1 diff)

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

@@ -3 +3 @@
     '../app/Router',
     '../app/Page',
-    'dojo/text!./index.html'
+    'dojo/text!./templates/index.html'
 ],function(declare,Router,Page,template){
     return declare([Page],{

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

@@ -8 +8 @@
     '../app/Router',
     '../app/Page',
-    '../ui/QuestionEditorPreview',
-    '../ui/QuestionEditorToolkit',
-    'dojo/text!./question.html'
+    '../model/widgets/QuestionEditorPreview',
+    '../model/widgets/QuestionEditorToolkit',
+    'dojo/text!./templates/question.html'
 ],function(declare, Deferred, event, lang, store, Content, Router, Page, QuestionEditorPreview, QuestionEditorToolkit, template){
     return declare([Page], {

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

@@ -8 +8 @@
     '../app/Router',
     '../app/Page',
-    '../ui/TabbedQuestionBrowser',
-    'dojo/text!./questions.html'
+    '../model/widgets/TabbedQuestionBrowser',
+    'dojo/text!./templates/questions.html'
 ],function(declare,Deferred,event,lang,store,Content,Router,Page,TabbedQuestionBrowser,template) {
     return declare([Page],{

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

@@ -9 +9 @@
     '../app/Page',
     '../app/Router',
-    '../ui/ThresholdFilteringSelect',
-    '../ui/lists/AccountListView',
-    'dojo/text!./session.html'
+    '../widgets/ThresholdFilteringSelect',
+    '../model/widgets/AccountListView',
+    'dojo/text!./templates/session.html'
 ],function(array,declare,Deferred,event,lang,search,store,Page,Router,ThresholdFilteringSelect,AccountListView,template){
     return declare([Page],{

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

@@ -6 +6 @@
     '../app/Router',
     '../app/Page',
-    '../ui/ObjectBox',
-    'dojo/text!./sessions.html'
+    '../widgets/ObjectBox',
+    'dojo/text!./templates/sessions.html'
 ],function(declare,lang,dateStamp,store,Router,Page,ObjectBox,template){
     return declare([Page],{

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

@@ -8 +8 @@
     '../store',
     '../app/Page',
-    '../ui/lists/QuestionListView',
-    '../ui/TabbedQuestionBrowser',
-    'dojo/text!./survey.html'
+    '../model/widgets/QuestionListView',
+    '../model/widgets/TabbedQuestionBrowser',
+    'dojo/text!./templates/survey.html'
 ],function(array,declare,Deferred,event,lang,Router,store,Page,
          QuestionListView,TabbedQuestionBrowser,template){
@@ -81 +81 @@
         refresh: function() {
             this.titleNode.innerHTML = this.survey.title || "(set title in properties)";
-            this.propertiesForm.set('value',this.survey);
+            this.propertiesDialog.set('value',this.survey);
         },
         _onShowProperties: function(evt) {
@@ -88 +88 @@
         _onPropertiesOk: function(evt) {
             this.propertiesDialog.hide();
-            lang.mixin(this.survey, this.propertiesForm.get('value'));
+            lang.mixin(this.survey, this.propertiesDialog.get('value'));
             this.refresh();
             event.stop(evt);
@@ -95 +95 @@
         _onPropertiesCancel: function(evt) {
             this.propertiesDialog.hide();
-            this.propertiesForm.set('value',this.survey);
+            this.propertiesDialog.reset('value',this.survey);
             event.stop(evt);
             return false;

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

@@ -4 +4 @@
     'dojo/_base/lang',
     'dojo/when',
+    'rx/rx.dojo',
     '../store',
     '../app/Content',
     '../app/Page',
     '../app/Router',
-    '../ui/LineWithActionsWidget',
-    'dojo/text!./surveys.html'
-],function(array,declare,lang,when,store,Content,Page,Router,LineWithActionsWidget,template){
+    '../widgets/LineWithActionsWidget',
+    'dojo/text!./templates/surveys.html'
+],function(array,declare,lang,when,Rx,store,Content,Page,Router,LineWithActionsWidget,template){
     return declare([Page],{
         templateString: template,
@@ -47 +48 @@
         },
         _onRunSurvey:function(survey){
+            this.surveyRun = {
+                type: 'SurveyRun',
+                surveyId: store.getIdentity(survey),
+                publicationDate: store.timestamp()
+            };
+            this.surveyRunDialog.set('value',this.surveyRun);
             this.surveyRunDialog.show();
+        },
+        _onSurveyRunOk: function() {
+            var surveyRun = lang.mixin(lang.clone(this.surveyRun),this.surveyRunDialog.get('value'));
+            store.put(surveyRun)
+            .then(lang.hitch(this,function(){
+                this.surveyRunDialog.hide();
+                this.refreshRuns();
+            }),function(err){
+                Content.notify(err);
+            });
+        },
+        _onSurveyRunCancel: function() {
+            this.surveyRunDialog.hide();
         },
         refresh: function() {
@@ -131 +151 @@
                 array.forEach(surveyRuns,function(surveyRun){
                     var w = new LineWithActionsWidget({
-                        title: survey.title,
+                        title: surveyRun.title+" (from "+surveyRun.startDate+" to "+surveyRun.endDate+")",
                         actions:[{
                             callback: lang.hitch(this,'_onCloseRun',surveyRun),

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

@@ -39 +39 @@
          data-dojo-attach-point="propertiesDialog"
          data-dojo-attach-event="onSubmit:_onPropertiesOk">
-
-        <div data-dojo-type="rft/ui/model/SurveyForm"
-              data-dojo-attach-point="propertiesForm"></div>
-            
-        <div>
-            <button data-dojo-type="dijit/form/Button"
-                    type="submit"
-                    data-dojo-attach-event="onClick:_onPropertiesOk">
-                OK</button>
-            <button data-dojo-type="dijit/form/Button"
-                    type="button"
-                    data-dojo-attach-event="onClick:_onPropertiesCancel">
-                Cancel</button>
-        </div>
-
+        <fieldset data-dojo-type="rft/model/widgets/SurveyFieldset"></fieldset>
+        <button data-dojo-type="dijit/form/Button"
+                type="submit"
+                data-dojo-attach-event="onClick:_onPropertiesOk">
+            OK</button>
+        <button data-dojo-type="dijit/form/Button"
+                type="button"
+                data-dojo-attach-event="onClick:_onPropertiesCancel">
+            Cancel</button>
     </div>
 

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

@@ -39 +39 @@
          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>
+        <fieldset data-dojo-type="rft/model/widgets/SurveyRunFieldset"></fieldset>
+        <button data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:_onSurveyRunOk">OK</button>
+        <button data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:_onSurveyRunCancel">Cancel</button>
     </div>
 

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

@@ -7 +7 @@
     '../store',
     '../app/Page',
-    '../ui/model/QuestionWidgetFactory',
-    'dojo/text!./viewSurvey.html'
+    '../model/widgets/QuestionWidgetFactory',
+    'dojo/text!./templates/viewSurvey.html'
 ],function(array,declare,Deferred,event,lang,store,Page,QuestionWidgetFactory,template){
     return declare([Page],{