Refactoring

This commit is contained in:
dahoud
2026-03-01 22:00:28 +00:00
parent c0e2c4da45
commit 6b28cf751e
469 changed files with 26866 additions and 14768 deletions

View File

@@ -164,9 +164,11 @@
<div class="field">
<p:outputLabel for="devise" value="Devise" />
<p:selectOneMenu id="devise" value="#{configBean.config.devise}">
<f:selectItem itemLabel="FCFA (XOF)" itemValue="XOF" />
<f:selectItem itemLabel="Euro (EUR)" itemValue="EUR" />
<f:selectItem itemLabel="Dollar (USD)" itemValue="USD" />
<f:selectItem itemLabel="XOF — Franc CFA (UEMOA)" itemValue="XOF" />
<f:selectItem itemLabel="XAF — Franc CFA (CEMAC)" itemValue="XAF" />
<f:selectItem itemLabel="MAD — Dirham marocain" itemValue="MAD" />
<f:selectItem itemLabel="NGN — Naira nigérian" itemValue="NGN" />
<f:selectItem itemLabel="GHS — Cédi ghanéen" itemValue="GHS" />
</p:selectOneMenu>
</div>

View File

@@ -156,11 +156,12 @@
<p:selectOneMenu id="devise"
value="#{configurationBean.deviseDefaut}"
styleClass="w-full">
<f:selectItem itemLabel="FCFA (Franc CFA)" itemValue="XOF" />
<f:selectItem itemLabel="EUR (Euro)" itemValue="EUR" />
<f:selectItem itemLabel="USD (Dollar)" itemValue="USD" />
<f:selectItem itemLabel="GHS (Cédi Ghana)" itemValue="GHS" />
<f:selectItem itemLabel="NGN (Naira Nigeria)" itemValue="NGN" />
<f:selectItem itemLabel="XOF — Franc CFA (UEMOA)" itemValue="XOF" />
<f:selectItem itemLabel="XAF — Franc CFA (CEMAC)" itemValue="XAF" />
<f:selectItem itemLabel="MAD — Dirham marocain" itemValue="MAD" />
<f:selectItem itemLabel="GHS Cédi ghanéen" itemValue="GHS" />
<f:selectItem itemLabel="NGN Naira nigérian" itemValue="NGN" />
<f:selectItem itemLabel="ZAR — Rand sud-africain" itemValue="ZAR" />
</p:selectOneMenu>
</div>

View File

@@ -119,10 +119,7 @@
<p:selectOneMenu id="filterType"
value="#{entitesGestionBean.filtres.type}"
styleClass="w-full">
<f:selectItem itemLabel="Tous les types" itemValue="" />
<f:selectItem itemLabel="Club Lions" itemValue="CLUB_LIONS" />
<f:selectItem itemLabel="LEO Club" itemValue="LEO_CLUB" />
<f:selectItem itemLabel="Branche" itemValue="BRANCHE" />
<f:selectItems value="#{entitesGestionBean.typesSelectItems}" />
<p:ajax update=":formTableEntites:dtEntites" />
</p:selectOneMenu>
</div>
@@ -145,11 +142,7 @@
<p:selectOneMenu id="filterRegion"
value="#{entitesGestionBean.filtres.region}"
styleClass="w-full">
<f:selectItem itemLabel="Toutes les régions" itemValue="" />
<f:selectItem itemLabel="Dakar" itemValue="DAKAR" />
<f:selectItem itemLabel="Thiès" itemValue="THIES" />
<f:selectItem itemLabel="Kaolack" itemValue="KAOLACK" />
<f:selectItem itemLabel="Saint-Louis" itemValue="SAINT_LOUIS" />
<f:selectItems value="#{entitesGestionBean.regionsDisponibles}" />
<p:ajax update=":formTableEntites:dtEntites" />
</p:selectOneMenu>
</div>
@@ -259,26 +252,23 @@
</p:column>
<p:column headerText="Actions" style="width:8rem" exportable="false">
<h:form id="formActions#{entite.id}">
<div class="flex gap-1">
<p:commandButton icon="pi pi-eye"
styleClass="ui-button-rounded ui-button-text ui-button-info ui-button-sm"
action="#{entitesGestionBean.voirEntite(entite)}"
title="Voir détails" />
<p:commandButton icon="pi pi-pencil"
styleClass="ui-button-rounded ui-button-text ui-button-warning ui-button-sm"
onclick="PF('dlgModifierEntite').show();"
title="Modifier">
<f:setPropertyActionListener target="#{entitesGestionBean.entiteSelectionne}" value="#{entite}" />
</p:commandButton>
<p:commandButton icon="pi pi-cog"
styleClass="ui-button-rounded ui-button-text ui-button-secondary ui-button-sm"
onclick="PF('dlgActionsEntite').show();"
title="Actions">
<f:setPropertyActionListener target="#{entitesGestionBean.entiteSelectionne}" value="#{entite}" />
</p:commandButton>
</div>
</h:form>
<div class="flex gap-1">
<p:button icon="pi pi-eye"
title="Voir détails"
styleClass="ui-button-rounded ui-button-text ui-button-info ui-button-sm"
href="/pages/secure/organisation/detail.xhtml?id=#{entite.id}" />
<p:button icon="pi pi-pencil"
styleClass="ui-button-rounded ui-button-text ui-button-warning ui-button-sm"
title="Modifier"
href="/pages/secure/organisation/detail.xhtml?id=#{entite.id}&amp;mode=edit" />
<p:commandButton icon="pi pi-cog"
styleClass="ui-button-rounded ui-button-text ui-button-secondary ui-button-sm"
title="Actions"
update=":formActionsEntite"
oncomplete="PF('dlgActionsEntite').show();">
<f:setPropertyActionListener target="#{entitesGestionBean.entiteSelectionne}" value="#{entite}" />
</p:commandButton>
</div>
</p:column>
</p:dataTable>
</h:form>
@@ -308,25 +298,19 @@
<label for="newType" class="block text-900 font-medium mb-2">Type d'entité *</label>
<p:selectOneMenu id="newType"
value="#{entitesGestionBean.nouvelleEntite.type}"
required="true">
<f:selectItem itemLabel="Sélectionner un type" itemValue="" />
<f:selectItem itemLabel="Club Lions" itemValue="CLUB_LIONS" />
<f:selectItem itemLabel="LEO Club" itemValue="LEO_CLUB" />
<f:selectItem itemLabel="Branche" itemValue="BRANCHE" />
required="true"
requiredMessage="Le type d'entité est requis.">
<f:selectItems value="#{entitesGestionBean.typesSelectItemsForForm}" />
</p:selectOneMenu>
<p:message for="newType" />
</div>
<div class="field col-12 md:col-6">
<label for="newRegion" class="block text-900 font-medium mb-2">Région *</label>
<p:selectOneMenu id="newRegion"
value="#{entitesGestionBean.nouvelleEntite.region}"
required="true">
<f:selectItem itemLabel="Sélectionner une région" itemValue="" />
<f:selectItem itemLabel="Dakar" itemValue="DAKAR" />
<f:selectItem itemLabel="Thiès" itemValue="THIES" />
<f:selectItem itemLabel="Kaolack" itemValue="KAOLACK" />
<f:selectItem itemLabel="Saint-Louis" itemValue="SAINT_LOUIS" />
</p:selectOneMenu>
<label for="newRegion" class="block text-900 font-medium mb-2">Région</label>
<p:inputText id="newRegion"
value="#{entitesGestionBean.nouvelleEntite.region}"
placeholder="Ex: Lagunes, Dakar, Abidjan..."
maxlength="100" />
</div>
<div class="field col-12 md:col-6">
@@ -394,38 +378,47 @@
<p:commandButton value="Gérer les membres"
icon="pi pi-users"
styleClass="ui-button-info ui-button-outlined ui-button-sm w-full"
action="#{entitesGestionBean.gererMembres}" />
action="#{entitesGestionBean.gererMembres}"
ajax="false" />
<p:commandButton value="Configuration"
icon="pi pi-cog"
<p:commandButton value="Voir / Configurer"
icon="pi pi-eye"
styleClass="ui-button-warning ui-button-outlined ui-button-sm w-full"
action="#{entitesGestionBean.configurerEntite}" />
action="#{entitesGestionBean.configurerEntite}"
ajax="false" />
<p:commandButton value="Rapports"
<p:commandButton value="Rapports &amp; Stats"
icon="pi pi-chart-bar"
styleClass="ui-button-secondary ui-button-outlined ui-button-sm w-full"
action="#{entitesGestionBean.voirRapports}" />
action="#{entitesGestionBean.voirRapports}"
ajax="false" />
<p:commandButton value="Suspendre"
icon="pi pi-ban"
styleClass="ui-button-danger ui-button-outlined ui-button-sm w-full"
action="#{entitesGestionBean.suspendreEntite}"
onclick="return confirm('Êtes-vous sûr de vouloir suspendre cette entité ?');"
update=":formTableEntites:dtEntites :formActionsEntite"
oncomplete="PF('dlgActionsEntite').hide();"
onclick="return confirm('Suspendre cette entité ?');"
rendered="#{entitesGestionBean.entiteSelectionne.statut == 'ACTIVE'}" />
<p:commandButton value="Réactiver"
icon="pi pi-check"
styleClass="ui-button-success ui-button-outlined ui-button-sm w-full"
action="#{entitesGestionBean.reactiverEntite}"
update=":formTableEntites:dtEntites :formActionsEntite"
oncomplete="PF('dlgActionsEntite').hide();"
rendered="#{entitesGestionBean.entiteSelectionne.statut == 'SUSPENDUE'}" />
<hr class="surface-border" />
<p:commandButton value="Supprimer"
<p:commandButton value="Supprimer définitivement"
icon="pi pi-trash"
styleClass="ui-button-danger ui-button-sm w-full"
onclick="return confirm('ATTENTION: Cette action est irréversible. Confirmer la suppression ?');"
action="#{entitesGestionBean.supprimerEntite}" />
action="#{entitesGestionBean.supprimerEntite}"
update=":formTableEntites:dtEntites"
oncomplete="PF('dlgActionsEntite').hide();"
onclick="return confirm('ATTENTION : action irréversible. Confirmer la suppression ?');" />
</div>
</h:form>
</p:dialog>

View File

@@ -162,6 +162,7 @@
<ui:include src="/ui/includes/organisation-form.xhtml">
<ui:param name="model" value="#{organisationsBean.nouvelleOrganisation}" />
<ui:param name="typesItems" value="#{organisationsBean.typesSelectItemsForForm}" />
<ui:param name="completionBean" value="#{organisationsBean}" />
</ui:include>
<f:facet name="footer">
@@ -191,6 +192,7 @@
<ui:include src="/ui/includes/organisation-form.xhtml">
<ui:param name="model" value="#{organisationsBean.organisationSelectionnee}" />
<ui:param name="typesItems" value="#{organisationsBean.typesSelectItemsForForm}" />
<ui:param name="completionBean" value="#{organisationsBean}" />
</ui:include>
<f:facet name="footer">