Changeset 289 for Dev/branches/rest-dojo-ui/server/classes/models/SurveyInstance.php

Timestamp:

02/24/12 16:17:56 (13 years ago)

Author:

hendrikvanantwerpen

Message:

[merge] svn merge ../jos-branch -r 284:287 .

Location:

Dev/branches/rest-dojo-ui

Files:

• . (modified) (1 prop)
• server/classes/models/SurveyInstance.php (modified) (2 diffs)

Dev/branches/rest-dojo-ui/server/classes/models/SurveyInstance.php

@@ -26 +26 @@
      * @param type $answersets: A list of answersets.
      */
-    public function __construct($uid, $survey, $starttime, $endtime, $open, $presetanswers, $answersets)
+        public function __construct($uid = null, $survey = null, $starttime = null, $endtime = null, $open = null, $presetanswers = null, $answersets = null)
     {
         if(!isset($uid))
@@ -242 +242 @@
         }
 
-    public static function create($obj) {
-        return new SurveyInstance($obj->uid, $obj->survey, $obj->starttime,
-                $obj->endtime, $obj->open, $obj->presetanswers,
-                $obj->answersets);
-    }
+        /**
+         * Creates a new SurveyInstance object out of the given object.
+         */
+        public static function create($obj)
+        {
+                return new Survey($obj->uid, $obj->survey, $obj->starttime, $obj->endtime, $obj->open, $obj->presetanswers, $obj->answersets);  
+        }
 
 }