admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

0000604: Dans le boite de recherche action

Browse source
This commit is contained in:
Dany De Bontridder 2012-06-09 14:37:22 +00:00
parent 7972057eea
commit 14cd033172
5 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/action.common.inc.php
View file

@ -174,7 +174,7 @@ if ( $sub_action == "list" )
Follow_Up::ShowActionList($cn,$base);
// Add a button to export to Csv
echo '<form method="GET" ACTION="export.php">';
echo HtmlInput::request_to_hidden(array("gDossier","qcode","start_date","end_date","ag_id","ag_dest_query",
echo HtmlInput::request_to_hidden(array("state","gDossier","qcode","start_date","end_date","ag_id","ag_dest_query",
"tdoc","see_all","all_action","query"));
echo HtmlInput::hidden("act", "CSV:ActionGestion");
echo HtmlInput::submit("follow_up_csv", "Export CSV");

2
include/action.inc.php
View file

@ -23,7 +23,7 @@
*/
require_once('class_ipopup.php');
global $g_user;
$retour=HtmlInput::button_anchor(_('Retour liste'),HtmlInput::request_to_string(array("ac","gDossier","qcode","ag_dest_query","query","tdoc","date_start","date_end","see_all","all_action")).'&my_action');
$retour=HtmlInput::button_anchor(_('Retour liste'),HtmlInput::request_to_string(array("state","ac","gDossier","qcode","ag_dest_query","query","tdoc","date_start","date_end","see_all","all_action")).'&my_action');
//-----------------------------------------------------
// Follow_Up
//-----------------------------------------------------

2
include/category_followup.inc.php
View file

@ -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("gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action","sb","sc"),"");
$base="ac=$p_action&sc=sv&sb=detail&f_id=".$_REQUEST['f_id']."&".HtmlInput::request_to_string(array("state","gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action","sb","sc"),"");
$retour=HtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base);
$fiche=new Fiche($cn,$_REQUEST['f_id']);

18
include/class_follow_up.php
View file

@ -488,7 +488,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("qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end", "see_all", "all_action"));
$r.=HtmlInput::request_to_hidden(array("state","qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end", "see_all", "all_action"));
/* get template */
ob_start();
require_once 'template/detail-action.php';
@ -663,7 +663,7 @@ class Follow_Up
function myList($p_base, $p_filter = "", $p_search = "")
{
// for the sort
$url = HtmlInput::get_to_string(array("qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end", "see_all", "all_action")) . '&' . $p_base;
$url = HtmlInput::get_to_string(array("state","qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end", "see_all", "all_action")) . '&' . $p_base;
$table = new Sort_Table();
$table->add('Date', $url, 'order by ag_timestamp asc', 'order by ag_timestamp desc', 'da', 'dd');
@ -735,7 +735,7 @@ class Follow_Up
//show the sub_action
foreach ($a_row as $row)
{
$href = '<A class="document" HREF="do.php' . HtmlInput::get_to_string(array("gDossier", "qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end", "see_all", "ac", "all_action")) . "&" . $p_base . '&sa=detail&ag_id=' . $row['ag_id'] . '">';
$href = '<A class="document" HREF="do.php' . HtmlInput::get_to_string(array("state","gDossier", "qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end", "see_all", "ac", "all_action")) . "&" . $p_base . '&sa=detail&ag_id=' . $row['ag_id'] . '">';
$i++;
$tr = ($i % 2 == 0) ? 'even' : 'odd';
if ($row['ag_priority'] < 2)
@ -1116,6 +1116,14 @@ class Follow_Up
$type_doc->value = $aTDoc;
$type_doc->selected = (isset($_GET['tdoc'])) ? $_GET['tdoc'] : -1;
/* State of documents */
$type_state= new ISelect('state');
$aState = $cn->make_array('select s_id,s_value from document_state order by s_value');
$aState[] = array('value' => '-1', 'label' => _('Tous les Etats'));
$type_state->value = $aState;
$type_state->selected = (isset($_GET['state'])) ? $_GET['state'] : -1;
// date
$start = new IDate('date_start');
$start->value = (isset($_GET['date_start'])) ? $_GET['date_start'] : "";
@ -1203,6 +1211,10 @@ class Follow_Up
{
$query .= ' and dt_id = ' . sql_string($tdoc);
}
if (isset($state) && $state!= -1)
{
$query .= ' and ag_state= ' . sql_string($state);
}
if (!isset($_GET['see_all']))
$query .= ' and ag_state in (2,3) ';
if (!isset($all_action))

4
include/template/action_search.php
View file

@ -61,6 +61,10 @@
<td style="text-align:right" ><?= _("Profile")?></td>
<td><?= $str_ag_dest?></td>
</tr>
<tr>
<td style="text-align:right" ><?= _("Etat")?></td>
<td><?= $type_state->input()?></td>
</tr>
<td style="text-align:right"><? printf(_('contenant le mot'))?></td>
<td ><input class="input_text" style="width:100%" type="text" name="query" value="<?= $a?>"></td>
</tr>