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

Timestamp:

08/15/12 18:30:58 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Added survey viewer page.

Added view.html page to view surveys. Widgets from the questions are
displayed, no answers are saved yet.

The content module is split for index.html and view.html, so viewers
cannot navigate to other pages. Widgets to pre-load are now seperated
in stddeps.js module and shared between run.js & view.js.

Location:

Dev/branches/rest-dojo-ui

Files:

• . (modified) (1 prop)
• client/rft/pages/survey.js (modified) (1 diff)
• client/rft/pages/viewSurvey.html (copied) (copied from Dev/branches/rest-dojo-ui/client/rft/pages/survey.html) (2 diffs)
• client/rft/pages/viewSurvey.js (copied) (copied from Dev/branches/rest-dojo-ui/client/rft/pages/survey.js) (3 diffs)

Dev/branches/rest-dojo-ui

@@ -1 +1 @@
 nbproject
+.project

@@ -1 +1 @@
 nbproject
+.project

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

@@ -99 +99 @@
             },
             _onShowPreview: function() {
-                content.goTo('surveyAdvanced', {uid: store.getIdentity(this.survey)});
+                content.goTo('previewSurvey', {uid: store.getIdentity(this.survey)});
             }
         });

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

@@ -1 @@
-<div data-dojo-type="rft.pages.survey" class="blue">
+<div data-dojo-type="rft.pages.viewSurvey" class="blue">
     <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'" style="height: 500px;">
 
@@ -5 +5 @@
             <h2>
                 <span class="rftIcon rftIconSurvey"></span>
-                <span class="headerText" data-rft-attach-point="titleNode">Survey Editor</span>
+                <span class="headerText" data-rft-attach-point="titleNode">Survey</span>
             </h2>
         </div>
         
-        <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'">
-            <div data-rft-attach-point="questionBrowser"></div>
+        <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'" data-rft-attach-point="questionsPane">
         </div>
         
-        <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'right'" style="width: 300px">
-            <div data-rft-attach-point="surveyListViewNode" class="rftSurveyListView">
-            </div>
-
-            <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'bottom'">
-                <button data-dojo-type="dijit.form.Button"
-                        data-rft-attach-event="onClick:_onShowProperties"
-                        data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconProperties'">
-                    Properties</button>
-                <button data-dojo-type="dijit.form.Button"
-                        data-rft-attach-event="onClick:_onSave"
-                        data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">
-                    Save Changes</button>
-                <button data-dojo-type="dijit.form.Button"
-                        data-rft-attach-event="onClick:_onDiscard"
-                        data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">
-                    Discard changes</button>
-                <button data-dojo-type="dijit.form.Button"
-                        data-rft-attach-event="onClick:_onShowPreview"
-                        data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconPreview'">
-                    Preview</button>
-            </div>
-        </div>
-    </div>
-
-    <div data-dojo-type="dijit.Dialog"
-         title="Survey properties"
-         data-rft-attach-point="propertiesDialog"
-         data-rft-attach-event="onSubmit:_onPropertiesOk">
-
-        <form data-dojo-type="dijit.form.Form"
-              data-rft-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>
+        <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'bottom'">
             <button data-dojo-type="dijit.form.Button"
                     type="submit"
-                    data-rft-attach-event="onClick:_onPropertiesOk">
-                OK</button>
+                    data-rft-attach-event="onClick:_onSubmit">
+                Submit</button>
             <button data-dojo-type="dijit.form.Button"
                     type="button"
-                    data-rft-attach-event="onClick:_onPropertiesCancel">
+                    data-rft-attach-event="onClick:_onCancel">
                 Cancel</button>
         </div>
+
     </div>
-
 </div>

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

@@ -5 +5 @@
     'dojo/_base/event',
     'dojo/_base/lang',
-    '../content',
     '../store',
     '../ui/_Page',
-    '../ui/lists/QuestionListView',
-    '../ui/TabbedQuestionBrowser'
+    '../ui/content/ContentWidgetFactory'
     ],
-    function(array,declare,Deferred,event,lang,content,store,_Page,
-             QuestionListView,TabbedQuestionBrowser){
-        return declare('rft.pages.survey',[_Page],{
+    function(array,declare,Deferred,event,lang,store,_Page,ContentWidgetFactory){
+        return declare('rft.pages.viewSurvey',[_Page],{
             survey: null,
-            questionList: null,
-            _dataMap: null,
             constructor: function(){
                 this._dataMap = {};
@@ -22 +17 @@
             onVisit: function() {
                 if ( this.pageArgs.uid ) {
-                    this._setupQuestionBrowser();
-                    this._setupListView();
                     Deferred.when(store.get(this.pageArgs.uid))
                     .then(lang.hitch(this,function(obj){
+                        var f = new ContentWidgetFactory();
                         this.survey = obj;
                         store.query(null,{keys:this.survey.questions,include_docs:true})
-                        .forEach(lang.hitch(this.questionList,'appendItem'));
-                        this.refresh();
+                        .forEach(function(question){
+                            array.forEach(question.content,function(item){
+                                var w = f.createViewWidget(item);
+                                if ( w !== null ) {
+                                    w.placeAt(this.questionsPane.containerNode,'last');
+                                    w.startup();
+                                }
+                            },this);
+                        },this);
                     }));
                 } else {
@@ -35 +36 @@
                 }
             },
-            _setupQuestionBrowser: function() {
-                this.questionBrowser = new TabbedQuestionBrowser({
-                    region: 'center',
-                    'class': 'blue',
-                    selectedActions: {
-                        "Include": {
-                            callback: lang.hitch(this,this._includeQuestion),
-                            icon: "Accept",
-                            description: "Include in survey"
-                        }
-                    },
-                    itemActions: {
-                        "Info": {
-                            callback: function(item){ item.description && alert(item.description); },
-                            icon: "Inspect",
-                            description: "Show item description"
-                        }
-                    }
-                },this.questionBrowser);
-                this.questionBrowser.startup();
-            },
-            _includeQuestion: function(question) {
-                this.questionList.insertItem(question);
-            },
-            _setupListView: function() {
-                this.questionList = new QuestionListView({
-                    region: 'center'
-                },this.surveyListViewNode);
-                this.questionList.startup();
-            },
-            refresh: function() {
-                this.titleNode.innerHTML = this.survey.title || "(set title in properties)";
-                this.propertiesForm.set('value',this.survey);
-            },
-            _onShowProperties: function(evt) {
-                this.propertiesDialog.show();
-            },
-            _onPropertiesOk: function(evt) {
-                this.propertiesDialog.hide();
-                lang.mixin(this.survey, this.propertiesForm.get('value'));
-                this.refresh();
+            _onSubmit: function(evt) {
                 event.stop(evt);
                 return false;
             },
-            _onPropertiesCancel: function(evt) {
-                this.propertiesDialog.hide();
-                this.propertiesForm.set('value',this.survey);
+            _onCancel: function(evt) {
                 event.stop(evt);
                 return false;
-            },
-            _onSave: function(evt) {
-                this.survey.questions = array.map(this.questionList.getItems(),function(item){
-                    return store.getIdentity(item);
-                });
-                store.put(this.survey)
-                .then(function() { 
-                    content.goTo('surveys');
-                });
-                event.stop(evt);
-                return false;
-            },
-            _onDiscard: function(evt) {
-            },
-            _onShowPreview: function() {
-                content.goTo('surveyAdvanced', {uid: store.getIdentity(this.survey)});
             }
         });

@@ -1 +1 @@
 nbproject
+.project