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

[phpcompta-dev]

Author: danydb
Date: 2013-12-18 02:35:35 +0100 (Wed, 18 Dec 2013)
New Revision: 626

Modified:
   trunk/rapport_avance/ajax_include_follow_save.php
   trunk/rapport_avance/include/class_rapav_listing_compute_fiche.php
   trunk/rapport_avance/rapav_javascript.js
Log:
Cosmetique : fait disparaitre les div input pour mail & action

Modified: trunk/rapport_avance/ajax_include_follow_save.php
===================================================================
--- trunk/rapport_avance/ajax_include_follow_save.php   2013-12-18 01:24:41 UTC 
(rev 625)
+++ trunk/rapport_avance/ajax_include_follow_save.php   2013-12-18 01:35:35 UTC 
(rev 626)
@@ -5,7 +5,15 @@
 ob_start();
 $compute = new RAPAV_Listing_Compute();
 $compute->load($_GET['lc_id']);
-$compute->include_follow($_GET);
+$a_result = $compute->include_follow($_GET);
+echo HtmlInput::title_box('Résultat', 'include_follow_save_result');
+echo '<ol>';
+for ($i = 0; $i < count($a_result); $i++)
+{
+    echo '<li>' . $a_result[$i] . '</li>';
+}
+echo '</ol>';
+echo HtmlInput::button_close('include_follow_save_result');
 $response = ob_get_clean();
 ob_end_clean();
 $html = escape_xml($response);

Modified: trunk/rapport_avance/include/class_rapav_listing_compute_fiche.php
===================================================================
--- trunk/rapport_avance/include/class_rapav_listing_compute_fiche.php  
2013-12-18 01:24:41 UTC (rev 625)
+++ trunk/rapport_avance/include/class_rapav_listing_compute_fiche.php  
2013-12-18 01:35:35 UTC (rev 626)
@@ -568,7 +568,7 @@
     {
         global $cn;
         $action=new Follow_Up($cn);
-        if (isDate($p_array['ag_date'])==null) 
$p_array['ag_date']=date('d.m.Y');
+        if (isDate($p_array['ag_timestamp'])==null) 
$p_array['ag_timestamp']=date('d.m.Y');
         if ( trim($p_array['ag_title']) == "")$p_array['ag_title']="Ajouté 
depuis plugin";
         
         $action->fromArray($p_array);
@@ -578,6 +578,7 @@
         $action->qcode_dest=$fiche->strAttribut(ATTR_DEF_QUICKCODE);
         $_POST['nb_item']=0;
         $action->save();
+        return $fiche->strAttribut(ATTR_DEF_QUICKCODE).' inclus dans Suivi';
     }
 
 }

Modified: trunk/rapport_avance/rapav_javascript.js
===================================================================
--- trunk/rapport_avance/rapav_javascript.js    2013-12-18 01:24:41 UTC (rev 
625)
+++ trunk/rapport_avance/rapav_javascript.js    2013-12-18 01:35:35 UTC (rev 
626)
@@ -975,8 +975,9 @@
                         console.log(code_html);
                         var position = fixed_position(451, 217) + ';width:50%';
                         add_div({'id': 'parameter_send_mail_result', 
'cssclass': 'inner_box', 'drag': 1, 'style': position});
+                        remove_waiting_box();
                         $('parameter_send_mail_result').innerHTML = code_html;
-                        remove_waiting_box();
+                        removeDiv('parameter_send_mail_input');
                     }
                 }
         );
@@ -991,7 +992,6 @@
 function js_include_follow()
 {
    try {
-       console.log('include_follow');
         var qs = $('include_follow_frm').serialize(false);
         waiting_box();
         var action = new Ajax.Request(
@@ -1052,8 +1052,9 @@
                         console.log(code_html);
                         var position = fixed_position(451, 217) + ';width:50%';
                         add_div({'id': 'include_follow_save_result', 
'cssclass': 'inner_box', 'drag': 1, 'style': position});
+                        remove_waiting_box();
                         $('include_follow_save_result').innerHTML = code_html;
-                        remove_waiting_box();
+                        removeDiv('include_follow_result');
                     }
                 }
         );



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