From b5956dd094628cdaf2c1fbcc79ba4be5aba096ca Mon Sep 17 00:00:00 2001
From: Lucas Woltmann <lwoltmann@gmx.de>
Date: Mon, 21 Jul 2014 15:48:40 +0200
Subject: [PATCH] added the requested drop down menu for the patrons

---
 README.md                                |   2 +-
 analysis.php                             |   0
 css/bootstrap.css                        |   0
 css/ese-logo.png                         | Bin
 css/print.css                            |   0
 css/style.css                            |   0
 index.php                                |   7 +++--
 keyControlPanel.php                      |   0
 keyTable.php                             |   0
 libs/chartLib.php                        |   0
 libs/formLib.php                         |  35 +++++++++++++++++++++--
 libs/keyLib.php                          |   0
 libs/loggingLib.php                      |   2 +-
 libs/questionnaireLib.php                |  29 +++++++++++++++++--
 logs/.gitignore                          |   0
 menu.php                                 |   0
 patronGen.php                            |   0
 patronGenTut.php                         |   0
 questionnaires/student_questionnaire.txt |   5 ++--
 questionnaires/tutor_questionnaire.txt   |   0
 tutorAnalysis.php                        |   0
 tutor_questionnaire.php                  |   0
 22 files changed, 67 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 analysis.php
 mode change 100644 => 100755 css/bootstrap.css
 mode change 100644 => 100755 css/ese-logo.png
 mode change 100644 => 100755 css/print.css
 mode change 100644 => 100755 css/style.css
 mode change 100644 => 100755 index.php
 mode change 100644 => 100755 keyControlPanel.php
 mode change 100644 => 100755 keyTable.php
 mode change 100644 => 100755 libs/chartLib.php
 mode change 100644 => 100755 libs/formLib.php
 mode change 100644 => 100755 libs/keyLib.php
 mode change 100644 => 100755 libs/loggingLib.php
 mode change 100644 => 100755 libs/questionnaireLib.php
 mode change 100644 => 100755 logs/.gitignore
 mode change 100644 => 100755 menu.php
 mode change 100644 => 100755 patronGen.php
 mode change 100644 => 100755 patronGenTut.php
 mode change 100644 => 100755 questionnaires/student_questionnaire.txt
 mode change 100644 => 100755 questionnaires/tutor_questionnaire.txt
 mode change 100644 => 100755 tutorAnalysis.php
 mode change 100644 => 100755 tutor_questionnaire.php

diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index 1ee455b..bc54012
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ The people responsible for the ESE create a new list of keys by using the page *
 
 ### 5. Analyse the results of the evaluation questionnaires                      
 
-//TODO                                                                        
+Just go to the *analysis.php* site to see the results.                                                                      
 
 ### 6. Files                                                                     
 
diff --git a/analysis.php b/analysis.php
old mode 100644
new mode 100755
diff --git a/css/bootstrap.css b/css/bootstrap.css
old mode 100644
new mode 100755
diff --git a/css/ese-logo.png b/css/ese-logo.png
old mode 100644
new mode 100755
diff --git a/css/print.css b/css/print.css
old mode 100644
new mode 100755
diff --git a/css/style.css b/css/style.css
old mode 100644
new mode 100755
diff --git a/index.php b/index.php
old mode 100644
new mode 100755
index 3761f61..9091f82
--- a/index.php
+++ b/index.php
@@ -17,8 +17,9 @@
 	$error = 0;
 	// Determines if a message box is shown, and what type of message box is shown
 	$keyState = "";
-	// load the questionnaire data
+	// load the questionnaire and patrons data
 	$questionnaire = ReadQuestionnaireFile(STUDENT_QUESTIONNAIRE);
+    $patrons = ReadPatronsFile(PATRONS);
 	// if the variable is set, the form has been posted to itself and can be validated
 	if (isset($_POST["submit"]))
 	{
@@ -69,11 +70,11 @@
 				<?php
 					CreateQuestionnaireElement("headline", $questionnaire, $_POST);
 					if ($error)
-						CreateMessageBox(MSG_DANGER, "Achtung:", "Deine Evaluation konnte aufgrund eines internen Fehlersl eider nicht erfolgreich bearbeitet werden.<br/>Bitte versuch es später nocheinmal oder wende dich an einen der Verantwortlichen.");
+						CreateMessageBox(MSG_DANGER, "Achtung:", "Deine Evaluation konnte aufgrund eines internen Fehlers leider nicht erfolgreich bearbeitet werden.<br/>Bitte versuch es später nocheinmal oder wende dich an einen der Verantwortlichen.");
 					else
 						CreateKeyMessageBox($keyState);
 					CreateQuestionnaireElement("code", $questionnaire, $_POST);
-					CreateQuestionnaireElement("tutorName", $questionnaire, $_POST);
+					CreateQuestionnaireElement("tutorName", $questionnaire, $patrons);
 					CreateQuestionnaireElement("legend", $questionnaire, $_POST);
 					CreateAllQuestionElements($questionnaire, $_POST);
 					CreateQuestionnaireElement("comment", $questionnaire, $_POST);
diff --git a/keyControlPanel.php b/keyControlPanel.php
old mode 100644
new mode 100755
diff --git a/keyTable.php b/keyTable.php
old mode 100644
new mode 100755
diff --git a/libs/chartLib.php b/libs/chartLib.php
old mode 100644
new mode 100755
diff --git a/libs/formLib.php b/libs/formLib.php
old mode 100644
new mode 100755
index 93f1198..c84a402
--- a/libs/formLib.php
+++ b/libs/formLib.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================================
 // Name        : formLib.php
-// Author      : Patrick Reipschläger
-// Version     : 1.0
-// Date        : 08-2013
+// Authors     : Patrick Reipschläger, Lucas Woltmann
+// Version     : 1.1
+// Date        : 07-2014
 // Description : Provides several functions for displaying form elements
 //               for the ESE evaluation for students and tutors.
 //============================================================================
@@ -211,6 +211,11 @@
 			CreateQuestion($entry[1], $id, $value);
 		else if ($type == Q_COMMENT)
 			CreateCommentBox($entry[1], $id, $value);
+		else if ($type == Q_DROPDOWN)
+		{
+			$value = $formData;
+			CreateDropDownMenu($entry[1], $id, $value);
+		}
 	}
 	/**
 	 * Echos a range of new divisions with switching row styles for all questions that
@@ -260,4 +265,28 @@
 		echo "	</div>\n";
 		echo "</div>\n";
 	}
+
+	/**
+	 * Echos a new division with a labelled text box and switching row styles.
+	 *
+	 * @param string $label The label that should be displayed for the dropdown menu.
+	 * @param string $id The unique id that is used to identify the dropdownmenu.
+	 * @param string $value The options that should be displayed within the dropdown menu.
+	 * 
+	 */
+	function CreateDropDownMenu($label, $id, $value)
+	{
+		CreateRowHeader();
+		echo "	<div class=\"col-sm-8\">\n";
+		echo "		<p class=\"lead\">" . $label . "</p>\n";
+		echo "	</div>\n";
+		echo "	<div class=\"col-sm-4\">\n";
+		echo "		<select class=\"form-control\" id=\"". $id . "\" name=\"". $id ."\" required>\n";
+		foreach ($value as $key => $entry) {
+			echo "			<option value=\"".$entry."\">".$entry."</option>\n";
+		}
+		echo "		</select>\n";
+		echo "	</div>\n";
+		echo "</div>\n";
+	}
 ?>
\ No newline at end of file
diff --git a/libs/keyLib.php b/libs/keyLib.php
old mode 100644
new mode 100755
diff --git a/libs/loggingLib.php b/libs/loggingLib.php
old mode 100644
new mode 100755
index 81e3bbf..cfd3957
--- a/libs/loggingLib.php
+++ b/libs/loggingLib.php
@@ -252,7 +252,7 @@
 				continue;
 			// get the type of the element with the same id as the form element from the questionnaire
 			$type = $questionnaire[$id][0];
-			// check if the element is a question on continue with the next one if that is not hte case
+			// check if the element is a question on continue with the next one if that is not the case
 			if ($type != "Question")
 				continue;
 			// if there is not field for the current element in the question dsta array, create a new
diff --git a/libs/questionnaireLib.php b/libs/questionnaireLib.php
old mode 100644
new mode 100755
index be7b1e8..0220609
--- a/libs/questionnaireLib.php
+++ b/libs/questionnaireLib.php
@@ -1,15 +1,16 @@
 <?php
 //============================================================================
 // Name        : questionnaireLib.php
-// Author      : Patrick Reipschläger
-// Version     : 1.0
-// Date        : 8-2013
+// Authors     : Patrick Reipschläger, Lucas Woltmann
+// Version     : 1.1
+// Date        : 07-2014
 // Description : Provides functions for handling questionnaire text files
 //               for the ESE questionnaire for students and tutors.
 //============================================================================
 
 	define ("STUDENT_QUESTIONNAIRE", "questionnaires/student_questionnaire.txt");
 	define ("TUTOR_QUESTIONNAIRE", "questionnaires/tutor_questionnaire.txt");
+	define ("PATRONS", "questionnaires/namenspatronen.txt");
 	// Possible Questionnaire Element Types
 	// Should be used by all scripts when referencing them
 	/**
@@ -41,6 +42,12 @@
 	 * - Label for the CommentBox
 	 */
 	define ("Q_COMMENT", "Comment");
+	/**
+	 * DropDown Element
+	 * Parameter:
+	 * - Label for the DropDownMenu
+	 */
+	define ("Q_DROPDOWN", "DropDown");
 
 	/**
 	 * Reads the questionnaire file with the specified name and returns an array
@@ -74,4 +81,20 @@
 			}
 		return $data;
 	}
+
+	function ReadPatronsFile($fileName)
+	{
+		if (!file_exists($fileName))
+			return null;
+		$handle = fopen($fileName, 'r');
+		if (!$handle)
+			return null;
+		$rawData =  fread($handle, filesize($fileName));
+		$lines = explode("\n", $rawData);
+		$data = array();
+		for ($i = 0; $i < count($lines); $i++)
+            $data[trim($lines[$i])] = trim($lines[$i]);
+
+		return $data;
+	}
 ?>
\ No newline at end of file
diff --git a/logs/.gitignore b/logs/.gitignore
old mode 100644
new mode 100755
diff --git a/menu.php b/menu.php
old mode 100644
new mode 100755
diff --git a/patronGen.php b/patronGen.php
old mode 100644
new mode 100755
diff --git a/patronGenTut.php b/patronGenTut.php
old mode 100644
new mode 100755
diff --git a/questionnaires/student_questionnaire.txt b/questionnaires/student_questionnaire.txt
old mode 100644
new mode 100755
index 79b58ee..a675dbe
--- a/questionnaires/student_questionnaire.txt
+++ b/questionnaires/student_questionnaire.txt
@@ -16,6 +16,7 @@
 #						Takes the question as a parameter.
 #		Comment		=	A box for comments (It is assumed there is only one such box)
 #						Takes the label of the comment box as a parameter.
+#       DropDown    =   Dropdown menu for the tutor
 #
 #	If fundamental changes are made (other than changing strings or adding/removing questions)
 #	The files 'student_questionnaire.php' and 'student_analysis' should be checked for validity,
@@ -23,14 +24,14 @@
 #------------------------------------------------
 
 # -- Header ---
-headline; Headline; ESE 2013
+headline; Headline; ESE 2014
 
 # -- personal Code --
 # this is important and should stay so the student can identify himself to the system and receive his cup later on
 code; TextBox; Persönlicher Code:
 
 # -- Name of the tutor --
-tutorName; TextBox; Wer war dein Namenspatron? (Nachname)
+tutorName; DropDown; Wer war dein Namenspatron?;
 
 # -- Legend --
 legend; Legend;
diff --git a/questionnaires/tutor_questionnaire.txt b/questionnaires/tutor_questionnaire.txt
old mode 100644
new mode 100755
diff --git a/tutorAnalysis.php b/tutorAnalysis.php
old mode 100644
new mode 100755
diff --git a/tutor_questionnaire.php b/tutor_questionnaire.php
old mode 100644
new mode 100755