Changeset 191 for Dev

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.

Location:

Dev/trunk

Files:

• classes/pipelineSequencer.php (deleted)
• classes/pipelineSequencer_1.php (deleted)
• classes/sessionEditorWidget.php (added)
• classes/surveyEditorWidget.php (modified) (3 diffs)
• createObject.php (modified) (1 diff)
• css/visualeditors.css (modified) (3 diffs)
• getInfo.php (modified) (1 diff)
• index.php (modified) (2 diffs)
• js/ajax.js (deleted)
• js/creation.js (deleted)
• js/generalScripts.js (modified) (1 diff)
• js/menu.js (deleted)
• js/sequencerScripts.js (modified) (11 diffs)
• js/surveyEditorScripts.js (deleted)
• pipelineEditor.php (deleted)
• returnObjectDisplay.php (modified) (1 diff)
• returnQuestionDisplay.php (deleted)
• returnStep.php (deleted)
• saveSurvey.php (added)
• savesession.php (modified) (1 diff)
• selectSession.php (modified) (5 diffs)
• sessionEditor.php (added)

Dev/trunk/classes/surveyEditorWidget.php

@@ -27 +27 @@
             $surveyResults = $dbi->get("Survey", array("uid" => $_POST['objectUid']));
             if (!empty($surveyResults)) {
-                (is_array($surveyResults)) ? $this->loadedSurvey = $surveyResults[0] : $this->loadedSurvey = $surveyResults;
+                $this->loadedSurvey = $surveyResults[0];
             } else {
                 die("No surveys found!");
@@ -39 +39 @@
         $questionString = "";
         foreach ($this->loadedSurvey->questions as $question) {
-            $questionString .= $question->uid . ",";
+            $questionString .= $question->code . ",";
         }
         // echo the HTML markup to display the editor on the screen
@@ -72 +72 @@
 
                 <input type="button" value="Discard survey" onClick="javascript:alert('discard not yet supported');" class="smallButton" />
-                <input type="button" value="Save survey" onClick="javascript:alert('save not yet supported');" class="smallButton" />
+                <input type="button" value="Save survey" onClick="saveSurvey(true);" class="smallButton" />
             </div>
 

Dev/trunk/createObject.php

@@ -14 +14 @@
 
 $dbi = new DatabaseInterface();
-$creator_results = $dbi->get("User", array("name" => $_SESSION['username']));
+$creator_results = $dbi->get("User", array("uid" => $_SESSION['userUid']));
+$creator = $creator_results[0];
 
-if (count($creator_results) > 0) {
-    $creator = $creator_results[0];
-} else {
-    //die ("Invalid creator, make sure you are logged in!");
+//var_dump($creator);
+
+if (!$creator) {
+    die("Stuff is broke, yo!");
 }
 

Dev/trunk/css/visualeditors.css

@@ -117 +117 @@
     box-shadow: 2px 2px 1px #888;
     border: 1px solid #FFF;
+    margin: 0;
 }
 
@@ -357 +358 @@
 
 #seqContentWrapper .divider.vertical {
-    height: 1px;
-    width: 200px;
-    background-color: #FF00FF; /* VIES MAGENTA! */
-    margin: 1em auto;
+    float: left;
+    clear: both;
+    height: 2px;
+    width: 400px;
+    background-color: #555; /* VIES MAGENTA! */
+    margin: 0.75em 100px;
 }
 
@@ -415 +418 @@
 }
 
+.smallFrame .smallButton {
+    width:55px;
+}
+

Dev/trunk/getInfo.php

@@ -37 +37 @@
     case "Session":
         $returnString .= "<span class='property'>Title: </span><span class='value'>$result->title</span>";
+        $result->evaluate();
         $returnString .= "<span class='property'>Created: </span><span class='value'>" . $result->datetime->format("H:i:s, d-m-Y") . " by " . $result->creator->name . "</span>";
         $cS = 0; $cD = 0; $cA = 0;

Dev/trunk/index.php

@@ -8 +8 @@
 
 //Even voor tijdelijk, aangezien er nog pagina's missen en redirects daarom niet goed werken:
-if (isset($_SESSION['username'])) {
+if (isset($_SESSION['userUid'])) {
     redirect("logout.php");
 }
@@ -15 +15 @@
 
 if (isset($_POST['register'])) {
-    if ($_POST['username'] != null && $_POST['password'] != null) {
+    if (isset($_POST['username']) && isset($_POST['password'])) {
         $dbi = new DatabaseInterface();
         $user_results = $dbi->get("user", array("name" => $_POST['username']));
-        $user_exists = (count($user_results) > 0);
-        if (!$user_exists) {
+        if (count($user_results) == 0 || !$user_results) {
             if (strlen($_POST['password']) > 6) {
                 $user = new User(null, $_POST['username'], $_POST['password']);
                 $dbi->set($user);
-                $_SESSION['username'] = $_POST['username'];
+                $_SESSION['userUid'] = $user->uid;
             } else {
-                $errorMessage[] = "Password is too short!";
-                //echo "Password is too short!";
+                $errorMessage[] = "Password is too short";
             }
         }
         else
             $errorMessage[] = "Username already exists, try something else!";
-        //echo "Username already exists, try something else";
     }
     else
         $errorMessage[] = "Please fill in a username and password";
-    //echo "please fill in a username and password";
 }
 
-if (isset($_POST['login'])) {
+if (isset($_POST['login'])) {   // User clicked the login button
     $dbi = new DatabaseInterface();
     $user_results = $dbi->get("user", array("name" => $_POST['username']));
     if (isset($user_results[0])) {
         if ($user_results[0]->password == $_POST['password']) {
-            $_SESSION['username'] = $user_results[0]->name;
-            // USER HAS LOGGED IN
+            $_SESSION['userUid'] = $user_results[0]->uid;
         } else {
             $errorMessage[] = "Incorrect password!";
-            //echo "Incorrect password!";
         }
     } else {
         $errorMessage[] = "Username doesn't exist!";
-        //echo "Username doesn't exist!";
     }
 }
 
-if (isset($_SESSION['username'])) {
+if (isset($_SESSION['userUid'])) {  // User just registered a new account
     redirect('selectSession.php');
 }

Dev/trunk/js/generalScripts.js

@@ -76 +76 @@
 }
 
+// Function that handles updating of info panel via AJAX getInfo.php. Currently operates on HTML to paste into #infoPanelContent, should eventually involve JSON arrays, to have more control over formatting.
+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 to save the object currently being edited.
 // !! Still needs to be generalized !!

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");

Dev/trunk/returnObjectDisplay.php

@@ -21 +21 @@
 foreach ($requestArray as $request) {
     
+    //!!! DEZE SHIT MOET WEER TERUGGEDRAAID WORDEN ZODRA QUESTIONS WEER GEWOON UIDS HEBBEN IPV CODES!
+    if ($request->type == "Question"){
     $results = $dbi->get($request->type, array("code" => $request->uid));
     // Bottom line, werkt prima. Questions werken nu op ns1:question_code, accessible als question->code
-    
+    }
+    else {
+        $results =  $dbi->get($request->type, array("uid"=>$request->uid));
+    }
     if (isset($results) && !empty($results)) {
         is_array($results) ? $object = $results[0] : $object = $results;

Dev/trunk/savesession.php

@@ -2 +2 @@
 
 require 'classes/master.php'; //should be at top of every page
+
+/*
+ * Dit kan een STUK sneller. Vervang gewoon de hele pipeline string met de lokale versie.
+ * Daarna: $session->eval
+ */
 
 if (isset($_POST['uids']) && isset($_POST['types']) && isset($_POST['sessionUid'])) {

Dev/trunk/selectSession.php

@@ -2 +2 @@
 require 'classes/master.php'; //should be at top of every page
 
-if (!isset($_SESSION['username'])) {
+if (!isset($_SESSION['userUid'])) {
     redirect("index.php");
 }
@@ -18 +18 @@
         // check if name is available
         if (!empty($_POST['newSessionName'])) {
-            $matching = $dbi->get("Session", array("title" => $_POST['newSessionName']));
-            if (count($matching) == 0) {
+            $session_results = $dbi->get("Session", array("title" => $_POST['newSessionName']));
+            if (count($session_results) == 0) {
                 // make new session!
-                unset($matching);
-                $creators = $dbi->get("User", array("username"=>$_SESSION['username']));
+                unset($session_results);
+                $creators = $dbi->get("User", array("uid" => $_SESSION['userUid']));
                 $creator = $creators[0];
                 $session = new Session(null, $_POST['newSessionName'], $creator, new DateTime(), null, null);
@@ -43 +43 @@
 if (isset($_POST['editSession'])) {
     if (isset($_POST['sessionUID'])) {
-        $matching = $dbi->get("SESSION", array("uid" => $_POST['sessionUID']));
-        if (count($matching) == 1 && $matching[0] != null) {
+        $session_results = $dbi->get("SESSION", array("uid" => $_POST['sessionUID']));
+        if (count($session_results) == 1 && $session_results[0] != null) {
             // DEZE SESSION MOET UITEINDELIJK EEN POST WORDEN, WANNEER DEZE HELE PAGINA IS OVERGEZET IN JAVASCRIPT!
             $_SESSION['currentSession'] = $_POST['sessionUID'];
             $_SESSION['updateNeeded'] = "true";
-            redirect("pipelineEditor.php");
+            redirect("sessionEditor.php");
         }
     }
@@ -66 +66 @@
         <?php new StyleSheet("awesome"); ?>
         <script type="text/javascript" src="js/sequencerScripts.js"></script>
+        <script type="text/javascript" src="js/generalScripts.js"></script>
     </head>
     <body>
@@ -74 +75 @@
         <div id="wrapper">
             <div id="content">
-            <form action="selectSession.php" method="POST">
-                <fieldset name="selectionMenu">
-                    <!-- onchange van volgende select linkt deze aan de ajax-based info panel, script staat in sequencerScripts.js -->
-                    <select name="sessionUID" style="float: left;" onChange="ajaxInfoRequest(this.value, document.getElementById('infoPanelContent'), 'Session');">
-                        <option value="" disabled="true" selected>Please select a session</option>
-            <?php
-                        foreach ($sessions as $session) {
-                            $selected = "";
-                            if ($session->title == $_POST['newSessionName']) {
-                                $selected = ' selected="true"';
+                <form action="selectSession.php" method="POST">
+                    <fieldset name="selectionMenu">
+                        <!-- onchange van volgende select linkt deze aan de ajax-based info panel, script staat in sequencerScripts.js -->
+                        <select name="sessionUid" style="float: left;" onChange="ajaxInfoRequest(this.value, document.getElementById('infoPanelContent'), 'Session');">
+                            <option value="" disabled="true" selected>Please select a session</option>
+                            <?php
+                            foreach ($sessions as $session) {
+                                $selected = "";
+                                if ($session->title == $_POST['newSessionName']) {
+                                    $selected = ' selected="true"';
+                                }
+
+                                echo '<option value="' . $session->uid . '"' . $selected . '>' . $session->title . '</option>' . "\n";
                             }
-                            
-                            echo '<option value="' . $session->uid . '"' . $selected . '>' . $session->title . '</option>' . "\n";
-                        }
-                        ?>                    
-                    </select>
-                    <br /><br />
-                    <input type="hidden" name="updateNeeded" value="true" />
-                    <input type="text" name="newSessionName" value="Name..." style="float: left;" /><br />
-                    <input type="submit" name="createSession" value="Create new session" class="surveybutton" style="float: left;" />
-                    <input type="submit" name="editSession" value="Edit session" class="surveybutton" style="float: left;" />
-                    <input type="submit" name="deleteSession" value="Delete session" class="surveybutton" style="float: left;" />
-                    <br /><br /><br />
-                    <div id="errorDisplay"><?php
-                        if (isset($errorMessage)) {
-                            foreach ($errorMessage as $message) {
-                                echo $message;
+                            ?>                    
+                        </select>
+                        <br /><br />
+                        <input type="hidden" name="updateNeeded" value="true" />
+                        <input type="text" name="newSessionName" value="Name..." style="float: left;" /><br />
+                        <input type="submit" name="createSession" value="Create new session" class="surveybutton" style="float: left;" />
+                        <input type="submit" name="editSession" value="Edit session" class="surveybutton" style="float: left;" />
+                        <input type="submit" name="deleteSession" value="Delete session" class="surveybutton" style="float: left;" />
+                        <br /><br /><br />
+                        <div id="errorDisplay"><?php
+                            if (isset($errorMessage)) {
+                                foreach ($errorMessage as $message) {
+                                    echo $message;
+                                }
                             }
-                        }
-                        ?></div>
-                </fieldset>
-                <fieldset id="sessionDescription">
-                    <div class="fieldsetTitle">
-                        Info
-                    </div>
-                    <div id="infoPanelContent">
-                    </div>
-                </fieldset>
-            </form>
-        </div>
+                            ?></div>
+                    </fieldset>
+                    <fieldset id="sessionDescription">
+                        <div class="fieldsetTitle">
+                            Info
+                        </div>
+                        <div id="infoPanelContent">
+                        </div>
+                    </fieldset>
+                </form>
+            </div>
         </div>
     </body>