app/controllers/DashboardController.php

@@ -1,11 +1,9 @@
 <?php
 
-class DashboardController extends BaseController {
+class DashboardController {
 
     function index($f3){
-
+        $f3->set('content', '../ui/views/dashboard.html');
-        $this->requireLogin();
+        echo \Template::instance()->render('../ui/templates/layout.html');
-
-        $this->renderView('/ui/views/dashboard.html');
     }
 }

app/controllers/HomeController.php

@@ -1,11 +1,12 @@
 <?php
 
-class HomeController extends BaseController {
+class HomeController {
 
     public function display($f3){
 
-        $this->renderView('/ui/views/home.html');
+        $f3->set('content', '/ui/views/home.html');
 
+        echo \Template::instance()->render('../ui/templates/layout.html');
     }
     // ...
 }

app/controllers/TicketController.php

@@ -45,15 +45,9 @@ class TicketController extends BaseController implements CRUD {
     // show create form
     // TODO_PROJECTS: dropdown to associate ticket with project
     public function createForm($f3){
-        $db = $this->getDB();
-        $priorities = (new TicketPriority($db))->findAll();
-        $statuses = (new TicketStatus($db))->findAll();
 
         $this->requireLogin();
-        $this->renderView('../ui/views/ticket/create.html',[
+        $this->renderView('../ui/views/ticket/create.html');
-            'priorities' => $priorities,
-            'statuses' => $statuses
-        ]);
     }
 
     // handle POST
@@ -66,8 +60,8 @@ class TicketController extends BaseController implements CRUD {
             'title' => $this->f3->get('POST.title'),
             'created_at' => $this->f3->get('POST.created_at'),
             'description' => $this->f3->get('POST.description'),
-            'priority_id' => $this->f3->get('POST.priority_id'),
+            'priority' => $this->f3->get('POST.priority'),
-            'status_id' => $this->f3->get('POST.status_id'),
+            'status' => $this->f3->get('POST.status'),
             'created_by' => $this->f3->get('SESSION.user.id')
         ];
 
@@ -86,8 +80,7 @@ class TicketController extends BaseController implements CRUD {
     // show edit form
     // including custom forms
     // TODO_PROJECTS: allow reasssigning or removing a project association
-    public function editForm($f3)
+    public function editForm($f3){
-    {
         $this->requireLogin();
 
         $ticket_id = $f3->get('PARAMS.id');
@@ -99,23 +92,16 @@ class TicketController extends BaseController implements CRUD {
             $this->f3->reroute('/tickets');
         }
 
-        // dropdowns
-        $priorities = (new TicketPriority($this->getDB()))->findAll();
-        $statuses = (new TicketStatus($this->getDB()))->findAll();
-
         $this->renderView('../ui/views/ticket/edit.html',[
             'ticket' => $ticket,
-            'ticket_meta' => $ticket->getMeta(),
+            'ticket_meta' => $ticket->getMeta()
-            'priorities' => $priorities,
-            'statuses' => $statuses
             ]
         );
         return;
     }
 
     // process edit POST TODO: if assigned or admin
-    public function update($f3)
+    public function update($f3){
-    {
 
         $this->requireLogin();
 
@@ -132,8 +118,8 @@ class TicketController extends BaseController implements CRUD {
             'title' => $this->f3->get('POST.title'),
             'created_at' => $this->f3->get('POST.created_at'),
             'description' => $this->f3->get('POST.description'),
-            'priority_id' => $this->f3->get('POST.priority_id'),
+            'priority' => $this->f3->get('POST.priority'),
-            'status_id' => $this->f3->get('POST.status_id'),
+            'status' => $this->f3->get('POST.status'),
             'updated_by' => $this->f3->get('SESSION.user.id') 
         ];
         $ticket->updateTicket($data);

app/extensions/BulmaFormHelper.php

@@ -5,26 +5,21 @@ class BulmaFormHelper extends \Prefab {
     const H_FIELD_INPUT = 1;
     const H_FIELD_TEXTAREA = 2;
     const H_FIELD_SELECT = 3;
-    const H_FIELD_SELECT_NEW = 4;
     
-    static public function render($node) {
+    static public function render($args) {
-
-        $attr = $node['@attrib'] ?? [];
-        $type = strtoupper($attr['type']) ?? null;
         
+        $type = strtoupper($args['@attrib']['type']);
         // all *
-        $label = $attr['label'];
+        $label = $args['@attrib']['label'];
-        $name = $attr['name'];
+        $name = $args['@attrib']['name'];
-        $value = isset($attr['value']) ? $attr['value'] : '';
+        $value = isset($args['@attrib']['value']) ? $args['@attrib']['value'] : '';
         // select
-        $options = isset($attr['options']) ? $attr['options'] : '';
+        $options = isset($args['@attrib']['options']) ? $args['@attrib']['options'] : '';
-        $selected = isset($attr['selected']) ? $attr['selected'] : '';
+        $selected = isset($args['@attrib']['selected']) ? $args['@attrib']['selected'] : '';
         //
-
         $label = \Template::instance()->build($label);
         $name = \Template::instance()->build($name);
         $value = \Template::instance()->build($value);
-        $options_array = \Template::instance()->token($options);
 
         if(defined("BulmaFormHelper::$type")){
 
@@ -40,9 +35,6 @@ class BulmaFormHelper extends \Prefab {
                 case BulmaFormHelper::H_FIELD_SELECT:
                     return BulmaFormHelper::build_h_field_select($label, $name, $options, $selected);
                 break;
-                case BulmaFormHelper::H_FIELD_SELECT_NEW:
-                    return BulmaFormHelper::build_h_field_select_new($attr);
-                break;
                 default:
                     return '<div class="notification is-danger">Error: Bulma CSS Form TYPE ('.$type.') not defined.</div>';
                 break;
@@ -54,40 +46,6 @@ class BulmaFormHelper extends \Prefab {
         
     }
 
-    static function build_h_field_select_new($attr)
-    {
-        $f3 = \Base::instance();
-
-        $label        = $attr['label']        ?? '';
-        $name         = $attr['name']         ?? '';
-        $options_arr  = $attr['options']      ?? [];
-        $optionValue  = $attr['option_value'] ?? 'id';
-        $optionName   = $attr['option_name']  ?? 'name';
-        $selected     = $attr['selected']     ?? '';
-
-        $options = $f3->get($options_arr);
-
-        $html = '<div class="field is-horizontal"><div class="field-label is-normal">';
-        if (!empty($label)) {
-            $html .= '<label class="label">'.$label.'</label>';
-        }
-        $html .= '</div><div class="field-body"><div class="field">';
-        $html .= '<div class="select">';
-        $html .= '<select name="'.$name.'">';
-        
-        foreach ($options as $option) {
-            $value = $option[$optionValue] ?? '';
-            $text  = $option[$optionName]  ?? '';
-            $sel   = ((string)$value === (string)$selected) ? ' selected="selected"' : '';
-            $html .= '<option value="'.$value.'"'.$sel.'>'.$text.'</option>';
-        }
-        
-        $html .= '</select>';
-        $html .= '</div></div></div></div>';
-
-        return $html;
-    }
-
     static function build_h_field_input($label, $name, $value){
         $string = '
         <div class="field is-horizontal">

app/extensions/IconsHelper.php

@@ -1,53 +0,0 @@
-<?php
-
-class IconsHelper extends \Prefab {
-
-    static public $status_icons = [
-        'New' => ['fas fa-plus-circle has-text-warning', "🆕"],
-        'In Progress' => ['fas fa-repeat has-text-link', "🔄"],
-        'On Hold' => ['fas fa-pause-circle has-text-danger',"⏸️"],
-        'Completed' => ['fas fa-check-circle has-text-success', "✅"]
-    ];
-
-    static public $priority_icons = [
-        'Low' => ['fas fa-arrow-down',"🟢"],
-        'Medium' => ['fas fa-minus', "🟡"],
-        'High' => ['fas fa-arrow-up', "🔴"]
-    ];
-
-    static public function icons($node){
-
-        $attr = $node['@attrib'];
-
-        $tpl = Template::instance();
-        $f3 = Base::instance();
-
-        $context = $f3->hive();
-        $inner = $tpl->token($node[0], $context);
-
-        return '<?php echo IconsHelper::do_the_switch("' . $attr['type'] . '", ' . $inner . '); ?>';
-        
-    }
-
-    static function do_the_switch($type, $value){
-
-        $icon_class = '';
-        switch(strtolower($type)){
-            case 'status':
-                $icon_class = IconsHelper::$status_icons[$value] ?? ['fas fa-question-circle has-text-info', "🔲"];
-                break;
-            case 'priority':
-                $icon_class = IconsHelper::$priority_icons[$value] ?? ['fas fa-question-circle', "🔲"];
-                break;
-            default:
-                $icon_class = 'fas fa-question-circle';
-        }
-
-        return '<span class="is-size-5">'.$icon_class[1].'</span>';
-        return '<i class="'.$icon_class[0].' is-size-4"></i>';
-
-    }
-
-}
-
-\Template::instance()->extend('icons', 'IconsHelper::icons');

app/models/Ticket.php

@@ -11,12 +11,10 @@ class Ticket extends \DB\SQL\Mapper {
     public function findAll(): array
     {
         return $this->db->exec(
-            'SELECT t.* , tp.name AS priority_name, ts.name AS status_name
+            'SELECT * 
-            FROM tickets  t
+            FROM tickets 
-            LEFT JOIN ticket_priorities tp ON t.priority_id = tp.id
+            WHERE recycled = 0
-            LEFT JOIN ticket_statuses ts ON t.status_id = ts.id
+            ORDER BY created_at DESC'
-            WHERE t.recycled = 0
-            ORDER BY t.created_at DESC'
         );
     }
 
@@ -32,12 +30,10 @@ class Ticket extends \DB\SQL\Mapper {
 
         $this->title = $data['title'] ?? '';
         $this->description = $data['description'] ?? '';
-        // 
+        $this->priority = $data['priority'] ?? 'Low';
-        $this->priority_id = $data['priority_id'] ?? null;
+        $this->status = $data['status'] ?? 'New';
-        $this->status = $data['status_id'] ?? null;
-        //
         $this->created_by = $data['created_by'] ?? null;
-        $this->created_at = ($data['created_at'] == '' ? date('Y-m-d H:i:s') : $data['created_at']) ?? date('Y-m-d H:i:s');
+        $this->created_at = $data['created_at'] ?? date('Y-m-d H:i:s');
         $this->updated_at = date('Y-m-d H:i:s');
 
         $this->save();
@@ -48,8 +44,8 @@ class Ticket extends \DB\SQL\Mapper {
     {
         if(isset($data['title'])){ $this->title = $data['title']; }
         if(isset($data['description'])) { $this->description = $data['description']; }
-        if(isset($data['priority_id'])) { $this->priority_id = $data['priority_id']; }
+        if(isset($data['priority'])) { $this->priority = $data['priority']; }
-        if(isset($data['status_id'])) { $this->status_id = $data['status_id']; } 
+        if(isset($data['status'])) { $this->status = $data['status']; } 
         if(isset($data['updated_by'])) { $this->updated_by = $data['updated_by']; }
         $this->created_at = ($data['created_at'] == '' ? date('Y-m-d H:i:s') : $data['created_at']) ?? date('Y-m-d H:i:s');
         $this->updated_at = date('Y-m-d H:i:s');

app/models/TicketPriority.php

@@ -1,16 +0,0 @@
-<?php
-
-class TicketPriority extends \DB\SQL\Mapper
-{
-    function __construct($db)
-    {
-        parent::__construct($db, 'ticket_priorities');
-    }
-
-    public function findAll(): array
-    {
-        return $this->db->exec(
-            'SELECT * FROM ticket_priorities ORDER BY sort_order ASC'
-        );
-    }
-}

app/models/TicketStatus.php

@@ -1,16 +0,0 @@
-<?php
-
-class TicketStatus extends \DB\SQL\Mapper
-{
-    function __construct($db)
-    {
-        parent::__construct($db, 'ticket_statuses');
-    }
-
-    public function findAll(): array
-    {
-        return $this->db->exec(
-            'SELECT * FROM ticket_statuses ORDER BY sort_order ASC'
-        );
-    }
-}

public/index.php

@@ -15,7 +15,7 @@ $htmlpurifier = \HTMLPurifier::instance();
 $md = \ParsedownTableExtension::instance();
 $md->setSafeMode(true);
 
-$f3->set('EXT', [new ParsedownHelper, new BulmaFormHelper, new IconsHelper]);
+$f3->set('EXT', [new ParsedownHelper, new BulmaFormHelper]);
 
 $f3->set('DB', new \DB\SQL(
     'mysql:host=localhost;port=3306;dbname=' . $f3->get('database.db_name'),

ui/views/ticket/create.html

@@ -1,5 +1,6 @@
 <h1 class="title">Create Ticket Form</h1>
 
+
 <form action="/ticket/create" method="POST">
 
     <bulma type="H_FIELD_INPUT" label="Title:" name="title" value=""></bulma>
@@ -7,13 +8,8 @@
     <bulma type="H_FIELD_TEXTAREA" label="Description:" name="description" value=""></bulma>
 
     <!-- TODO implement priority and status -->
-    <bulma type="H_FIELD_SELECT_NEW" label="Priority:" name="priority_id" 
+    <bulma type="H_FIELD_SELECT" label="Priority:" name="priority" options="['Low', 'Medium', 'High']" selected="Medium"></bulma>
-        options="priorities" option_value="id" option_name="name" 
+    <bulma type="H_FIELD_SELECT" label="Status:" name="status" options="['New', 'In Progress', 'On Hold', 'Completed']" selected="New"></bulma>
-        selected="2"></bulma>
-    
-    <bulma type="H_FIELD_SELECT_NEW" label="Status:" name="status_id" 
-        options="statuses" option_value="id" option_name="name" 
-        selected="1"></bulma>
 
     <!-- custom fields -->
     <hr>

ui/views/ticket/edit.html

@@ -7,13 +7,8 @@
     <bulma type="H_FIELD_TEXTAREA" label="Description:" name="description" value="{{@ticket.description}}"></bulma>
 
 
-    <bulma type="H_FIELD_SELECT_NEW" label="Priority:" name="priority_id" 
+    <bulma type="H_FIELD_SELECT" label="Priority:" name="priority" options="['Low', 'Medium', 'High']" selected="{{@ticket.priority}}"></bulma>
-        options="priorities" option_value="id" option_name="name" 
+    <bulma type="H_FIELD_SELECT" label="Status:" name="status" options="['New', 'In Progress', 'On Hold', 'Completed']" selected="{{@ticket.status}}"></bulma>
-        selected="{{@ticket.priority_id}}"></bulma>
-
-    <bulma type="H_FIELD_SELECT_NEW" label="Status:" name="status_id" 
-        options="statuses" option_value="id" option_name="name" 
-        selected="@ticket.status_id"></bulma>
 
     <include href="/ui/parts/clipboard.html"></include>
 

ui/views/ticket/index.html

@@ -17,8 +17,8 @@
             <tr>
                 <td>{{@ticket.id}}</td>
                 <td><a href="/ticket/{{@ticket.id}}">{{@ticket.title}}</a></td>
-                <td><icons type="status">{{@ticket.status_name}}</icons></td>
+                <td>{{@ticket.status}}</td>
-                <td><icons type="priority">{{@ticket.priority_name}}</icons></td>
+                <td>{{@ticket.priority}}</td>
                 <td>{{@ticket.created_at}}</td>
                 <td>
                     <a class="button is-link is-small" href="/ticket/{{@ticket.id}}/edit">