Changeset 478 for Dev

Timestamp:

10/16/13 16:05:39 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Changes for response submission & deletion.

Location:

Dev/trunk/src

Files:

• client/qed-client/pages/response.js (modified) (4 diffs)
• client/qed-client/pages/templates/response.html (modified) (1 diff)
• client/qed-client/store.js (modified) (1 diff)
• server/app.js (modified) (6 diffs)
• server/util/couch.coffee (modified) (1 diff)

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

@@ -63 +63 @@
             this.submitButton.set('disabled',false);
             this.continueButton.set('disabled',false);
+            this.cancelButton.set('disabled',false);
             this.surveyWidget.set('disabled', false);
         },
@@ -68 +69 @@
             this.submitButton.set('disabled',true);
             this.continueButton.set('disabled',true);
+            this.cancelButton.set('disabled',true);
             this.surveyWidget.set('disabled', true);
         },
@@ -80 +82 @@
                 data:json.toJson(this.response),
                 headers:{"Content-Type": "application/json"}
-            }).then(function(){
+            }).then(lang.hitch(this,function(res){
+                this.response._rev = res.rev;
                 Content.notify("Your response is saved.");
-            }, function(err){
+            }), function(err){
                 Content.notify(err,'error');
             });
@@ -104 +107 @@
             return false;
         },
+        _onCancel: function(e) {
+            this._disableSubmit();
+            this.surveyWidget.destroy();
+            request('/api/responses/'+store.getIdentity(this.response)+'?rev='+store.getRevision(this.response),{
+                method: 'DELETE',
+                handleAs:'json',
+                data:json.toJson(this.response),
+                headers:{"Content-Type": "application/json"}
+            }).then(lang.hitch(this,function(res){
+                this._showInfo("<div>Your response has been deleted, no answers have been saved.</div>");
+                Content.notify("Your response is deleted.");
+            }), function(err){
+                Content.notify(err,'error');
+            });
+            if ( e ) { event.stop(e); }
+            return false;
+        },
         _ignoreEvent: function(e) {
             if ( e ) { event.stop(e); }

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

@@ -29 +29 @@
                 data-dojo-attach-point="continueButton"
                 data-dojo-attach-event="onClick:_onContinueLater">
-            Continue later</button>
+            Save & Continue later</button>
+        <button data-dojo-type="dijit/form/Button"
+                type="button"
+                data-dojo-attach-point="cancelButton"
+                data-dojo-attach-event="onClick:_onCancel">
+            Cancel & Delete</button>
     </div>
 

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

@@ -10 +10 @@
     
     var couchStore = new CouchStore({
-        target: 'api/data/',
+        target: '/data/',
         request: request /*,
         validate: function(object) {

Dev/trunk/src/server/app.js

@@ -48 +48 @@
 
     // cookies and session
-    app.use('/api',express.bodyParser());
     app.use(express.cookieParser());
     app.use(express.session({ secret: "quasi experimental design" }));
+    app.use('/api',express.bodyParser());
 
     // passport
@@ -77 +77 @@
     });
 
+    // data is proxied to couch
+    app.use('/data', ensureAuthenticated);
+    app.use('/data', proxy(settings.couchDbURL));
 
     // post to this url to login
@@ -99 +102 @@
         });
 
-    // expose everything needed to fill in responses
-    // FIXME : this needs more security, now you can guess ids
-    //         and get actual survey and response data!
-    app.get(
-        '/live',
-        function(req,res){
-            res.redirect('/response.html#!/55704d6a84194c2d7ba9bec93c000e75');
-        });
     app.get(
         '/api/surveyRuns/:id',
@@ -155 +150 @@
             });
         });
+    app.delete(
+        '/api/responses/:id',
+        function(req,res){
+            var id = req.params.id;
+            var rev = req.query.rev;
+            couch.delete(id,rev).then(function(result){
+                res.send(200, result);
+            }, function(error){
+                res.send(500, error);
+            });
+        });
     
-    // data is proxied to couch
-    app.use('/api/data', ensureAuthenticated);
-    app.use('/api/data', proxy(settings.couchDbURL));
-
     // generate CSV download of responses
     app.get(
@@ -224 +226 @@
 }
 
-function writeObjectsToCSVStream(objects, stream) {
+function writeObjectsToCSVStream(objects, stream, prelude) {
     var keys = _.chain(objects)
                 .map(_.keys)
@@ -235 +237 @@
     });
     var writer = new CSV.CsvWriter(stream);
+    if ( prelude ) {
+        _.forEach(prelude, function(val,key){
+            writer.writeRecord([key,val]);
+        });
+    }
     writer.writeRecord(keys);
     _.forEach(objects, function(obj){

Dev/trunk/src/server/util/couch.coffee

@@ -15 +15 @@
         url = "#{@url}/#{id}"
         couchRequest 'PUT', url, doc
+    delete: (id, rev) ->
+        url = "#{@url}/#{id}?rev=#{rev}"
+        couchRequest 'DELETE', url
 
 normalizeURL = (url) ->