[Phpcompta-dev] r5285 - in phpcompta/trunk: html html/admin/sql/patch html/js include

[phpcompta-dev]

Author: danydb
Date: 2013-05-18 22:06:43 +0200 (Sat, 18 May 2013)
New Revision: 5285

Modified:
   phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/html/style-epad.css
   phpcompta/trunk/html/style-light.css
   phpcompta/trunk/html/style-print.css
   phpcompta/trunk/html/style-test.css
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/ac_common.php
Log:
task #845: Ajout d'un div d'information

Modified: phpcompta/trunk/html/admin/sql/patch/upgrade106.sql
===================================================================
--- phpcompta/trunk/html/admin/sql/patch/upgrade106.sql 2013-05-17 22:49:21 UTC 
(rev 5284)
+++ phpcompta/trunk/html/admin/sql/patch/upgrade106.sql 2013-05-18 20:06:43 UTC 
(rev 5285)
@@ -4,7 +4,13 @@
 ALTER TABLE mod_payment  ADD CONSTRAINT mod_payment_mp_fd_id_fkey FOREIGN KEY 
(mp_fd_id)      REFERENCES fiche_def (fd_id) MATCH SIMPLE      ON UPDATE 
cascade ON DELETE cascade;
 ALTER TABLE mod_payment  DROP CONSTRAINT mod_payment_mp_jrn_def_id_fkey ;
 ALTER TABLE mod_payment  ADD CONSTRAINT mod_payment_mp_jrn_def_id_fkey FOREIGN 
KEY (mp_jrn_def_id)      REFERENCES jrn_def (jrn_def_id) MATCH SIMPLE ON UPDATE 
        CASCADE ON DELETE CASCADE;
-
+ALTER TABLE fiche_def ADD COLUMN fd_description text;
+update fiche_def set fd_description='Achats de marchandises' where fd_id=1;
+update fiche_def set fd_description='Liste des clients' where fd_id=2;
+update fiche_def set fd_description='Liste des comptes financiers: banque, 
caisse,...' where fd_id=3;
+update fiche_def set fd_description='Liste des fournisseurs' where fd_id=4;
+update fiche_def set fd_label='Services & Biens Divers',fd_description='Pour 
les charges diverses' where fd_id=5;
+update fiche_def set fd_description='Vente de prestations, marchandises ' 
where fd_id=6;
 update version set val=107;
 
 commit;

Modified: phpcompta/trunk/html/js/scripts.js
===================================================================
--- phpcompta/trunk/html/js/scripts.js  2013-05-17 22:49:21 UTC (rev 5284)
+++ phpcompta/trunk/html/js/scripts.js  2013-05-18 20:06:43 UTC (rev 5285)
@@ -678,6 +678,8 @@
                removeDiv('wait_box');
                }
        add_div(obj);
+       $('info_div').innerHTML="Un instant";
+       $('info_div').style.display="block";
 
 }
 /**
@@ -1181,6 +1183,8 @@
 function remove_waiting_box()
 {
                        removeDiv('wait_box');
+                       $('info_div').innerHTML="";
+                       $('info_div').style.display="none";
 }
 function get_profile_detail(gDossier,profile_id)
 {
@@ -1723,8 +1727,11 @@
  * @see HtmlInput::filter_table
  */
 function filter_table(phrase, _id, colnr,start_row) {
+       $('info_div').innerHTML="Un instant";
+       $('info_div').style.display="block";
        var words = $(phrase).value.toLowerCase();
        var table = document.getElementById(_id);
+
        // if colnr contains a comma then check several columns
        var aCol = new Array();
        if (colnr.indexOf(',') >= 0) {
@@ -1733,6 +1740,7 @@
                aCol[0] = colnr;
        }
        var ele;
+
        for (var r = start_row; r < table.rows.length; r++) {
                var found=0;
                for (var col =0;col < aCol.length;col++)
@@ -1752,6 +1760,8 @@
                } else {
                        table.rows[r].style.display = 'none';
                }
+               $('info_div').style.display="none";
+               $('info_div').innerHTML="";
        }
 }
 function display_task(p_id)

Modified: phpcompta/trunk/html/style-epad.css
===================================================================
--- phpcompta/trunk/html/style-epad.css 2013-05-17 22:49:21 UTC (rev 5284)
+++ phpcompta/trunk/html/style-epad.css 2013-05-18 20:06:43 UTC (rev 5285)
@@ -1147,3 +1147,12 @@
        margin-right: 5px;
        border:lightgrey 2px groove;
 }
+#info_div {
+       display:none;
+       background-color: yellow;
+       color:red;
+       z-index: 15;
+       position: absolute;
+       top:0;
+       left:0;
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style-light.css
===================================================================
--- phpcompta/trunk/html/style-light.css        2013-05-17 22:49:21 UTC (rev 
5284)
+++ phpcompta/trunk/html/style-light.css        2013-05-18 20:06:43 UTC (rev 
5285)
@@ -1140,4 +1140,13 @@
        margin-left:5px;
        margin-right: 5px;
        border:lightgrey 2px groove;
+}
+#info_div {
+       display:none;
+       background-color: yellow;
+       color:red;
+       z-index: 15;
+       position: absolute;
+       top:0;
+       left:0;
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/style-print.css
===================================================================
--- phpcompta/trunk/html/style-print.css        2013-05-17 22:49:21 UTC (rev 
5284)
+++ phpcompta/trunk/html/style-print.css        2013-05-18 20:06:43 UTC (rev 
5285)
@@ -286,4 +286,7 @@
        margin-left:5px;
        margin-right: 5px;
        border:lightgrey 2px groove;
+}
+#info_div {
+       display:none;
 }
\ No newline at end of file

Modified: phpcompta/trunk/html/style-test.css
===================================================================
--- phpcompta/trunk/html/style-test.css 2013-05-17 22:49:21 UTC (rev 5284)
+++ phpcompta/trunk/html/style-test.css 2013-05-18 20:06:43 UTC (rev 5285)
@@ -52,7 +52,6 @@
            margin-left:10%;
             margin-right:10%;
             padding:2%;
-//         background-color:white;
 }
 H2 {
    font-size:16pt;
@@ -64,3 +63,12 @@
        padding-left:5px;
        padding-right:5px;
 }
+#info_div {
+       display:none;
+       background-color: yellow;
+       color:red;
+       z-index: 15;
+       position: absolute;
+       top:0;
+       left:0;
+}
\ No newline at end of file

Modified: phpcompta/trunk/html/style.css
===================================================================
--- phpcompta/trunk/html/style.css      2013-05-17 22:49:21 UTC (rev 5284)
+++ phpcompta/trunk/html/style.css      2013-05-18 20:06:43 UTC (rev 5285)
@@ -1147,3 +1147,12 @@
        margin-right: 5px;
        border:lightgrey 2px groove;
 }
+#info_div {
+       display:none;
+       background-color: yellow;
+       color:red;
+       z-index: 15;
+       position: absolute;
+       top:0;
+       left:0;
+}
\ No newline at end of file

Modified: phpcompta/trunk/include/ac_common.php
===================================================================
--- phpcompta/trunk/include/ac_common.php       2013-05-17 22:49:21 UTC (rev 
5284)
+++ phpcompta/trunk/include/ac_common.php       2013-05-18 20:06:43 UTC (rev 
5285)
@@ -310,6 +310,7 @@
     ';
 
     echo "<BODY $p_script>";
+       echo '<div id="info_div"></div>';
 // language
     if (isset($_SESSION['g_lang']))
     {



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