[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 37/38: Cosmetic
From: |
dwm |
Subject: |
[Noalyss-commit] [noalyss] 37/38: Cosmetic |
Date: |
Sun, 18 Feb 2024 07:30:48 -0500 (EST) |
sparkyx pushed a commit to branch devel
in repository noalyss.
commit 2942abefae4aff36f9a659c5ab2f02335a7176be
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Sun Feb 18 13:06:46 2024 +0100
Cosmetic
---
include/class/acc_ledger.class.php | 3 ++-
include/template/follow_up_filter-display_list.php | 23 +++++++++++++++++-----
sql/upgrade.sql | 2 +-
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/include/class/acc_ledger.class.php
b/include/class/acc_ledger.class.php
index 77bc1c500..69e22667c 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -662,7 +662,8 @@ class Acc_Ledger extends jrn_def_sql
$e_pj=$this->guess_pj();
$span="";
}
- $ret.="<tr><td>"._('PJ Num')." </td><td>".h($e_pj).$span."</td></tr>";
+ if ($p_readonly == false) $ret.="<tr><td>"._('PJ Num')."
</td><td>".h($e_pj).$span."</td></tr>";
+ if ($p_readonly == true ) $ret.="<tr><td>"._('PJ Num')."
</td><td>".h($this->pj).$span."</td></tr>";
$ret.='</table>';
$ret.="<table class=\"result\">";
$ret.="<tr>";
diff --git a/include/template/follow_up_filter-display_list.php
b/include/template/follow_up_filter-display_list.php
index d8802c6b1..01fe4f112 100644
--- a/include/template/follow_up_filter-display_list.php
+++ b/include/template/follow_up_filter-display_list.php
@@ -45,7 +45,13 @@ if (count($a_list) == 0) {
<p>
Cliquer sur un filtre pour chercher
</p>
-<ul>
+<?php
+echo \HtmlInput::filter_list("filter_list_ul");
+
+?>
+
+
+<ul id="filter_list_ul" class="list-group m-2">
<?php
foreach ($a_list as $item) :
@@ -54,12 +60,14 @@ foreach ($a_list as $item) :
$dossier_id = Dossier::id();
?>
-<li id="item_fu<?=$item['af_id']?>">
+<li id="item_fu<?=$item['af_id']?>" class="list-group-item-action"
style="background-color: transparent">
<a href="<?=$url?>" class="line">
-
+ <span class="search-content">
<?php
echo h($item['af_name']);
?>
+
+ </span>
</a>
<?php
echo \Icon_Action::trash(uniqid(),
sprintf("delete_filter_followup('%s','%s')",
@@ -68,15 +76,20 @@ foreach ($a_list as $item) :
<?php
endforeach;
?>
- <li>
+
+</ul>
+<ul class="list-group m-2">
+
+ <li class="list-group-item-action">
<?php
$url = "do.php?".http_build_query(["ac"=>
$acces_code,"gDossier"=>$dossier_id]);
?>
<a href="<?=$url?>" >
- Aucun filtre
+ Aucun filtre
</a>
</li>
</ul>
+
<ul class="aligned-block">
<li>
<?php
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 0d7a56b84..a535f78b4 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -25,4 +25,4 @@ INSERT INTO public.menu_ref
(me_code,me_menu,me_file,me_url,me_description,me_pa
insert into public.profile_menu (me_code,p_id,p_type_display) select
'PDF:card',p_id,'P' from profile;
-create table action_gestion_filter(af_id bigint generated always as identity,
af_user text not null, af_name text not null , ag_search text not null);
+create table action_gestion_filter(af_id bigint generated always as identity,
af_user text not null, af_name text not null , af_search text not null);
- [Noalyss-commit] [noalyss] 27/38: Nouvelle fonction pour ajouter des attributs à un élément DOM, (continued)
- [Noalyss-commit] [noalyss] 27/38: Nouvelle fonction pour ajouter des attributs à un élément DOM, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 31/38: DB protect against JS Injection, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 24/38: Nouveau #00022980002298: detail fiche , historique du suivi, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 35/38: Merge devel, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 09/38: Task #2321: Sécurité : empêcher changement de numéro de pièce, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 16/38: Follow-Up : bug ne peut pas ajouter fichier sur nouvel événement, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 18/38: Fix cosmetic bug : duplicate operation with autoreverse VAT has an VAT amount, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 20/38: Fix : auto numbering receipt, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 21/38: Merge branch 'devel', dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 25/38: cosmetic, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 37/38: Cosmetic,
dwm <=
- [Noalyss-commit] [noalyss] 38/38: Upgrade SQL, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 28/38: DB protect against JS Injection, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 07/38: SUIVI : ajout prénom, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 14/38: integre changement SQL, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 30/38: redirect via javascript, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 34/38: Gestion : possibilité de sauvegarder les recherches, dwm, 2024/02/18