Changeset 164 for Dev/trunk/classes

Timestamp:

11/22/11 16:42:37 (13 years ago)

Author:

fpvanagthoven

Message:

Editor wordt steeds meer JS based en werkt nu voor het grootste deel op een local copy van de session en de hidden input fields. Routine is ongeveer: Page load->DB query, meest up-to-date versie van pipeline en objecten worden geladen, uids daarvan ingevoerd in hidden fields. Alle operaties op de pipeline gebeuren alleen op deze hidden fields. Aanmaken van objecten roept wel php code aan die dit object toevoegt aan de DB, NIET aan de pipeline.

Bij edit/delete/logout/refresh of andere pagina wissel wordt saveSession.php aangeroepen en de informatie uit de hidden fields weggeschreven naar de PHP objecten (localCopy) en DB.

Bij changes aan een object wordt deze geflagged als niet up to date (pipelineUpdatedField),

-

Verder heb ik nog een $creator[0] in SessionConnector?.php:117 veranderd in $creator. Deze code is inderdaad niet opgewassen tegen meerdere resultaten, maar dit zou met de UID's toch nooit kunnen gebeuren (en deze check zit er voor andere arguments ook niet in. Ondertussen fixt dit wel zo'n 3 warnings/errors per pagina.
Jos, als dit niet de bedoeling was, feel free to revert.

Location:

Dev/trunk/classes

Files:

• Logo.php (modified) (1 diff)
• SessionConnector.php (modified) (1 diff)
• pipelineSequencer.php (modified) (8 diffs)

Dev/trunk/classes/Logo.php

@@ -17 +17 @@
         echo '<div id="logo"><a href="index.php">Research Tool</a>';
         if (isset($_SESSION['username'])) {
-            echo '<a href="logout.php" style="font-size: 12pt;">Log out</a>';
+            echo '<a href="index.php" onClick="savePipeline();" style="font-size: 12pt;">Log out</a>';
         }
         echo '</div>';

Dev/trunk/classes/SessionConnector.php

@@ -115 +115 @@
                                 $datetime = new DateTime();
                                 $datetime->setTimestamp(intval($result['?datetime']->label));
-                                $sessions[] = new Session($result['?uid']->label, $result['?title']->label, $creator[0], $datetime, $pipeline, $answersets);
+                                $sessions[] = new Session($result['?uid']->label, $result['?title']->label, $creator, $datetime, $pipeline, $answersets);
                         }
                 }

Dev/trunk/classes/pipelineSequencer.php

@@ -1 +1 @@
 <?php
+
 /*
  * To change this template, choose Tools | Templates
@@ -23 +24 @@
     public function init() {
         $stringPipeline = "";
+        $stringPipelineType = "";
+        $stringPipelineUpdated = "";
+        $numberOfSteps = 0;
+        
         if (is_array($this->loadedSession->pipeline)) {
             foreach ($this->loadedSession->pipeline as $object) {
                 $stringPipeline .= "$object->uid,";
+                $stringPipelineType .= get_class($object).",";
+                $stringPipelineUpdated .= "1,";
+                $numberOfSteps++;
+                
             }
             $stringPipeline = rtrim($stringPipeline, ",");
+            $stringPipelineType = rtrim($stringPipelineType, ",");
+            $stringPipelineUpdated = rtrim($stringPipelineUpdated, ",");
+            
         } else {
             $stringPipeline = $this->loadedSession->pipeline;
+            $stringPipelineType = $_POST['pipelineTypes'];
+            $stringPipelineUpdated = $_POST['pipelineUpdatedField'];
         }
         ?>
@@ -45 +59 @@
                     <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?
+                    <input type="button" id="t_saveSession" name="t_saveSession" onClick="savePipeline();" value="t_Save_session!" />
+                    <input type="button" id="t_setOOD" name="t_setOOD" onClick="t_setOutOfDate();" value="t_Set_OOD" />
+                    <input type="button" id="t_updateSeq" name="t_updateSeq" onClick="updateSequencer();" value="t_Update_Seq" />
                 </div>
                 <div id="hiddenInputs">
                     <input type="hidden" name="selectedStep" id="selectedStepField" value="" />
-                    <!-- <input type="hidden" name="pipelineString" id="pipelineStringField" value="123,456" /> -->
                     <input type="hidden" name="pipelineString" id="pipelineStringField" value="<?php echo $stringPipeline; ?>" />
+                    <input type="hidden" name="pipelineTypes" id="pipelineTypeField" value="<?php echo $stringPipelineType; ?>" />
+                    <input type="hidden" name="pipelineUpDated" id="pipelineUpdatedField" value="<?php echo $stringPipelineUpdated; ?>" />
+                    <input type="hidden" name="numSteps" id="numSteps" value="<?php echo $numberOfSteps; ?>" />
                 </div>
             </fieldset>
@@ -92 +111 @@
             if (count($sessionResults) > 0) {
                 $_SESSION['localSessionCopy'] = $sessionResults[0];
+                unset($_SESSION['updateNeeded']);
             } else {
                 die("No session with that UID found!");
             }
         }
-            var_dump($_SESSION['localSessionCopy']);   
+            //var_dump($_SESSION['localSessionCopy']);   
         
         if (isset($_SESSION['localSessionCopy']) && !empty($_SESSION['localSessionCopy'])) {
@@ -115 +135 @@
         if (isset($_POST['moveSelectedLeft'])) {
             if (isset($_POST['selectedStep']) && !empty($_POST['selectedStep'])) {
-                MoveStep($_POST['selectedStep'], -1);
+                $this->MoveStep($_POST['selectedStep'], -1);
             }
         }
@@ -121 +141 @@
         if (isset($_POST['moveSelectedRight'])) {
             if (isset($_POST['selectedStep']) && !empty($_POST['selectedStep'])) {
-                MoveStep($_POST['selectedStep'], 1);
+                $this->MoveStep($_POST['selectedStep'], 1);
             }
         }
@@ -148 +168 @@
 
         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];
+            if ($newSession->pipeline[$i]->uid == $uid) {
+                $temp = $newSession->pipeline[$i];
+                $newSession->pipeline[$i] = $newSession->pipeline[$i + $direction];
+                $newSession->pipeline[$i + $direction] = $temp;
                 break;
             }
@@ -157 +177 @@
 
         $this->loadedSession = $newSession;
+        redirect("pipelineEditor.php");
     }
 
-    public function StoreToDb() {
-        if (isset($_SESSION['localSessionCopy']) && !empty($_SESSION['localSessionCopy'])) {
-            $this->dbi->set($_SESSION['localSessionCopy']);
-            unset($_SESSION['updateNeeded']);
-        }
-    }
 
 }