Changeset 233 for Dev/branches/jos-branch/classes/widgets

Timestamp:

01/13/12 13:57:41 (13 years ago)

Author:

fpvanagthoven

Message:

 

Location:

Dev/branches/jos-branch/classes/widgets

Files:

• SurveyEditorWidget.php (modified) (2 diffs)
• Toolbox.php (modified) (2 diffs)

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

@@ -13 +13 @@
 
     private $loadedSurvey;
-    private $dbi;
 
     public function __construct() {
-        // Set basic variables
-        // Should probably include a default empty survey for the sake of safety
-        $dbi = new DatabaseInterface();
+        
     }
 
     public function handlePost() {
         // Get POSTed data and store variables to class instance properties
-        $dbi = new DatabaseInterface();
+        
         if (isset($_POST['objectUid']) && !empty($_POST['objectUid'])) {
-            $surveyResults = $dbi->get("Survey", array("uid" => $_POST['objectUid']));
+            $surveyResults = Survey::get(array("uid" => $_POST['objectUid']));
             if (!empty($surveyResults)) {
                 $this->loadedSurvey = $surveyResults[0];
@@ -39 +36 @@
         $questionString = "";
         foreach ($this->loadedSurvey->questions as $question) {
-            $questionString .= $question->code . ",";
+            $questionString .= $question->uid . ",";
         }
         // echo the HTML markup to display the editor on the screen

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

@@ -25 +25 @@
                         <div class="bigButton toolbox" onclick="ddMenu.Open('toolbox_m1')"><img src="images/icons/survey.png" class="buttonIcon" /><p>Survey</p>
                             <div id="toolbox_m1" onmouseover="ddMenu.CancelCloseTimer()" onmouseout="ddMenu.SetCloseTimer()">
-                                <a href="#" >+ Add new</a>
+                                <a href="#" onclick="submitToolbox('Survey')">+ Add new</a>
                                 <a href="#">> Add existing</a>
                             </div>
@@ -34 +34 @@
                         <div class="bigButton toolbox" onClick="ddMenu.Open('toolbox_m2')"><img src="images/icons/application.png" class="buttonIcon" /><p>Application</p>
                             <div id="toolbox_m2" onmouseover="ddMenu.CancelCloseTimer()" onmouseout="ddMenu.SetCloseTimer()">
-                                <a href="#">+ Add new</a>
+                                <a href="#" onclick="submitToolbox('Application')">+ Add new</a>
                                 <a href="#">> Add existing</a>
                             </div>