Changeset 56 for Dev/trunk

Timestamp:

07/26/11 17:19:26 (14 years ago)

Author:

fpvanagthoven

Message:

Stubs and some refactoring

Location:

Dev/trunk

Files:

• applicationcreation.php (added)
• classes/Application.php (added)
• classes/Session.php (added)
• classes/Survey.php (modified) (3 diffs)
• classes/SurveyButton.php (deleted)
• mainmenu.php (modified) (2 diffs)
• sessioncreation.php (added)
• surveycreation.php (modified) (1 diff)

Dev/trunk/classes/Survey.php

@@ -1 +1 @@
 <?php
-
 /*
  * To change this template, choose Tools | Templates
@@ -12 +11 @@
  */
 class Survey {
+
     public $id;
     public $title;
     public $description;
     public $questions;
-    
-    public function __construct($id, $title, $description = null)
-    {
+
+    public function __construct($id, $title, $description = null) {
         $this->id = $id;
         $this->title = $title;
@@ -24 +23 @@
         $this->questions = array();
     }
-   
-    public static function getSurvey($info)
-    {
+
+    public static function getSurvey($info) {
         $id = $info['surveyID'];
         $title = $info['surveyTitle'];
         $description = $info['surveyDescription'];
-       
+
         $survey = new Survey($id, $title, $description);
-        
+
         $numQ = 1; //number questions
-        while (isset($info['questionTitle' . $numQ]))
-        {
+        while (isset($info['questionTitle' . $numQ])) {
             $id = $info['questionID' . $numQ];
             $title = $info['questionTitle' . $numQ];
             $type = $info['questionType' . $numQ];
             $description = $info['questionDescription' . $numQ];
-                    
+
             $question = new Question($id, $title, $type, $description);
 
             $numA = 1; //number answers
-            while (isset($info['q' . $numQ . 'ans' . $numA]))
-            {
+            while (isset($info['q' . $numQ . 'ans' . $numA])) {
                 $answer = $info['q' . $numQ . 'ans' . $numA];
                 $question->answers[$numA] = $answer;
-                
+
                 $numA++;
             }
-            
-            
+
+
             $survey->questions[$numQ] = $question;
-            
+
             $numQ++;
         }
-        
+
         return $survey;
     }
-    
+
+    public static function newSurveyButton() {
+        ?>
+
+        <form action="surveycreation.php" method="post">
+
+            <input type="submit" value="Create new survey" class="surveyButton bigSurveyButton" />
+
+        </form>
+
+        <?php
+    }
+
+    /**
+     *
+     * @param Survey $surveys An array of surveys
+     */
+    public static function loadSurveyButton($surveys) {
+        ?>
+        <form id="loadForm" action="surveycreation.php" method="post">
+            <input type="button" onclick="loadSurvey()" value="Load survey" class="surveyButton bigSurveyButton" />
+        </form>
+        <br/>
+        <select id="surveysToLoad" size="1000">
+            <?php
+            foreach ($surveys as $survey) {
+                ?><option value='<?php echo $survey->id; ?>'><?php echo $survey->title; ?></option><?php
+        }
+            ?>
+        </select>
+        <?php
+    }
+
 }
-
 ?>

Dev/trunk/mainmenu.php

@@ -1 @@
-<?php require 'classes/master.php'; //should be at top of every page   
+<?php
+require 'classes/master.php'; //should be at top of every page   
 
-if(isset($_POST['login']))
-{
-        if($_POST['username'] == '')
-                die("Please log in!");
-        else
-        {
-                $userDBI = new UserDatabaseInterface();
-                $user_exists = $userDBI->checkUserName($_POST['username']);
-                if($user_exists)
-                {       
-                        $correct_password = $userDBI->checkUserPassword($_POST);
-                        if(!$correct_password)
-                                die("The password you entered is not correct!");
-                }       
-                else
-                        die("Unknown user name");
-        }       
+if (isset($_POST['login'])) {
+    if ($_POST['username'] == '')
+        die("Please log in!");
+    else {
+        $userDBI = new UserDatabaseInterface();
+        $user_exists = $userDBI->checkUserName($_POST['username']);
+        if ($user_exists) {
+            $correct_password = $userDBI->checkUserPassword($_POST);
+            if (!$correct_password)
+                die("The password you entered is not correct!");
+        }
+        else
+            die("Unknown user name");
+    }
 }
 
@@ -43 +41 @@
     <body>
         <div id="header">
-                <?php new Logo(); ?>
-            </div>
-        
+            <?php new Logo(); ?>
+        </div>
+
         <div id="wrapper">
-            
+
             <div id="content">
                 <div id="menu">                
-                    <?php 
-                    SurveyButton::newSurveyButton(); 
-                    SurveyButton::loadSurveyButton($surveys);
+                    <?php
+                    Session::createSessionButton();
+                    Application::createApplicationButton();
+                    Survey::newSurveyButton();
+                    Survey::loadSurveyButton($surveys);
                     ?>
                 </div>

Dev/trunk/surveycreation.php

@@ -38 +38 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-            <title>Survey</title>
+            <title>Survey Creation</title>
             <link rel="stylesheet" type="text/css" href="css/style.css" />
     </head>