From 0824aca6b9368073716327eaa0310a06a75d010b Mon Sep 17 00:00:00 2001
From: Daniel Mason <daniel@masonit.co.nz>
Date: Sun, 1 Jan 2017 00:23:57 +1300
Subject: [PATCH] progress

---
 includes/classes/class.answer.php   |  5 +++++
 includes/classes/class.dataitem.php |  9 ++++----
 includes/classes/class.question.php |  5 +++++
 index.php                           | 32 ++++++++++++++++++++++++-----
 4 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/includes/classes/class.answer.php b/includes/classes/class.answer.php
index d05cc11..56ede3e 100755
--- a/includes/classes/class.answer.php
+++ b/includes/classes/class.answer.php
@@ -28,4 +28,9 @@ class Answer extends DataItem
     {
         return $this->answerdata_correct;
     }
+
+    public static function checkIfCorrect($answer)
+    {
+
+    }
 }
\ No newline at end of file
diff --git a/includes/classes/class.dataitem.php b/includes/classes/class.dataitem.php
index 5319f14..fb75983 100755
--- a/includes/classes/class.dataitem.php
+++ b/includes/classes/class.dataitem.php
@@ -8,10 +8,11 @@ class DataItem {
         $this->_db = new db(); //Will optimise this to get existing conn at some point.
     }
 
-    public function getById($id) {
-        $this->_db->query("SELECT * FROM `".static::_getType()."` WHERE ".static::_getType()."_id = :id");
-        $this->_db->bind(":id", $id);
-        return $this->_db->getObject();
+    public static function getById($id) {
+        $db = new db();
+        $db->query("SELECT * FROM `".static::_getType()."` WHERE ".static::_getType()."_id = :id");
+        $db->bind(":id", $id);
+        return $db->getObject();
     }
 
     private function _getAllWhere($where = false, $orderBy = false, $join = false, $limit = false) {
diff --git a/includes/classes/class.question.php b/includes/classes/class.question.php
index 7d1e6d7..02973f5 100755
--- a/includes/classes/class.question.php
+++ b/includes/classes/class.question.php
@@ -38,6 +38,11 @@ class Question extends DataItem {
         return Answer::getAllWhere("answerdata_question = ".$this->getId());
     }
 
+    public function getCorrectAnswer()
+    {
+        return Answer::getWhere("answerdata_question = ".$this->getId()." and answerdata_correct = 1");
+    }
+
     public function getImage()
     {
         return $this->questiondata_image;
diff --git a/index.php b/index.php
index 529d132..4a6b66e 100755
--- a/index.php
+++ b/index.php
@@ -1,7 +1,10 @@
 <?php
 require_once('includes/include.php');
-define('QUESTION_COUNT', 60); //How many questions to ask.
-$questions = Question::getQuestions(QUESTION_COUNT);
+$questions = [];
+if(!isset($_POST['mark'])) {
+    define('QUESTION_COUNT', 60); //How many questions to ask.
+    $questions = Question::getQuestions(QUESTION_COUNT);
+}
 ?><!doctype html>
 <html class="no-js" lang="">
     <head>
@@ -20,7 +23,23 @@ $questions = Question::getQuestions(QUESTION_COUNT);
         <div id="container">
             <div id="header"><h1>Unofficial NZART Practice Exam</h1></div>
             <div id="body" class="center">
+                <?php if(isset($_POST['mark'])) {
+                    ?><a href="/">Return to new Questions</a><br/><br/><?php
+                    unset($_POST['mark']);
+                        foreach($_POST as $i=>$q) {
+                            $question = Question::getById($i);
+                            $answer = Answer::getById($q);
+                            echo $question->getQuestion()."<br>";
+                            if($answer->isCorrect()) {
+                                echo "Correct - ".$answer->getAnswer()."<br>";
+                            } else {
+                                $corAnswer = $question->getCorrectAnswer();
+                                echo "Wrong.<br>Your Answer: ".$answer->getAnswer()."<br>Correct Answer:".$corAnswer->getAnswer();
+                            }
+                        }
+                    } else { ?>
                 60 Questions
+                <form action="/" method="POST">
                 <table>
                     <tbody>
                     <?php
@@ -28,7 +47,7 @@ $questions = Question::getQuestions(QUESTION_COUNT);
                         foreach($questions as $i=>$q) {
                             echo "<tr>";
                                 echo "<td>".($i+1)."</td>";
-                                echo "<td>".$q->getQuestion()."</td>";
+                                echo "<td style='padding-left:10px'>".$q->getQuestion()."</td>";
                             echo "</tr>";
                             if(!empty($q->getImage())) {
                                 echo "<tr>";
@@ -37,15 +56,18 @@ $questions = Question::getQuestions(QUESTION_COUNT);
                             }
                             foreach($q->answers as $x=>$ans) {
                                 echo "<tr>";
-                                    echo "<td style='padding-left:10px'>".$letters[$x]."</td>";
-                                    echo "<td style='padding-left:10px'>".$ans->getAnswer()."</td>";
+                                    echo "<td></td>";
+                                    echo "<td style='padding-left:10px'><input type='radio' name='".$q->getId()."' value='".$ans->getId()."'> ".($letters[$x]." ".$ans->getAnswer())."</td>";
                                 echo "</tr>";
                             }
                             echo "<tr><td>&nbsp;</td><td></td></tr>";
                         }
                     ?>
+                    <tr><td></td><td><input type="hidden" name="mark" value="1"><button type="submit">Submit</button></td></tr>
                     </tbody>
                 </table>
+                </form>
+                <?php } ?>
             </div>
             <div id="footer">
                 All Questions and images from NZART question bank located

".($i+1)."	".$q->getQuestion()."	".$q->getQuestion()."
".$letters[$x]."	".$ans->getAnswer()."		".($letters[$x]." ".$ans->getAnswer())."