diff --git a/webgui/company.php b/webgui/company.php index de1fd6f..e3c1ba2 100644 --- a/webgui/company.php +++ b/webgui/company.php @@ -1,7 +1,7 @@ $v) { + diff --git a/webgui/documents.php b/webgui/documents.php index 50f0899..1ce6479 100644 --- a/webgui/documents.php +++ b/webgui/documents.php @@ -39,6 +39,11 @@ switch ($submit = form_get_action()) { $action = ACT_DEFAULT; break; + case 'freset': + db_clear_filter(209); + $action = ACT_DEFAULT; + break; + case 'insert': // WIP New standalone document // debug $g_message->Add(print_r($_FILES, true)); @@ -304,6 +309,7 @@ foreach ($opt_special + $opt_reftype as $k => $v) { + diff --git a/webgui/equipment.php b/webgui/equipment.php index acce7d4..0c5ed24 100644 --- a/webgui/equipment.php +++ b/webgui/equipment.php @@ -39,6 +39,11 @@ switch ($submit = form_get_action()) { $action = ACT_DEFAULT; break; + case 'freset': + db_clear_filter(200); + $action = ACT_DEFAULT; + break; + case 'insert': $p[':vid'] = $user->vid; $p[':ename'] = gpc_get_string($_POST, 'ename'); @@ -265,6 +270,7 @@ filter_create_select('flt_supp', _('Supplier'), $g_opt_all + $opt_none_male + $o + diff --git a/webgui/inventory.php b/webgui/inventory.php index fd04630..f9344ee 100644 --- a/webgui/inventory.php +++ b/webgui/inventory.php @@ -1,7 +1,7 @@ $v) { + diff --git a/webgui/maintenance.php b/webgui/maintenance.php index e14e255..c6b4696 100644 --- a/webgui/maintenance.php +++ b/webgui/maintenance.php @@ -32,6 +32,11 @@ switch ($submit = form_get_action()) { $action = ACT_DEFAULT; break; + case 'freset': + db_clear_filter(204); + $action = ACT_DEFAULT; + break; + case 'insert': $p[':vid'] = $user->vid; $p[':eid'] = gpc_get_int($_POST, 'eid'); @@ -96,6 +101,7 @@ foreach ($opt_special + $opt_equipment as $k => $v) { + diff --git a/webgui/projects.php b/webgui/projects.php index 4a349bf..e319cec 100644 --- a/webgui/projects.php +++ b/webgui/projects.php @@ -32,11 +32,18 @@ switch ($submit = form_get_action()) { case 'filter': $flt = array(); - $flt['txt'] = gpc_get_string($_POST, 'flt_txt'); + $flt['name'] = gpc_get_string($_POST, 'flt_name'); + $flt['state'] = gpc_get_string($_POST, 'flt_state'); + $flt['remarks'] = gpc_get_string($_POST, 'flt_remarks'); db_save_filter($flt, 205); $action = ACT_DEFAULT; break; + case 'freset': + db_clear_filter(205); + $action = ACT_DEFAULT; + break; + case 'insert': $p[':vid'] = $user->vid; $p[':projname'] = gpc_get_string($_POST, 'projname'); @@ -85,6 +92,38 @@ if ($action == ACT_DEFAULT): page_caption_search($pagetitle); +// load filter from db +$flt = db_get_filter($user->id, 205); + +$w = array(); +$p = array(); + +$where = join(' AND ', $w); +$order = ' ORDER BY comptype, compname'; + +// grand total of records for current vessel +$grandtotal = $pdo->query("SELECT COUNT(*) FROM project")->fetchColumn(); + +// Filter +?> +
+
+
Filter
+
+ + +state); +?> + + + + +
+
+
+Text + diff --git a/webgui/tag.php b/webgui/tag.php index b85cc6d..2b4beea 100644 --- a/webgui/tag.php +++ b/webgui/tag.php @@ -1,7 +1,7 @@ $pagetitle\n"; +