Merge remote-tracking branch 'origin/master' into insert-timeline

src/public/index.php

@@ -43,7 +43,7 @@ $errorMiddleware = $app->addErrorMiddleware(true, true, true);
 // Add Twig-View Middleware
 $container->set('view', function () {
     // Of course put correct path to your views here
-    return new Twig('../templates', ['cache' => false]);
+    return Twig::create('../templates', ['cache' => false]);
 });
 
 $app->add(TwigMiddleware::createFromContainer($app));
@@ -69,12 +69,12 @@ class TimeSheetDB extends SQLite3
         $query->bindValue(':deadline', $deadline);
         $query->bindValue(':parent_ref', $parent);
 
-        $query->execute()->finalize();
+        $query->execute();
     }
 
     function newUser($userName, $password, $name, $email, $manager)
     {
-        $query = $this->prepare('insert into users (username, password, name, email, manager_ref) 
+        $query = $this->prepare('insert into users (username, password, name, email, manager_ref)
         values (username, password, name, email, manager_ref)');
 
         $query->bindValue(':username', $userName);
@@ -83,8 +83,18 @@ class TimeSheetDB extends SQLite3
         $query->bindValue(':email', $email);
         $query->bindValue(':manager', $manager);
 
-
-        $query->execute()->finalize();
+        $query->execute();
+    }
+    function getTasks()
+    {
+        $query = $this->prepare('SELECT * from tasks');
+        $dbResults = $query->execute();
+        $resultArray = array();
+
+        while ($row = $dbResults->fetchArray()) {
+            array_push($resultArray, $row);
+        }
+        return $resultArray;
     }
     function newTimeline($task_ref, $user_ref, $start_dt, $end_dt, $duration,$note)
     {
@@ -116,13 +126,10 @@ $app->get('/hello/{name}', function (Request $request, Response $response, $args
     return $response;
 });
 
-
 $app->get('/task/new', function (Request $request, Response $response, $args) {
-    return $this->get('view')->render($response, 'newTask.twig', [
-    ]);
+    return $this->get('view')->render($response, 'newTask.twig', []);
 });
 
-    
 $app->post('/task/save', function (Request $request, Response $response, $args) {
     $name = $_POST['name'];
     $description = $_POST['description'];
@@ -132,12 +139,28 @@ $app->post('/task/save', function (Request $request, Response $response, $args)
     $priority = $_POST['priority'];
     $deadline = $_POST['deadline'];
     $parentRef = $_POST['parent_ref'];
-    
+
     $db = $this->get('db');
     $db->newTask($name, $description, $userRef, $status, $eta, $priority, $deadline, $parentRef);
 
     return $response->withStatus(302)->withHeader('Location', $_SERVER['HTTP_REFERER']);
 });
 
+$app->get('/task/overview[/{user}]', function (Request $request, Response $response, $args) {
+    if ($_GET) {
+    }
+
+    if ($args['user']) {
+    }
+
+    $db = $this->get('db');
+    $data = $db->getTasks();
+
+
+    return $this->get('view')->render($response, 'overview.twig', [
+        'data' => $data
+    ]);
+});
+
 // Run app
 $app->run();

src/templates/newTask.twig

@@ -7,7 +7,8 @@
 
 		<label for="description">Description:</label>
 		<textarea name="description" id="" cols="50" rows="10"/>
-
+		</textarea>
+		
 		<input type="text" name="user_ref" id="" hidden/>
 
 		<input type="text" name="status" id="" hidden/>

src/templates/overview.twig

@@ -0,0 +1,8 @@
+{% extends "index.twig" %}
+
+{% block body  %}
+{% for row in data %}
+<div class="task">{{data.name}} {{data.description}} {{data.priority}} {{data.deadline}}</div>
+
+{% endfor %}
+{% endblock %}