Changeset 78 for Dev/trunk

Timestamp:

08/08/11 17:25:20 (14 years ago)

Author:

basvannuland

Message:

save and load application
start with save and load session

Location:

Dev/trunk

Files:

• applicationcreation.php (modified) (1 diff)
• classes/Application.php (modified) (1 diff)
• classes/ApplicationDatabaseInterface.php (modified) (3 diffs)
• classes/ApplicationMenu.php (modified) (3 diffs)
• classes/ApplicationRDFReader.php (modified) (3 diffs)
• classes/Loader.php (modified) (1 diff)
• classes/SessionDatabaseInterface.php (added)
• classes/SessionRDFReader.php (added)
• classes/SessionRDFWriter.php (added)
• classes/SurveyRDFReader.php (modified) (1 diff)
• data/users/users.rdf (modified) (1 diff)
• mainmenu.php (modified) (3 diffs)
• rdfConstants.php (modified) (2 diffs)
• survey.php (modified) (2 diffs)

Dev/trunk/applicationcreation.php

@@ -8 +8 @@
 
 /* TODO: Bas! Dit aanpassen zodat application wordt opgeslagen. */
-if(!empty($_POST))
+if(isset($_POST['applicationUID']))
 {
-        $title = $_POST['applicationTitle'];
-        $description = $_POST['applicationDescription'];
-        $application = new Application($title, $description);
-        var_dump($application);
+    $id = $_POST['applicationUID'];
+    $title = $_POST['applicationTitle'];
+    $description = $_POST['applicationDescription'];
+    $application = new Application($id, $title, $description);
+        
+    $applicationDBI = new ApplicationDatabaseInterface($id);
+    $applicationDBI->setApplicationInfo($application);
 }
 

Dev/trunk/classes/Application.php

@@ -7 +7 @@
  */
 class Application {
+    
+    public $id;
     public $title;
     public $description;
     public $style;
 
-    public function __construct($title = null, $description = null, $style = null) {
+    public function __construct($id = null, $title = null, $description = null, $style = null) 
+    {
+        $this->id = $id;
         $this->title = $title;
-                $this->description = $description;
-                $this->style = $style;
+        $this->description = $description;
+        $this->style = $style;
     }
 

Dev/trunk/classes/ApplicationDatabaseInterface.php

@@ -15 +15 @@
 
 
-    public function __construct()
-    {                                   
-        $this->applicationRDFWriter = new ApplicationRDFWriter();
+    public function __construct($applicationID)
+    {           
+        if($applicationID == null)
+            $applicationUID = md5( uniqid(rand(), true) );
+        else
+            $applicationUID = $applicationID;
+                        
+        $this->applicationRDFWriter = new ApplicationRDFWriter($applicationUID);
         $this->applicationRDFReader = new ApplicationRDFReader();
     }
@@ -25 +30 @@
         $appTitle = $application['applicationTitle'];
         $appDescription = $application['applicationDescription'];
-        $appStyle       = $application['applicationStyle'];
+        $appStyle = $application['applicationStyle'];
 
         $this->applicationRDFWriter->setApplicationInfo($appTitle, $appDescription, $appStyle);
@@ -54 +59 @@
         for($aNumber = 0;$aNumber<=sizeof($resultApplication[0]);$aNumber++)
         {
-            $aID = substr($resultSurvey[0][$aNumber]['?uid'],9,strlen($resultSurvey[0][$aNumber]['?uid'])-11);
-            $aTitle = substr($resultSurvey[1][$aNumber]['?title'],9,strlen($resultSurvey[0][$aNumber]['?title'])-11);
+            $aID = substr($resultApplication[0][$aNumber]['?uid'],9,strlen($resultApplication[0][$aNumber]['?uid'])-11);
+            $aTitle = substr($resultApplication[1][$aNumber]['?title'],9,strlen($resultApplication[0][$aNumber]['?title'])-11);
             $applicationInfo[$aID] = $aTitle;
         }               

Dev/trunk/classes/ApplicationMenu.php

@@ -8 +8 @@
 class ApplicationMenu extends Menu {
 
-    public function __construct() {
+    public function __construct($applications) {
         ?><fieldset class="menu"><?php
         parent::__construct('Application');
@@ -15 +15 @@
         ApplicationMenu::loadApplicationButton();
         ?> </div> <?php
-        ApplicationMenu::loadApplicationList(null);
+        ApplicationMenu::loadApplicationList($applications);
         ?></fieldset><?php
     }
@@ -51 +51 @@
             if (!empty($applications)) {
                 foreach ($applications as $application) {
-                    ?><option value='<?php echo $application->id; ?>'><?php echo $application->name; ?></option><?php
+                    ?><option value='<?php echo $application->id; ?>'><?php echo $application->title; ?></option><?php
             }
         }

Dev/trunk/classes/ApplicationRDFReader.php

@@ -28 +28 @@
                                         predicates:uid                  "' . $applicationID . '"        ;
                                         predicates:title                ?title  ;
-                                        prdeicates:description          ?description    ;
+                                        predicates:description          ?description    ;
                                         predicates:style                ?style
             }';
@@ -45 +45 @@
         $result[] = $this->readApplicationStyles();
 
-        return $restult;
+        return $result;
     }
 
@@ -91 +91 @@
             {
                     _application        predicates:resource_type        resources:application ;
-                                        prdeicates:description          ?description    
+                                        predicates:description          ?description    
             }';
 

Dev/trunk/classes/Loader.php

@@ -25 +25 @@
         return $surveys;
     }
+    
+    public static function loadApplications()
+    {
+        $applications = array();
+        
+        $applicationDBI = new ApplicationDatabaseInterface(null);
+        $applicationTitles = $applicationDBI->getExistingApplications();
+        
+        foreach ($applicationTitles as $id => $title) {
+            $application = new Application($id, $title);
+            array_push($applications, $application);
+        }
+        
+        return $applications;
+    }
+    
+    public static function loadSessions()
+    {
+        $sessions = array();
+        
+        $sessionDBI = new SessionDatabaseInterface(null);
+        $sessionTitles = $sessionDBI->getExistingSessions();
+        
+        foreach ($sessionIDTitles as $id => $title) {
+            $session = new Application($id, $title);
+            array_push($sessions, $session);
+        }
+        
+        return $sessions;
+    }
 
 }

Dev/trunk/classes/SurveyRDFReader.php

@@ -20 +20 @@
     public function loadSurvey()
     {
-     $this->model->load($this->filePath);
+        $this->model->load($this->filePath);
     }
 

Dev/trunk/data/users/users.rdf

@@ -7 +7 @@
    xmlns:ns1="http://www.survey.tool/predicates/">
 
-<rdf:Description rdf:about="http://www.survey.tool/resources/user/b45804a8696456b33f3d19f80bf3c198">
+<rdf:Description rdf:about="http://www.survey.tool/resources/user/90d392c2c2e4303c80e7fdf114bb5c5a">
    <ns1:resource_type rdf:resource="http://www.survey.tool/resources/user"/>
-   <ns1:name>frans</ns1:name>
-   <ns1:uid>b45804a8696456b33f3d19f80bf3c198</ns1:uid>
-   <ns1:password>YrNByNHxZwPoreIjW3lpAgeMg+J6kYBdl53uBCsHRKo=</ns1:password>
+   <ns1:name>Bas</ns1:name>
+   <ns1:uid>90d392c2c2e4303c80e7fdf114bb5c5a</ns1:uid>
+   <ns1:password>7oQB+6q1NLM/zyzMcaYsfuEUcvuUlgm/UfP/xwxJFRA=</ns1:password>
 </rdf:Description>
 

Dev/trunk/mainmenu.php

@@ -2 +2 @@
 require 'classes/master.php'; //should be at top of every page   
 
+    var_dump($_POST);
 if (isset($_POST['login'])) {
     if ($_POST['username'] == '')
@@ -24 +25 @@
 
 $surveys = Loader::loadSurveys();
+$applications = Loader::loadApplications();
 
 ?>
@@ -46 +48 @@
                     <?php new SessionMenu(); ?>
 
-                    <?php new ApplicationMenu(); ?>
+                    <?php new ApplicationMenu($applications); ?>
                 
                     <?php new SurveyMenu($surveys); ?>

Dev/trunk/rdfConstants.php

@@ -11 +11 @@
 // Resource used for RDF triples
 define('SURVEY',SURVEYTOOL_RESOURCES_NAMESPACE . 'survey');
+define('APPLICATION',SURVEYTOOL_RESOURCES_NAMESPACE . 'application');
+define('SESSION',SURVEYTOOL_RESOURCES_NAMESPACE . 'session');
+define('DASHBOARD',SURVEYTOOL_RESOURCES_NAMESPACE . 'dashboard');
+define('USER',SURVEYTOOL_RESOURCES_NAMESPACE . 'user');
 define('QUESTION',SURVEYTOOL_RESOURCES_NAMESPACE . 'question');
 define('ANSWER',SURVEYTOOL_RESOURCES_NAMESPACE . 'answer');
-define('USER',SURVEYTOOL_RESOURCES_NAMESPACE . 'user');
-define('APPLICATION',SURVEYTOOL_RESOURCES_NAMESPACE . 'application');
 
 // Predicates used for RDF triples
@@ -31 +33 @@
 define('ANSWERED',SURVEYTOOL_PREDICATES_NAMESPACE . 'answered');
 define('RESPONDENT',SURVEYTOOL_PREDICATES_NAMESPACE . 'respondent');
-define('HAS_PROCESS',SURVEYTOOL_PREDICATES_NAMESPACE . 'hes_process');
+define('HAS_PROCESS',SURVEYTOOL_PREDICATES_NAMESPACE . 'has_process');
+define('INDEX',SURVEYTOOL_PREDICATES_NAMESPACE . 'index');
 
 ?>

Dev/trunk/survey.php

@@ -2 +2 @@
 require 'classes/master.php';
 
+    var_dump($_POST);
+    
 if (is_null($_SESSION['username']))
     redirect('index.php');
@@ -14 +16 @@
     $savedSurvey = Survey::getSurvey($info);
     
-//    var_dump($_POST);
+    //var_dump($_POST);
 }
 else