Merge branch 'models'

app/controllers/ProjectController.php

@@ -7,23 +7,59 @@
         // list all projects
         public function index($f3){
             $this->check_access($f3);
+
+            $db = $f3->get('DB');
+
+            // retrieve projects
+            $projects = $db->exec('SELECT * FROM projects ORDER BY created_at DESC');
+
+            $f3->set('projects', $projects);
+
+
             $f3->set('content', '../ui/views/project/index.html');
             echo \Template::instance()->render('../ui/templates/layout.html');
+            
+            $f3->clear('SESSION.error');
         }
 
         // create a new project
         public function createForm($f3){
+            $this->check_access($f3);
+            $f3->set('content', '../ui/views/project/create.html');
+            echo \Template::instance()->render('../ui/templates/layout.html');
 
         }
+
         public function create($f3){
 
         }
 
         // show project details including links, tickets, events, tasks
-        public function view($f3){}
+        public function view($f3){
+            $this->check_access($f3);
+
+            $project_id = $f3->get('PARAMS.id');
+            $db = $f3->get('DB');
+
+            $result = $db->exec(
+                'SELECT * FROM projects WHERE id = ? LIMIT 1', [$project_id]
+            );
+            $project = $result[0];
+            $f3->set('project', $project);
+
+            $f3->set('content', '../ui/views/project/view.html');
+            echo \Template::instance()->render('../ui/templates/layout.html');
+        }
 
         // update project details
-        public function editForm($f3){}
+        public function editForm($f3){
+
+            $this->check_access($f3);
+            $f3->set('content', '../ui/views/project/edit.html');
+            echo \Template::instance()->render('../ui/templates/layout.html');
+
+        }
+
         public function update($f3){}
 
     }

app/controllers/TicketController.php

@@ -37,7 +37,7 @@ class TicketController implements CRUD {
         $this->get_custom_fields($f3, $db, $ticket_id);
 
         // render
-        $f3->set('js', 'ticket_view.js');
+        // $f3->set('js', 'ticket_view.js');
         $f3->set('content', '../ui/views/ticket/view.html');
         echo \Template::instance()->render('../ui/templates/layout.html');
 
@@ -216,6 +216,7 @@ class TicketController implements CRUD {
 
     protected function get_ticket_check_edit_permission($f3){
 
+
         $db = $f3->get('DB');
         
         $ticket_id = $f3->get('PARAMS.id');
@@ -244,6 +245,25 @@ class TicketController implements CRUD {
     }
 
     protected function get_ticket($f3, $db, $ticket_id){
+
+        // new
+        $db = $f3->get('DB');
+        $ticket_id = $f3->get('PARAMS.id');
+
+        $ticketModel = new Ticket($db);
+        $ticket = $ticketModel->findById($ticket_id);
+
+        if(!$ticket->dry()){
+            $f3->set('ticket', $ticket);
+            $f3->set('attachments', $ticket->attachments());
+            $f3->set('comments', $ticket->comments());
+        } else {
+            $f3->error(404, "Ticket not found!");
+        }
+        return;
+
+        // old:
+
         $result = $db->exec(
             'SELECT t.*, u.username as created_by_name
             FROM tickets t

app/extensions/ParsedownHelper.php

@@ -16,7 +16,7 @@ class ParsedownHelper extends \Prefab {
 
         }
 
-        return '<pre>'.print_r($args,1).'<pre>';
+        // return '<pre>'.print_r($args,1).'</pre>';
 
         $content = $args[0];
         $content_token = \Template::instance()->token($content);

app/models/Attachment.php

@@ -0,0 +1,21 @@
+<?php
+
+class Attachment extends \DB\SQL\Mapper {
+
+    function __construct($db)
+    {
+        parent::__construct($db, 'attachments');
+    }
+
+    public function findWithUserByTicketId($ticket_id){
+        return $this->db->exec(
+            'SELECT a.*, u.username
+            FROM attachments a
+            LEFT JOIN users u ON u.id = a.uploaded_by
+            WHERE a.ticket_id = ?
+            ORDER BY a.created_at DESC', 
+            [$ticket_id]
+        );
+    }
+
+}

app/models/Comment.php

@@ -0,0 +1,19 @@
+<?php
+
+    class Comment extends \DB\SQL\Mapper {
+        function __construct($db)
+        {
+            parent::__construct($db, 'ticket_comments');
+        }
+
+        public function findWithUserByTicketId($ticket_id){
+            return $this->db->exec(
+                'SELECT c.*, u.username AS author_name
+                FROM ticket_comments c
+                LEFT JOIN users u ON c.created_by = u.id
+                WHERE c.ticket_id = ?
+                ORDER BY c.created_at DESC',
+                [$ticket_id]
+        );
+        }
+    }

app/models/Ticket.php

@@ -0,0 +1,22 @@
+<?php
+
+class Ticket extends \DB\SQL\Mapper {
+    function __construct($db){
+        parent::__construct($db, 'tickets');
+    }
+
+    public function findById($id){
+        $this->load(['id = ?', $id]);
+        return $this;
+    }
+
+    public function attachments(){
+        $attachment = new Attachment($this->db);
+        return $attachment->findWithUserByTicketId($this->id);
+    }
+
+    public function comments(){
+        $comment = new Comment($this->db);
+        return $comment->findWithUserByTicketId($this->id);
+    }
+}

public/index.php

@@ -43,6 +43,7 @@ $f3->route('GET /dashboard', function($f3){
     }
     echo 'Welcome to the dashboard' . $f3->get('SESSION.username');
     echo '<a href="/logout">logout</a>';
+    
 });
 
 // tickets - CRUD (CREATE, READ, UPDATE, DELETE)

ui/templates/layout.html

@@ -42,9 +42,9 @@
     <div id="mainNavbar" class="navbar-menu">
       <div class="navbar-start">
         <a class="navbar-item" href="/dashboard">Dashboard</a>
+        <a class="navbar-item" href="/kb">Knowledge Base</a>
         <a class="navbar-item" href="/projects">Projects</a>
         <a class="navbar-item" href="/tickets">Tickets</a>
-        <a class="navbar-item" href="/kb">Knowledge Base</a>
         <a class="navbar-item" href="/tags">Tags</a>
       </div>
       <div class="navbar-end">

ui/views/attachment/index.html

@@ -3,6 +3,7 @@
         <h2 class="title">Attachments</h2>
         <div class="block">
             <check if="isset( {{@attachments }})">
+                <check if="count({{@attachments}}) > 0">
                 <table class="table is-fullwidth is-narrow is-striped is-hoverable">
                     <thead>
                         <tr>
@@ -28,9 +29,10 @@
                     </tbody>
                 </table>
                 </check>
+            </check>
             <div class="block">
                 <h3 class="title">Upload attachment</h3>
-            <form action="/ticket/{{@ticket_id}}/attachments/upload" method="POST" enctype="multipart/form-data">
+                <form action="/ticket/{{@PARAMS.id}}/attachments/upload" method="POST" enctype="multipart/form-data">
                     <div class="field has-addons">
                         <div class="control has-icons-left"><!-- is-expanded -->
                             <input class="input" type="file" name="attachment" required>
@@ -45,4 +47,5 @@
                 </form>
             </div>
         </div>
+    </div>
 </div>

ui/views/comments/view.html

@@ -1,18 +1,6 @@
+<hr>
 <div class="box" id="comments">
     <h2 class="title">Comments</h2>
-    <div class="block">
-        <form action="/ticket/{{@PARAMS.id}}/comment" method="POST">
-            <div class="field">
-                <label class="label">Add comment:</label>
-                <div class="control">
-                    <textarea class="textarea" name="comment" rows="4" cols="50"></textarea>
-                </div>
-            </div>
-            <div class="field">
-                <button class="button is-primary" type="submit">Submit Comment</button>
-            </div>
-        </form>
-    </div>
     <check if="{{ !empty(@comments) }}">
         <div class="list">
             <repeat group="{{ @comments }}" value="{{ @comment}}">
@@ -38,4 +26,17 @@
             </repeat>
         </div>
     </check>
+    <div class="block">
+        <form action="/ticket/{{@PARAMS.id}}/comment" method="POST">
+            <div class="field">
+                <label class="label">Add comment:</label>
+                <div class="control">
+                    <textarea class="textarea" name="comment" rows="4" cols="50"></textarea>
+                </div>
+            </div>
+            <div class="field is-clearfix">
+                <button class="button is-primary is-pulled-right" type="submit">Submit Comment</button>
+            </div>
+        </form>
+    </div>
 </div>

ui/views/kb/index.html

@@ -41,7 +41,7 @@
 <check if="{{@articles}}">
     <table class="table is-fullwidth is-bordered">
         <thead>
-            <tr>
+            <tr class="has-background-info">
                 <th>id</th><th>title</th><th>created_at</th>
                 <th></th>
             </tr>
@@ -50,8 +50,8 @@
         <tbody>
             <repeat group="{{@articles}}" value="{{@article}}">
                 <tr>
-                    <td><a href="/kb/{{@article.id}}">{{@article.id}}</a></td>
+                    <td>{{@article.id}}</td>
-                    <td>{{@article.title}}</td>
+                    <td><a href="/kb/{{@article.id}}">{{@article.title}}</a></td>
                     <td>{{@article.created_at}}</td>
                     <td>
                         <a href="/kb/{{@article.id}}/edit"><i class="fa fa-edit"></i></a>

ui/views/kb/view.html

@@ -1,4 +1,6 @@
 <h1 class="title">{{@article.title}}</h1>
+<p><a href="/kb/{{ @article.id}}/edit">edit article</a></p>
+<hr>
 
     <div class="content">
         <parsedown>{{ @article.content | raw }}</parsedown>

ui/views/project/create.html

@@ -0,0 +1,3 @@
+<pre>
+    TODO: create form.
+</pre>

ui/views/project/edit.html

@@ -0,0 +1,3 @@
+<pre>
+    TODO: edit form
+</pre>

ui/views/project/index.html

@@ -1,8 +1,9 @@
 <h3 class="title">Projects</h3>
-
+<a href="/project/create">create new project</a>
+<hr>
 <table class="table is-fullwidth is-hoverable is-bordered">
     <thead>
-        <tr class="is-primary">
+        <tr class="has-background-primary">
             <th>ID</th>
             <th>Title</th>
             <th>Requester</th>
@@ -13,122 +14,16 @@
         </tr>
     </thead>
     <tbody>
+        <repeat group="{{ @projects }}" value="{{ @p }}">
         <tr>
-            <td>{id}</td>
+            <td>{{ @p.id }}</td>
-            <td>{title}</td>
+            <td><a href="/project/{{@p.id}}">{{ @p.title }}</a></td>
-            <td>{requester}</td>
+            <td>{{ @p.requester }}</td>
-            <td>{created_by}</td>
+            <td>{{ @p.created_by }}</td>
-            <td>{created_at}</td>
+            <td>{{ @p.created_at }}</td>
-            <td>{start_date}</td>
+            <td>{{ @p.start_date }}</td>
-            <td>{end_date}</td>
+            <td>{{ @p.end_date }}</td>
         </tr>
+        </repeat>
     </tbody>
 </table>
-
-<hr>
-
-
-<h3 class="title">Project {NAME}</h3>
-<div class="columns">
-    <div class="column is-two-thirds">
-        <h3 class="title subtitle">Overview</h3>
-        <div class="skeleton-lines">
-            <div></div>
-            <div></div>
-            <div></div>
-            <div></div>
-            <div></div>
-        </div>
-    </div>
-    <div class="column">
-        <div class="block">
-            <h3 class="title subtitle">Links</h3>
-                <div class="skeleton-lines">
-                    <div></div>
-                    <div></div>
-                    <div></div>
-                    <div></div>
-                    <div></div>
-                </div>
-        </div>
-    </div>
-</div>
-
-<hr>
-
-<div class="columns">
-    <div class="column">
-        <h3 class="title subtitle">Tickets</h3>
-            <div class="skeleton-lines">
-                <div></div>
-                <div></div>
-                <div></div>
-                <div></div>
-                <div></div>
-            </div>
-    </div>
-    <div class="column">
-        <h3 class="title subtitle">Tasks</h3>
-            <div class="skeleton-lines">
-                <div></div>
-                <div></div>
-                <div></div>
-                <div></div>
-                <div></div>
-            </div>
-    </div>
-    <div class="column">
-        <h3 class="title subtitle">Events</h3>
-            <div class="skeleton-lines">
-                <div></div>
-                <div></div>
-                <div></div>
-                <div></div>
-                <div></div>
-            </div>
-    </div>
-</div>
-
-<hr>
-
-<div class="columns">
-    <div class="column">
-        <h3 class="title">Timeline</h3>
-        <div class="skeleton-lines">
-            <div></div>
-            <div></div>
-            <div></div>
-            <div></div>
-            <div></div>
-        </div>
-    </div>
-</div>
-
-<parsedown inline="true">
----
-## View project 
-
-A central place to see everything for this project:
-
-- Overview: (title, description, links, start/end dates).
-- related tickets (with status and priorities)
-- events
-- tasks
-- timeline combining events, tickets, milestone dates
-
-## Example Workflow
-
-- create a project - `team manager overview`
--- attach relevant links
-- add tickets - each new request or issue can be a ticket referencing this project
-- add events - quick notes about management meetings, or verbal discussions that don't need ticket overhead
--- meeting on 01 jan to discuss layout
--- teams message on 28 jan clarifying data requirements
-- project tasks - for smaller to do items that don't warrant a full ticket
--- identify location of required data, create initial pq connections, build a mockup layout
-
-## Reporting Timelines
-- timeline view - merge ticket data with project_events sorted by date - chronological Overview
-- status summaries - how many tickets open, on hold, completed
-- progress tracking - sumarries or gantt style charts
-</parsedown>

ui/views/project/view.html

@@ -0,0 +1,102 @@
+<h3 class="title">{{ @project.title }}</h3>
+<p><a href="/project/{{ @project.id}}/edit">edit project</a></p>
+<hr>
+<div class="columns">
+    <div class="column is-two-thirds">
+        <h3 class="title subtitle">Overview</h3>
+        <div class="box">
+            <parsedown>{{ @project.description }}</parsedown>
+        </div>
+    </div>
+    <div class="column">
+        <div class="block">
+            <h3 class="title subtitle">Links</h3>
+                <div class="skeleton-lines">
+                    <div></div>
+                    <div></div>
+                    <div></div>
+                    <div></div>
+                    <div></div>
+                </div>
+        </div>
+    </div>
+</div>
+
+<hr>
+
+<div class="columns">
+    <div class="column">
+        <h3 class="title subtitle">Tickets</h3>
+            <div class="skeleton-lines">
+                <div></div>
+                <div></div>
+                <div></div>
+                <div></div>
+                <div></div>
+            </div>
+    </div>
+    <div class="column">
+        <h3 class="title subtitle">Tasks</h3>
+            <div class="skeleton-lines">
+                <div></div>
+                <div></div>
+                <div></div>
+                <div></div>
+                <div></div>
+            </div>
+    </div>
+    <div class="column">
+        <h3 class="title subtitle">Events</h3>
+            <div class="skeleton-lines">
+                <div></div>
+                <div></div>
+                <div></div>
+                <div></div>
+                <div></div>
+            </div>
+    </div>
+</div>
+
+<hr>
+
+<div class="columns">
+    <div class="column">
+        <h3 class="title">Timeline</h3>
+        <div class="skeleton-lines">
+            <div></div>
+            <div></div>
+            <div></div>
+            <div></div>
+            <div></div>
+        </div>
+    </div>
+</div>
+
+<parsedown inline="true">
+---
+## View project 
+
+A central place to see everything for this project:
+
+- Overview: (title, description, links, start/end dates).
+- related tickets (with status and priorities)
+- events
+- tasks
+- timeline combining events, tickets, milestone dates
+
+## Example Workflow
+
+- create a project - `team manager overview`
+-- attach relevant links
+- add tickets - each new request or issue can be a ticket referencing this project
+- add events - quick notes about management meetings, or verbal discussions that don't need ticket overhead
+-- meeting on 01 jan to discuss layout
+-- teams message on 28 jan clarifying data requirements
+- project tasks - for smaller to do items that don't warrant a full ticket
+-- identify location of required data, create initial pq connections, build a mockup layout
+
+## Reporting Timelines
+- timeline view - merge ticket data with project_events sorted by date - chronological Overview
+- status summaries - how many tickets open, on hold, completed
+- progress tracking - sumarries or gantt style charts
+</parsedown>

ui/views/ticket/index.html

@@ -11,7 +11,7 @@
 
 <table class="table is-fullwidth is-bordered">
     <thead>
-        <tr>
+        <tr class="has-background-warning">
             <th>id</th><th>title</th>
             <th>status</th><th>priority</th><th>created_at</th>
             <th></th>
@@ -21,8 +21,8 @@
     <tbody>
         <repeat group="{{@tickets}}" value="{{@ticket}}">
             <tr>
-                <td><a href="/ticket/{{@ticket.id}}">{{@ticket.id}}</a></td>
+                <td>{{@ticket.id}}</td>
-                <td>{{@ticket.title}}</td>
+                <td><a href="/ticket/{{@ticket.id}}">{{@ticket.title}}</a></td>
                 <td>{{@ticket.status}}</td>
                 <td>{{@ticket.priority}}</td>
                 <td>{{@ticket.created_at}}</td>

ui/views/ticket/view.html

@@ -76,9 +76,13 @@
     
     
     <hr>
+    <include href="../ui/views/attachment/index.html">
+    <include href="../ui/views/comments/view.html">
 
 
+    <!-- 
     <div class="block" id="attachments"></div>
     <div class="block" id="comments"></div>
+    -->
 
 </div>