From 5848f9ea907f69915b384ba2d210d0ff15a57f75 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 21 Jun 2012 11:39:28 +0000 Subject: [PATCH] 0000638: Recherche action gestion Ajout dans profile : tous les profiles --- include/action.common.inc.php | 2 +- include/action.inc.php | 2 +- include/category_followup.inc.php | 2 +- include/class_follow_up.php | 26 ++++++++++++++------------ include/template/action_search.php | 5 ----- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/include/action.common.inc.php b/include/action.common.inc.php index 91510836e..3a8abc7ae 100644 --- a/include/action.common.inc.php +++ b/include/action.common.inc.php @@ -195,7 +195,7 @@ if ($sub_action == "list") // Add a button to export to Csv echo '
'; echo HtmlInput::request_to_hidden(array("remind_date_end","remind_date","sag_ref", "remind_date","only_internal", "state", "gDossier", "qcode", "start_date", "end_date", "ag_id", "ag_dest_query", - "tdoc", "hsstate", "all_action", "query")); + "tdoc", "query")); echo HtmlInput::hidden("act", "CSV:ActionGestion"); echo HtmlInput::submit("follow_up_csv", "Export CSV"); echo "
"; diff --git a/include/action.inc.php b/include/action.inc.php index 78290304c..a99e79af9 100644 --- a/include/action.inc.php +++ b/include/action.inc.php @@ -24,7 +24,7 @@ require_once('class_ipopup.php'); global $g_user; $retour=HtmlInput::button_anchor(_('Retour liste'), - HtmlInput::request_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","ac","gDossier","qcode","ag_dest_query","query","tdoc","date_start","date_end","hsstate","all_action")).'&my_action'); + HtmlInput::request_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","ac","gDossier","qcode","ag_dest_query","query","tdoc","date_start","date_end","hsstate"))); //----------------------------------------------------- // Follow_Up //----------------------------------------------------- diff --git a/include/category_followup.inc.php b/include/category_followup.inc.php index 135becd42..c238a8475 100644 --- a/include/category_followup.inc.php +++ b/include/category_followup.inc.php @@ -37,7 +37,7 @@ require_once('class_follow_up.php'); $sub_action=(isset($_REQUEST['sa']))?$_REQUEST['sa']:"list"; $ag_id=(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0; $p_action=$_REQUEST['ac']; -$base="ac=$p_action&sc=sv&sb=detail&f_id=".$_REQUEST['f_id']."&".HtmlInput::request_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","hsstate","all_action","sb","sc"),""); +$base="ac=$p_action&sc=sv&sb=detail&f_id=".$_REQUEST['f_id']."&".HtmlInput::request_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","hsstate","sb","sc"),""); $retour=HtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base); $fiche=new Fiche($cn,$_REQUEST['f_id']); diff --git a/include/class_follow_up.php b/include/class_follow_up.php index 824c9def7..c7152ce6c 100644 --- a/include/class_follow_up.php +++ b/include/class_follow_up.php @@ -498,7 +498,7 @@ class Follow_Up /* add the number of item */ $Hid = new IHidden(); $r.=$Hid->input("nb_item", MAX_ARTICLE); - $r.=HtmlInput::request_to_hidden(array("remind_date_end","remind_date","sag_ref","only_internal","state","qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end", "hsstate", "all_action")); + $r.=HtmlInput::request_to_hidden(array("remind_date_end","remind_date","sag_ref","only_internal","state","qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end", "hsstate")); /* get template */ ob_start(); require_once 'template/detail-action.php'; @@ -671,7 +671,7 @@ class Follow_Up function myList($p_base, $p_filter = "", $p_search = "") { // for the sort - $url = HtmlInput::get_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end", "hsstate", "all_action")) . '&' . $p_base; + $url = HtmlInput::get_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end", "hsstate")) . '&' . $p_base; $table = new Sort_Table(); $table->add('Date', $url, 'order by ag_timestamp asc', 'order by ag_timestamp desc', 'da', 'dd'); @@ -743,7 +743,7 @@ class Follow_Up //show the sub_action foreach ($a_row as $row) { - $href = ''; + $href = ''; $i++; $tr = ($i % 2 == 0) ? 'even' : 'odd'; if ($row['ag_priority'] < 2) @@ -1146,14 +1146,13 @@ class Follow_Up $end = new IDate('date_end'); $end->value = (isset($_GET['date_end'])) ? $_GET['date_end'] : ""; - $my_action = new ICheckBox('all_action'); - $my_action->selected = (isset($_GET['all_action'])) ? true : false; $only_internal= new ICheckBox('only_internal'); $only_internal->selected = (isset($_GET['only_internal'])) ? true : false; // select profile $aAg_dest = $cn->make_array("select p_id as value, " . "p_name as label " . " from profile order by 2"); + $aAg_dest[] = array('value' => '-2', 'label' => _('Tous les profiles')); $ag_dest = new ISelect(); $ag_dest->name = "ag_dest_query"; $ag_dest->value = $aAg_dest; @@ -1247,10 +1246,7 @@ class Follow_Up if (isset($_GET['only_internal'])) $query .= ' and f_id_dest=0 '; - if ( isset($all_action)) - { - $query .=" and (ag_owner='" . $_SESSION['g_user'] . "' or ".self::sql_security_filter($cn, "R")." or ag_dest=-1 )"; - } + if (isset($date_start) && isDate($date_start) != null) { $query.=" and ag_timestamp >= to_date('$date_start','DD.MM.YYYY')"; @@ -1259,10 +1255,16 @@ class Follow_Up { $query.=" and ag_timestamp <= to_date('$date_end','DD.MM.YYYY')"; } - if (isset($ag_dest_query)&& ! isset($all_action) ) + if (isset($ag_dest_query) && $ag_dest_query != -2 ) { - $query.= " and ag_dest = " . sql_string($ag_dest_query); - } + $query.= " and ag_dest = " . sql_string($ag_dest_query); + } + else + { + $query .=" and (ag_owner='" . $_SESSION['g_user'] . "' or ".self::sql_security_filter($cn, "R")." or ag_dest=-1 )"; + } + + if (isNumber($ag_id) == 1 && $ag_id != 0) { $query = " and ag_id= " . sql_string($ag_id); diff --git a/include/template/action_search.php b/include/template/action_search.php index 6406a17b1..6d5bf36ec 100644 --- a/include/template/action_search.php +++ b/include/template/action_search.php @@ -108,11 +108,6 @@ - - - input()?> - - input()?>