Changeset 154 for Dev/trunk

Timestamp:

11/15/11 16:25:01 (13 years ago)

Author:

fpvanagthoven

Message:

Location:

Dev/trunk

Files:

• classes/DisplayStep.php (deleted)
• classes/Step.php (deleted)
• classes/Toolbox.php (modified) (1 diff)
• classes/pipelineSequencer.php (modified) (4 diffs)
• css/awesome.css (modified) (1 diff)
• images/icons/questionnaire.png (deleted)
• images/icons/questionnaire2.png (deleted)
• images/icons/survey.png (added)
• images/icons/survey2.png (added)
• js/sequencerScripts.js (modified) (6 diffs)
• pipelineEditor.php (modified) (1 diff)
• pipelineEditor_1.php (deleted)
• returnStep.php (modified) (2 diffs)

Dev/trunk/classes/Toolbox.php

@@ -20 +20 @@
                 <div class="title">Toolbox</div>
                 <p>Add new: </p>
-                <div class="creationButton" onClick="document.toolbox.objectToCreate.value = 'Questionnaire'; SubmitToolbox();"><img src="images/icons/questionnaire.png" class="buttonIcon"/><p>Questionnaire</p></div>
+                <div class="creationButton" onClick="document.toolbox.objectToCreate.value = 'Survey'; SubmitToolbox();"><img src="images/icons/survey.png" class="buttonIcon"/><p>Survey</p></div>
                 <div class="creationButton" onClick="document.toolbox.objectToCreate.value = 'Application'; SubmitToolbox();"><img src="images/icons/application.png" class="buttonIcon"/><p>Application</p></div>
                 <div class="creationButton" onClick="document.toolbox.objectToCreate.value = 'Dashboard'; SubmitToolbox();"><img src="images/icons/dashboard.png" class="buttonIcon"/><p>Dashboard</p></div>

Dev/trunk/classes/pipelineSequencer.php

@@ -27 +27 @@
         $stringPipeline = rtrim($stringPipeline, ",");
         ?>
-        <br /><form name="sequencer" action="pipelineEditor.php" method="post">
+        <br /><form name="sequencerForm" action="pipelineEditor.php" method="post">
             <fieldset id="sequencer">
                 <div class="title">Name: <?php echo $this->loadedSession->title; ?> </div>
 
-                <div id="seqContent">
-
-                </div>
+                <div id="seqContent"></div>
 
                 <div id="controls">
@@ -43 +41 @@
                     <input type="checkbox" name="confirmClear" onChange="IsCheckEnabled(this, document.sequencer.clearPipeline);" />Really clear?
                 </div>
-                <div id="hiddeInputs">
+                <div id="hiddenInputs">
                     <input type="hidden" name="selectedStep" id="selectedStepField" value="" />
-                    <input type="hidden" name="pipelineString" id="pipelineStringField" value="123,456,123" />
+                    <input type="hidden" name="pipelineString" id="pipelineStringField" value="123,456" />
                 </div>
             </fieldset>
@@ -66 +64 @@
     public function Javascript() {
         $pipelineString = "ERROR";
-        
+
         echo "<!--$pipelineString-->";
-        
         ?>
         <script type="text/javascript" src="js/sequencerScripts.js"></script>
@@ -90 +87 @@
         if (count($sessionResults) > 0) {
             $this->loadedSession = $sessionResults[0];
-        } else {
+        } else {        //No session with that UID found in database!
             die("Invalid session!");
         }
     }
 
+    public function HandlePostData() {
+        if (isset($_POST['editSelected'])) {
+            if (isset($_POST['selectedStep']) && !empty($_POST['selectedStep'])) {
+                redirect("editredirect.php");
+            }
+        }
+
+        if (isset($_POST['moveSelectedLeft'])) {
+            if (isset($_POST['selectedStep']) && !empty($_POST['selectedStep'])) {
+                MoveStep($_POST['selectedStep'], -1);
+            }
+        }
+
+        if (isset($_POST['moveSelectedRight'])) {
+            if (isset($_POST['selectedStep']) && !empty($_POST['selectedStep'])) {
+                MoveStep($_POST['selectedStep'], 1);
+            }
+        }
+
+        if (isset($_POST['objectToCreate']) && !empty($_POST['objectToCreate'])) {
+            switch (strtolower($_POST['objectToCreate'])) {
+                case "survey":
+                    redirect("createsurvey.php");
+                    break;
+                case "application":
+                    redirect("createapplication.php");
+                    break;
+                case "dashboard":
+                    redirect("createdashboard.php");
+                    break;
+                default:
+                    // Er is iets fout gegaan, want er is geen valid type meegegeven!
+                    break;
+            }
+        }
+    }
+
+    // Dit is een pure php versie. Deze slaat nog niet op in de Database, en reageert nog niet op 
+    public function MoveStep($uid, $direction) {
+        $newSession = $this->loadedSession;
+
+        for ($i = 0; $i < count($newSession->pipeline); $i++) {
+            if ($newSession->pipeline[i]->uid == $uid) {
+                $temp = $newSession->pipeline[i];
+                $newSession->pipeline[i] = $newSession->pipeline[i + $direction];
+                $newSession->pipeline[i + $direction] = $newSession->pipeline[i];
+                break;
+            }
+        }
+
+        $this->loadedSession = $newSession;
+    }
+
 }
 ?>

Dev/trunk/css/awesome.css

@@ -668 +668 @@
 
 .displayStep.selected {
-    background-color: rgba(255, 255, 255, 0.5);
+    -moz-box-shadow: 0 0 50px #FFF;
+    -webkit-box-shadow: 0 0 50px #FFF;
+    box-shadow: 0 0 50px #FFF;
+    
 }
 

Dev/trunk/js/sequencerScripts.js

@@ -32 +32 @@
 
 function hasClass(ele,cls) {
-    return ele.className.match(new RegExp('(\\s|^)'+cls+'(\\s|$)'));
+    if (ele.className)
+        return ele.className.match(new RegExp('(\\s|^)'+cls+'(\\s|$)'));
 }
  
@@ -50 +51 @@
 
 function selectStep(uid) {
-    document.getElementById(uid).addClass("selected");
-    var selectedInfo = document.getElementById("selectedStepField");
-    if (selectedInfo == null) {     // This is the first time a step is selected after a reload of the page, therefore a hidden input field is not yet present.
-        selectedInfo = document.createElement("input")
-        selectedInfo.setAttribute("type","hidden");
-        selectedInfo.setAttribute("id","selectedStepField");
-        selectedInfo.setAttribute("value",uid);
-        var hiddenInputFields = document.getElementById("hiddenInputs");
-        hiddenInputFields.appendChild(selectedInfo);
+    var nodes = document.getElementById("seqContent").childNodes;
+    for (var i = 0; i < nodes.length; i++) {     //loop through childNodes. Skip first node (whitespace)
+        //debugger;
+        if (hasClass(nodes[i], "displayStep")) {    //check if current childNode is a displayStep, not divider or text.
+            if (nodes[i].id == uid) {
+                addClass(nodes[i], "selected");
+            }
+            else {
+                removeClass(nodes[i], "selected");
+            }
+        }
     }
-    else {      // There already exists a hidden input field with id selectedStepField, therefore we only change the value of this field.
-        var hiddenInput = document.getElementById("selectedStepField");
-        hiddenInput.value = uid;
-    }
+    
+    // Update selected step field with uid of currently selected step.
+    var selectedStepField = document.getElementById("selectedStepField");
+    selectedStepField.value = uid;
+    
 }
                                                                             
@@ -123 +127 @@
 }
 
+
 /*
  * ajaxStepRequest gets  the markup for displaying a step in the sequencer from returnStep.php
@@ -128 +133 @@
  */
 
-function ajaxStepRequest(UID) {
-    var c = "uid="+UID;
+function ajaxStepRequest(UIDS) {
+    var c = "uids="+UIDS;
     var u = "returnStep.php";
     newAjaxRequest(c, u, function(result) {
-        var newDiv = document.createElement("div");
-        newDiv.innerHTML = result.responseText;
-        document.getElementById("seqContent").appendChild(newDiv);
+        document.getElementById("seqContent").innerHTML = result.responseText;
     });
 }
@@ -156 +159 @@
     var content = document.getElementById("seqContent");
     var pipeline = document.getElementById("pipelineStringField").value;
-    var copy = pipeline;
-    pipeline = copy.split(",");
-    
-    // then do an xmlhttp request for each step to be added to the sequencer
-    var numberOfSteps = pipeline.length;
-    for (var i = 0; i < numberOfSteps; i++) {
-        ajaxStepRequest(pipeline[i]);
-        if (i < (numberOfSteps-1)) {
-            ajaxStepRequest("divider");
-        }
-    }
-    
-                
+    pipeline = pipeline.replace(/,/g , ",divider,");    //regex search for commas, global (repeat), to represent them with visual dividers.
+    ajaxStepRequest(pipeline);
 }
 
@@ -174 +166 @@
     
 }
-
-

Dev/trunk/pipelineEditor.php

@@ -3 +3 @@
 
 if (!isset($_SESSION['username'])) {
-    $_SESSION['message'] = "You were redirected here because your session timed out or you used an invalid link.";
     redirect('index.php');
 }
 
 $sequencer = new PipelineSequencer();
-$sequencer->GetFromDB($_SESSION['currentSession']);
+$sequencer->GetFromDB($_SESSION['currentSession']); //load session into php part of the sequencer
+$sequencer->HandlePostData();
 ?>
 

Dev/trunk/returnStep.php

@@ -10 +10 @@
 
 // Check if calling script actually passed a uid to use
-if (isset($_POST['uid'])) {
-    if (!empty($_POST['uid'])) {
-        $uid = $_POST['uid'];
+if (isset($_POST['uids'])) {
+    if (!empty($_POST['uids'])) {
+        $uids = $_POST['uids'];
     } else {
-        echo "Invalid UID passed!";
+        echo "Invalid UIDs passed!";
     }
 } else {
@@ -20 +20 @@
 }
 
+$sUids = explode(",", $uids);
+$response = "";
+$dbi = new DatabaseInterface();
+foreach ($sUids as $uid) {
+    $response .= processUid($uid);
+}
+
+echo $response;
 
 
-if ($uid == "123") {        // test case for when steps aren't actually working
-    $imageURL = "images/icons/unknowntype.png";
-    $response = '<div class="displayStep" id="' . "123" . '"><div class="displayStepIcon"><img src="' . $imageURL . '" /></div>' . "123" . '</div>';
-    echo $response;
-} 
-else if($uid == '456') {
-    $imageURL = "images/icons/unknowntype.png";
-    $response = '<div class="displayStep" id="' . "456" . '"><div class="displayStepIcon"><img src="' . $imageURL . '" /></div>' . "456" . '</div>';
-    echo $response;
-}
-else {
-    
-
-    if ($uid == "divider") {    //a divider has been requested instead of a displaystep
-        $response = '<div class="divider"></div>';
-        echo $response;
-    } else {        // an actual step has been requested.
+/*
+ * ProcessUid needs to be changed once all the object classes are fixed. The '123', '456' test cases are not functional and are for testing puroses only.
+ * Additional onclick events for selecting objects would need to be added as well.
+ */
 
 
-        $dbi = new DatabaseInterface();
+
+function processUid($uid) {
+    if ($uid == "123") {        // test case for when steps aren't actually working
+        $imageURL = "images/icons/unknowntype.png";
+        $responsePart = '<div class="displayStep" id="' . "123" . '" onClick="selectStep(this.id);"><div class="displayStepIcon"><img src="' . $imageURL . '" /></div>' . "123" . '</div>';
+        return $responsePart;
+    } else if ($uid == '456') {
+        $imageURL = "images/icons/unknowntype.png";
+        $responsePart = '<div class="displayStep" id="' . "456" . '" onClick="selectStep(this.id);"><div class="displayStepIcon"><img src="' . $imageURL . '" /></div>' . "456" . '</div>';
+        return $responsePart;
+    } else {
+
+
+        if ($uid == "divider") {    //a divider has been requested instead of a displaystep
+            $responsePart = '<div class="divider"></div>';
+            return $responsePart;
+        } else {        // an actual step has been requested.
+            
 //Check in order: survey, application, dashboard.
-        $result = null;
-        $resultType = null;
-        $surveys = $dbi->get("Survey", array("uid" => $uid));
-        if (count($surveys) > 0) {
-            if ($surveys[0] != null) {
-                // A survey exists with the given UID!
-                $result = $surveys[0];
-                $resultType = "Survey";
-            }
-        }
-
-        if (result != null) {
-            $applications = $dbi->get("Application", array("uid" => $uid));
-            if (count($applications) > 0) {
-                if ($applications[0] != null) {
-                    // An application exists with the given UID!
-                    $result = $applications[0];
-                    $resultType = "Application";
+            $result = null;
+            $resultType = null;
+            $surveys = $dbi->get("Survey", array("uid" => $uid));
+            if (count($surveys) > 0) {
+                if ($surveys[0] != null) {
+                    // A survey exists with the given UID!
+                    $result = $surveys[0];
+                    $resultType = "Survey";
                 }
             }
-        }
 
-        if (result != null) {
-            $dashboards = $dbi->get("Dashboard", array("uid" => $uid));
-            if (count($dashboards) > 0) {
-                if ($dashboards[0] != null) {
-                    // A dashboard exists with the given UID!
-                    $result = $dashboards[0];
-                    $resultType = "Dashboard";
+            if (result != null) {
+                $applications = $dbi->get("Application", array("uid" => $uid));
+                if (count($applications) > 0) {
+                    if ($applications[0] != null) {
+                        // An application exists with the given UID!
+                        $result = $applications[0];
+                        $resultType = "Application";
+                    }
                 }
             }
-        }
+
+            if (result != null) {
+                $dashboards = $dbi->get("Dashboard", array("uid" => $uid));
+                if (count($dashboards) > 0) {
+                    if ($dashboards[0] != null) {
+                        // A dashboard exists with the given UID!
+                        $result = $dashboards[0];
+                        $resultType = "Dashboard";
+                    }
+                }
+            }
 
 // If result is still null at this point, the passed UID does not refer to an existing object!
-        if ($result == null || $resultType == null) {
-            echo "Non-existing UID passed!";
-        } else {
+            if ($result == null || $resultType == null) {
+                echo "Non-existing UID passed!";
+            } else {
 
-            // set relevant variables based on the type and properties of the step in question (currently stored in $result)
-            switch (strtolower($resultType)) {
-                case "questionnaire":
-                    $imageURL = "images/icons/questionnaire.png";
-                    break;
-                case "dashboard":
-                    $imageURL = "images/icons/dashboard.png";
-                    break;
-                case "application":
-                    $imageURL = "images/icons/application.png";
-                    break;
-                default:
-                    $imageURL = "images/icons/unknowntype.png";
-                    break;
-            }
+                // set relevant variables based on the type and properties of the step in question (currently stored in $result)
+                switch (strtolower($resultType)) {
+                    case "survey":
+                        $imageURL = "images/icons/survey.png";
+                        break;
+                    case "dashboard":
+                        $imageURL = "images/icons/dashboard.png";
+                        break;
+                    case "application":
+                        $imageURL = "images/icons/application.png";
+                        break;
+                    default:
+                        $imageURL = "images/icons/unknowntype.png";
+                        break;
+                }
 
 //echo out the HTML markup
-            $response = '<div class="displayStep" id="' . $result->uid . '"><div class="displayStepIcon"><img src="' . $imageURL . '" /></div>' . $result->name . '</div>';
-            echo $response;
+                $responsePart = '<div class="displayStep" id="' . $result->uid . '" onClick="selectStep(this.id);"><div class="displayStepIcon"><img src="' . $imageURL . '" /></div>' . $result->name . '</div>';
+                return $responsePart;
+            }
         }
     }
 }
+
 ?>