Refactroring
This commit is contained in:
dahoud
@@ -144,7 +144,7 @@
|
||||
<p:commandButton icon="#{org.statut == organisationsBean.statutActive ? 'pi pi-ban' : 'pi pi-check'}"
|
||||
title="#{org.statut == organisationsBean.statutActive ? 'Désactiver' : 'Activer'}"
|
||||
action="#{organisationsBean.basculerStatutOrganisation(org)}"
|
||||
update="dtOrganisations messages"
|
||||
update=":formOrganisations:dtOrganisations :formOrganisations:messages"
|
||||
styleClass="ui-button-rounded #{org.statut == organisationsBean.statutActive ? 'ui-button-secondary' : 'ui-button-success'} mr-2">
|
||||
<p:confirm header="Confirmation"
|
||||
message="Êtes-vous sûr de vouloir #{org.statut == organisationsBean.statutActive ? 'désactiver' : 'activer'} cette organisation ?"
|
||||
@@ -154,7 +154,7 @@
|
||||
<p:commandButton icon="pi pi-trash"
|
||||
title="Supprimer"
|
||||
action="#{organisationsBean.supprimerOrganisation(org)}"
|
||||
update="dtOrganisations messages"
|
||||
update=":formOrganisations:dtOrganisations :formOrganisations:messages"
|
||||
styleClass="ui-button-rounded ui-button-danger">
|
||||
<p:confirm header="Confirmation"
|
||||
message="Êtes-vous sûr de vouloir supprimer cette organisation ? Cette action est irréversible."
|
||||
@@ -179,68 +179,10 @@
|
||||
<ui:param name="formId" value="formNouvelle" />
|
||||
<ui:param name="width" value="800" />
|
||||
<ui:define name="content">
|
||||
<div class="col-12 md:col-8">
|
||||
<ui:include src="/templates/components/form-field-text.xhtml">
|
||||
<ui:param name="id" value="nom" />
|
||||
<ui:param name="label" value="Nom complet *" />
|
||||
<ui:param name="value" value="#{organisationsBean.nouvelleOrganisation.nom}" />
|
||||
<ui:param name="required" value="true" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12 md:col-6">
|
||||
<ui:include src="/templates/components/form-field-select.xhtml">
|
||||
<ui:param name="id" value="type" />
|
||||
<ui:param name="label" value="Type *" />
|
||||
<ui:param name="value" value="#{organisationsBean.nouvelleOrganisation.typeAssociation}" />
|
||||
<ui:param name="items" value="#{organisationsBean.typesSelectItemsForForm}" />
|
||||
<ui:param name="required" value="true" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12 md:col-6">
|
||||
<ui:include src="/templates/components/form-field-text.xhtml">
|
||||
<ui:param name="id" value="email" />
|
||||
<ui:param name="label" value="Email *" />
|
||||
<ui:param name="value" value="#{organisationsBean.nouvelleOrganisation.email}" />
|
||||
<ui:param name="required" value="true" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12 md:col-6">
|
||||
<ui:include src="/templates/components/form-field-text.xhtml">
|
||||
<ui:param name="id" value="telephone" />
|
||||
<ui:param name="label" value="Téléphone" />
|
||||
<ui:param name="value" value="#{organisationsBean.nouvelleOrganisation.telephone}" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12 md:col-6">
|
||||
<ui:include src="/templates/components/form-field-text.xhtml">
|
||||
<ui:param name="id" value="ville" />
|
||||
<ui:param name="label" value="Ville *" />
|
||||
<ui:param name="value" value="#{organisationsBean.nouvelleOrganisation.ville}" />
|
||||
<ui:param name="required" value="true" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12 md:col-6">
|
||||
<ui:include src="/templates/components/form-field-text.xhtml">
|
||||
<ui:param name="id" value="region" />
|
||||
<ui:param name="label" value="Région" />
|
||||
<ui:param name="value" value="#{organisationsBean.nouvelleOrganisation.region}" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12 md:col-6">
|
||||
<ui:include src="/templates/components/form-field-text.xhtml">
|
||||
<ui:param name="id" value="pays" />
|
||||
<ui:param name="label" value="Pays" />
|
||||
<ui:param name="value" value="#{organisationsBean.nouvelleOrganisation.pays}" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<ui:include src="/templates/components/form-field-textarea.xhtml">
|
||||
<ui:param name="id" value="description" />
|
||||
<ui:param name="label" value="Description" />
|
||||
<ui:param name="value" value="#{organisationsBean.nouvelleOrganisation.description}" />
|
||||
<ui:param name="rows" value="3" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<ui:include src="/ui/includes/organisation-form.xhtml">
|
||||
<ui:param name="model" value="#{organisationsBean.nouvelleOrganisation}" />
|
||||
<ui:param name="typesItems" value="#{organisationsBean.typesSelectItemsForForm}" />
|
||||
</ui:include>
|
||||
</ui:define>
|
||||
<ui:define name="footer">
|
||||
<p:commandButton value="Annuler"
|
||||
@@ -265,52 +207,10 @@
|
||||
<ui:param name="width" value="800" />
|
||||
<ui:define name="content">
|
||||
<ui:fragment rendered="#{organisationsBean.organisationSelectionnee != null}">
|
||||
<div class="col-12 md:col-8">
|
||||
<ui:include src="/templates/components/form-field-text.xhtml">
|
||||
<ui:param name="id" value="nomMod" />
|
||||
<ui:param name="label" value="Nom complet *" />
|
||||
<ui:param name="value" value="#{organisationsBean.organisationSelectionnee.nom}" />
|
||||
<ui:param name="required" value="true" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12 md:col-6">
|
||||
<ui:include src="/templates/components/form-field-text.xhtml">
|
||||
<ui:param name="id" value="emailMod" />
|
||||
<ui:param name="label" value="Email *" />
|
||||
<ui:param name="value" value="#{organisationsBean.organisationSelectionnee.email}" />
|
||||
<ui:param name="required" value="true" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12 md:col-6">
|
||||
<ui:include src="/templates/components/form-field-text.xhtml">
|
||||
<ui:param name="id" value="telephoneMod" />
|
||||
<ui:param name="label" value="Téléphone" />
|
||||
<ui:param name="value" value="#{organisationsBean.organisationSelectionnee.telephone}" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12 md:col-6">
|
||||
<ui:include src="/templates/components/form-field-text.xhtml">
|
||||
<ui:param name="id" value="villeMod" />
|
||||
<ui:param name="label" value="Ville *" />
|
||||
<ui:param name="value" value="#{organisationsBean.organisationSelectionnee.ville}" />
|
||||
<ui:param name="required" value="true" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12 md:col-6">
|
||||
<ui:include src="/templates/components/form-field-text.xhtml">
|
||||
<ui:param name="id" value="regionMod" />
|
||||
<ui:param name="label" value="Région" />
|
||||
<ui:param name="value" value="#{organisationsBean.organisationSelectionnee.region}" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<ui:include src="/templates/components/form-field-textarea.xhtml">
|
||||
<ui:param name="id" value="descriptionMod" />
|
||||
<ui:param name="label" value="Description" />
|
||||
<ui:param name="value" value="#{organisationsBean.organisationSelectionnee.description}" />
|
||||
<ui:param name="rows" value="3" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<ui:include src="/ui/includes/organisation-form.xhtml">
|
||||
<ui:param name="model" value="#{organisationsBean.organisationSelectionnee}" />
|
||||
<ui:param name="typesItems" value="#{organisationsBean.typesSelectItemsForForm}" />
|
||||
</ui:include>
|
||||
</ui:fragment>
|
||||
</ui:define>
|
||||
<ui:define name="footer">
|
||||
|
||||
@@ -0,0 +1,212 @@
|
||||
<!DOCTYPE html>
|
||||
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:h="http://xmlns.jcp.org/jsf/html"
|
||||
xmlns:f="http://xmlns.jcp.org/jsf/core"
|
||||
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
|
||||
xmlns:p="http://primefaces.org/ui"
|
||||
template="/templates/main-template.xhtml">
|
||||
|
||||
<ui:define name="title">Gestion des Organisations</ui:define>
|
||||
|
||||
<ui:define name="content">
|
||||
<h:form id="formOrgs">
|
||||
<p:messages id="messages" showDetail="true" closable="true" />
|
||||
|
||||
<div class="card mb-3">
|
||||
<div class="flex justify-content-between align-items-center">
|
||||
<div>
|
||||
<h5 class="mb-1">Organisations</h5>
|
||||
<span class="text-600">
|
||||
CRUD complet des organisations. Respect DRY/WOU: composants réutilisés et simplicité.
|
||||
</span>
|
||||
</div>
|
||||
<div>
|
||||
<p:commandButton value="Nouvelle organisation"
|
||||
icon="pi pi-plus"
|
||||
styleClass="ui-button-success"
|
||||
actionListener="#{organisationsBean.preparerNouvelleOrganisation}"
|
||||
update=":formOrgs:dlgCreate"
|
||||
oncomplete="PF('dlgCreate').show();" />
|
||||
<p:commandButton value="Rafraîchir"
|
||||
icon="pi pi-refresh"
|
||||
styleClass="ui-button-secondary ml-2"
|
||||
actionListener="#{organisationsBean.recharger}"
|
||||
update=":formOrgs:dtOrgs :formOrgs:stats :formOrgs:messages" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p:outputPanel id="stats" styleClass="grid mb-3">
|
||||
<div class="col-12 md:col-4">
|
||||
<p:card>
|
||||
<f:facet name="title">Total</f:facet>
|
||||
<h:outputText value="#{organisationsBean.totalOrganisations}" />
|
||||
</p:card>
|
||||
</div>
|
||||
<div class="col-12 md:col-4">
|
||||
<p:card>
|
||||
<f:facet name="title">Actives</f:facet>
|
||||
<h:outputText value="#{organisationsBean.organisationsActives}" />
|
||||
</p:card>
|
||||
</div>
|
||||
<div class="col-12 md:col-4">
|
||||
<p:card>
|
||||
<f:facet name="title">Inactives</f:facet>
|
||||
<h:outputText value="#{organisationsBean.organisationsInactives}" />
|
||||
</p:card>
|
||||
</div>
|
||||
</p:outputPanel>
|
||||
|
||||
<div class="card">
|
||||
<div class="grid mb-3 p-3">
|
||||
<div class="col-12 md:col-4">
|
||||
<p:inputText placeholder="Recherche (nom, ville, description)"
|
||||
value="#{organisationsBean.rechercheGlobale}">
|
||||
<p:ajax event="keyup" update=":formOrgs:dtOrgs" listener="#{organisationsBean.appliquerFiltres}" />
|
||||
</p:inputText>
|
||||
</div>
|
||||
<div class="col-12 md:col-3">
|
||||
<p:selectOneMenu value="#{organisationsBean.filtreStatut}">
|
||||
<f:selectItems value="#{organisationsBean.statutsSelectItems}" />
|
||||
<p:ajax update=":formOrgs:dtOrgs" listener="#{organisationsBean.appliquerFiltres}" />
|
||||
</p:selectOneMenu>
|
||||
</div>
|
||||
<div class="col-12 md:col-3">
|
||||
<p:selectOneMenu value="#{organisationsBean.filtreType}">
|
||||
<f:selectItems value="#{organisationsBean.typesSelectItems}" />
|
||||
<p:ajax update=":formOrgs:dtOrgs" listener="#{organisationsBean.appliquerFiltres}" />
|
||||
</p:selectOneMenu>
|
||||
</div>
|
||||
<div class="col-12 md:col-2 text-right">
|
||||
<p:commandButton value="Réinitialiser"
|
||||
icon="pi pi-filter-slash"
|
||||
styleClass="ui-button-secondary"
|
||||
actionListener="#{organisationsBean.reinitialiserFiltres}"
|
||||
update=":formOrgs:dtOrgs :formOrgs:filters" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p:dataTable id="dtOrgs"
|
||||
value="#{organisationsBean.organisationsFiltrees}"
|
||||
var="org"
|
||||
paginator="true"
|
||||
rows="20"
|
||||
rowsPerPageTemplate="10,20,50"
|
||||
paginatorPosition="bottom"
|
||||
emptyMessage="Aucune organisation trouvée">
|
||||
|
||||
<p:column headerText="Nom" sortBy="#{org.nom}">
|
||||
<h:outputText value="#{org.nom}" />
|
||||
</p:column>
|
||||
|
||||
<p:column headerText="Type" sortBy="#{org.typeAssociation}" style="width: 200px;">
|
||||
<p:tag value="#{org.typeLibelle}" severity="info" />
|
||||
</p:column>
|
||||
|
||||
<p:column headerText="Statut" style="width: 140px; text-align: center;">
|
||||
<p:tag value="#{org.statutLibelle}" severity="#{org.statutSeverity}" />
|
||||
</p:column>
|
||||
|
||||
<p:column headerText="Localisation" sortBy="#{org.ville}">
|
||||
<h:outputText value="#{org.ville}" />
|
||||
<h:outputText value=", " rendered="#{not empty org.ville and not empty org.region}" />
|
||||
<h:outputText value="#{org.region}" />
|
||||
</p:column>
|
||||
|
||||
<p:column headerText="Actions" style="width: 220px; text-align: center;">
|
||||
<p:commandButton icon="pi pi-pencil"
|
||||
title="Modifier"
|
||||
styleClass="ui-button-rounded ui-button-warning mr-2"
|
||||
actionListener="#{organisationsBean.setOrganisationSelectionnee(org)}"
|
||||
update=":formOrgs:dlgEdit"
|
||||
oncomplete="PF('dlgEdit').show();" />
|
||||
|
||||
<p:commandButton icon="#{organisationsBean.estActive(org) ? 'pi pi-ban' : 'pi pi-check'}"
|
||||
title="#{organisationsBean.estActive(org) ? 'Désactiver' : 'Activer'}"
|
||||
styleClass="ui-button-rounded #{organisationsBean.estActive(org) ? 'ui-button-secondary' : 'ui-button-success'} mr-2"
|
||||
update=":formOrgs:dtOrgs :formOrgs:messages :formOrgs:stats"
|
||||
actionListener="#{organisationsBean.basculerStatutOrganisation(org)}">
|
||||
<p:confirm header="Confirmation"
|
||||
message="Confirmez l'action sur le statut de l'organisation ?"
|
||||
icon="pi pi-exclamation-triangle" />
|
||||
</p:commandButton>
|
||||
|
||||
<p:commandButton icon="pi pi-trash"
|
||||
title="Supprimer"
|
||||
styleClass="ui-button-rounded ui-button-danger"
|
||||
update=":formOrgs:dtOrgs :formOrgs:messages :formOrgs:stats"
|
||||
actionListener="#{organisationsBean.supprimerOrganisation(org)}">
|
||||
<p:confirm header="Confirmation"
|
||||
message="Supprimer cette organisation ?"
|
||||
icon="pi pi-exclamation-triangle" />
|
||||
</p:commandButton>
|
||||
</p:column>
|
||||
</p:dataTable>
|
||||
</div>
|
||||
|
||||
<p:confirmDialog global="true" showEffect="fade" hideEffect="fade" responsive="true" width="350">
|
||||
<p:commandButton value="Non" type="button" styleClass="ui-button-secondary" icon="pi pi-times"
|
||||
onclick="PF('confirmDialog').hide()" />
|
||||
<p:commandButton value="Oui" type="button" styleClass="ui-button-danger" icon="pi pi-check" />
|
||||
</p:confirmDialog>
|
||||
|
||||
<!-- Dialogue création -->
|
||||
<p:dialog id="dlgCreate"
|
||||
widgetVar="dlgCreate"
|
||||
header="Nouvelle organisation"
|
||||
modal="true"
|
||||
resizable="false"
|
||||
responsive="true"
|
||||
width="700">
|
||||
|
||||
<ui:include src="/ui/includes/organisation-form.xhtml">
|
||||
<ui:param name="model" value="#{organisationsBean.nouvelleOrganisation}" />
|
||||
<ui:param name="typesItems" value="#{organisationsBean.typesSelectItemsForForm}" />
|
||||
</ui:include>
|
||||
|
||||
<f:facet name="footer">
|
||||
<p:commandButton value="Annuler"
|
||||
icon="pi pi-times"
|
||||
onclick="PF('dlgCreate').hide();"
|
||||
styleClass="ui-button-secondary" />
|
||||
|
||||
<p:commandButton value="Créer"
|
||||
icon="pi pi-check"
|
||||
process="@form"
|
||||
update=":formOrgs:dtOrgs :formOrgs:messages :formOrgs:stats"
|
||||
actionListener="#{organisationsBean.creerOrganisation}"
|
||||
oncomplete="if(!args.validationFailed) PF('dlgCreate').hide();" />
|
||||
</f:facet>
|
||||
</p:dialog>
|
||||
|
||||
<!-- Dialogue édition -->
|
||||
<p:dialog id="dlgEdit"
|
||||
widgetVar="dlgEdit"
|
||||
header="Modifier l'organisation"
|
||||
modal="true"
|
||||
resizable="false"
|
||||
responsive="true"
|
||||
width="700">
|
||||
|
||||
<ui:include src="/ui/includes/organisation-form.xhtml">
|
||||
<ui:param name="model" value="#{organisationsBean.organisationSelectionnee}" />
|
||||
<ui:param name="typesItems" value="#{organisationsBean.typesSelectItemsForForm}" />
|
||||
</ui:include>
|
||||
|
||||
<f:facet name="footer">
|
||||
<p:commandButton value="Annuler"
|
||||
icon="pi pi-times"
|
||||
onclick="PF('dlgEdit').hide();"
|
||||
styleClass="ui-button-secondary" />
|
||||
|
||||
<p:commandButton value="Enregistrer"
|
||||
icon="pi pi-check"
|
||||
process="@form"
|
||||
update=":formOrgs:dtOrgs :formOrgs:messages"
|
||||
actionListener="#{organisationsBean.modifierOrganisation}"
|
||||
oncomplete="if(!args.validationFailed) PF('dlgEdit').hide();" />
|
||||
</f:facet>
|
||||
</p:dialog>
|
||||
</h:form>
|
||||
</ui:define>
|
||||
</ui:composition>
|
||||
@@ -0,0 +1,101 @@
|
||||
<ui:fragment xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:h="http://xmlns.jcp.org/jsf/html"
|
||||
xmlns:f="http://xmlns.jcp.org/jsf/core"
|
||||
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
|
||||
xmlns:p="http://primefaces.org/ui">
|
||||
|
||||
<!--
|
||||
Fragment réutilisable (DRY) pour le formulaire d'Organisation
|
||||
Paramètres attendus via <ui:param>:
|
||||
- model: l'objet cible (ex: #{organisationsBean.nouvelleOrganisation} ou #{organisationsBean.organisationSelectionnee})
|
||||
- typesItems: la liste des SelectItem pour les types (ex: #{organisationsBean.typesSelectItemsForForm})
|
||||
-->
|
||||
|
||||
<div class="ui-fluid">
|
||||
<div class="formgrid grid">
|
||||
<!-- Nom -->
|
||||
<div class="field col-12 md:col-8">
|
||||
<p:outputLabel for="nom" value="Nom *" />
|
||||
<p:inputText id="nom"
|
||||
value="#{model.nom}"
|
||||
required="true"
|
||||
requiredMessage="Nom: une donnée est requise."
|
||||
maxlength="200" />
|
||||
<p:message for="nom" />
|
||||
</div>
|
||||
|
||||
<!-- Type -->
|
||||
<div class="field col-12 md:col-4">
|
||||
<p:outputLabel for="type" value="Type *" />
|
||||
<p:selectOneMenu id="type" value="#{model.typeAssociation}" required="true"
|
||||
requiredMessage="Type d'organisation requis.">
|
||||
<f:selectItems value="#{typesItems}" />
|
||||
</p:selectOneMenu>
|
||||
<p:message for="type" />
|
||||
</div>
|
||||
|
||||
<!-- Date de fondation -->
|
||||
<div class="field col-12 md:col-4">
|
||||
<p:outputLabel for="dateFondation" value="Date de fondation" />
|
||||
<p:datePicker id="dateFondation" value="#{model.dateFondation}" pattern="yyyy-MM-dd" showIcon="true" />
|
||||
</div>
|
||||
|
||||
<!-- Email -->
|
||||
<div class="field col-12 md:col-4">
|
||||
<p:outputLabel for="email" value="Email" />
|
||||
<p:inputText id="email" value="#{model.email}" maxlength="200" />
|
||||
</div>
|
||||
|
||||
<!-- Téléphone -->
|
||||
<div class="field col-12 md:col-4">
|
||||
<p:outputLabel for="telephone" value="Téléphone" />
|
||||
<p:inputText id="telephone" value="#{model.telephone}" maxlength="20" />
|
||||
</div>
|
||||
|
||||
<!-- Description -->
|
||||
<div class="field col-12">
|
||||
<p:outputLabel for="description" value="Description" />
|
||||
<p:inputTextarea id="description" value="#{model.description}" rows="3" maxlength="500" />
|
||||
</div>
|
||||
|
||||
<!-- Adresse -->
|
||||
<div class="field col-12">
|
||||
<p:outputLabel for="adresse" value="Adresse" />
|
||||
<p:inputTextarea id="adresse" value="#{model.adresse}" rows="2" maxlength="500" />
|
||||
</div>
|
||||
|
||||
<!-- Ville / Région / Pays -->
|
||||
<div class="field col-12 md:col-4">
|
||||
<p:outputLabel for="ville" value="Ville" />
|
||||
<p:inputText id="ville" value="#{model.ville}" maxlength="100" />
|
||||
</div>
|
||||
<div class="field col-12 md:col-4">
|
||||
<p:outputLabel for="region" value="Région" />
|
||||
<p:inputText id="region" value="#{model.region}" maxlength="100" />
|
||||
</div>
|
||||
<div class="field col-12 md:col-4">
|
||||
<p:outputLabel for="pays" value="Pays" />
|
||||
<p:inputText id="pays" value="#{model.pays}" maxlength="100" />
|
||||
</div>
|
||||
|
||||
<!-- Numéro d'enregistrement -->
|
||||
<div class="field col-12 md:col-6">
|
||||
<p:outputLabel for="numEnreg" value="Numéro d'enregistrement" />
|
||||
<p:inputText id="numEnreg" value="#{model.numeroRegistre}" maxlength="100" />
|
||||
</div>
|
||||
|
||||
<!-- Code postal -->
|
||||
<div class="field col-12 md:col-6">
|
||||
<p:outputLabel for="codePostal" value="Code postal" />
|
||||
<p:inputText id="codePostal" value="#{model.codePostal}" maxlength="10" />
|
||||
</div>
|
||||
|
||||
<!-- Site web -->
|
||||
<div class="field col-12 md:col-6">
|
||||
<p:outputLabel for="siteWeb" value="Site web" />
|
||||
<p:inputText id="siteWeb" value="#{model.siteWeb}" maxlength="500" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</ui:fragment>
|
||||
Reference in New Issue
Block a user