diff --git a/html/js/infobulle.js b/html/js/infobulle.js index 8c776d2ca..024aa46ef 100644 --- a/html/js/infobulle.js +++ b/html/js/infobulle.js @@ -49,6 +49,11 @@ content[18]="Donnez une partie du nom, prénom, de la description, du poste comp content[19]="Donnez une partie du nom, de la description, du n° de TVA ou quick code"; content[20]="Les menus ne peuvent dépendre que dans d'un menu principal ou d'un menu, si cette liste est vide, ajouter des modules ou menu principal sans donner de dépendance"; content[21]="Donnez un nombre entre 0 & 100"; +content[22]="Donnez une partie du nom du dossier,du nom, du prénom ou du login pour filtrer"; +content[23]="Donnez une partie du nom du dossier ou de la description pour filtrer"; +content[24]="Donnez une partie du poste comptable ou du libellé pour filtrer"; +content[25]="Donnez une partie du libellé, la date, le montant ou le numéro d'opération pour filtrer, cela n'efface pas ce qui a déjà été sélectionné"; + function showBulle(p_ctl) { d=document.getElementById('bulle'); diff --git a/html/js/scripts.js b/html/js/scripts.js index e12d7854d..a2695d0f2 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -1712,4 +1712,45 @@ function view_action(ag_id,dossier,modify) } } ); +} +/** + * @brief filter quickly a table + * @param phrase : phrase to seach + * @param _id : id of the table + * @param colnr : string containing the column number where you're searching separated by a comma + * @param start_row : first row (1 if you have table header) + * @returns nothing + * @see HtmlInput::filter_table + */ +function filter_table(phrase, _id, colnr,start_row) { + 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) { + aCol = colnr.split(','); + } else { + 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++) + { + var idx=aCol[col]; + console.log(r); + if (table.rows[r].cells[idx]) + { + ele = table.rows[r].cells[idx].innerHTML.replace(/<[^>]+>/g, ""); + //var displayStyle = 'none'; + if (ele.toLowerCase().indexOf(words) >= 0){ found=1; } + } + + } + if (found == 1 ){ + table.rows[r].style.display = ''; + } else { + table.rows[r].style.display = 'none'; + } + } } \ No newline at end of file diff --git a/html/user_login.php b/html/user_login.php index f67553434..5cadeb751 100644 --- a/html/user_login.php +++ b/html/user_login.php @@ -25,6 +25,7 @@ include_once ("ac_common.php"); require_once('class_database.php'); require_once('class_itext.php'); +require_once 'function_javascript.php'; @html_page_start($_SESSION['g_theme']); $rep=new Database(); include_once ("class_user.php"); @@ -93,6 +94,7 @@ if ( $User->Admin() == 1) include_once("user_menu.php"); $priv=($User->admin==1)?"Administrateur":"Utilisateur"; +load_all_script(); echo '
'; /** * @@ -140,29 +142,18 @@ echo '
'; ?>
'._('Choississez votre dossier').'';?> -
- - input('p_nom',$p_nom); - + + - - - show_dossier($filtre); +$res=$User->show_dossier(""); echo $res; ?>

diff --git a/include/balance.inc.php b/include/balance.inc.php index 3d0d7b46b..dc799afb4 100644 --- a/include/balance.inc.php +++ b/include/balance.inc.php @@ -172,6 +172,7 @@ if ( isset ($_GET['view'] ) ) $hid=new IHidden(); + echo ""; echo ''; echo '
'. @@ -255,8 +256,11 @@ if ( isset($_GET['view'] ) ) $a=$periode->get_date_limit($_GET['from_periode']); $b=$periode->get_date_limit($_GET['to_periode']); echo "

période du ".$a['p_start']." au ".$b['p_end']."

"; - - echo ''; + echo ''; + echo _('Filtre').HtmlInput::infobulle(24); + echo HtmlInput::filter_table("t_balance", "0,1","1"); + echo ''; + echo '
'; echo ''; echo ''; echo ''; diff --git a/include/class_html_input.php b/include/class_html_input.php index 3034db643..7aeab0c8d 100755 --- a/include/class_html_input.php +++ b/include/class_html_input.php @@ -713,4 +713,13 @@ class HtmlInput return $sel; } } + static function filter_table($p_table_id,$p_col,$start_row) + { + $r= " + + + + "; + return $r; + } } \ No newline at end of file diff --git a/include/class_user.php b/include/class_user.php index 7b13f9c64..80a5690d4 100644 --- a/include/class_user.php +++ b/include/class_user.php @@ -935,7 +935,7 @@ class User if ($p_array == 0) return $result . " * Aucun dossier *"; - $result.="
Poste ComptableLibelléDébit
"; + $result.="
"; for ($i = 0; $i < sizeof($p_array); $i++) { diff --git a/include/compta_fin_rec.inc.php b/include/compta_fin_rec.inc.php index b2e9d6693..98b364c34 100644 --- a/include/compta_fin_rec.inc.php +++ b/include/compta_fin_rec.inc.php @@ -122,7 +122,11 @@ echo 'solde Fin' . $nend_extrait->input(); echo IButton::tooggle_checkbox('rec1'); echo '

'; echo HtmlInput::submit('save', 'Mettre à jour le n° de relevé bancaire'); -echo '
'; +echo ''; + echo _('Filtre').HtmlInput::infobulle(25); + echo HtmlInput::filter_table("t_rec_bk", "0,1,2,3","1"); + echo ''; +echo '
'; $r =''; $r.=th('Libellé'); $r.=th('N° interne'); diff --git a/include/constant.php b/include/constant.php index 604495f0c..b0e5164f7 100644 --- a/include/constant.php +++ b/include/constant.php @@ -35,8 +35,9 @@ $g_failed=""; $g_succeed=""; /*set to none for production */ /* uncomment for production */ +define ('SVNINFO',5666); $version_phpcompta=SVNINFO; -define ("DEBUG",false); +define ("DEBUG",true); /* define ('SVNINFO',5015); * $version_phpcompta=SVNINFO; * define ("DEBUG",true); diff --git a/include/dossier.inc.php b/include/dossier.inc.php index ef230c8da..f7019f855 100644 --- a/include/dossier.inc.php +++ b/include/dossier.inc.php @@ -172,7 +172,11 @@ if ( $sa == 'list' ) $compteur=1; $template=""; echo '
'; - echo '
'.'Date '.HtmlInput::infobulle(17).' ▴'.'
'; + echo ''; + echo _('Filtre').HtmlInput::infobulle(23); + echo HtmlInput::filter_table("t_dossier", "0,1,2","1"); + echo ''; + echo '
'; $r=""; $r.='
'.$header->get_header(0).''; $r.=''.$header->get_header(1).''; diff --git a/include/modele.inc.php b/include/modele.inc.php index 0ee4155c0..a8896db28 100644 --- a/include/modele.inc.php +++ b/include/modele.inc.php @@ -232,8 +232,11 @@ if ($sa == 'list') echo HtmlInput::button_anchor('Rafraîchir', 'admin_repo.php?action=modele_mgt'); echo HtmlInput::button_anchor('Ajouter', 'admin_repo.php?action=modele_mgt&sa=add'); - - echo ''; + echo ''; + echo _('Filtre').HtmlInput::infobulle(23); + echo HtmlInput::filter_table("t_modele", "0,1,2","1"); + echo ''; + echo '
'; echo "". "" . "" . diff --git a/include/user.inc.php b/include/user.inc.php index 82690341a..e2864824b 100644 --- a/include/user.inc.php +++ b/include/user.inc.php @@ -112,7 +112,11 @@ $a_user=$repo->get_user_folder($sql); if ( !empty ($a_user) ) { - echo '
".$header->get_header(0)."".$header->get_header(1)."
'; + echo ''; + echo _('Filtre').HtmlInput::infobulle(22); + echo HtmlInput::filter_table("user", "0,1,2,5","1"); + echo ''; + echo '
'; echo ''; echo ''; echo '';
'.$header->get_header(0).''.$header->get_header(1).'