Changeset 230 for Dev/branches/jos-branch

Timestamp:

01/13/12 11:30:11 (13 years ago)

Author:

jkraaijeveld

Message:

Made most functionality from the demo branch work with new database.

Location:

Dev/branches/jos-branch

Files:

• classes/master.php (modified) (1 diff)
• classes/styles (added)
• classes/styles/Logo.php (added)
• classes/styles/StyleSheet.php (added)
• classes/widgets (added)
• classes/widgets/DbDataSelectionWidget.php (added)
• classes/widgets/PipelineInfoPanel.php (added)
• classes/widgets/SessionEditorWidget.php (added)
• classes/widgets/SurveyEditorWidget.php (added)
• classes/widgets/Toolbox.php (added)
• data/applications (added)
• data/applications/applications.rdf (added)
• data/questions (added)
• data/questions/questions.rdf (added)
• data/results (added)
• data/results/answers.rdf (added)
• data/results/answersets.rdf (added)
• data/results/resultsets.rdf (added)
• data/sessions (added)
• data/sessions/sessioninstances.rdf (added)
• data/sessions/sessions.rdf (added)
• data/surveys (added)
• data/surveys/surveys.rdf (added)
• data/users (added)
• data/users/respondents.rdf (added)
• data/users/users.rdf (added)
• getInfo.php (modified) (1 diff)
• index.php (modified) (2 diffs)
• selectSession.php (modified) (4 diffs)
• testpage.php (modified) (1 diff)

Dev/branches/jos-branch/classes/master.php

@@ -20 +20 @@
         else if (file_exists('classes/models/' . $class_name . '.php'))
                 require 'classes/models/' . $class_name . '.php';
+        else if (file_exists('classes/widgets/' . $class_name . '.php'))
+                require 'classes/widgets/' . $class_name . '.php';
+        else if (file_exists('classes/styles/' . $class_name . '.php'))
+                require 'classes/styles/' . $class_name . '.php';
 }
 

Dev/branches/jos-branch/getInfo.php

@@ -15 +15 @@
     return;
 }
+echo $type;
 
-$dbi = new DatabaseInterface();
 
-$results = $dbi->get($type, array("uid" => $uid));
+$results = $type::get(array("uid" => $uid));
 
 if (count($results) > 0) {      // check if DB object exists and assign it to variable

Dev/branches/jos-branch/index.php

@@ -16 +16 @@
 if (isset($_POST['register'])) {
     if (isset($_POST['username']) && isset($_POST['password'])) {
-        $dbi = new DatabaseInterface();
-        $user_results = $dbi->get("user", array("name" => $_POST['username']));
+        $user_results = User::get(array("name" => $_POST['username']));
         if (count($user_results) == 0 || !$user_results) {
             if (strlen($_POST['password']) > 6) {
                 $user = new User(null, $_POST['username'], $_POST['password']);
-                $dbi->set($user);
+                                $user->save();
                 $_SESSION['userUid'] = $user->uid;
             } else {
@@ -35 +34 @@
 
 if (isset($_POST['login'])) {   // User clicked the login button
-    $dbi = new DatabaseInterface();
-    $user_results = $dbi->get("user", array("name" => $_POST['username']));
+    $user_results = User::get(array("name" => $_POST['username']));
     if (isset($user_results[0])) {
         if ($user_results[0]->password == $_POST['password']) {

Dev/branches/jos-branch/selectSession.php

@@ -11 +11 @@
 }
 
-$dbi = new DatabaseInterface();
-
 if (isset($_POST['createSession'])) {
     //check if name is set
@@ -18 +16 @@
         // check if name is available
         if (!empty($_POST['newSessionName'])) {
-            $session_results = $dbi->get("Session", array("title" => $_POST['newSessionName']));
+            $session_results = Session::get(array("title" => $_POST['newSessionName']));
             if (count($session_results) == 0) {
                 // make new session!
                 unset($session_results);
-                $creators = $dbi->get("User", array("uid" => $_SESSION['userUid']));
+                $creators = User::get(array("uid" => $_SESSION['userUid']));
                 $creator = $creators[0];
                 $session = new Session(null, $_POST['newSessionName'], $creator, new DateTime(), null, null);
-                $dbi->set($session);
+                                $session->save();
             } else {
                 $errorMessage[] = "A session with the name " . $_POST['newSessionName'] . " already exists!";
@@ -44 +42 @@
         var_dump($_POST);
     if (isset($_POST['sessionUid'])) {
-        $session_results = $dbi->get("SESSION", array("uid" => $_POST['sessionUid']));
+        $session_results = Session::get((array("uid" => $_POST['sessionUid'])));
                 var_dump($session_results);
         if (count($session_results) == 1 && $session_results[0] != null) {
@@ -57 +55 @@
 //Get available sessions for current user
 //$sessions = $dbi->get("Session", array("creator"=>$_SESSION['username']));  //This does not work, session.php does not yet have a property 'creator'
-$sessions = $dbi->get("Session");  // Let's just load everything then...
+$sessions = Session::get(array());  // Let's just load everything then...
 ?>
 

Dev/branches/jos-branch/testpage.php

@@ -1 +1 @@
 <?php
     require 'classes/master.php';
-        
-        $sessionInstance = new Sessioninstance(null, "Titel", "Locatie", "9043f64705e67ceb8f28242207b83adf", new Datetime(), new Datetime(), array(), "293b162b0b774ec1b303ce839b60ebd2", null);
-        $sessionInstance->save();
         $result = SessionInstance::get(array());
-        print_r($result);
+        $sessionInstance = $result[0];
+        $sessionInstance->evaluate();
+        print_r($sessionInstance);
+
 ?>