Changeset 238 for Dev/branches/jos-branch/classes

Timestamp:

01/18/12 16:39:27 (13 years ago)

Author:

fpvanagthoven

Message:

-selectObject is een algemene object selector. Kan gebruikt worden vanuit het mainmenu om in de verschillende editors te komen, en kan eventueel ook onder de "add existing" knop kopen te staan binnen die editors.

Location:

Dev/branches/jos-branch/classes

Files:

• styles/Logo.php (modified) (2 diffs)
• widgets/SessionEditorWidget.php (modified) (2 diffs)
• widgets/SurveyEditorWidget.php (modified) (1 diff)

Dev/branches/jos-branch/classes/styles/Logo.php

@@ -14 +14 @@
     // hardcoded logo div, image is defined in stylesheet. (#logo background:"";)
     public function __construct() {
+        if (isset($_SESSION['userUid'])) {
+            $users = User::get(array("uid" => $_SESSION['userUid']));
+            $user = $users[0];
+            $loggedIn = true;
+            $message = "Welcome, " . $user->name . "!";
+        } else {
+            $message = "Please log in.";
+            $loggedIn = false;
+        }
         ?>
 
@@ -21 +30 @@
             </div>
             <div id="logoControls">
-                Welcome, Igor! <a href="logout.php">Log out</a>
+                <?php echo $message; ?> 
+
+                <?php
+                if ($loggedIn == true) {
+                    echo "<a href='logout.php'>Log out</a>";
+                }
+                ?>
             </div>
         </div>

Dev/branches/jos-branch/classes/widgets/SessionEditorWidget.php

@@ -52 +52 @@
                 <input type="button" id="editSelected" value="Edit step" class="smallButton" onClick="editStep();" />
                 <input type="button" id="deleteSelected" value="Delete step" class="smallButton" onClick="deleteStep();" />
-                <input type="submit" id ="clearPipeline" name="clearPipeline" value="Clear pipeline" class="smallButton dis" disabled="true"/>
-                <input type="checkbox" id="confirmClear" name="confirmClear" onChange="IsCheckEnabled(this, document.getElementById('clearPipeline'));" />Really clear?
                 <input type="button" value="debug_save" onClick="savePipeline(true);" />
             </div>
@@ -91 +89 @@
     public function LoadSession() {   // Initialize variables on page load.
                 // Redirect if no session is set
-        if (!isset($_SESSION['currentSession'])) {
+        if (!isset($_POST['objectUid'])) {
             redirect("selectSession.php");
         }
-        // Store the current session in internal variable
-        $results = Session::get(array("uid"=> $_SESSION['currentSession']));
+        
+        $results = Session::get(array("uid"=> $_POST['objectUid']));
                 //print_r($results);
         if (!empty($results)) {

Dev/branches/jos-branch/classes/widgets/SurveyEditorWidget.php

@@ -15 +15 @@
 
     public function __construct() {
-        
+        // Nothing yet
     }
 
     public function handlePost() {
         // Get POSTed data and store variables to class instance properties
-        
+
         if (isset($_POST['objectUid']) && !empty($_POST['objectUid'])) {
             $surveyResults = Survey::get(array("uid" => $_POST['objectUid']));
             if (!empty($surveyResults)) {
                 $this->loadedSurvey = $surveyResults[0];
+                $this->loadedSurvey->evaluate();
             } else {
                 die("No surveys found!");