From 3ee4cfe30bddeb0f57814ea35516e4054b1f448f Mon Sep 17 00:00:00 2001 From: aspangaro <alexandre.spangaro@gmail.com> Date: Mon, 3 Nov 2014 05:57:09 +0100 Subject: [PATCH] Intervention card list --- htdocs/fichinter/list.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 076ad9bc689..28dad4bbb89 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -61,6 +61,13 @@ $search_company=GETPOST('search_company','alpha'); $search_desc=GETPOST('search_desc','alpha'); $search_status=GETPOST('search_status'); +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $search_company=""; + $search_desc=""; + $search_status=""; +} /* * View @@ -125,6 +132,7 @@ if ($result) print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],"fd.duree","",$urlparam,'align="right"',$sortfield,$sortorder); } print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.fk_statut","",$urlparam,'align="right"',$sortfield,$sortorder); + print_liste_field_titre('',$_SERVER["PHP_SELF"], ''); print "</tr>\n"; print '<tr class="liste_titre">'; @@ -145,9 +153,10 @@ if ($result) print '<td class="liste_titre" align="right">'; $liststatus=$interventionstatic->statuts_short; print $form->selectarray('search_status', $liststatus, GETPOST('search_status'), 1, 0, 0, '', 1); - print '<input class="liste_titre" align="right" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">'; print '</td>'; - print "</tr>\n"; + print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">'; + print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">'; + print "</td></tr>\n"; $companystatic=new Societe($db); @@ -178,7 +187,8 @@ if ($result) print '<td align="right">'.convertSecondToTime($objp->duree).'</td>'; } print '<td align="right">'.$interventionstatic->LibStatut($objp->fk_statut,5).'</td>'; - + + print '<td> </td>'; print "</tr>\n"; $total += $objp->duree; @@ -188,10 +198,10 @@ if ($result) if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) { print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td>'; - print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total).'</td><td> </td>'; + print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total).'</td><td> </td><td> </td>'; print '</tr>'; } - + print '</table>'; print "</form>\n"; $db->free($result); -- GitLab