diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index 4102df22064..0b83d591b23 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -62,6 +62,8 @@ $staticcontratligne=new ContratLigne($db); * View */ +$form=new Form($db); + llxHeader(); $sql = "SELECT s.rowid as socid, s.nom, c.rowid as cid,"; @@ -88,6 +90,10 @@ if ($search_nom) $sql.= " AND s.nom like '%".addslashes($search_nom)."%'"; if ($search_contract) $sql.= " AND c.rowid = '".addslashes($search_contract)."'"; if ($search_service) $sql.= " AND (p.ref like '%".addslashes($search_service)."%' OR p.description like '%".addslashes($search_service)."%')"; if ($socid > 0) $sql.= " AND s.rowid = ".$socid; +$filter_date1=dolibarr_mktime(0,0,0,$_REQUEST['op1month'],$_REQUEST['op1day'],$_REQUEST['op1year']); +$filter_date2=dolibarr_mktime(0,0,0,$_REQUEST['op2month'],$_REQUEST['op2day'],$_REQUEST['op2year']); +if (! empty($_REQUEST['filter_op1']) && $_REQUEST['filter_op1'] != -1 && $filter_date1 != '') $sql.= " AND date_ouverture_prevue ".$_REQUEST['filter_op1']." ".$db->idate($filter_date1); +if (! empty($_REQUEST['filter_op2']) && $_REQUEST['filter_op2'] != -1 && $filter_date2 != '') $sql.= " AND date_fin_validite ".$_REQUEST['filter_op2']." ".$db->idate($filter_date2); $sql .= " ORDER BY $sortfield $sortorder"; $sql .= $db->plimit($limit + 1 ,$offset); @@ -105,7 +111,11 @@ if ($resql) if ($search_service) $param.='&search_service='.urlencode($search_service); if ($mode) $param.='&mode='.$mode; if ($filter) $param.='&filter='.$filter; - + if (! empty($_REQUEST['filter_op1']) && $_REQUEST['filter_op1'] != -1) $param.='&filter_op1='.urlencode($_REQUEST['filter_op1']); + if (! empty($_REQUEST['filter_op2']) && $_REQUEST['filter_op2'] != -1) $param.='&filter_op2='.urlencode($_REQUEST['filter_op2']); + if ($filter_date1 != '') $param.='&op1day='.$_REQUEST['op1day'].'&op1month='.$_REQUEST['op1month'].'&op1year='.$_REQUEST['op1year']; + if ($filter_date2 != '') $param.='&op2day='.$_REQUEST['op2day'].'&op2month='.$_REQUEST['op2month'].'&op2year='.$_REQUEST['op2year']; + print_barre_liste($langs->trans("ListOfServices"), $page, "services.php", $param, $sortfield, $sortorder,'',$num); print '
| '; print ''; print ' | '; - print ''; - print ' | '; + print ' | '; + $arrayofoperators=array('<'=>'<','>'=>'>'); + print $form->select_array('filter_op1',$arrayofoperators,$_REQUEST['filter_op1'],1); + print ' '; + $filter_date1=dolibarr_mktime(0,0,0,$_REQUEST['op1month'],$_REQUEST['op1day'],$_REQUEST['"op1year']); + print $form->select_date($filter_date1,'op1',0,0,1); + print ' | '; + print ''; + $arrayofoperators=array('<'=>'<','>'=>'>'); + print $form->select_array('filter_op2',$arrayofoperators,$_REQUEST['filter_op2'],1); + print ' '; + $filter_date2=dolibarr_mktime(0,0,0,$_REQUEST['op2month'],$_REQUEST['op2day'],$_REQUEST['op2year']); + print $form->select_date($filter_date2,'op2',0,0,1); + print ' | '; print ''; print " | "; print "\n";