Changeset 153

Timestamp:

11/15/11 11:01:31 (13 years ago)

Author:

fpvanagthoven

Message:

 

Location:

Dev/trunk

Files:

• classes/pipelineSequencer.php (modified) (5 diffs)
• css/awesome.css (modified) (2 diffs)
• images/icons/unknowntype.png (modified) (previous)
• js/jquery.js (added)
• js/sequencerScripts.js (modified) (2 diffs)
• pipelineEditor.php (modified) (2 diffs)
• returnStep.php (modified) (2 diffs)
• selectSession.php (modified) (1 diff)
• surveycreation.php (modified) (3 diffs)

Dev/trunk/classes/pipelineSequencer.php

@@ -21 +21 @@
 
     public function init() {
+        $stringPipeline = "";
+        foreach ($this->loadedSession->pipeline as $object) {
+            $stringPipeline .= "$object->uid,";
+        }
+        $stringPipeline = rtrim($stringPipeline, ",");
         ?>
         <br /><form name="sequencer" action="pipelineEditor.php" method="post">
@@ -27 +32 @@
 
                 <div id="seqContent">
-                    <?php $this->DrawSteps(); ?>          
+
                 </div>
 
@@ -37 +42 @@
                     <input type="submit" name="clearPipeline" value="Clear pipeline" class="surveyButton dis" disabled="true"/>
                     <input type="checkbox" name="confirmClear" onChange="IsCheckEnabled(this, document.sequencer.clearPipeline);" />Really clear?
-                    <input type="hidden" name="selectedStep" />
-                    <input type="hidden" name="numSteps" />
-                    <input type="hidden" name="pipeline" />
+                </div>
+                <div id="hiddeInputs">
+                    <input type="hidden" name="selectedStep" id="selectedStepField" value="" />
+                    <input type="hidden" name="pipelineString" id="pipelineStringField" value="123,456,123" />
                 </div>
             </fieldset>
@@ -47 +53 @@
 
     public function DrawSteps() {
-        
+        // Use AJAX to draw visual representations of step objects in a pipeline
+        // <TODO> Implement parameters such as screen size in the drawing of objects </TODO>
+        ?>
+        <script type="text/javascript">
+            drawSteps();
+        </script>
+
+
+        <?php
     }
 
-    private function Javascript() {
+    public function Javascript() {
+        $pipelineString = "ERROR";
+        
+        echo "<!--$pipelineString-->";
+        
         ?>
         <script type="text/javascript" src="js/sequencerScripts.js"></script>
-
+        <script type="text/javascript" src="js/jquery.js"></script>
+        <script type="text/javascript">
+            $(document).ready(function() {
+                drawSteps();
+            });
+        </script>
         <?php
     }
@@ -63 +86 @@
             redirect("selectSession.php");
         }
-        
+
         $sessionResults = $dbi->get("Session", array("uid" => $currentSession));
         if (count($sessionResults) > 0) {
             $this->loadedSession = $sessionResults[0];
-        }
-        else {
+        } else {
             die("Invalid session!");
         }

Dev/trunk/css/awesome.css

@@ -627 +627 @@
 }
 
-#sequencer .seqContent {
+#sequencer #seqContent {
     height: 9em;
     overflow-x: scroll;
@@ -687 +687 @@
 }
 
-.seqContent .divider {
+#seqContent .divider {
     width: 10px;
     height: 50px;

Dev/trunk/js/sequencerScripts.js

@@ -51 +51 @@
 function selectStep(uid) {
     document.getElementById(uid).addClass("selected");
-    document.sequencer.controls.selectedStep.value = uid;
+    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);
+    }
+    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;
+    }
 }
                                                                             
                                                                             
-/*
- * ajaxStepRequest gets  the markup for displaying a step in the sequencer from returnStep.php
- * Using ajax principle allows for editing of pipeline without constantly refreshing the page.
- */
-
-function ajaxStepRequest(UID) {
-    var c = "uid="+UID;
-    var u = "returnStep.php";
-    newAjaxRequest(c, u, function(result) {
-        var newDiv = result.responseText;
-        document.getElementById("seqContent").appendChild(newDiv);
-    });
-}
-
-function ajaxInfoRequest(id, el) {
-    var uid = id;
-    var c = "uid="+uid;
-    var u = "getInfo.php";
-    newAjaxRequest(c, u, function(result) {
-        el.innerHTML = result.responseText;
-    });
-}
-
 /*
  * This function allows for simple use of AJAX requests.
@@ -133 +122 @@
     xml.send(contentString);
 }
+
+/*
+ * ajaxStepRequest gets  the markup for displaying a step in the sequencer from returnStep.php
+ * Using ajax principle allows for editing of pipeline without constantly refreshing the page.
+ */
+
+function ajaxStepRequest(UID) {
+    var c = "uid="+UID;
+    var u = "returnStep.php";
+    newAjaxRequest(c, u, function(result) {
+        var newDiv = document.createElement("div");
+        newDiv.innerHTML = result.responseText;
+        document.getElementById("seqContent").appendChild(newDiv);
+    });
+}
+
+function ajaxInfoRequest(id, el) {
+    var uid = id;
+    var c = "uid="+uid;
+    var u = "getInfo.php";
+    newAjaxRequest(c, u, function(result) {
+        el.innerHTML = result.responseText;
+    });
+}
                             
 
+
+
+
+
+
 function drawSteps() {
-    var sequencer = document.getElementById("sequencer");
-    var seqContent = document.getElementById("seqContent");
-                
-    // first delete all current children of seqContent (to reset the sequencer).
-    while (seqContent.childNodes.length > 0) {
-        var step = seqContent.childNodes[0];
-        step.parentNode.removeChild(step);
-    }
-                
-    // get pipeline contents from hidden form inputs.
-    var pipeline = sequencer.controls.pipeline.value;
-    var pipeline = pipeline.split(", ");
-                
+    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++) {
+    for (var i = 0; i < numberOfSteps; i++) {
         ajaxStepRequest(pipeline[i]);
+        if (i < (numberOfSteps-1)) {
+            ajaxStepRequest("divider");
+        }
     }
+    
                 
 }
 
+function updatePipelineHidden (pipelineString) {
+    
+}
+
+

Dev/trunk/pipelineEditor.php

@@ -21 +21 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <title></title>
-        <?php new StyleSheet("awesome"); ?>
-        <script type="text/javascript" src="js/menu.js"></script>
-        <script type="text/javascript" src="js/jquery.jps"></script>
-        <script type="text/javascript" src="js/sequencerScripts.js"></script>
+        <?php new StyleSheet("awesome"); 
+        $sequencer->Javascript();
+        ?>
+        
     </head>
     <body>
@@ -36 +36 @@
                 <?php $toolbox = new Toolbox(); ?>
             </div>
+    
     </body>
 </html>

Dev/trunk/returnStep.php

@@ -1 @@
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
 <?php
+
+require 'classes/master.php'; //should be at top of every page
 /*
  * Return the HTML markup for visualisation of an object in a pipeline, to be used in the PipelineSequencer.php
@@ -23 +21 @@
 
 
-$dbi = new DatabaseInterface();
+
+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.
+
+
+        $dbi = new DatabaseInterface();
 //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";
-    }
-}
+        $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";
+        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 {
+
+            // 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;
+            }
+
+//echo out the HTML markup
+            $response = '<div class="displayStep" id="' . $result->uid . '"><div class="displayStepIcon"><img src="' . $imageURL . '" /></div>' . $result->name . '</div>';
+            echo $response;
         }
     }
 }
-
-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 {
-
-    // 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;
-    }
-    
-//echo out the HTML markup
-    $response = '<div class="displayStep" id="' . $result->uid . '"><div class="displayStepIcon"><img src="' . $imageURL . '" /></div>' . $result->name . '</div>';
-    echo $response;
-}
 ?>

Dev/trunk/selectSession.php

@@ -64 +64 @@
     </head>
     <body>
-        <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('sessionDescription'));">
-                    <?php
-                    foreach ($sessions as $session) {
-                        echo '<option value="' . $session->uid . '">' . $session->title . '</option>' . "\n";
-                    }
-                    ?>                    
-                </select>
-                <br /><br />
-                <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 id="header">
+            <?php new Logo(); ?>
+        </div>
+
+        <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('sessionDescription'));">
+                        <?php
+                        foreach ($sessions as $session) {
+                            echo '<option value="' . $session->uid . '">' . $session->title . '</option>' . "\n";
                         }
-                    }
-                    ?></div>
-            </fieldset>
-            <fieldset id="sessionDescription">
-                Info goes here: 
-            </fieldset>
-        </form>
+                        ?>                    
+                    </select>
+                    <br /><br />
+                    <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">
+                    Info goes here: 
+                </fieldset>
+            </form>
+        </div>
+        </div>
     </body>
 </html>

Dev/trunk/surveycreation.php

@@ -5 +5 @@
     redirect('index.php');
 
-$savedSurvey = null;
-$timeStamp = null;
+if (isset($_POST['submit'])) {
+    if (isset($_POST['surveyName'])) {
+        $survey = new Survey(null, $_POST['surveyName'], "Thijs", null);
+        $dbi = new DatabaseInterface();
+        $dbi->set($survey);
+    }
+}
 
 
+
+
+/*
+  $savedSurvey = null;
+  $timeStamp = null;
+ */
+
 /* LOAD SURVEY */
-if (isset($_POST['UID'])) {
-    $surveyID = $_POST['UID'];
-    $surveyDBI = new SurveyCreationDatabaseInterface($surveyID);
-    $info = $surveyDBI->getSurveyInfo();
+/*
+  if (isset($_POST['UID'])) {
+  $surveyID = $_POST['UID'];
+  $surveyDBI = new SurveyCreationDatabaseInterface($surveyID);
+  $info = $surveyDBI->getSurveyInfo();
 
-    $savedSurvey = Survey::getSurvey($info);
-}
+  $savedSurvey = Survey::getSurvey($info);
+  }
+ */
+/* AUTOSAVE */
 
-/* AUTOSAVE */ 
-else if (isset($_POST['timeStamp'])) {
-    $timeStamp = $_POST['timeStamp'];
+/*
+  else if (isset($_POST['timeStamp'])) {
+  $timeStamp = $_POST['timeStamp'];
 
-    echo 'This is what gets sent:';
-    var_dump($_POST);
-    echo '<br/><br/>';
-    $surveyDBI = new SurveyCreationDatabaseInterface($_POST['surveyID']);
-    $surveyDBI->setSurveyInfo($_POST,$_SESSION);
-    $info = $surveyDBI->getSurveyInfo();
-    echo '<br/><br/>';
-    echo 'This is what I get back:';
-    var_dump($info);
+  echo 'This is what gets sent:';
+  var_dump($_POST);
+  echo '<br/><br/>';
+  $surveyDBI = new SurveyCreationDatabaseInterface($_POST['surveyID']);
+  $surveyDBI->setSurveyInfo($_POST,$_SESSION);
+  $info = $surveyDBI->getSurveyInfo();
+  echo '<br/><br/>';
+  echo 'This is what I get back:';
+  var_dump($info);
 
-    $savedSurvey = Survey::getSurvey($info);
-}
+  $savedSurvey = Survey::getSurvey($info);
+  }
+
+ */
 ?>
 
@@ -42 +59 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-            <title>Survey Creation</title>
-            <?php new StyleSheet(); ?>
+        <title>Survey Creation</title>
+        <?php new StyleSheet("awesome"); ?>
     </head>
     <body>
@@ -52 +69 @@
 
             <div id="content">
-                <?php
-                new SurveyCreationTool($savedSurvey, $timeStamp);
-                ?>
+                <form action="surveycreation.php" method="post">
+                    <fieldset>
+                    Name: <input type="text" name="surveyName" /><br />
+                    Uid: <input type="text" name="surveyID" /><br /><br />
+                    <input type="submit" name="submit" value="Make fake survey!" />
+                    </fieldset>
+                </form>
             </div>
         </div>