Changeset 156 for Dev

Timestamp:

11/17/11 17:54:55 (13 years ago)

Author:

fpvanagthoven

Message:

 

Location:

Dev/trunk

Files:

• classes/pipelineSequencer.php (modified) (3 diffs)
• createapplication.php (modified) (1 diff)
• createsurvey.php (added)
• js/ajax.js (added)
• selectSession.php (modified) (1 diff)

Dev/trunk/classes/pipelineSequencer.php

@@ -22 +22 @@
     public function init() {
         $stringPipeline = "";
+        if (is_array($this->loadedSession->pipeline)){
         foreach ($this->loadedSession->pipeline as $object) {
             $stringPipeline .= "$object->uid,";
         }
         $stringPipeline = rtrim($stringPipeline, ",");
+        }
+        else {
+            $stringPipeline = $this->loadedSession->pipeline;
+        }
         ?>
         <br /><form name="sequencerForm" action="pipelineEditor.php" method="post">
@@ -34 +39 @@
 
                 <div id="controls">
-                    <input type="submit" name="moveSelectedLeft" value="< Move" class="surveyButton" />
-                    <input type="submit" name="moveSelectedRight" value="Move >" class="surveyButton" />
-                    <input type="submit" name="editSelected" value="Edit step" class="surveyButton" />
-                    <input type="submit" name="deleteSelected" value="Delete step" class="surveyButton" />
-                    <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="submit" id="moveSelectedLeft" name="moveSelectedLeft" value="< Move" class="surveyButton" />
+                    <input type="submit" id="moveSelectedRight" name="moveSelectedRight" value="Move >" class="surveyButton" />
+                    <input type="submit" id="editSelected" name="editSelected" value="Edit step" class="surveyButton" />
+                    <input type="submit" id="deleteSelected" name="deleteSelected" value="Delete step" class="surveyButton" />
+                    <input type="submit" id ="clearPipeline" name="clearPipeline" value="Clear pipeline" class="surveyButton dis" disabled="true"/>
+                    <input type="checkbox" id="confirmClear" name="confirmClear" onChange="IsCheckEnabled(this, document.getElementById('clearPipeline'));" />Really clear?
                 </div>
                 <div id="hiddenInputs">
@@ -91 +96 @@
             die("Invalid session!");
         }
+        var_dump($this->loadedSession->pipeline);
     }
 

Dev/trunk/createapplication.php

@@ -15 +15 @@
 }
 
-$newApplication = new Application(null, "New application", null, null);
+$newApplication = new Application(null, "New application", "Default application", "Default style");
 $dbi->set($newApplication);
-$session->pipeline[] = $newApplication;
-$dbi->set($session);
+$session->pipeline[] = $newApplication->uid;
+//$dbi->set($session);
 
 redirect("pipelineEditor.php");

Dev/trunk/selectSession.php

@@ -74 +74 @@
                     <!-- 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
+                        <option value="" disabled="true" selected>Please select a session</option>
+            <?php
                         foreach ($sessions as $session) {
                             echo '<option value="' . $session->uid . '">' . $session->title . '</option>' . "\n";