[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 50/119: Follow-up search : show the closing s
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 50/119: Follow-up search : show the closing status |
Date: |
Mon, 26 Oct 2020 18:27:17 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 3effa4bb848e0daef8e89b7ba4295272bf3f6254
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Mon Oct 5 15:43:39 2020 +0200
Follow-up search : show the closing status
---
include/class/follow_up.class.php | 9 ++++++---
include/template/action_search.php | 9 +++++----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/include/class/follow_up.class.php
b/include/class/follow_up.class.php
index 1637c39..26a8927 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -1117,7 +1117,7 @@ class Follow_Up
/* 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'));
+ $aState[]=array('value'=>'-1', 'label'=>_('Tous les actions
ouvertes'));
$type_state->value=$aState;
$type_state->selected=(isset($_GET['state']))?$_GET['state']:-1;
@@ -1235,7 +1235,7 @@ class Follow_Up
if ($p_array==null) $p_array=$_GET;
$action_query="";
-
+ $ag_state=""; //<! selected status of the event , if not set or equal
to -1 , it is all of them
if (isset($_REQUEST['action_query']))
{
// if a query is request build the sql stmt
@@ -1268,6 +1268,8 @@ class Follow_Up
if (isset($p_array['state'])&&$p_array['state'] !=-1)
{
$action_query .= ' and ag_state= '.sql_string($p_array['state']);
+ // a status is selected
+ $ag_state=$p_array['state'];
}
if (isset($p_array['hsstate'])&&$p_array['hsstate']!=-1)
{
@@ -1313,7 +1315,8 @@ class Follow_Up
{
$action_query .= " and
to_date('".sql_string($p_array['remind_date_end'])."','DD.MM.YYYY')>=
ag_remind_date";
}
- if (!isset($p_array['closed_action']))
+ // only for open action or a closing status is selected
+ if (!isset($p_array['closed_action']) && $ag_state == "")
{
$action_query.=" and s_status is null ";
}
diff --git a/include/template/action_search.php
b/include/template/action_search.php
index 657f5d9..58cab55 100644
--- a/include/template/action_search.php
+++ b/include/template/action_search.php
@@ -56,6 +56,10 @@
<td style="text-align:right" ><?php echo
_("Etat")?></td>
<td><?php echo $type_state->input()?></td>
</tr>
+ <tr>
+ <td style="text-align:right"> <?php echo
_("Affiche aussi les actions fermées");?></td>
+ <td><?php echo $closed_action->input();?></td>
+ </tr>
<tr>
<td style="text-align:right" ><?php echo
_("Exclure Etat")?></td>
<td><?php echo
$hsExcptype_state->input()?></td>
@@ -103,10 +107,7 @@
<?php echo $remind_date_end->input();?>
</td>
</tr>
- <tr>
- <td style="text-align:right"> <?php echo
_("Affiche aussi les actions fermées");?></td>
- <td><?php echo $closed_action->input();?></td>
- </tr>
+
</table>
- [Noalyss-commit] [noalyss] 11/119: Improve use of the security, (continued)
- [Noalyss-commit] [noalyss] 11/119: Improve use of the security, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 17/119: javascript : add function to concat 2 json objects, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 18/119: javascript: remove hardcoding of dialog box for manage_table, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 30/119: Bug 1834 : duplicate , cannot confirm an duplicated operation because the $_GET is taken in priority, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 29/119: Remove debug info, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 37/119: javascript: remove hardcoding of dialog box for manage_table, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 52/119: NEW Security : add tag, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 22/119: ManageTable : you can set the style of the dialog box, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 23/119: Rewriting of Predefined Operation. You can add new Predefined Operation, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 43/119: Documentation, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 50/119: Follow-up search : show the closing status,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 60/119: FollowUp Deatil : add the amount + tva from card, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 74/119: Search concerned card with company , name , ... and export contact option to CSV, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 80/119: Follow Up : multiple card , search by category of card, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 15/119: doc, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 19/119: fix type, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 20/119: documentation, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 26/119: FollowUp : new right : delete action, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 40/119: ManageTable : you can set the style of the dialog box, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 36/119: javascript : add function to concat 2 json objects, Dany De Bontridder, 2020/10/26
- [Noalyss-commit] [noalyss] 32/119: Bug : syntax error, Dany De Bontridder, 2020/10/26