Changeset 308 for Dev/branches/jos-branch

Timestamp:

03/09/12 09:49:26 (13 years ago)

Author:

jkraaijeveld

Message:

 

Location:

Dev/branches/jos-branch/server/classes/models

Files:

• AnswerSet.php (modified) (1 diff)
• ResearchToolObject.php (modified) (1 diff)
• Respondent.php (modified) (1 diff)
• User.php (modified) (1 diff)

Dev/branches/jos-branch/server/classes/models/AnswerSet.php

@@ -152 +152 @@
                                 predicates:for_survey ?for_survey ;
                                 predicates:by_respondent ?by_respondent ;
-                                predicates:datetime ?datetime ;
+                                predicates:creationdate ?datetime ;
                                 ' . ResearchToolObject::createArguments($arguments) . '
                         }';

Dev/branches/jos-branch/server/classes/models/ResearchToolObject.php

@@ -92 +92 @@
                                 case "has_surveyinstance" : foreach($arguments[$key] as $instance) { $addition = $addition . "predicates:has_surveyinstance <" . SURVEYINSTANCE . '/' . $instance . ">\n"; } break;
                                 case "preset_answers" : foreach($arguments[$key] as $instance) { $addition = $addition . "predicates:preset_answer <" . ANSWER . '/' . $instance . ">\n"; } break;
+                                case "of_survey": $addition = "predicates:of_survey <" . SURVEY . '/' . $arguments[$key] . ">\n"; break;
                         }
                         $argumentString = $argumentString . $addition;

Dev/branches/jos-branch/server/classes/models/Respondent.php

@@ -83 +83 @@
          * Gets the array of Respondent objects belonging to arguments supplied.
          * @param type $arguments : An array containing zero or more of the following keys:
-                                                                'uid', 'name', 'password'
+                                                                'uid', 'name', 'passwordHash', 'passwordSalt'
          */
     public static function get($arguments) {

Dev/branches/jos-branch/server/classes/models/User.php

@@ -79 +79 @@
          * Gets the array of User objects belonging to arguments supplied.
          * @param type $arguments : An array containing zero or more of the following keys:
-         *                                                      'uid', 'email', 'password'
+         *                                                      'uid', 'email', 'passwordHash', 'passwordSalt'
          */
         public static function get($arguments)