Merge branch 'dev7109' into entreprise

This commit is contained in:
Dany De Bontridder 2019-08-17 22:22:59 +02:00
commit f33ff144e5
70 changed files with 2833 additions and 797 deletions

View file

@ -28,7 +28,8 @@ $_POST=array (
'rapt' => '',
'div' => 'det2',
'act' => 'save',
'op'=>'ledger'
'op'=>'ledger',
'jr_optype'=>'NOR'
);
$_POST['gDossier']=$gDossierLogInput;
$_GET['gDossier']=$gDossierLogInput;

View file

@ -46,7 +46,7 @@ div.select_box a:hover,div.select_box ul li:hover {
</p>
<p style="float : static">
<?php
require NOALYSS_INCLUDE.'/lib/select_box.class.php';
require_once NOALYSS_INCLUDE.'/lib/select_box.class.php';
$a=new Select_Box("test","click me !");
$a->add_url("List (link)","?id=5&".Dossier::get());
$a->add_javascript("Hello (Javascript)","alert('hello')");
@ -56,6 +56,24 @@ div.select_box a:hover,div.select_box ul li:hover {
echo $a->input();
?>
<?php
$a=new Select_Box("test2","click me !");
$a->set_filter(_("recherche"));
$a->add_value("Value = 10 (set value)",10);
$a->add_value("Value = 1 (set value)",1);
$a->add_value("Value = 17 (set value)",15);
$a->add_value("Value = 18 (set value)",15);
$a->add_value("Value = 19 (set value)",15);
$a->add_value("Value = 20 (set value)",15);
$a->add_value("Value = 25 (set value)",15);
$a->add_value("Value = 30 (set value)",15);
$a->add_value("Value = 40 (set value)",15);
$a->add_value("Value = 50 (set value)",15);
$a->add_value("Value = 51 (set value)",15);
echo $a->input();
?>
</p>
</div>

View file

@ -79,7 +79,6 @@ echo "<h1>"."Icon MODIFY place"."</h1>";
echo "<h2>"." Mod left"."</h2>";
$manage_table->set_icon_mod("left");
$manage_table->display_table("where pcm_val::text >= '400' order by pcm_val::text limit 10");
return;
echo "<h2>"." Mod right"."</h2>";
$manage_table->set_icon_mod("right");
@ -99,4 +98,5 @@ $manage_table->set_icon_del("right");
$manage_table->display_table("where pcm_val::text >= '400' order by pcm_val::text limit 10");
?>