[Phpcompta-dev] r619 - in trunk/rapport_avance: . include

[phpcompta-dev]

Author: danydb
Date: 2013-12-14 13:43:51 +0100 (Sat, 14 Dec 2013)
New Revision: 619

Modified:
   trunk/rapport_avance/ajax_rapav_declaration_display.php
   trunk/rapport_avance/ajax_rapav_listing_display.php
   trunk/rapport_avance/include/class_rapav_listing_compute.php
   trunk/rapport_avance/include/declaration.inc.php
Log:
Task #0000944: Listing : Propose de t?\195?\169l?\195?\169charger tous les 
documents dans un ZIP
Task #0000935: Listing : inclure dans Suivi
Task #0000936: Listing : envoi par email

Modified: trunk/rapport_avance/ajax_rapav_declaration_display.php
===================================================================
--- trunk/rapport_avance/ajax_rapav_declaration_display.php     2013-12-14 
12:26:52 UTC (rev 618)
+++ trunk/rapport_avance/ajax_rapav_declaration_display.php     2013-12-14 
12:43:51 UTC (rev 619)
@@ -27,7 +27,7 @@
  */
 require_once 'include/class_rapav_declaration.php';
 global $cn;
-echo HtmlInput::button_action("Retour","$('declaration_list_div').show(); 
$('declaration_display_div').hide();");
+echo HtmlInput::button_action("Retour","$('declaration_list_div').show(); 
$('declaration_display_div').hide();",'rt'.$_GET['d_id'],'smallbutton');
 $decl = new Rapav_Declaration();
 $decl->d_id = $_GET['d_id'];
 $decl->load();
@@ -36,6 +36,6 @@
 echo '<hr>';
 
$ref=HtmlInput::array_to_string(array('gDossier','plugin_code','d_id'),$_GET,'extension.raw.php?');
 $ref.="&amp;act=export_decla_csv";
-echo HtmlInput::button_anchor("Export CSV",$ref,'export_id');
-echo HtmlInput::button_action("Retour","$('declaration_list_div').show(); 
$('declaration_display_div').hide();");
+echo HtmlInput::button_anchor("Export CSV",$ref,'export_id','','smallbutton');
+echo HtmlInput::button_action("Retour","$('declaration_list_div').show(); 
$('declaration_display_div').hide();",'rt','smallbutton');
 ?>

Modified: trunk/rapport_avance/ajax_rapav_listing_display.php
===================================================================
--- trunk/rapport_avance/ajax_rapav_listing_display.php 2013-12-14 12:26:52 UTC 
(rev 618)
+++ trunk/rapport_avance/ajax_rapav_listing_display.php 2013-12-14 12:43:51 UTC 
(rev 619)
@@ -6,14 +6,21 @@
 require_once 'rapav_constant.php';
 require_once 'include/class_rapav_listing_compute.php';
 global $cn;
-echo HtmlInput::button_action("Retour","$('declaration_list_div').show(); 
$('declaration_display_div').hide();");
-$decl = new RAPAV_Listing_Compute();
-$decl->load($_GET['d_id']);
-$decl->display(false);
-//echo $decl->anchor_document();
+echo '<div class="content">';
+echo '<p>';
+echo HtmlInput::button_action("Retour","$('declaration_list_div').show(); 
$('declaration_display_div').hide();",'rttop'.$_GET['d_id'],'smallbutton');
+echo '</p>';
+$listing = new RAPAV_Listing_Compute();
+$listing->load($_GET['d_id']);
+$listing->display(false);
+//echo $listing->anchor_document();
 echo '<hr>';
-$decl->propose_CSV();
-echo HtmlInput::button_action("Retour","$('declaration_list_div').show(); 
$('declaration_display_div').hide();");
-// require_once '.php';
+$listing->propose_CSV();
+$listing->propose_send_mail();
+$listing->propose_include_follow();
+$listing->propose_download_all();
 
+echo HtmlInput::button_action("Retour","$('declaration_list_div').show(); 
$('declaration_display_div').hide();",'rt'.$_GET['d_id'],'smallbutton');
+echo '</div>';
+
 ?>        
\ No newline at end of file

Modified: trunk/rapport_avance/include/class_rapav_listing_compute.php
===================================================================
--- trunk/rapport_avance/include/class_rapav_listing_compute.php        
2013-12-14 12:26:52 UTC (rev 618)
+++ trunk/rapport_avance/include/class_rapav_listing_compute.php        
2013-12-14 12:43:51 UTC (rev 619)
@@ -313,7 +313,7 @@
         echo 
HtmlInput::array_to_hidden(array('ac','gDossier','plugin_code','sa'), 
$_REQUEST);
         echo HtmlInput::hidden('lc_id',$this->data->lc_id);
         echo HtmlInput::hidden('act','export_listing_csv');
-        echo HtmlInput::submit("export_listing", "Export CSV");
+        echo HtmlInput::submit("export_listing", "Export 
CSV","","smallbutton");
         echo '</form>';
     }
     /**
@@ -327,7 +327,7 @@
         echo "Numéro de document ".$num->input();
         echo 
HtmlInput::array_to_hidden(array('ac','gDossier','plugin_code','sa'), 
$_REQUEST);
         echo HtmlInput::hidden('lc_id',$this->data->lc_id);
-        echo HtmlInput::submit("generate_document", "Génération des 
documents");
+        echo HtmlInput::submit("generate_document", "Génération des 
documents","","smallbutton");
         echo '</form>';
         
     }
@@ -380,5 +380,38 @@
         }
         
     }
+    function propose_send_mail()
+    {
+        
+        echo '<form method="GET" action="extension.raw.php" class="noprint" 
style="display:inline">';
+        echo 
HtmlInput::array_to_hidden(array('ac','gDossier','plugin_code','sa'), 
$_REQUEST);
+        echo HtmlInput::hidden('lc_id',$this->data->lc_id);
+        echo HtmlInput::hidden('act','export_send_mail');
+        echo HtmlInput::submit("export_send_mail", "Envoi par 
email","","smallbutton");
+        echo '</form>';
+        return 0;
+    }
+    function propose_include_follow()
+    {
+        
+        echo '<form method="GET" action="extension.raw.php" class="noprint" 
style="display:inline">';
+        echo 
HtmlInput::array_to_hidden(array('ac','gDossier','plugin_code','sa'), 
$_REQUEST);
+        echo HtmlInput::hidden('lc_id',$this->data->lc_id);
+        echo HtmlInput::hidden('act','include_follow_up');
+        echo HtmlInput::submit("include_follow_up", "Inclure dans les 
actions","","smallbutton");
+        echo '</form>';
+        return 0;
+    }
+    function propose_download_all()
+    {
+        
+        echo '<form method="GET" action="extension.raw.php" class="noprint" 
style="display:inline">';
+        echo 
HtmlInput::array_to_hidden(array('ac','gDossier','plugin_code','sa'), 
$_REQUEST);
+        echo HtmlInput::hidden('lc_id',$this->data->lc_id);
+        echo HtmlInput::hidden('act','export_download_all');
+        echo HtmlInput::submit("export_download_all", "Télécharger tous les 
documents","","smallbutton");
+        echo '</form>';
+        return 0;
+    }
 
 }

Modified: trunk/rapport_avance/include/declaration.inc.php
===================================================================
--- trunk/rapport_avance/include/declaration.inc.php    2013-12-14 12:26:52 UTC 
(rev 618)
+++ trunk/rapport_avance/include/declaration.inc.php    2013-12-14 12:43:51 UTC 
(rev 619)
@@ -58,7 +58,7 @@
 
     $ref_csv = HtmlInput::array_to_string(array('gDossier', 'plugin_code', 
'd_id'), $_REQUEST, 'extension.raw.php?');
     $ref_csv.="&amp;act=export_decla_csv";
-    echo HtmlInput::button_anchor("Export CSV", $ref_csv, 'export_id');
+    echo HtmlInput::button_anchor("Export CSV", $ref_csv, 
'export_id',"",'small_button');
     if ($decl->d_filename != '' && $decl->d_step == 0)
         echo $decl->anchor_document();
     exit();
@@ -97,6 +97,9 @@
         $listing->create_pdf();
     
     $listing->display(false);
+    $listing->propose_send_mail();
+    $listing->propose_include_follow();
+    $listing->propose_download_all();
     exit();
 }
 /**



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