Changeset 492 for Dev/trunk/src/server/app.js

Timestamp:

03/09/14 14:23:42 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Enable/disable buttons on content change.
• One place to do date formatting, because it was going wrong again.
• Serialize questions in survey properly.
• _ComplexValueMixin consumes submit events, but does trigger outer forms if present.
• Trigger dialog show/hide for login only after previous effect is finished.
• Check that documents are actually valid, not just that validator returned a result.
• Validate email and timestamp formats.
• Prepared for live runs.

File:

• Dev/trunk/src/server/app.js (modified) (7 diffs)

Dev/trunk/src/server/app.js

@@ -8 +8 @@
   , CouchDB = require('./util/couch').CouchDB
   , _ = require("underscore")
-  , tv4 = require("tv4")
+  , validator = require("./util/validator")
   , HTTPResult = require("./util/http-result")
   , etags = require("./util/etags")
@@ -151 +151 @@
         return new HTTPResult(500,{error: error.reason});
     }
-    function handleUnknownError(error){
+    function handleUnknownError(error) {
         return new HTTPResult(500, {error: "Unknown error", innerError: error});
     }
@@ -159 +159 @@
     function handleRowDocs(result) {
         return _.map(result.rows, function(item) { return item.doc; });
+    }
+    function handleRowFirstDoc(result) {
+        if ( result.rows.length > 0 ) {
+            return result.rows[0].doc;
+        } else {
+            return new HTTPResult(404,{error:"No document found."});
+        }
+    }
+    function handleRowFirstValue(result) {
+        if ( result.rows.length > 0 ) {
+            return result.rows[0].value;
+        } else {
+            return new HTTPResult(404,{error:"No document found."});
+        }
+    }
+    function handleRowDictOfDocs(result) {
+        return _.reduce(result.rows, function(dict,item) {
+            dict[item.key] = item.doc;
+            return dict;
+        }, {});
+    }
+    function handleRowDictOfValues(result) {
+        return _.reduce(result.rows, function(dict,item) {
+            dict[item.key] = item.value;
+            return dict;
+        }, {});
     }
 
@@ -199 +225 @@
     function putDocument(id,rev,type,doc) {
         var priv = stripAndReturnPrivates(doc);
-        if ( doc.type === type && tv4.validateResult(doc, schema) ) {
+        if ( doc.type === type && validator(doc, schema).valid ) {
             var opts = rev ? {headers:{'If-Match':'"'+rev+'"'}} : {};
             return HTTPResult.fromResponsePromise(couch.put(id,doc,opts).response,
@@ -236 +262 @@
     function postDocument(type,doc) {
         var priv = stripAndReturnPrivates(doc);
-        if ( doc.type === type && tv4.validateResult(doc, schema) ) {
+        if ( doc.type === type && validator(doc, schema).valid ) {
             return HTTPResult.fromResponsePromise(couch.post(doc).response,
                                                   handleUnknownError)
@@ -321 +347 @@
         .handle({
             200: handleRowDocs,
+            default: handleUnknownResponse
+        });
+    }
+    function getQuestionsAndCodes() {
+        var url = '_design/questions/_view/by_code';
+        var query = {include_docs:true};
+        return HTTPResult.fromResponsePromise(couch.get(url,{query:query}).response,
+                                              handleUnknownError)
+        .handle({
+            200: handleRowDictOfDocs,
             default: handleUnknownResponse
         });
@@ -760 +796 @@
                         return new HTTPResult(403,{error: "Secrets are not the same."});
                     } else {
-                        return deleteDocument(id,rev,doc);
+                        return getDocument(doc.surveyRunId,[],'SurveyRun')
+                        .handle({
+                            200: function(surveyRun) {
+                                if ( surveyRun.respondentCanDeleteOwnResponse === true ) {
+                                    return deleteDocument(id,rev,doc);
+                                } else {
+                                    return new HTTPResult(403,{error:"Not allowed to delete response."});
+                                }
+                            }
+                        });
                     }
                 }