Changeset 463 for Dev/trunk/src/client/qed-client

Timestamp:

06/23/13 13:59:15 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Working towards Heroku deployment, restructuring for that and to allow coffee builds.

Location:

Dev/trunk/src/client/qed-client

Files:

• index.js (modified) (1 diff)
• pages/surveyRun.js (modified) (2 diffs)
• pages/templates/response.html (modified) (2 diffs)
• pages/templates/surveyRun.html (modified) (1 diff)
• store/CouchStore.js (modified) (1 diff)
• store/request.js (added)
• widgets/_ComplexValueMixin.coffee (added)
• widgets/_ComplexValueMixin.js (deleted)

Dev/trunk/src/client/qed-client/index.js

@@ -1 +1 @@
 define([
-    'dojo/_base/array',
-    'dojo/parser',
-    './app/Content',
-    './app/Page',
-    './app/Router',
-    './ui/MainMenu',
-    './routes',
-    './store',
-    'dojo/domReady!',
-    './stddeps'
-],function(array,parser,Content,Page,Router,MainMenu,routes,store) {
+    "./app/Content",
+    "./app/Page",
+    "./app/Router",
+    "./routes",
+    "./store",
+    "./store/request",
+    "./ui/MainMenu",
+    "dojo/_base/array",
+    "dojo/parser",
+    "dojo/request/registry",
+    "./stddeps",
+    "dojo/domReady!"
+], function(Content, Page, Router, routes, store, request, MainMenu, array, parser, registry) {
+
+    registry.register(/.*/,request);
+    
     parser.parse();
-
     store.info()
     .then(function(){

Dev/trunk/src/client/qed-client/pages/surveyRun.js

@@ -72 +72 @@
             var surveyRun = this.surveyRunWidget.get('value');
             if ( surveyRun.mode === "open" ) {
-                this.runURLNode.innerHTML = this._link(this._getGeneralURL(store.getIdentity(this.surveyRun)));
+                this.runURLNode.innerHTML =
+                    this._link(this._getGeneralURL(store.getIdentity(this.surveyRun)));
             } else {
-                this.runURLNode.innerHTML = "No general URL. Add individual respondents below.";
+                this.runURLNode.innerHTML =
+                    "No general URL. Add individual respondents below.";
             }
         },
@@ -102 +104 @@
                 });
             }
-            event.stop(evt);
+            if ( evt ) { event.stop(evt); }
             return false;
         },
         _onDiscard: function(evt) {
             Router.go('/surveys');
+            if ( evt ) { event.stop(evt); }
+            return false;
+        },
+        _onExport: function(evt) {
+            if ( evt ) { event.stop(evt); }
+            return false;
         }
     });

Dev/trunk/src/client/qed-client/pages/templates/response.html

@@ -1 +1 @@
 <div class="blue">
 
-    <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'top'">
+    <div data-dojo-type="dijit/layout/ContentPane"
+         data-dojo-props="region:'top'">
         <h2>
             <span class="rftIcon rftIconSurvey"></span>
@@ -9 +10 @@
     </div>
     
-    <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'center'" data-dojo-attach-point="content">
-        <div name="answers" data-dojo-type="../model/widgets/SurveyRenderWidget" data-dojo-attach-point="surveyWidget"></div>
+    <div data-dojo-type="dijit/layout/ContentPane"
+         data-dojo-props="region:'center'" data-dojo-attach-point="content">
+        <div name="answers"
+             data-dojo-type="../model/widgets/SurveyRenderWidget"
+             data-dojo-attach-point="surveyWidget"></div>
     </div>
     
 
-    <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'bottom'">
+    <div data-dojo-type="dijit/layout/ContentPane"
+         data-dojo-props="region:'bottom'">
         <button data-dojo-type="dijit/form/Button"
                 type="submit"

Dev/trunk/src/client/qed-client/pages/templates/surveyRun.html

@@ -1 +1 @@
 <div class="blue">
 
-    <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'top'">
+    <div data-dojo-type="dijit/layout/ContentPane"
+         data-dojo-props="region:'top'">
         <h2>
             <span class="rftIcon rftIconSurvey"></span>
-            <span class="headerText" data-dojo-attach-point="titleNode">SurveyRun Editor</span>
+            <span class="headerText"
+                  data-dojo-attach-point="titleNode">SurveyRun Editor</span>
         </h2>
     </div>
     
-    <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'center'">
+    <div data-dojo-type="dijit/layout/ContentPane"
+         data-dojo-props="region:'center'">
         <fieldset class="qedFieldset">
             <legend>Survey</legend>
-            <div data-dojo-type="../model/widgets/SurveySummary" data-dojo-attach-point="surveySummaryWidget"></div>
+            <div data-dojo-type="../model/widgets/SurveySummary"
+                 data-dojo-attach-point="surveySummaryWidget"></div>
         </fieldset>
         <fieldset class="qedFieldset">
             <legend>Run Details</legend>
-            <div data-dojo-type="../model/widgets/SurveyRunWidget" data-dojo-attach-point="surveyRunWidget"></div>
+            <div data-dojo-type="../model/widgets/SurveyRunWidget"
+                 data-dojo-attach-point="surveyRunWidget"></div>
         </fieldset>
         <fieldset class="qedFieldset">
             <legend>Response Details</legend>
-            <div><div class="qedLabel">General URL</div><div class="qedField" data-dojo-attach-point="runURLNode" style="overflow: ellipsis"></div></div>
-            <div><div class="qedLabel">Responses <span data-dojo-attach-point="responsesCountNode"></span></div><div class="qedField qedFill" data-dojo-attach-point="responsesNode"></div></div>
+            <div>
+                <div class="qedLabel">General URL</div>
+                <div class="qedField"
+                     data-dojo-attach-point="runURLNode"
+                     style="overflow: ellipsis"></div>
+            </div>
+            <div>
+                <div class="qedLabel">Response count</div>
+                <div data-dojo-attach-point="responsesCountNode"></div>
+            </div>
+            <div>
+                <div class="qedLabel">In progress count</div>
+                <div data-dojo-attach-point="inprogressCountNode"></div>
+            </div>
+            <div>
+                <div class="qedLabel">Responses (including partial)</div>
+                <div class="qedField qedFill"
+                     data-dojo-attach-point="responsesNode"></div>
+            </div>
+            <div>
+                <div class="qedLabel">Export results</div>
+                <button data-dojo-type="dijit/form/Button"
+                        class="qedField blue"
+                        data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconSave'"
+                        data-dojo-attach-event="onClick:_onExport">To CSV</button>
+            </div>
         </fieldset>
     </div>
     
-    <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region: 'bottom'" style="height: 40px;">
+    <div data-dojo-type="dijit/layout/ContentPane"
+         data-dojo-props="region: 'bottom'" style="height: 40px;">
         <button data-dojo-type="dijit/form/Button"
                 class="blue"

Dev/trunk/src/client/qed-client/store/CouchStore.js

@@ -5 +5 @@
     "dojo/_base/json",
     "dojo/_base/lang",
-    "dojo/request",
+    "dojo/request/registry",
     "dojo/store/util/QueryResults"
 ], function(Deferred, array, declare, json, lang, request, QueryResults) {