\n";
echo "| ", $row['tagname'], " | \n";
echo "", $row['description'], " | \n";
- echo "", $row['color'], " | \n";
+ echo "", format_color($row['color']), " | \n";
echo "";
// Action buttons
form_action_buttons($g_scriptname, $row['tagid']);
@@ -147,6 +149,50 @@ echo "\n";
elseif ($action == ACT_VIEW):
// ========== VARIANT: view single record =====================================
+$sql = "SELECT tagname, description, color "
+ . "FROM tag "
+ . "WHERE tagid=?";
+$sth = $pdo->prepare($sql);
+$sth->execute([$id]);
+$tag = $sth->fetch(PDO::FETCH_OBJ);
+
+echo '', _('View Tag'), "\n";
+
+echo '', "\n";
+echo '| ', _('Tag')," | ", $tag->tagname, " |
|---|
\n";
+echo '| ', _('Color')," | ", format_color($tag->color), " |
|---|
\n";
+echo '| ', _('Description')," | ", $tag->description, " |
|---|
\n";
+echo " \n";
+
+form_view_buttons($g_scriptname, $id);
+
+echo '', _('Tag usage'), "\n";
+$sql = "SELECT objid, objtype FROM tagref WHERE tagid=?";
+$sth = $pdo->prepare($sql);
+$sth->execute([$id]);
+
+$link = array(
+ 'equip' => 'equipment.php',
+ 'inv' => 'inventory.php',
+ 'prov' => 'provisions.php',
+ 'doc' => 'documents.php',
+ 'proj' => 'projects.php',
+ 'task' => 'task.php',
+ 'maint' => 'maintenance.php'
+ );
+echo '';
+if ($sth->rowCount() > 0) {
+ foreach ($sth->fetchAll() as $row) {
+ echo '', $row['objid'], '/', $row['objtype'], "\n";
+ }
+} else {
+ echo _('Tag is not used anywhere');
+}
+echo " \n";
+
+echo '', _('Related tags'), "\n";
+echo '', _('Not yet implemented'), " \n";
+
elseif ($action == ACT_EDIT):
// ========== VARIANT: edit single record =====================================
@@ -181,6 +227,21 @@ echo "\n";
elseif ($action == ACT_DELETE):
// ========== VARIANT: delete record ==========================================
+echo '', _('Delete tag'), "\n";
+
+$sql = "SELECT objid, objtype FROM tagref WHERE tagid=?";
+$sth = $pdo->prepare($sql);
+$sth->execute([$id]);
+if ($sth->rowCount() > 0) {
+ foreach ($sth->fetchAll() as $row) {
+ echo '', $row['objid'], '/', $row['objtype'], "\n";
+ }
+} else {
+ echo _('Tag is not used anywhere');
+ $_SESSION['token'] = bin2hex(random_bytes(8));
+ form_delete_buttons($g_scriptname, $id, $_SESSION['token']);
+}
+
else:
// ========== ERROR UNKNOWN VARIANT ===========================================
diff --git a/webgui/task.php b/webgui/task.php
index 24704af..b910055 100644
--- a/webgui/task.php
+++ b/webgui/task.php
@@ -13,6 +13,7 @@ $id = gpc_get_int($_REQUEST, 'id', 0);
$opt_projects = db_get_opt_proj($user->vid, array(-1 => _('unassigned')));
$opt_priority = db_load_enum('task', 'priority', true, true);
+$opt_state = db_load_enum('task', 'taskstate', true, true);
// ========== ACTIONS START ===================================================
@@ -25,6 +26,15 @@ switch ($submit = form_get_action()) {
case 'edit': $action = ACT_EDIT; break;
case 'del': $action = ACT_DELETE; break;
+ case 'filter':
+ $flt = array();
+ $flt['prio'] = gpc_get_enum($_POST, 'flt_prio', array_merge(array_keys($opt_priority), ['-2', '-1']));
+ $flt['stat'] = gpc_get_enum($_POST, 'flt_stat', array_merge(array_keys($opt_state), ['-2', '-1']));
+ $flt['txt'] = gpc_get_string($_POST, 'flt_txt');
+ db_save_filter($flt, 206);
+ $action = ACT_DEFAULT;
+ break;
+
case 'insert':
$p[':vid'] = $user->vid;
$p[':projid'] = gpc_get_int($_POST, 'projid');
@@ -39,21 +49,52 @@ switch ($submit = form_get_action()) {
case 'update':
$p[':taskid'] = $id;
$p[':projid'] = gpc_get_int($_POST, 'projid');
- $p[':plandate'] = gpc_get_string($_POST, 'plandate');
- $p[':duedate'] = gpc_get_string($_POST, 'duedate');
+ $p[':plandate'] = gpc_get_date($_POST, 'plandate');
+ $p[':duedate'] = gpc_get_date($_POST, 'duedate');
if ($p[':projid'] == -1) {
$p[':projid'] = NULL;
}
$p[':taskname'] = gpc_get_string($_POST, 'taskname');
$p[':priority'] = gpc_get_string($_POST, 'priority', 10);
- if ($p[':priority'] == 'X') {
- $p[':projid'] = NULL;
+ if ($p[':priority'] == '-1') {
+ $p[':priority'] = NULL;
}
+ $p[':started'] = gpc_get_datetime($_POST, 'started');
+ $p[':finished'] = gpc_get_datetime($_POST, 'finished');
+ $p[':taskstate'] = gpc_get_enum($_POST, 'taskstate', array_keys($opt_state));
db_exec_update('task', $p, 'taskid');
$action = ACT_VIEW;
break;
case 'delete':
+ // Only captain is allowed to delete
+ if ($user->role != 'captain') {
+ $g_warning->Add('Only captain is allowed to delete tasks.');
+ $action = ACT_VIEW;
+ break;
+ }
+ // Security token needed!
+ if (gpc_get_string($_POST, 'token', 16) != $_SESSION['token']) {
+ $g_error->Add(_('Delete prohibited, invalid security token!'));
+ $action = ACT_VIEW;
+ break;
+ }
+ unset($_SESSION['token']);
+ // get information for possible redirect
+ $sth = $pdo->prepare("SELECT projid FROM task WHERE taskid=?");
+ $sth->execute([$id]);
+ $task = $sth->fetch(PDO::FETCH_OBJ);
+ if (isset($task->projid)) {
+ $backlink = 'project.php?id='.$task->projid;
+ }
+ // now really delete
+ $sth = $pdo->prepare("DELETE FROM task WHERE taskid=?");
+ $sth->execute([$id]);
+ $g_success->Add(_('Task deleted'));
+ if (isset($backlink)) {
+ header_location($backlink, ['info' => _('Note deleted.')]);
+ }
+ $action = ACT_DEFAULT;
break;
default:
@@ -71,20 +112,82 @@ require 'header.php';
if ($action == ACT_DEFAULT):
// ========== VARIANT: default behavior =======================================
-echo "$pagetitle\n";
+page_caption_search($pagetitle);
+
+// load filter from db
+$flt = db_get_filter($user->id, 206);
+
+$w = array('(t.vid=:vid OR t.vid IS NULL)');
+$p = array(':vid' => $user->vid);
+if (strlen($flt->txt) > 1) {
+ $w[] = '(taskname LIKE :txt)';
+ $p[':txt'] = '%'.$flt->txt.'%';
+}
+if (strlen($flt->prio) > 2 ) {
+ $w[] = 'priority=:priority';
+ $p[':priority'] = $flt->prio;
+} elseif ($flt->prio == -1) {
+ $w[] = 'priority IS NULL';
+}
+if (strlen($flt->stat) > 2 ) {
+ $w[] = 'taskstate=:taskstate';
+ $p[':taskstate'] = $flt->stat;
+}
+$where = join(' AND ', $w);
+$order = ' ORDER BY t.taskid';
+
+// get total recond count for pagination and limit
+$sql = "SELECT COUNT(*) FROM task";
+if ($where) $sql .= " WHERE $where";
-$sql = "SELECT t.taskid, t.projid, t.taskname, t.priority, p.projname "
- . "FROM task AS t LEFT JOIN project AS p USING (projid) "
- . "WHERE p.projid IS NULL OR p.vid=? "
- . "ORDER BY t.taskid";
$sth = $pdo->prepare($sql);
try {
- $sth->execute([$user->vid]);
+ $sth->execute($p);
+} catch(PDOException $e) {
+ $g_error->Add($e->getMessage());
+ $g_error->Add($sql);
+ $g_error->Add(print_r($p, true));
+}
+$numrows = $sth->fetchColumn();
+$lastpage = ceil($numrows/$g_rows_pp);
+$page = gpc_get_int($_REQUEST, 'p', 1);
+
+$sql = "SELECT t.taskid, t.vid, t.projid, t.taskname, t.priority, t.taskstate,"
+ . " p.projname "
+ . "FROM task AS t LEFT JOIN project AS p USING (projid) "
+ . "WHERE $where";
+if ($order) $sql .= $order;
+
+// if pagination:
+// $sql .= ' LIMIT ' . ($page - 1) * $g_rows_pp . ',' . $g_rows_pp;
+$sth = $pdo->prepare($sql);
+try {
+ $sth->execute($p);
} catch (PDOexception $e) {
$g_error->Add('SQL-Error: '. $e->getMessage());
+ $g_error->Add($sql);
+ $g_error->Add(print_r($p, true));
}
$res = $sth->fetchAll();
+?>
+
+', "\n";
echo "\n";
echo "\n";
@@ -92,16 +195,19 @@ echo '| # | ';
echo '', _('Task'), " | ";
echo '', _('Project'), " | ";
echo '', _('Priority'), " | ";
+echo '', _('Status'), " | ";
echo " | ";
echo " | \n";
echo " \n";
echo "\n";
foreach ($res as $row) {
echo " |