Changeset 95 for Dev/trunk/classes

Timestamp:

08/31/11 15:35:10 (14 years ago)

Author:

fpvanagthoven

Message:

Done: Default question description -> do not display in SurveyTool?. Added bug to TODO list

Location:

Dev/trunk/classes

Files:

• Survey.php (modified) (4 diffs)
• SurveyTool.php (modified) (2 diffs)

Dev/trunk/classes/Survey.php

@@ -1 +1 @@
 <?php
+
 /*
  * To change this template, choose Tools | Templates
@@ -16 +17 @@
     public $description;
     public $questions;
-        
-        public $results;
+    public $results;
+    
+    const DEFAULT_DESCRIPTION = "Write a helpful description for this survey here.";
 
     public function __construct($id, $title, $description = null) {
@@ -24 +26 @@
         $this->description = $description;
         $this->questions = array();
-                
-                $this->results = null;
+
+        $this->results = null;
     }
-        
-        public function addQuestion($question)
-        {
-                array_push($this->questions, $question);
-        }
-        
-        public function setResults($surveyResults)
-        {
-                $this->results = $surveyResults;
-        }
+
+    public function addQuestion($question) {
+        array_push($this->questions, $question);
+    }
+
+    public function setResults($surveyResults) {
+        $this->results = $surveyResults;
+    }
 
     public static function getSurvey($info) {
@@ -70 +70 @@
         return $survey;
     }
-        
-        /**
-         * TODO: Should return Results-object from reading RDF-database
-         * @param type $surveyID 
-         */
-        public static function getResults($surveyID)
-        {
-                
-        }
+
+    /**
+     * TODO: Should return Results-object from reading RDF-database
+     * @param type $surveyID 
+     */
+    public static function getResults($surveyID) {
+        
+    }
 
 }
+
 ?>

Dev/trunk/classes/SurveyTool.php

@@ -70 +70 @@
 
     private function displayDescription() {
+        if ($this->survey->description != Survey::DEFAULT_DESCRIPTION)
+            $description = $this->survey->description;
+        else
+            $description = "";
         ?>
-        <p class='centerBoxed'><?php echo $this->survey->description; ?></p>
+        <p class='centerBoxed'><?php echo $description; ?></p>
         <?php
     }
@@ -97 +101 @@
 
     private function displayQuestionDescription($question) {
+        if ($question->description != "Write a question description here.")
+            $description = $question->description;
+        else
+            $description = "";
         ?>
-        <p><?php echo "<div class='questionDescription noPadding'>" . $question->description . "</div>"; ?></p>
+        <p><?php echo "<div class='questionDescription noPadding'>" . $description . "</div>"; ?></p>
         <?php
     }