Changeset 191 for Dev/trunk/js/sequencerScripts.js

Timestamp:

12/21/11 17:52:00 (13 years ago)

Author:

fpvanagthoven

Message:

• Clean up van bestanden die niet meer gebruikt worden/niet nodig zijn/zijn gemerged met bestaande files.
• Daarnaast question/survey editor nu grotendeels werkend (min save functie...)
• Inloggen werkt nu op userUid ipv naam, werkt beter met het aanmaken van creators.
• Bug in returnObjectDisplay gefixt, er stond nog een var_dump tussen de echoes. JSON houdt niet van HTML tags.

File:

• Dev/trunk/js/sequencerScripts.js (modified) (11 diffs)

Dev/trunk/js/sequencerScripts.js

@@ -73 +73 @@
         // settings fields first
         initSequencer();
-        
+        debugger;
         switch (sequencer.settings.content.contentType.toLowerCase()) {
             case "session":
@@ -230 +230 @@
         requestString = "args="+JSON.stringify(args);
         newAjaxRequest(requestString, "returnObjectDisplay.php", function(result){
+            console.log(result.responseText);
             insertNewObjects(result.responseText, needsUpdating);
         }, true);
@@ -290 +291 @@
 
         // This means that one or more steps are being added, not an entire pipeline's worth of them
-        debugger;
         needsUpdating = new Array();
         args = [];
@@ -305 +305 @@
         requestString = "args="+JSON.stringify(args);
         newAjaxRequest(requestString, "returnObjectDisplay.php", function(result){
+            //console.log(result.responseText);
             insertNewObjects(result.responseText, needsUpdating);
         }, true);
@@ -388 +389 @@
 
 function insertNewObjects(responseText, needsUpdating) {
+    //console.log(responseText);
     // Container function that calls different insertNewX() functions depending on content type. Called from updateSequencer().
     var response = JSON.parse(responseText);
@@ -520 +522 @@
     // Loop through returned question objects
     for (var i = 0; i < response.length; i++) {
+        
+        /*
+         * The following block of code defines the layout and composition of the question display
+         */
+        
         // Define the outer frame
         var frameDiv = ce("div");
@@ -570 +577 @@
         frameDiv.appendChild(controlsDiv);
         
+        /* 
+         * This is where the layout code ends
+         * We proceed to insertion of the created DIV into the document
+         */ 
+        
         // We now have a full question display DIV contained in the frameDiv variable. We should now add this to the sequencer content.
-        debugger;
         for (var j = needsUpdating.length - 1; j >= 0; j--) {
             if (needsUpdating[j][1] != response[i].uid) continue;
@@ -587 +598 @@
     
     sequencer.state.updating = false;   //re-enable user commands
+}
+
+function saveSurvey(confirmSave) {
+    // Sends an AJAX request to the PHP server that saves the current object.
+    var answer = (confirmSave == true) ? confirm("Save changes?") : true;
+    if (answer == false) return;
+    
+    // Check for object type being edited, adjust requestString and target URL to this information.
+    var request = new Object(), url, requestString;
+    switch (sequencer.settings.content.contentType.toLowerCase()) {
+        case "survey":
+            url = "saveSurvey.php";
+            request.title = sequencer.survey.title;
+            request.uid = sequencer.survey.uid;
+            request.description = sequencer.survey.description;
+            request.questions = new Object();
+            request.questions.uids = sequencer.survey.questions.uids;
+            requestString = "args="+JSON.stringify(request);
+            console.log(request);
+            newAjaxRequest(requestString, url, function(result){
+                console.log(result.responseText);
+            }, true);
+            break;
+        case "blaaaat":
+            url = "savesession.php";
+            request.pipeline.uids = sequencer.session.pipeline.uids;
+            request.pipeline.types = sequencer.session.pipeline.types;
+            break;
+    }
 }
 
@@ -648 +688 @@
 }
 
-function ajaxInfoRequest(uid, el, type) {
-    // Info panel update.
-    
-    var c = "uid="+uid;
-    c += "&type="+type;
-    var u = "getInfo.php";
-    newAjaxRequest(c, u, function(result) {
-        el.innerHTML = result.responseText;
-    }, true);
-}
+
 
 function savePipeline (confirmSave) {
@@ -784 +815 @@
 
 // Temp function that creates a dummy question to test the insertNewQuestions function.
+// NOTE: CAN BE REMOVED!
 function debug_addQuestion() {
     // Derp, natuurlijk werkt de addQuestion call niet twee keer. Hij creeert twee keer exact hetzelfde object. Bottom line: het werkt. Nu de editing code voor deze questions gaan schrijven!
@@ -803 +835 @@
 
 // Temp function that articially switches content type when the page is already loaded, to easily test layout changes and content flow.
+// NOTE: CAN BE REMOVED!
 function debug_switchType() {
     var content = ge("seqContent");