[Phpcompta-dev] r4919 - in phpcompta/trunk/include: . template

[phpcompta-dev]

Author: danydb
Date: 2012-06-18 09:56:06 +0200 (Mon, 18 Jun 2012)
New Revision: 4919

Modified:
   phpcompta/trunk/include/action.common.inc.php
   phpcompta/trunk/include/action.inc.php
   phpcompta/trunk/include/class_follow_up.php
   phpcompta/trunk/include/template/action_search.php
Log:
0000630: Action - Gestion : recherche date de rappel : interval

Modified: phpcompta/trunk/include/action.common.inc.php
===================================================================
--- phpcompta/trunk/include/action.common.inc.php       2012-06-16 23:42:17 UTC 
(rev 4918)
+++ phpcompta/trunk/include/action.common.inc.php       2012-06-18 07:56:06 UTC 
(rev 4919)
@@ -194,7 +194,7 @@
        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("remind_date","sag_ref", 
"remind_date","only_internal", "state", "gDossier", "qcode", "start_date", 
"end_date", "ag_id", "ag_dest_query",
+       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"));
        echo HtmlInput::hidden("act", "CSV:ActionGestion");
        echo HtmlInput::submit("follow_up_csv", "Export CSV");

Modified: phpcompta/trunk/include/action.inc.php
===================================================================
--- phpcompta/trunk/include/action.inc.php      2012-06-16 23:42:17 UTC (rev 
4918)
+++ phpcompta/trunk/include/action.inc.php      2012-06-18 07:56:06 UTC (rev 
4919)
@@ -23,7 +23,8 @@
  */
 require_once('class_ipopup.php');
 global $g_user;
-$retour=HtmlInput::button_anchor(_('Retour 
liste'),HtmlInput::request_to_string(array("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');
+$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');
 //-----------------------------------------------------
 // Follow_Up
 //-----------------------------------------------------

Modified: phpcompta/trunk/include/class_follow_up.php
===================================================================
--- phpcompta/trunk/include/class_follow_up.php 2012-06-16 23:42:17 UTC (rev 
4918)
+++ phpcompta/trunk/include/class_follow_up.php 2012-06-18 07:56:06 UTC (rev 
4919)
@@ -498,7 +498,7 @@
                /* add the number of item */
                $Hid = new IHidden();
                $r.=$Hid->input("nb_item", MAX_ARTICLE);
-               
$r.=HtmlInput::request_to_hidden(array("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", "see_all", 
"all_action"));
                /* get template */
                ob_start();
                require_once 'template/detail-action.php';
@@ -671,7 +671,7 @@
        function myList($p_base, $p_filter = "", $p_search = "")
        {
                // for the sort
-               $url = 
HtmlInput::get_to_string(array("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", "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');
@@ -743,7 +743,7 @@
                //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","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", 
"see_all", "ac", "all_action"),"&") . '&sa=detail&ag_id=' . $row['ag_id'] . 
'">';
                        $i++;
                        $tr = ($i % 2 == 0) ? 'even' : 'odd';
                        if ($row['ag_priority'] < 2)
@@ -1156,6 +1156,8 @@
                $osag_ref->value=(isset($_GET['sag_ref']))?$_GET['sag_ref']:"";
                $remind_date=new IDate('remind_date');
                
$remind_date->value=(isset($_GET['remind_date']))?$_GET['remind_date']:"";
+               $remind_date_end=new IDate('remind_date_end');
+               
$remind_date_end->value=(isset($_GET['remind_date_end']))?$_GET['remind_date_end']:"";
                // show the  action in
                require_once 'template/action_search.php';
        }
@@ -1257,8 +1259,12 @@
                }
                if ( isset($remind_date) && $remind_date != "" && 
isDate($remind_date)==$remind_date)
                {
-                       $query = " and to_char(ag_remind_date,'DD.MM.YYYY')= 
'".sql_string($remind_date)."'";
+                       $query .= " and 
to_date('".sql_string($remind_date)."','DD.MM.YYYY')<= ag_remind_date";
                }
+               if ( isset($remind_date_end) && $remind_date_end != "" && 
isDate($remind_date_end)==$remind_date_end)
+               {
+                       $query .= " and 
to_date('".sql_string($remind_date_end)."','DD.MM.YYYY')>= ag_remind_date";
+               }
                return $query . $str;
        }
 

Modified: phpcompta/trunk/include/template/action_search.php
===================================================================
--- phpcompta/trunk/include/template/action_search.php  2012-06-16 23:42:17 UTC 
(rev 4918)
+++ phpcompta/trunk/include/template/action_search.php  2012-06-18 07:56:06 UTC 
(rev 4919)
@@ -48,11 +48,17 @@
                <?= dossier::hidden()?>
                <table style="width:100%">
                        <tr>
-                               <td style="width:180px;text-align:right"> Date 
de rappel</td>
+                               <td style="width:180px;text-align:right"> Date 
de rappel après</td>
                                <td>
                                        <?=$remind_date->input();?>
                                </td>
                        <tr>
+                       <tr>
+                               <td style="width:180px;text-align:right"> Date 
de rappel avant</td>
+                               <td>
+                                       <?=$remind_date_end->input();?>
+                               </td>
+                       <tr>
                        <td style="width:180px;text-align:right"> Référence</td>
                                <td>
                                        <?=$osag_ref->input();?>



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu