0000638: Recherche action gestion
Amélioration : enlever "inclure les actions fermées" car double emploi avec Etat de document Ajout de "Exclure Etat de document"
This commit is contained in:
Dany De Bontridder
parent
7d64e758c0
commit
5a56226d58
6 changed files with 25 additions and 19 deletions
|
|
@ -195,7 +195,7 @@ if ($sub_action == "list")
|
|||
// Add a button to export to Csv
|
||||
echo '<form method="GET" ACTION="export.php">';
|
||||
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", "see_all", "all_action", "query"));
|
||||
"tdoc", "hsstate", "all_action", "query"));
|
||||
echo HtmlInput::hidden("act", "CSV:ActionGestion");
|
||||
echo HtmlInput::submit("follow_up_csv", "Export CSV");
|
||||
echo "</form>";
|
||||
|
|
|
|||
|
|
@ -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","see_all","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","all_action")).'&my_action');
|
||||
//-----------------------------------------------------
|
||||
// Follow_Up
|
||||
//-----------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -53,4 +53,4 @@ echo $st->input($p_array,true);
|
|||
<?=HtmlInput::submit("del", "Effacer");?>
|
||||
<?=HtmlInput::button_close($_GET['ctl'])?>
|
||||
<?=HtmlInput::hidden('r_id',$p_array['p_depot'])?>
|
||||
</form>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -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","see_all","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","all_action","sb","sc"),"");
|
||||
$retour=HtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base);
|
||||
$fiche=new Fiche($cn,$_REQUEST['f_id']);
|
||||
|
||||
|
|
|
|||
|
|
@ -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", "see_all", "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", "all_action"));
|
||||
/* 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", "see_all", "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", "all_action")) . '&' . $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 = '<A class="document" HREF="do.php?' . $p_base .HtmlInput::get_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","gDossier", "qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end", "see_all", "ac", "all_action"),"&") . '&sa=detail&ag_id=' . $row['ag_id'] . '">';
|
||||
$href = '<A class="document" HREF="do.php?' . $p_base .HtmlInput::get_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","gDossier", "qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end", "hsstate", "ac", "all_action"),"&") . '&sa=detail&ag_id=' . $row['ag_id'] . '">';
|
||||
$i++;
|
||||
$tr = ($i % 2 == 0) ? 'even' : 'odd';
|
||||
if ($row['ag_priority'] < 2)
|
||||
|
|
@ -1131,14 +1131,21 @@ class Follow_Up
|
|||
$type_state->selected = (isset($_GET['state'])) ? $_GET['state'] : -1;
|
||||
|
||||
|
||||
|
||||
/* Except State of documents */
|
||||
$hsExcptype_state= new ISelect('state');
|
||||
$aExcpState = $cn->make_array('select s_id,s_value from document_state order by s_value');
|
||||
$aExcpState[] = array('value' => '-1', 'label' => _('Aucun'));
|
||||
$hsExcptype_state->value = $aState;
|
||||
$hsExcptype_state->selected = (isset($_GET['hsstate'])) ? $_GET['hsstate'] : -1;
|
||||
|
||||
|
||||
// date
|
||||
$start = new IDate('date_start');
|
||||
$start->value = (isset($_GET['date_start'])) ? $_GET['date_start'] : "";
|
||||
$end = new IDate('date_end');
|
||||
$end->value = (isset($_GET['date_end'])) ? $_GET['date_end'] : "";
|
||||
|
||||
$see_all = new ICheckBox('see_all');
|
||||
$see_all->selected = (isset($_GET['see_all'])) ? true : false;
|
||||
$my_action = new ICheckBox('all_action');
|
||||
$my_action->selected = (isset($_GET['all_action'])) ? true : false;
|
||||
$only_internal= new ICheckBox('only_internal');
|
||||
|
|
@ -1229,12 +1236,15 @@ class Follow_Up
|
|||
{
|
||||
$query .= ' and ag_state= ' . sql_string($state);
|
||||
}
|
||||
if (isset($hsstate) && $hsstate!= -1)
|
||||
{
|
||||
$query .= ' and ag_state <> ' . sql_string($hsstate);
|
||||
}
|
||||
if (isset($sag_ref) && trim($sag_ref) != "")
|
||||
{
|
||||
$query .= ' and ag_ref= \'' . sql_string($sag_ref)."'";
|
||||
}
|
||||
if (!isset($_GET['see_all']))
|
||||
$query .= ' and ag_state in (2,3) ';
|
||||
|
||||
if (isset($_GET['only_internal']))
|
||||
$query .= ' and f_id_dest=0 ';
|
||||
if ( isset($all_action))
|
||||
|
|
|
|||
|
|
@ -82,6 +82,10 @@
|
|||
<td style="text-align:right" ><?= _("Etat")?></td>
|
||||
<td><?= $type_state->input()?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="text-align:right" ><?= _("Exclure Etat")?></td>
|
||||
<td><?= $hsExcptype_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>
|
||||
|
|
@ -104,14 +108,6 @@
|
|||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="text-align:right">
|
||||
<?= _('inclure les actions fermées ')?>
|
||||
</td>
|
||||
<td>
|
||||
<?= $see_all->input()?>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="text-align:right"><?= _('les actions affectées à d\'autres')?></td>
|
||||
<td><?= $my_action->input()?>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue