diff --git a/app.php b/app.php index 148c1fc..ae34f1d 100644 --- a/app.php +++ b/app.php @@ -1,8 +1,4 @@ - + + + -
-
-
- - - -
-
- - -
- strip_tags($_GET['arg'])], false); } - ?> - strip_tags($_GET['arg'])], false); - } - $alerttype = MESSAGES[$_GET['msg']]['type']; - $alerticon = "square-o"; - switch (MESSAGES[$_GET['msg']]['type']) { - case "danger": - $alerticon = "times"; - break; - case "warning": - $alerticon = "exclamation-triangle"; - break; - case "info": - $alerticon = "info-circle"; - break; - case "success": - $alerticon = "check"; - break; - } - echo << -
+ $alerttype = MESSAGES[$_GET['msg']]['type']; + $alerticon = "square-o"; + switch (MESSAGES[$_GET['msg']]['type']) { + case "danger": + $alerticon = "times"; + break; + case "warning": + $alerticon = "exclamation-triangle"; + break; + case "info": + $alerticon = "info-circle"; + break; + case "success": + $alerticon = "check"; + break; + } + echo << +
- $alertmsg + $alertmsg
END; - } - ?> + } + ?> + + var navbar_breakpoint = \"$navbar_breakpoint\";" + ?> + + +
- + \n"; diff --git a/index.php b/index.php index f2892a3..0072492 100644 --- a/index.php +++ b/index.php @@ -1,15 +1,10 @@ - - + -
-
-
-
- - - -
-
-
-

-
-
-
- -
- -
- - " required="required" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" autofocus />
- " required="required" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
- -
-
- - - -
- -
- " required="required" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" autofocus />
- - - - -
-
-
-
-
-
-
- Copyright © +
+
+
- - - +
+
+
+
+
+ +
+ +
+ + " required="required" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" autofocus />
+ " required="required" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
+ +
+
+ + + +
+ +
+ " required="required" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" autofocus />
+ + + + +
+
+
+
+
+
+ Copyright © +
+
+ + + \ No newline at end of file diff --git a/lib/getmsgs.php b/lib/getmsgs.php index 40a273c..1d19985 100644 --- a/lib/getmsgs.php +++ b/lib/getmsgs.php @@ -1,5 +1,4 @@ 0) { $to = $usercache[$msg['to']]; } ?> -
-
- -
-
-
-
- $usercache[$msg['from']]['username']]) ?>">   $to['username']]) ?>"> -
-
- -
- - - -
-
+
+
+ + $usercache[$msg['from']]['username']]) ?>"> + + +
+ + $to['username']]) ?>"> + +
+

+
+ +
" . lang("no messages", false) . "
"; + echo "
" . lang("no messages", false) . "
"; } ?> \ No newline at end of file diff --git a/lib/gettaskman.php b/lib/gettaskman.php index 66f1fe5..0732d07 100644 --- a/lib/gettaskman.php +++ b/lib/gettaskman.php @@ -1,5 +1,4 @@ 0) { $usercache = []; foreach ($tasks as $task) { if (isset($_GET['alone']) || (isset($pageid) && $pageid != "home")) { - echo "
"; + echo "
"; } - $panelclass = "default"; + $colorclass = "default"; switch ($task['statusid']) { case 2: - $panelclass = "success"; + $colorclass = "success"; break; case 4: - $panelclass = "warning"; + $colorclass = "warning"; break; } ?> -
-
-

- my-2'> +
+
"; + break; + case 1: + echo ""; + break; + case 2: + echo ""; + break; + case 3: + echo ""; + break; + case 4: + echo ""; + break; + } + echo " " . $task['title']; // Check if the task is assigned to someone and show status if it is if (!is_null($task['userid'])) { - echo ""; + echo ""; if (!isset($usercache[$task['userid']])) { $usercache[$task['userid']] = getUserByID($task['userid']); } - echo " " . $usercache[$task['userid']]['name'] . " "; - switch ($task['statusid']) { - case 0: - echo " " . lang("pending", false); - break; - case 1: - echo " " . lang("started", false); - break; - case 2: - echo " " . lang("finished", false); - break; - case 3: - echo " " . lang("paused", false); - break; - case 4: - echo " " . lang("problem", false); - break; - } + echo " " . $usercache[$task['userid']]['name']; echo ""; } ?> -
-
-
+

-
+
-
- ($task['assigned'] > 0 ? date("F j, Y, g:i a", strtotime($task['assigned'])) : lang("no assigned date", false))]) ?> -
- ($task['due'] > 0 ? date("F j, Y, g:i a", strtotime($task['due'])) : lang("no due date", false))]) ?> +
+
+ ($task['assigned'] > 0 ? date("M j, g:i a", strtotime($task['assigned'])) : lang("no assigned date", false))]) ?> +
+
+ ($task['due'] > 0 ? date("M j, g:i a", strtotime($task['due'])) : lang("no due date", false))]) ?> +
0) { ?> -
- date("F j, Y, g:i a", strtotime($task['starttime']))]) ?> +
+ date("M j, g:i a", strtotime($task['starttime']))]) ?> +
-
- date("F j, Y, g:i a", strtotime($task['endtime']))]) ?> +
+ date("M j, g:i a", strtotime($task['endtime']))]) ?> +
-
-
-
+
+
+ ' /> - +
+ class='bin-btn'> ' /> 0) { - +
@@ -153,11 +155,9 @@ if (count($tasks) > 0) { } } else { if (isset($_GET['alone']) || (isset($pageid) && $pageid != "home")) { - echo "
"; - } else { - echo "
"; + echo "
"; } - echo "
" . lang("no tasks", false) . "
"; + echo "
" . lang("no tasks", false) . "
"; if (isset($_GET['alone']) || (isset($pageid) && $pageid != "home")) { echo "
"; } diff --git a/lib/gettasks.php b/lib/gettasks.php index 0577ddf..bd5f0b6 100644 --- a/lib/gettasks.php +++ b/lib/gettasks.php @@ -1,5 +1,4 @@ debug()->select('assigned_tasks', ['[>]tasks' => ['taskid' => 'taskid']], '*', ["AND" => ['assigned_tasks.userid' => $_SESSION['uid'], 'assigned_tasks.statusid' => [0, 1, 3, 4], '#taskassignedon[<=]' => 'NOW()'], "ORDER" => ['0 - taskdueby' => "DESC"]]); $tasks = $database->query("SELECT * FROM assigned_tasks LEFT JOIN tasks ON assigned_tasks.taskid = tasks.taskid WHERE assigned_tasks.userid = '" . $_SESSION['uid'] . "' AND assigned_tasks.statusid IN (0,1,3,4) AND taskassignedon <= NOW() AND tasks.deleted = 0 ORDER BY 0 - taskdueby DESC")->fetchAll(); if (count($tasks) > 0) { foreach ($tasks as $task) { - if (isset($_GET['alone']) || (isset($pageid) && $pageid != "home")) { - echo "
"; - } - $panelclass = 'panel-default'; + $colorclass = 'border-blue-grey'; if ($task['taskdueby'] == null) { // This bit is just here to skip the rest of the branches if we need to } else if (strtotime($task['taskdueby']) - time() < 0) { // deadline overdue - $panelclass = 'panel-danger'; + $colorclass = 'border-red'; } else if (strtotime($task['taskdueby']) - time() < 60 * 60 * 3) { // less than three hours - $panelclass = 'panel-warning'; + $colorclass = 'border-orange'; } else if (strtotime($task['taskdueby']) - time() < 60 * 60 * 8) { // less than eight hours - $panelclass = 'panel-primary'; + $colorclass = 'border-blue'; } - ?> -
-
-

- - - - - - - -

-
-
- -
-
-
-
- date("F j, Y, g:i a", strtotime($task['taskassignedon']))]) ?> -
- ($task['taskdueby'] > 0 ? date("F j, Y, g:i a", strtotime($task['taskdueby'])) : lang("no due date", false))]) ?> - 0) { - ?> -
- date("F j, Y, g:i a", strtotime($task['starttime']))]) ?> - - -
- date("F j, Y, g:i a", strtotime($task['endtime']))]) ?> - + + $statusicon = ""; + if ($task['statusid'] == 1) { + $statusicon = 'fas fa-play'; + } else if ($task['statusid'] == 3) { + $statusicon = 'fas fa-play'; + } else if ($task['statusid'] == 4) { + $statusicon = 'fas fa-exclamation'; + } + + $btns = ""; + if ($task['statusid'] == 0) { + $btns = "
+ + + +
"; + } else if ($task['statusid'] == 1) { + $btns = "
+ + + +
"; + $btns .= "
+ + + +
"; + $btns .= "
+ + + +
"; + } else if ($task['statusid'] == 3 || $task['statusid'] == 4) { + $btns = "
+ + + +
"; + } + + $assignedon = " " . lang2("assigned on", ["date" => date("F j, Y, g:i a", strtotime($task['taskassignedon']))], false); + $dueby = " " . lang2("due by", ["date" => ($task['taskdueby'] > 0 ? date("F j, Y, g:i a", strtotime($task['taskdueby'])) : lang("no due date", false))], false); + $startedon = ""; + if ($task['statusid'] > 0) { + $startedon = " " . lang2("started on", ["date" => date("F j, Y, g:i a", strtotime($task['starttime']))], false); + } + $finishedon = ""; + if ($task['statusid'] == 2) { + $finishedon = " " . lang2("finished on", ["date" => date("F j, Y, g:i a", strtotime($task['endtime']))], false); + } + if ($home) { + ?> +
+
+
+
+

+
+
+
+ +
+
+ +
+ +
+ +
+ + +
+ +
+
-
- :
- -
- ' /> - - -
- -
- ' /> - - -
-
- ' /> - - -
-
- ' /> - - -
- -
- ' /> - - -
- +
+
-
- "; + +
+

+ +

+
+ +
+
+
+
+
+ +
+
+ +
+ +
+ +
+ + +
+ +
+ +
+
+ +
+
+
+
+ "; + echo "
"; } - echo "
" . lang("all caught up", false) . "
"; + echo "
" . lang("all caught up", false) . "
"; if (isset($_GET['alone']) || (isset($pageid) && $pageid != "home")) { - echo "
"; + echo "
"; } } ?> diff --git a/pages.php b/pages.php index 3c71479..dc8c61b 100644 --- a/pages.php +++ b/pages.php @@ -10,7 +10,7 @@ define("PAGES", [ "home" => [ "title" => "home", "navbar" => true, - "icon" => "home", + "icon" => "fas fa-home", "styles" => [ "static/css/easy-autocomplete.min.css" ], @@ -23,7 +23,7 @@ define("PAGES", [ "mytasks" => [ "title" => "my tasks", "navbar" => true, - "icon" => "th-list", + "icon" => "fas fa-th-list", "scripts" => [ "static/js/tasks.js" ] @@ -31,7 +31,7 @@ define("PAGES", [ "taskman" => [ "title" => "task manager", "navbar" => true, - "icon" => "tasks", + "icon" => "fas fa-tasks", "scripts" => [ "static/js/taskman.js" ] @@ -39,7 +39,7 @@ define("PAGES", [ "messages" => [ "title" => "messages", "navbar" => true, - "icon" => "comments", + "icon" => "fas fa-comments", "styles" => [ "static/css/easy-autocomplete.min.css" ], @@ -51,16 +51,16 @@ define("PAGES", [ "edittask" => [ "title" => "edit task", "navbar" => false, - "icon" => "pencil", + "icon" => "fas fa-pencil", "styles" => [ - "static/css/bootstrap-datetimepicker.min.css", "static/css/easy-autocomplete.min.css", - "static/css/summernote.css" + "static/css/tempusdominus-bootstrap-4.min.css", + "static/css/summernote-lite.css" ], "scripts" => [ - "static/js/summernote.min.js", + "static/js/summernote-lite.js", "static/js/moment.min.js", - "static/js/bootstrap-datetimepicker.min.js", + "static/js/tempusdominus-bootstrap-4.min.js", "static/js/jquery.easy-autocomplete.min.js", "static/js/edittask.js" ] diff --git a/pages/404.php b/pages/404.php index f14ee30..21110a2 100644 --- a/pages/404.php +++ b/pages/404.php @@ -5,8 +5,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ?> -
-
+
+

\ No newline at end of file diff --git a/pages/edittask.php b/pages/edittask.php index 06eaef9..6658069 100644 --- a/pages/edittask.php +++ b/pages/edittask.php @@ -1,5 +1,4 @@ -
-
-

- -

-
+
+

+ +

-
- - - - +
: " required="required" class="form-control" value=""/>
:

- : + : " placeholder="" />
- : " /> - + : " />
- : "/> + : "/>
-
- - + + + + +
+ +
diff --git a/pages/home.php b/pages/home.php index 99ea6f1..63bd08a 100644 --- a/pages/home.php +++ b/pages/home.php @@ -1,5 +1,4 @@
-
-
-
-

- -

-
-
+
+
+
+

+ +

-
-
-
-

- -

-
-
+
+
+
+

+ +

diff --git a/pages/messages.php b/pages/messages.php index fd0eb8e..e051322 100644 --- a/pages/messages.php +++ b/pages/messages.php @@ -1,5 +1,4 @@ -
+ -
-
- " autocomplete="off" /> +
+ " autocomplete="off" /> + " autocomplete="off" /> +
+
-
- " autocomplete="off" /> -
-
-> +
-
"> - +?> +
"> +