Changeset 188

Timestamp:

12/16/11 16:22:19 (13 years ago)

Author:

fpvanagthoven

Message:

 

Location:

Dev/trunk

Files:

• classes/pipelineSequencer.php (modified) (1 diff)
• createObject.php (modified) (1 diff)
• css/visualeditors.css (modified) (1 diff)
• js/sequencerScripts.js (modified) (13 diffs)
• returnObjectDisplay.php (modified) (1 diff)

Dev/trunk/classes/pipelineSequencer.php

@@ -95 +95 @@
         $results = $this->dbi->get("Session", array("uid"=> $_SESSION['currentSession']));
         if (!empty($results)) {
-            (is_array($results)) ? $this->loadedSession = $results[0] : $this->loadedSession = $results;
+            if ($results[0]->evaluate()) {
+                $this->loadedSession = $results[0];
+            }
         }
         else {

Dev/trunk/createObject.php

@@ -15 +15 @@
 $dbi = new DatabaseInterface();
 $creator_results = $dbi->get("User", array("name" => $_SESSION['username']));
+
 if (count($creator_results) > 0) {
     $creator = $creator_results[0];

Dev/trunk/css/visualeditors.css

@@ -141 +141 @@
 }
 
-.smallFrame.selected .smallTitle {
-    background-color: #FF0000;
+.smallFrame.selected {
+    background-color: #777777;
+    border-color:#000;
 }
 

Dev/trunk/js/sequencerScripts.js

@@ -145 +145 @@
         case "survey":
             sequencer.settings.content.orientation = "vertical";
-            sequencer.settings.content.width = 800;
-            sequencer.settings.content.height = "auto";
+            sequencer.settings.content.width = 650;     //guesstimated
+            var roomH = screen.availHeight;
+            sequencer.settings.content.height = roomH - 200;
             content.style.width = sequencer.settings.content.width+"px";
             content.style.height = sequencer.settings.content.height+"px";
@@ -179 +180 @@
             break;
     }
-    
-    
-    
-    
-    //console.log(sequencer);
-    sequencer.state.updating = false;   // Re-enable new actions
 }
 
@@ -258 +253 @@
 // THIS NEEDS SOME WORK! A LOT OF IT ACTUALLY!
 function updateSequencer_Survey() {
-    //debugger;
+    
     var content = ge("seqContentWrapper");
     var requestString, needsUpdating, args;
@@ -283 +278 @@
         requestString = "args="+JSON.stringify(args);
         newAjaxRequest(requestString, "returnObjectDisplay.php", function(result){
-            //debugger;
             content.removeChild(loadingGif);
             insertNewObjects(result.responseText, needsUpdating);
+            sequencer.state.loaded = true;
         }, true);
         sequencer.state.loaded = false;
@@ -293 +288 @@
     }
     else {
+
         // This means that one or more steps are being added, not an entire pipeline's worth of them
+        debugger;
         needsUpdating = new Array();
         args = [];
         // Add steps that need updating to the needsUpdating array (index, uid, type).
-        for (var i = 0; i < sequencer.session.pipeline.uids.length; i++) {
-            if (sequencer.session.pipeline.upToDate[i] == true) continue;
-            needsUpdating.push(new Array(i, sequencer.session.pipeline.uids[i], sequencer.session.pipeline.types[i]));
+        for (var i = 0; i < sequencer.survey.questions.uids.length; i++) {
+            if (sequencer.survey.questions.upToDate[i] == true) continue;
+            needsUpdating.push(new Array(i, sequencer.survey.questions.uids[i], "Question"));
             args.push({
-                uid: sequencer.session.pipeline.uids[i],
-                type: sequencer.session.pipeline.types[i]
+                uid: sequencer.survey.questions.uids[i],
+                type: "Question"
             });        
         }
@@ -326 +323 @@
         updateDividers();
     // End optional
-    }
+        
+    }
+        
 }
 
@@ -363 +362 @@
         }
     }
+    
+    // Because updateDividers is always called last, we set updating to false here, so the user can again issue commands to the pipeline
+    sequencer.state.updating = false;   // Re-enable new actions
 }
 
@@ -387 +389 @@
 function insertNewObjects(responseText, needsUpdating) {
     // Container function that calls different insertNewX() functions depending on content type. Called from updateSequencer().
-    debugger;
     var response = JSON.parse(responseText);
     // For now I assume that only one type of element can be displayed in the editor at one time. Therefore, the type of response[0] is the type of all elements of response.
@@ -394 +395 @@
             insertNewSteps(response, needsUpdating);
             break;
-        case "question":
+        case "survey":
             insertNewQuestions(response, needsUpdating);
             break;
@@ -411 +412 @@
         
     newAjaxRequest(c, u, function(result) {
-        debugger;
         sequencer.survey.questions.uids.push(removeNL(result.responseText));
         sequencer.survey.questions.upToDate.push(false);
@@ -517 +517 @@
 function insertNewQuestions(response, needsUpdating) {
     //Code that inserts or replaces new object displays in the sequencer. Question version.
-    
     var content = ge("seqContentWrapper");
     // Loop through returned question objects
@@ -566 +565 @@
         controlsDiv.appendChild(editButton);
         controlsDiv.appendChild(removeButton);
+        frameDiv.addEventListener("click", function(){
+            clickStep(this.id);
+        }, false);
         frameDiv.appendChild(controlsDiv);
         
         // 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;
             if (needsUpdating[j][0] > sequencer.state.numSteps-1) {
                 content.appendChild(frameDiv);
+                sequencer.state.numSteps++;
             }
             else {
                 content.replaceChild(frameDiv, content.childNodes[needsUpdating[j][0]*2]);
             }
-            sequencer.state.numSteps++;
-        }
-    }
+            sequencer.survey.questions.upToDate[needsUpdating[j][0]] = true;
+            
+        }
+    }
+    
+    sequencer.state.updating = false;   //re-enable user commands
 }
 
@@ -609 +616 @@
     if (element) {
         addClass(element, "selected");
-        var type = sequencer.session.pipeline.types[sequencer.session.pipeline.uids.indexOf(uid)];
-        ajaxInfoRequest(uid, ge("infoPanelContent"), type);
+        var type;
+        switch (sequencer.settings.content.contentType.toLowerCase()) {
+            case "session":
+                type = sequencer.session.pipeline.types[sequencer.session.pipeline.uids.indexOf(uid)];
+                break;
+            case "survey":
+                type = "Question";
+                break;
+            default:
+                //Dunno
+                break;
+        }
+        (type != "survey") ? ajaxInfoRequest(uid, ge("infoPanelContent"), type) : type=type /*This does nothing*/;
         sequencer.state.selectedObject.uid = uid;
         sequencer.state.selectedObject.index = null;  //Don't know how to do this yet.

Dev/trunk/returnObjectDisplay.php

@@ -20 +20 @@
 $outputArray = array();
 foreach ($requestArray as $request) {
-    var_dump($request);
-    $results = $dbi->get(strtolower($request->type), array("uid" => $request->uid));
     
-    /*
-     * Reden voor deze var dumps is dat de questions niet gevonden kunnen worden. De bovenstaande regel returnet geen question object, ook als deze zeker weten wel bestaat.
-     * Even aan Jos vragen wat hier fout gaat?
-     */
+    $results = $dbi->get($request->type, array("code" => $request->uid));
+    // Bottom line, werkt prima. Questions werken nu op ns1:question_code, accessible als question->code
     
-    
-    
-    
-    var_dump($results);
     if (isset($results) && !empty($results)) {
         is_array($results) ? $object = $results[0] : $object = $results;