Changeset 150

Timestamp:

11/07/11 18:02:38 (13 years ago)

Author:

fpvanagthoven

Message:

 

Location:

Dev/trunk

Files:

• classes/Step.php (modified) (3 diffs)
• classes/pipelineSequencer.php (modified) (4 diffs)
• css/awesome.css (modified) (3 diffs)
• js/sequencerScripts.js (modified) (1 diff)
• pipelineEditor.php (modified) (3 diffs)

Dev/trunk/classes/Step.php

@@ -1 +1 @@
 <?php
-
 /*
  * To change this template, choose Tools | Templates
@@ -16 +15 @@
     public $type;
     public $name;
-    public $id;
+    public $uid;
     // merging step and displayStep
 
     public $imageURL;
 
-    public function __construct($t, $n, $i) {
+    public function __construct($type, $name, $uid) {
 
-        if (strtolower($t) == "application" || strtolower($t) == "dashboard" || strtolower($t) == "questionnaire") {
-            $this->type = $t;
-            $this->name = $n;
-            $this->id = $i;
+        // check if type given is valid, set internal variables
+        if (strtolower($type) == "application" || strtolower($type) == "dashboard" || strtolower($type) == "questionnaire") {
+            $this->type = strtolower($type);
+            $this->name = strtolower($name);
+            $this->id = strtolower($uid);
         } else {
-            die("Invalid type given: " . $t . "\n $n $i");
+            die("Invalid type given: " . $type . "\n $name $uid");
         }
 
-        switch (strtolower($this->type)) {
+        // assign relevant icon
+        switch ($this->type) {
             case "questionnaire":
                 $this->imageURL = "images/icons/questionnaire.png";
@@ -47 +48 @@
     }
 
+    public function init() {
+        if (isset($this->type) && isset($this->imageURL) && isset($this->name)) {
+            ?>
+            <div class="displayStep" onClick="checkSelectedStep('<?php echo $this->id; ?>');"><div class="displayStepIcon"><img src="<?php echo $this->imageURL; ?>" /></div><?php echo $this->name; ?></div>
+            <?php
+        }
+    }
+
     public function AdjustID($offset) {
         $this->id += $offset;
     }
 
-    public function DrawStep() {
-        if (isset($this->type) && isset($this->imageURL) && isset($this->name)) {
-            ?>
-<div class="displayStep" onClick="checkSelectedStep('<?php echo $this->id; ?>');"><div class="displayStepIcon"><img src="<?php echo $this->imageURL; ?>" /></div><?php echo $this->name; ?></div>
-<?php        
 }
-    }
-
-}
-
 ?>

Dev/trunk/classes/pipelineSequencer.php

@@ -13 +13 @@
 
     // properties
-    private $pipeline = array();
-    private $name = "testSequencer";
+    private $pipeline;
+    private $name = "empty";
     private $numStepsInArray = 0;
     private $maxNumStepsInArray = 10;
     private $selectedStep;
 
-    public function __construct($pipeline, $name, $id) {
-        $this->pipeline = $pipeline;
-        $this->name = $name;
+    public function __construct($uid) {
+        $dbi = new DatabaseInterface();
+        $this->pipeline = $dbi->get("pipeline", array("uid"=>$uid));
     }
 
-    public function DrawSequencer() {
+    public function init() {
         ?>
         <br /><form name="sequencer" action="pipelineEditor.php" method="post"><fieldset id="sequencer">
-                <div class="title">Name: <?php echo $this->name; ?> </div>
+                <div class="title">Name: <?php echo $this->pipeline->name; ?> </div>
 
                 <div class="seqContent">
@@ -91 +91 @@
                 if ($this->numStepsInArray < $this->maxNumStepsInArray) {
                     //var_dump($step);
-                    $step->DrawStep();
+                    $step->init();
                     $this->numStepsInArray++;
                     if ($this->numStepsInArray < $this->maxNumStepsInArray && $this->numStepsInArray < count($this->pipeline)) {
@@ -133 +133 @@
     }
 
-    public function GetFromDB() {
+    public function HandlePost() {
 
+        //this doesn't actually work, the sequencer doesn't know what the uid is yet. This data should be POSTed upon refresh!
+        
+        
+        
         if (isset($_POST['destroy'])) {
             unset($_POST['destroy']);
@@ -171 +175 @@
     }
 
+    private function Javascript() {
+        ?>
+        <!-- 
+        Add JS code for selecting steps, highlighting them, reordering, etc.
+        Is a refresh of the page (with subsequent querying of database really necessary?
+        
+        -->
+        <script type="text/javascript">
+            function selectStep(step) {
+                step.addClass("selected");
+                document.sequencer.controls.selectedStep.value = step.name;
+            }
+        </script>
+
+
+        <?php
+    }
+
 }
 ?>

Dev/trunk/css/awesome.css

@@ -658 +658 @@
 }
 
-.seqContent .displayStep {
+.displayStep {
     width: 52px;
     padding: 0;
@@ -667 +667 @@
 }
 
-.seqContent .displayStep .displayStepIcon {
+.displayStep.selected {
+    background-color: rgba(255, 255, 255, 0.5);
+}
+
+.displayStep .displayStepIcon {
     width: 50px;
     height: 50px;
@@ -675 +679 @@
 }
 
-.seqContent .displayStep p{
+.displayStep p{
     margin-top: 5px;
     font-weight: normal;

Dev/trunk/js/sequencerScripts.js

@@ -38 +38 @@
 function checkSelectedStep(number){
     document.sequencer.selectedStep.value = number;
+    var step = document.getElementById("seqContent")
     document.refresh();
 }

Dev/trunk/pipelineEditor.php

@@ -6 +6 @@
   } */
 
-//var_dump($_POST);
+
 
 if (isset($_SESSION['currentPipeline'])) {
@@ -14 +14 @@
 }
 
-$sequencer->GetFromDB();    // doesn't actually currently get from db, uses session/post as a temporary alternative.
+$sequencer->HandlePost();    // doesn't actually currently get from db, uses session/post as a temporary alternative.
 
 
-//$dbi = new DatabaseInterface();
+
 ?>
 
@@ -42 +42 @@
         <div id="wrapper">
             <div id="content">
-<?php $sequencer->DrawSequencer(); ?>
+<?php $sequencer->init(); ?>
                 <?php $toolbox = new Toolbox(); ?>
             </div>