From 9d821b9bb1fde811a7827a0abf0d6a2b5bfd78bb Mon Sep 17 00:00:00 2001 From: kenza Date: Thu, 30 Jul 2026 09:37:16 +0100 Subject: [PATCH] #391 --- .../bean/ChoixEtablissementBean.java | 40 +- .../com/triz/trizservice/bean/FiltreBean.java | 24 +- .../triz/trizservice/bean/FormGroupBean.java | 23 +- ...entConverter.java => CentreConverter.java} | 10 +- .../com/triz/trizservice/modeles/Alerte.java | 157 ----- .../trizservice/modeles/AlertesMedicales.java | 130 ++++ .../trizservice/modeles/AnneeFiscale.java | 153 ----- .../com/triz/trizservice/modeles/Banque.java | 130 ---- .../com/triz/trizservice/modeles/Centre.java | 249 +++++++ .../com/triz/trizservice/modeles/Cheque.java | 159 ----- .../triz/trizservice/modeles/Chequier.java | 146 ----- .../trizservice/modeles/CompteComptable.java | 153 ----- .../trizservice/modeles/Consultation.java | 189 ++++++ .../trizservice/modeles/ControleTresorie.java | 130 ---- .../trizservice/modeles/Etablissement.java | 171 ----- .../com/triz/trizservice/modeles/Examen.java | 238 +++++++ .../trizservice/modeles/FichierDossier.java | 131 ++++ .../trizservice/modeles/FichierExamen.java | 131 ++++ .../triz/trizservice/modeles/ImageCles.java | 116 ++++ .../com/triz/trizservice/modeles/Machine.java | 195 ++++++ .../com/triz/trizservice/modeles/Medecin.java | 173 +++++ ...iceWilaya.java => MedecinSpecialiste.java} | 66 +- .../triz/trizservice/modeles/Mouvement.java | 299 --------- .../trizservice/modeles/MouvementTier.java | 182 ------ .../trizservice/modeles/Notification.java | 157 +++++ ...lissementUser.java => NotifieMedecin.java} | 48 +- .../triz/trizservice/modeles/Parametre.java | 116 ++++ .../com/triz/trizservice/modeles/Patient.java | 286 ++++++++ .../modeles/{Agence.java => Priority.java} | 106 ++- .../com/triz/trizservice/modeles/Queue.java | 201 ++++++ .../trizservice/modeles/QueueStatusTime.java | 117 ++++ .../triz/trizservice/modeles/QueueTips.java | 123 ++++ .../com/triz/trizservice/modeles/Rdv.java | 162 +++++ .../modeles/{Class.java => SalleDeSoin.java} | 67 +- .../modeles/ServiceFonctiongroupe.java | 120 ++-- .../modeles/ServiceFonctionnaliter.java | 20 +- .../trizservice/modeles/ServiceGroupe.java | 65 +- .../ServiceHistoriqueManipulation.java | 92 ++- .../trizservice/modeles/ServiceMember.java | 13 +- .../triz/trizservice/modeles/ServiceUser.java | 87 ++- ...erTresorie.java => ServiceUserCentre.java} | 47 +- .../modeles/ServicehistoriqueConnection.java | 28 +- .../modeles/SpecialiteMedicale.java | 105 +++ .../modeles/{Sort.java => Status.java} | 77 ++- .../modeles/StockTypeDestinataire.java | 125 ---- .../com/triz/trizservice/modeles/Tier.java | 356 ---------- .../triz/trizservice/modeles/Tresorie.java | 334 ---------- .../modeles/TypeAlerteMedical.java | 112 ++++ .../triz/trizservice/modeles/TypeExamen.java | 162 +++++ .../{TypeTresorie.java => TypeMachine.java} | 86 +-- .../trizservice/modeles/TypeMouvement.java | 129 ---- .../com/triz/trizservice/modeles/Wilaya.java | 112 ++++ .../security/impl/CostumSuccesHandler.java | 25 +- .../security/impl/LoginServiceImpl.java | 2 +- .../triz/trizservice/service/DaoService.java | 19 +- .../service/TransactionService.java | 20 +- .../service/impl/DaoServiceImpl.java | 43 +- .../service/impl/TransactionServiceImpl.java | 25 +- src/main/java/com/triz/util/UtilContext.java | 25 +- .../com/triz/util/UtilControleAccess.java | 18 +- .../java/com/triz/util/UtilGetParametre.java | 8 +- src/main/java/com/triz/util/UtilURL.java | 13 +- src/main/resources/META-INF/persistence.xml | 27 + .../db/migration/V000__main_schema.sql | 613 ++++++++++++++++++ .../resources/langue/message_fr.properties | 10 +- .../resources/demo/styles/auth/_login.scss | 2 +- .../resources/resources/demo/styles/demo.css | 2 +- .../resources/layout/styles/layout-light.css | 1 + .../layout/layout-common/styles/_main.scss | 1 + src/main/webapp/META-INF/context.xml | 2 +- .../webapp/WEB-INF/applicationContext.xml | 2 +- .../WEB-INF/layout/sections/breadcrumb.xhtml | 2 +- .../WEB-INF/layout/sections/footer.xhtml | 50 +- .../WEB-INF/layout/sections/inlinemenu.xhtml | 222 +++++-- .../webapp/WEB-INF/layout/sections/menu.xhtml | 197 +++++- .../WEB-INF/layout/sections/topbar.xhtml | 435 +++++++++---- src/main/webapp/WEB-INF/layout/template.xhtml | 2 +- src/main/webapp/auth/login.xhtml | 183 ++++-- .../resources/demo/styles/auth/_login.scss | 2 +- .../webapp/resources/demo/styles/demo.css | 2 +- .../resources/layout/styles/layout-light.css | 1 + .../layout/layout-common/styles/_main.scss | 1 + 82 files changed, 5320 insertions(+), 3483 deletions(-) rename src/main/java/com/triz/trizservice/bean/converter/{EtablissementConverter.java => CentreConverter.java} (82%) delete mode 100644 src/main/java/com/triz/trizservice/modeles/Alerte.java create mode 100644 src/main/java/com/triz/trizservice/modeles/AlertesMedicales.java delete mode 100644 src/main/java/com/triz/trizservice/modeles/AnneeFiscale.java delete mode 100644 src/main/java/com/triz/trizservice/modeles/Banque.java create mode 100644 src/main/java/com/triz/trizservice/modeles/Centre.java delete mode 100644 src/main/java/com/triz/trizservice/modeles/Cheque.java delete mode 100644 src/main/java/com/triz/trizservice/modeles/Chequier.java delete mode 100644 src/main/java/com/triz/trizservice/modeles/CompteComptable.java create mode 100644 src/main/java/com/triz/trizservice/modeles/Consultation.java delete mode 100644 src/main/java/com/triz/trizservice/modeles/ControleTresorie.java delete mode 100644 src/main/java/com/triz/trizservice/modeles/Etablissement.java create mode 100644 src/main/java/com/triz/trizservice/modeles/Examen.java create mode 100644 src/main/java/com/triz/trizservice/modeles/FichierDossier.java create mode 100644 src/main/java/com/triz/trizservice/modeles/FichierExamen.java create mode 100644 src/main/java/com/triz/trizservice/modeles/ImageCles.java create mode 100644 src/main/java/com/triz/trizservice/modeles/Machine.java create mode 100644 src/main/java/com/triz/trizservice/modeles/Medecin.java rename src/main/java/com/triz/trizservice/modeles/{ServiceWilaya.java => MedecinSpecialiste.java} (53%) delete mode 100644 src/main/java/com/triz/trizservice/modeles/Mouvement.java delete mode 100644 src/main/java/com/triz/trizservice/modeles/MouvementTier.java create mode 100644 src/main/java/com/triz/trizservice/modeles/Notification.java rename src/main/java/com/triz/trizservice/modeles/{ServiceEtablissementUser.java => NotifieMedecin.java} (61%) create mode 100644 src/main/java/com/triz/trizservice/modeles/Parametre.java create mode 100644 src/main/java/com/triz/trizservice/modeles/Patient.java rename src/main/java/com/triz/trizservice/modeles/{Agence.java => Priority.java} (51%) create mode 100644 src/main/java/com/triz/trizservice/modeles/Queue.java create mode 100644 src/main/java/com/triz/trizservice/modeles/QueueStatusTime.java create mode 100644 src/main/java/com/triz/trizservice/modeles/QueueTips.java create mode 100644 src/main/java/com/triz/trizservice/modeles/Rdv.java rename src/main/java/com/triz/trizservice/modeles/{Class.java => SalleDeSoin.java} (60%) rename src/main/java/com/triz/trizservice/modeles/{ServiceUserTresorie.java => ServiceUserCentre.java} (65%) create mode 100644 src/main/java/com/triz/trizservice/modeles/SpecialiteMedicale.java rename src/main/java/com/triz/trizservice/modeles/{Sort.java => Status.java} (52%) delete mode 100644 src/main/java/com/triz/trizservice/modeles/StockTypeDestinataire.java delete mode 100644 src/main/java/com/triz/trizservice/modeles/Tier.java delete mode 100644 src/main/java/com/triz/trizservice/modeles/Tresorie.java create mode 100644 src/main/java/com/triz/trizservice/modeles/TypeAlerteMedical.java create mode 100644 src/main/java/com/triz/trizservice/modeles/TypeExamen.java rename src/main/java/com/triz/trizservice/modeles/{TypeTresorie.java => TypeMachine.java} (57%) delete mode 100644 src/main/java/com/triz/trizservice/modeles/TypeMouvement.java create mode 100644 src/main/java/com/triz/trizservice/modeles/Wilaya.java diff --git a/src/main/java/com/triz/trizservice/bean/ChoixEtablissementBean.java b/src/main/java/com/triz/trizservice/bean/ChoixEtablissementBean.java index fd8ef6b..4a29735 100644 --- a/src/main/java/com/triz/trizservice/bean/ChoixEtablissementBean.java +++ b/src/main/java/com/triz/trizservice/bean/ChoixEtablissementBean.java @@ -4,9 +4,9 @@ */ package com.triz.trizservice.bean; -import com.triz.trizservice.modeles.Etablissement; -import com.triz.trizservice.modeles.ServiceEtablissementUser; +import com.triz.trizservice.modeles.Centre; import com.triz.trizservice.modeles.ServiceUser; +import com.triz.trizservice.modeles.ServiceUserCentre; import com.triz.trizservice.modeles.ServicehistoriqueConnection; import com.triz.trizservice.service.TransactionService; import com.triz.util.UtilContext; @@ -30,7 +30,7 @@ public class ChoixEtablissementBean { private static final long serialVersionUID = 1L; - private Etablissement etablissementSelected; + private Centre centreSelected; private String URL = "/view/telephone/listActif.xhtml?faces-redirect=true"; private String STOCK_URL = "/accueil.xhtml?faces-redirect=true"; private String STOCK_URL_TB = "/accueil.xhtml?faces-redirect=true"; @@ -42,7 +42,7 @@ public class ChoixEtablissementBean { private boolean useDistribution; private boolean voirTableau; - private List listeEtablissement; + private List listeCentre; @Autowired public transient TransactionService service; @@ -64,7 +64,7 @@ public class ChoixEtablissementBean { // if ("true".equals(user.getShowTableauDeBord())) { // voirTableau = true; // } - listeEtablissement = service.getAllStockEtablissementFromUsersEtablissementByUser(user); + listeCentre = service.getAllStockEtablissementFromUsersEtablissementByUser(user); // for (Etablissement etab : listeEtablissement) { //// if (etab.getCodeUsine() == null) { //// etab.setCodeUsine(etab.getId()); @@ -80,20 +80,20 @@ public class ChoixEtablissementBean { // context.setAllFonctionByUser(null); } - public List getListeEtablissement() { - return listeEtablissement; + public Centre getCentreSelected() { + return centreSelected; } - public void setListeEtablissement(List listeEtablissement) { - this.listeEtablissement = listeEtablissement; + public void setCentreSelected(Centre centreSelected) { + this.centreSelected = centreSelected; } - public Etablissement getEtablissementSelected() { - return etablissementSelected; + public List getListeCentre() { + return listeCentre; } - public void setEtablissementSelected(Etablissement etablissementSelected) { - this.etablissementSelected = etablissementSelected; + public void setListeCentre(List listeCentre) { + this.listeCentre = listeCentre; } public String etablissementIsSelected(FiltreBean filtre) { @@ -115,13 +115,13 @@ public class ChoixEtablissementBean { // return TABLEAU_URL; // } // } - - UtilURL.setIdEtablissement(etablissementSelected.getIdEtabStock()); - UtilURL.setFonctionnalite(service.getFonctionServerByUsersByEtablissement(context.getCurrentUser(), etablissementSelected)); - ServiceEtablissementUser userEtablissement = service.getAllUserEtablissementByEtablissementByUser(etablissementSelected, user); + System.out.println("centreSelected " + centreSelected.getName()); + UtilURL.setIdCentre(centreSelected.getId()); + UtilURL.setFonctionnalite(service.getFonctionServerByUsersByEtablissement(context.getCurrentUser(), centreSelected)); + ServiceUserCentre userEtablissement = service.getAllUserCentreByCentreByUser(centreSelected, user); // if(etablissementSelected.gettypeetab) //getListeModeleEdition(etablissementSelected); - saveConnection(etablissementSelected); + saveConnection(centreSelected); // if (("true".equals(userEtablissement.getUseSuperette()))) { // UtilURL.setIsProuction(false); // return STOCK_URL_VENTECOMPTOIRE; @@ -150,10 +150,10 @@ public class ChoixEtablissementBean { } - private void saveConnection(Etablissement etablissement) { + private void saveConnection(Centre etablissement) { ServicehistoriqueConnection his = new ServicehistoriqueConnection(); his.setFkUser(user); - his.setFkEtablissement(etablissement); + his.setFkCentre(etablissement); his.setDate(new Date()); his.setHeur(new Date()); his.setAdresseIp(""); diff --git a/src/main/java/com/triz/trizservice/bean/FiltreBean.java b/src/main/java/com/triz/trizservice/bean/FiltreBean.java index 3d05368..e80e35d 100644 --- a/src/main/java/com/triz/trizservice/bean/FiltreBean.java +++ b/src/main/java/com/triz/trizservice/bean/FiltreBean.java @@ -4,9 +4,9 @@ */ package com.triz.trizservice.bean; -import com.triz.trizservice.modeles.Etablissement; +import com.triz.trizservice.modeles.Centre; import com.triz.trizservice.modeles.ServiceUser; -import com.triz.trizservice.modeles.ServiceWilaya; +import com.triz.trizservice.modeles.Wilaya; import com.triz.trizservice.service.TransactionService; import com.triz.util.UtilContext; import com.triz.util.UtilFile; @@ -27,16 +27,16 @@ public class FiltreBean { private ServiceUser user; // private Users userDist; - private Etablissement etablissement; - private Etablissement etablissementPrincipal; + private Centre etablissement; + private Centre etablissementPrincipal; // private Etablissement etablissementDisPrincipal; // private Etablissement etablissementDist; private List listeZone; - private List listeEtablissement; + private List listeEtablissement; //private List listeEtablissementDist; //private List listeCamion; // private List listeCommunes; - private List listeWilaya; + private List listeWilaya; // private List listeTypeActivitie; // private List listeTypeClient; // private List listeRaisonNonVente; @@ -159,14 +159,14 @@ public class FiltreBean { // this.userDist = userDist; // } - public Etablissement getEtablissement() { + public Centre getEtablissement() { if (etablissement == null) { init(); } return etablissement; } - public void setEtablissement(Etablissement etablissement) { + public void setEtablissement(Centre etablissement) { this.etablissement = etablissement; } @@ -192,14 +192,14 @@ public class FiltreBean { this.listeZone = listeZone; } - public List getListeEtablissement() { + public List getListeEtablissement() { if (listeEtablissement == null) { init(); } return listeEtablissement; } - public void setListeEtablissement(List listeEtablissement) { + public void setListeEtablissement(List listeEtablissement) { this.listeEtablissement = listeEtablissement; } @@ -236,14 +236,14 @@ public class FiltreBean { // this.listeCommunes = listeCommunes; // } - public List getListeWilaya() { + public List getListeWilaya() { if (listeWilaya == null) { init(); } return listeWilaya; } - public void setListeWilaya(List listeWilaya) { + public void setListeWilaya(List listeWilaya) { this.listeWilaya = listeWilaya; } diff --git a/src/main/java/com/triz/trizservice/bean/FormGroupBean.java b/src/main/java/com/triz/trizservice/bean/FormGroupBean.java index 9fb8215..5b3d9b3 100644 --- a/src/main/java/com/triz/trizservice/bean/FormGroupBean.java +++ b/src/main/java/com/triz/trizservice/bean/FormGroupBean.java @@ -105,7 +105,7 @@ public class FormGroupBean { boolean existe = false; for (ServiceFonctiongroupe fg : listeFonctionnalite) { - if (fg.getFkFonction().getId().equals(f.getId())) { + if (fg.getFkFonctionnalite().getId().equals(f.getId())) { existe = true; break; } @@ -114,12 +114,12 @@ public class FormGroupBean { if (!existe) { ServiceFonctiongroupe newFg = new ServiceFonctiongroupe(); // newFg.setId(groupeSelected.getId() + f.getId()); - newFg.setFkFonction(f); + newFg.setFkFonctionnalite(f); newFg.setFkGroupe(groupeSelected); - newFg.setCanCreate("true"); - newFg.setCanUpdate("true"); - newFg.setCanDelete("true"); - newFg.setCanUpdateDate("true"); + newFg.setCanCreate(true); + newFg.setCanUpdate(true); + newFg.setCanDelete(true); + newFg.setCanUpdateDate(true); listeFonctionnalite.add(newFg); } } @@ -134,8 +134,8 @@ public class FormGroupBean { listeFonctionnalite.remove(fonctionSelected); listeFonctionsASupprimer.add(fonctionSelected); // Marquer pour suppression - if (!Source.contains(fonctionSelected.getFkFonction())) { - Source.add(fonctionSelected.getFkFonction()); + if (!Source.contains(fonctionSelected.getFkFonctionnalite())) { + Source.add(fonctionSelected.getFkFonctionnalite()); } fonctionSelected = null; @@ -145,14 +145,9 @@ public class FormGroupBean { public String saveGroupe() { if (isNew) { System.out.println("hello from save 1"); - String id = GenerateIDObject.genererIdGroups(service); - while (service.getGroupsById(id) != null) { - id = GenerateIDObject.genererIdGroups(service); - } - groupeSelected.setId(id); groupeSelected.setActif("true"); service.save(groupeSelected); - context.saveNewManipulation("Groupe", groupeSelected.getId(), "Ajouter Groupe", new Date(), new Date(), user, 0d, 0d); + context.saveNewManipulation("Groupe", groupeSelected.getNomGroupe(), "Ajouter Groupe", new Date(), new Date(), user,"", ""); }else{ System.out.println("hello from save 2"); service.save(groupeSelected); diff --git a/src/main/java/com/triz/trizservice/bean/converter/EtablissementConverter.java b/src/main/java/com/triz/trizservice/bean/converter/CentreConverter.java similarity index 82% rename from src/main/java/com/triz/trizservice/bean/converter/EtablissementConverter.java rename to src/main/java/com/triz/trizservice/bean/converter/CentreConverter.java index e92b48b..29cc469 100644 --- a/src/main/java/com/triz/trizservice/bean/converter/EtablissementConverter.java +++ b/src/main/java/com/triz/trizservice/bean/converter/CentreConverter.java @@ -4,7 +4,7 @@ */ package com.triz.trizservice.bean.converter; -import com.triz.trizservice.modeles.Etablissement; +import com.triz.trizservice.modeles.Centre; import com.triz.trizservice.service.TransactionService; import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; @@ -18,9 +18,9 @@ import org.springframework.stereotype.Component; * * @author FORCE TECH */ -@FacesConverter("etablissementConverter") +@FacesConverter("centreConverter") @Component -public class EtablissementConverter implements Converter{ +public class CentreConverter implements Converter{ @Autowired protected transient TransactionService service; @@ -30,7 +30,7 @@ public class EtablissementConverter implements Converter{ return service.getEtablissementById(value); } catch (NumberFormatException e) { - new FacesMessage(FacesMessage.SEVERITY_ERROR, "Conversion Error", "Etablissement n'existe pas."); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "Conversion Error", "Centre n'existe pas."); } return null; @@ -39,7 +39,7 @@ public class EtablissementConverter implements Converter{ @Override public String getAsString(FacesContext fc, UIComponent uic, Object object) { if (object != null) { - return String.valueOf(((Etablissement) object).getIdEtabStock()); + return String.valueOf(((Centre) object).getId()); } else { return null; } diff --git a/src/main/java/com/triz/trizservice/modeles/Alerte.java b/src/main/java/com/triz/trizservice/modeles/Alerte.java deleted file mode 100644 index 3bdc2d7..0000000 --- a/src/main/java/com/triz/trizservice/modeles/Alerte.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - -import java.io.Serializable; -import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "alerte") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "Alerte.findAll", query = "SELECT a FROM Alerte a"), - @NamedQuery(name = "Alerte.findById", query = "SELECT a FROM Alerte a WHERE a.id = :id"), - @NamedQuery(name = "Alerte.findByReference", query = "SELECT a FROM Alerte a WHERE a.reference = :reference"), - @NamedQuery(name = "Alerte.findByMontant", query = "SELECT a FROM Alerte a WHERE a.montant = :montant"), - @NamedQuery(name = "Alerte.findByDate", query = "SELECT a FROM Alerte a WHERE a.date = :date"), - @NamedQuery(name = "Alerte.findByObservation", query = "SELECT a FROM Alerte a WHERE a.observation = :observation")}) -public class Alerte implements Serializable { - - @Size(max = 50) - @Column(name = "reference") - private String reference; - @Size(max = 255) - @Column(name = "observation") - private String observation; - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Basic(optional = false) - @Column(name = "id") - private Integer id; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Column(name = "montant") - private Double montant; - @Column(name = "date") - @Temporal(TemporalType.DATE) - private Date date; - @JoinColumn(name = "fk_mouvement", referencedColumnName = "id") - @ManyToOne - private Mouvement fkMouvement; - @JoinColumn(name = "fk_type_mouvement", referencedColumnName = "id") - @ManyToOne - private TypeMouvement fkTypeMouvement; - - public Alerte() { - } - - public Alerte(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - - public Double getMontant() { - return montant; - } - - public void setMontant(Double montant) { - this.montant = montant; - } - - public Date getDate() { - return date; - } - - public void setDate(Date date) { - this.date = date; - } - - - public Mouvement getFkMouvement() { - return fkMouvement; - } - - public void setFkMouvement(Mouvement fkMouvement) { - this.fkMouvement = fkMouvement; - } - - public TypeMouvement getFkTypeMouvement() { - return fkTypeMouvement; - } - - public void setFkTypeMouvement(TypeMouvement fkTypeMouvement) { - this.fkTypeMouvement = fkTypeMouvement; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Alerte)) { - return false; - } - Alerte other = (Alerte) object; - if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.Alerte[ id=" + id + " ]"; - } - - public String getReference() { - return reference; - } - - public void setReference(String reference) { - this.reference = reference; - } - - public String getObservation() { - return observation; - } - - public void setObservation(String observation) { - this.observation = observation; - } - -} diff --git a/src/main/java/com/triz/trizservice/modeles/AlertesMedicales.java b/src/main/java/com/triz/trizservice/modeles/AlertesMedicales.java new file mode 100644 index 0000000..ae27289 --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/AlertesMedicales.java @@ -0,0 +1,130 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.Date; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "alertes_medicales") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "AlertesMedicales.findAll", query = "SELECT a FROM AlertesMedicales a"), + @NamedQuery(name = "AlertesMedicales.findByDerscription", query = "SELECT a FROM AlertesMedicales a WHERE a.derscription = :derscription"), + @NamedQuery(name = "AlertesMedicales.findByDate", query = "SELECT a FROM AlertesMedicales a WHERE a.date = :date")}) +public class AlertesMedicales implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Size(max = 2147483647) + @Column(name = "derscription") + private String derscription; + @Column(name = "date") + @Temporal(TemporalType.DATE) + private Date date; + @JoinColumn(name = "fk_patient", referencedColumnName = "id") + @ManyToOne + private Patient fkPatient; + @JoinColumn(name = "fk_type_alerte_medical", referencedColumnName = "id") + @ManyToOne + private TypeAlerteMedical fkTypeAlerteMedical; + + public AlertesMedicales() { + } + + public AlertesMedicales(Object id) { + this.id = id; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public String getDerscription() { + return derscription; + } + + public void setDerscription(String derscription) { + this.derscription = derscription; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Patient getFkPatient() { + return fkPatient; + } + + public void setFkPatient(Patient fkPatient) { + this.fkPatient = fkPatient; + } + + public TypeAlerteMedical getFkTypeAlerteMedical() { + return fkTypeAlerteMedical; + } + + public void setFkTypeAlerteMedical(TypeAlerteMedical fkTypeAlerteMedical) { + this.fkTypeAlerteMedical = fkTypeAlerteMedical; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof AlertesMedicales)) { + return false; + } + AlertesMedicales other = (AlertesMedicales) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.AlertesMedicales[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/AnneeFiscale.java b/src/main/java/com/triz/trizservice/modeles/AnneeFiscale.java deleted file mode 100644 index ab9d7f1..0000000 --- a/src/main/java/com/triz/trizservice/modeles/AnneeFiscale.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - -import java.io.Serializable; -import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "annee_fiscale") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "AnneeFiscale.findAll", query = "SELECT a FROM AnneeFiscale a"), - @NamedQuery(name = "AnneeFiscale.findByAnnee", query = "SELECT a FROM AnneeFiscale a WHERE a.annee = :annee"), - @NamedQuery(name = "AnneeFiscale.findByCloture", query = "SELECT a FROM AnneeFiscale a WHERE a.cloture = :cloture"), - @NamedQuery(name = "AnneeFiscale.findByActif", query = "SELECT a FROM AnneeFiscale a WHERE a.actif = :actif"), - @NamedQuery(name = "AnneeFiscale.findByCodeLetterage", query = "SELECT a FROM AnneeFiscale a WHERE a.codeLetterage = :codeLetterage")}) -public class AnneeFiscale implements Serializable { - - @Size(max = 255) - @Column(name = "code_letterage") - private String codeLetterage; - - private static final long serialVersionUID = 1L; - @Id - @Basic(optional = false) - @NotNull - @Column(name = "annee") - private Integer annee; - @Column(name = "cloture") - private Boolean cloture; - @Column(name = "actif") - private Boolean actif; - @JoinColumn(name = "fk_etablissement", referencedColumnName = "id_etab_stock") - @ManyToOne - private Etablissement fkEtablissement; - @OneToMany(mappedBy = "fkAnneeFiscale") - private List mouvementTierList; - @OneToMany(mappedBy = "fkAnneeFiscale") - private List mouvementList; - - public AnneeFiscale() { - } - - public AnneeFiscale(Integer annee) { - this.annee = annee; - } - - public Integer getAnnee() { - return annee; - } - - public void setAnnee(Integer annee) { - this.annee = annee; - } - - public Boolean getCloture() { - return cloture; - } - - public void setCloture(Boolean cloture) { - this.cloture = cloture; - } - - public Boolean getActif() { - return actif; - } - - public void setActif(Boolean actif) { - this.actif = actif; - } - - public String getCodeLetterage() { - return codeLetterage; - } - - public void setCodeLetterage(String codeLetterage) { - this.codeLetterage = codeLetterage; - } - - public Etablissement getFkEtablissement() { - return fkEtablissement; - } - - public void setFkEtablissement(Etablissement fkEtablissement) { - this.fkEtablissement = fkEtablissement; - } - - @XmlTransient - public List getMouvementTierList() { - return mouvementTierList; - } - - public void setMouvementTierList(List mouvementTierList) { - this.mouvementTierList = mouvementTierList; - } - - @XmlTransient - public List getMouvementList() { - return mouvementList; - } - - public void setMouvementList(List mouvementList) { - this.mouvementList = mouvementList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (annee != null ? annee.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof AnneeFiscale)) { - return false; - } - AnneeFiscale other = (AnneeFiscale) object; - if ((this.annee == null && other.annee != null) || (this.annee != null && !this.annee.equals(other.annee))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.AnneeFiscale[ annee=" + annee + " ]"; - } - - - -} diff --git a/src/main/java/com/triz/trizservice/modeles/Banque.java b/src/main/java/com/triz/trizservice/modeles/Banque.java deleted file mode 100644 index 3dd1b73..0000000 --- a/src/main/java/com/triz/trizservice/modeles/Banque.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - -import java.io.Serializable; -import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "banque") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "Banque.findAll", query = "SELECT b FROM Banque b"), - @NamedQuery(name = "Banque.findById", query = "SELECT b FROM Banque b WHERE b.id = :id"), - @NamedQuery(name = "Banque.findByNom", query = "SELECT b FROM Banque b WHERE b.nom = :nom"), - @NamedQuery(name = "Banque.findByAbreviation", query = "SELECT b FROM Banque b WHERE b.abreviation = :abreviation")}) -public class Banque implements Serializable { - - @Size(max = 50) - @Column(name = "nom") - private String nom; - @Size(max = 10) - @Column(name = "abreviation") - private String abreviation; - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Basic(optional = false) - @Column(name = "id") - private Integer id; - @OneToMany(mappedBy = "fkBanque") - private List agenceList; - @OneToMany(mappedBy = "fkBanque") - private List compteComptableList; - - public Banque() { - } - - public Banque(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - - @XmlTransient - public List getAgenceList() { - return agenceList; - } - - public void setAgenceList(List agenceList) { - this.agenceList = agenceList; - } - - @XmlTransient - public List getCompteComptableList() { - return compteComptableList; - } - - public void setCompteComptableList(List compteComptableList) { - this.compteComptableList = compteComptableList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Banque)) { - return false; - } - Banque other = (Banque) object; - if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.Banque_1[ id=" + id + " ]"; - } - - public String getNom() { - return nom; - } - - public void setNom(String nom) { - this.nom = nom; - } - - public String getAbreviation() { - return abreviation; - } - - public void setAbreviation(String abreviation) { - this.abreviation = abreviation; - } - -} diff --git a/src/main/java/com/triz/trizservice/modeles/Centre.java b/src/main/java/com/triz/trizservice/modeles/Centre.java new file mode 100644 index 0000000..2657a12 --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/Centre.java @@ -0,0 +1,249 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.List; +import java.util.UUID; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "centre") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "Centre.findAll", query = "SELECT c FROM Centre c"), + @NamedQuery(name = "Centre.findByName", query = "SELECT c FROM Centre c WHERE c.name = :name"), + @NamedQuery(name = "Centre.findByAdresse", query = "SELECT c FROM Centre c WHERE c.adresse = :adresse"), + @NamedQuery(name = "Centre.findByLatitude", query = "SELECT c FROM Centre c WHERE c.latitude = :latitude"), + @NamedQuery(name = "Centre.findByLongitude", query = "SELECT c FROM Centre c WHERE c.longitude = :longitude")}) +public class Centre implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @NotNull + @Column(name = "id") + private UUID id; + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2147483647) + @Column(name = "name") + private String name; + @Size(max = 2147483647) + @Column(name = "adresse") + private String adresse; + // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation + @Column(name = "latitude") + private Double latitude; + @Column(name = "longitude") + private Double longitude; + @OneToMany(mappedBy = "fkCentre") + private List serviceUserCentreList; + @OneToMany(mappedBy = "fkCentre") + private List rdvList; + @OneToMany(mappedBy = "fkCentre") + private List notificationList; + @OneToMany(mappedBy = "fkCentre") + private List parametreList; + @OneToMany(mappedBy = "fkCentre") + private List patientList; + @OneToMany(mappedBy = "fkCentre") + private List medecinList; + @JoinColumn(name = "fk_wilaya", referencedColumnName = "code") + @ManyToOne + private Wilaya fkWilaya; + @OneToMany(mappedBy = "fkCentre") + private List machineList; + @OneToMany(mappedBy = "fkCentre") + private List salleDeSoinList; + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 5) + @Column(name = "actif") + private String actif; + + public Centre() { + } + + public Centre(UUID id) { + this.id = id; + } + + public Centre(UUID id, String name) { + this.id = id; + this.name = name; + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAdresse() { + return adresse; + } + + public void setAdresse(String adresse) { + this.adresse = adresse; + } + + public Double getLatitude() { + return latitude; + } + + public void setLatitude(Double latitude) { + this.latitude = latitude; + } + + public Double getLongitude() { + return longitude; + } + + public void setLongitude(Double longitude) { + this.longitude = longitude; + } + + @XmlTransient + public List getServiceUserCentreList() { + return serviceUserCentreList; + } + + public void setServiceUserCentreList(List serviceUserCentreList) { + this.serviceUserCentreList = serviceUserCentreList; + } + + @XmlTransient + public List getRdvList() { + return rdvList; + } + + public void setRdvList(List rdvList) { + this.rdvList = rdvList; + } + + @XmlTransient + public List getNotificationList() { + return notificationList; + } + + public void setNotificationList(List notificationList) { + this.notificationList = notificationList; + } + + @XmlTransient + public List getParametreList() { + return parametreList; + } + + public void setParametreList(List parametreList) { + this.parametreList = parametreList; + } + + @XmlTransient + public List getPatientList() { + return patientList; + } + + public void setPatientList(List patientList) { + this.patientList = patientList; + } + + @XmlTransient + public List getMedecinList() { + return medecinList; + } + + public void setMedecinList(List medecinList) { + this.medecinList = medecinList; + } + + public Wilaya getFkWilaya() { + return fkWilaya; + } + + public void setFkWilaya(Wilaya fkWilaya) { + this.fkWilaya = fkWilaya; + } + + @XmlTransient + public List getMachineList() { + return machineList; + } + + public void setMachineList(List machineList) { + this.machineList = machineList; + } + + @XmlTransient + public List getSalleDeSoinList() { + return salleDeSoinList; + } + + public void setSalleDeSoinList(List salleDeSoinList) { + this.salleDeSoinList = salleDeSoinList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof Centre)) { + return false; + } + Centre other = (Centre) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.Centre[ id=" + id + " ]"; + } + + public String getActif() { + return actif; + } + + public void setActif(String actif) { + this.actif = actif; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/Cheque.java b/src/main/java/com/triz/trizservice/modeles/Cheque.java deleted file mode 100644 index e8db9c4..0000000 --- a/src/main/java/com/triz/trizservice/modeles/Cheque.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "cheque") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "Cheque.findAll", query = "SELECT c FROM Cheque c"), - @NamedQuery(name = "Cheque.findById", query = "SELECT c FROM Cheque c WHERE c.id = :id"), - @NamedQuery(name = "Cheque.findByReference", query = "SELECT c FROM Cheque c WHERE c.reference = :reference"), - @NamedQuery(name = "Cheque.findByMontant", query = "SELECT c FROM Cheque c WHERE c.montant = :montant"), - @NamedQuery(name = "Cheque.findByDateEmission", query = "SELECT c FROM Cheque c WHERE c.dateEmission = :dateEmission"), - @NamedQuery(name = "Cheque.findByDateRemise", query = "SELECT c FROM Cheque c WHERE c.dateRemise = :dateRemise")}) -public class Cheque implements Serializable { - - @Size(max = 50) - @Column(name = "reference") - private String reference; - @Column(name = "date_remise") - @Temporal(TemporalType.DATE) - private Date dateRemise; - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Basic(optional = false) - @Column(name = "id") - private Integer id; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Column(name = "montant") - private Double montant; - @Column(name = "date_emission") - @Temporal(TemporalType.DATE) - private Date dateEmission; - @JoinColumn(name = "fk_chequier", referencedColumnName = "id") - @ManyToOne - private Chequier fkChequier; - @OneToMany(mappedBy = "fkCheque") - private List mouvementList; - - public Cheque() { - } - - public Cheque(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - - public Double getMontant() { - return montant; - } - - public void setMontant(Double montant) { - this.montant = montant; - } - - public Date getDateEmission() { - return dateEmission; - } - - public void setDateEmission(Date dateEmission) { - this.dateEmission = dateEmission; - } - - public Date getDateRemise() { - return dateRemise; - } - - public void setDateRemise(Date dateRemise) { - this.dateRemise = dateRemise; - } - - public Chequier getFkChequier() { - return fkChequier; - } - - public void setFkChequier(Chequier fkChequier) { - this.fkChequier = fkChequier; - } - - @XmlTransient - public List getMouvementList() { - return mouvementList; - } - - public void setMouvementList(List mouvementList) { - this.mouvementList = mouvementList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Cheque)) { - return false; - } - Cheque other = (Cheque) object; - if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.Cheque[ id=" + id + " ]"; - } - - public String getReference() { - return reference; - } - - public void setReference(String reference) { - this.reference = reference; - } - -} diff --git a/src/main/java/com/triz/trizservice/modeles/Chequier.java b/src/main/java/com/triz/trizservice/modeles/Chequier.java deleted file mode 100644 index 49ef030..0000000 --- a/src/main/java/com/triz/trizservice/modeles/Chequier.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - -import java.io.Serializable; -import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "chequier") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "Chequier.findAll", query = "SELECT c FROM Chequier c"), - @NamedQuery(name = "Chequier.findById", query = "SELECT c FROM Chequier c WHERE c.id = :id"), - @NamedQuery(name = "Chequier.findBySerie", query = "SELECT c FROM Chequier c WHERE c.serie = :serie"), - @NamedQuery(name = "Chequier.findByRefInitiale", query = "SELECT c FROM Chequier c WHERE c.refInitiale = :refInitiale"), - @NamedQuery(name = "Chequier.findByRefFinale", query = "SELECT c FROM Chequier c WHERE c.refFinale = :refFinale")}) -public class Chequier implements Serializable { - - @Size(max = 10) - @Column(name = "serie") - private String serie; - @Size(max = 10) - @Column(name = "ref_initiale") - private String refInitiale; - @Size(max = 10) - @Column(name = "ref_finale") - private String refFinale; - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Basic(optional = false) - @Column(name = "id") - private Integer id; - @JoinColumn(name = "fk_tresorie", referencedColumnName = "id") - @ManyToOne - private Tresorie fkTresorie; - @OneToMany(mappedBy = "fkChequier") - private List chequeList; - - public Chequier() { - } - - public Chequier(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - - public String getRefInitiale() { - return refInitiale; - } - - public void setRefInitiale(String refInitiale) { - this.refInitiale = refInitiale; - } - - public String getRefFinale() { - return refFinale; - } - - public void setRefFinale(String refFinale) { - this.refFinale = refFinale; - } - - public Tresorie getFkTresorie() { - return fkTresorie; - } - - public void setFkTresorie(Tresorie fkTresorie) { - this.fkTresorie = fkTresorie; - } - - @XmlTransient - public List getChequeList() { - return chequeList; - } - - public void setChequeList(List chequeList) { - this.chequeList = chequeList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Chequier)) { - return false; - } - Chequier other = (Chequier) object; - if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.Chequier[ id=" + id + " ]"; - } - - public String getSerie() { - return serie; - } - - public void setSerie(String serie) { - this.serie = serie; - } - - - -} diff --git a/src/main/java/com/triz/trizservice/modeles/CompteComptable.java b/src/main/java/com/triz/trizservice/modeles/CompteComptable.java deleted file mode 100644 index 2d93700..0000000 --- a/src/main/java/com/triz/trizservice/modeles/CompteComptable.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - -import java.io.Serializable; -import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "compte_comptable", catalog = "triz_tresorie", schema = "public") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "CompteComptable.findAll", query = "SELECT c FROM CompteComptable c"), - @NamedQuery(name = "CompteComptable.findById", query = "SELECT c FROM CompteComptable c WHERE c.id = :id"), - @NamedQuery(name = "CompteComptable.findByCode", query = "SELECT c FROM CompteComptable c WHERE c.code = :code"), - @NamedQuery(name = "CompteComptable.findByNumCompteComptable", query = "SELECT c FROM CompteComptable c WHERE c.numCompteComptable = :numCompteComptable"), - @NamedQuery(name = "CompteComptable.findByAccepterTier", query = "SELECT c FROM CompteComptable c WHERE c.accepterTier = :accepterTier")}) -public class CompteComptable implements Serializable { - - @Size(max = 255) - @Column(name = "code") - private String code; - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Basic(optional = false) - @Column(name = "id") - private Integer id; - @Column(name = "num_compte_comptable") - private Integer numCompteComptable; - @Column(name = "accepter_tier") - private Boolean accepterTier; - @OneToMany(mappedBy = "fkCompteComptable") - private List tierList; - @JoinColumn(name = "fk_banque", referencedColumnName = "id") - @ManyToOne - private Banque fkBanque; - @OneToMany(mappedBy = "fkCompteComptable") - private List tresorieList; - - public CompteComptable() { - } - - public CompteComptable(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - - public Integer getNumCompteComptable() { - return numCompteComptable; - } - - public void setNumCompteComptable(Integer numCompteComptable) { - this.numCompteComptable = numCompteComptable; - } - - public Boolean getAccepterTier() { - return accepterTier; - } - - public void setAccepterTier(Boolean accepterTier) { - this.accepterTier = accepterTier; - } - - @XmlTransient - public List getTierList() { - return tierList; - } - - public void setTierList(List tierList) { - this.tierList = tierList; - } - - public Banque getFkBanque() { - return fkBanque; - } - - public void setFkBanque(Banque fkBanque) { - this.fkBanque = fkBanque; - } - - @XmlTransient - public List getTresorieList() { - return tresorieList; - } - - public void setTresorieList(List tresorieList) { - this.tresorieList = tresorieList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof CompteComptable)) { - return false; - } - CompteComptable other = (CompteComptable) object; - if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.CompteComptable[ id=" + id + " ]"; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - -} diff --git a/src/main/java/com/triz/trizservice/modeles/Consultation.java b/src/main/java/com/triz/trizservice/modeles/Consultation.java new file mode 100644 index 0000000..21662fe --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/Consultation.java @@ -0,0 +1,189 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.Date; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "consultation") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "Consultation.findAll", query = "SELECT c FROM Consultation c"), + @NamedQuery(name = "Consultation.findByRapportEcrit", query = "SELECT c FROM Consultation c WHERE c.rapportEcrit = :rapportEcrit"), + @NamedQuery(name = "Consultation.findByFilePathRapportDictee", query = "SELECT c FROM Consultation c WHERE c.filePathRapportDictee = :filePathRapportDictee"), + @NamedQuery(name = "Consultation.findBySessionAnnule", query = "SELECT c FROM Consultation c WHERE c.sessionAnnule = :sessionAnnule"), + @NamedQuery(name = "Consultation.findByFilePathSignature", query = "SELECT c FROM Consultation c WHERE c.filePathSignature = :filePathSignature"), + @NamedQuery(name = "Consultation.findByDate", query = "SELECT c FROM Consultation c WHERE c.date = :date"), + @NamedQuery(name = "Consultation.findByHeureDebut", query = "SELECT c FROM Consultation c WHERE c.heureDebut = :heureDebut"), + @NamedQuery(name = "Consultation.findByHeureFin", query = "SELECT c FROM Consultation c WHERE c.heureFin = :heureFin")}) +public class Consultation implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Size(max = 2147483647) + @Column(name = "rapport_ecrit") + private String rapportEcrit; + @Size(max = 2147483647) + @Column(name = "file_path_rapport_dictee") + private String filePathRapportDictee; + @Column(name = "session_annule") + private Boolean sessionAnnule; + @Size(max = 2147483647) + @Column(name = "file_path_signature") + private String filePathSignature; + @Column(name = "date") + @Temporal(TemporalType.DATE) + private Date date; + @Column(name = "heure_debut") + @Temporal(TemporalType.TIME) + private Date heureDebut; + @Column(name = "heure_fin") + @Temporal(TemporalType.TIME) + private Date heureFin; + @JoinColumn(name = "fk_examen", referencedColumnName = "id") + @ManyToOne + private Examen fkExamen; + @JoinColumn(name = "fk_medecin", referencedColumnName = "id") + @ManyToOne + private Medecin fkMedecin; + + public Consultation() { + } + + public Consultation(Object id) { + this.id = id; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public String getRapportEcrit() { + return rapportEcrit; + } + + public void setRapportEcrit(String rapportEcrit) { + this.rapportEcrit = rapportEcrit; + } + + public String getFilePathRapportDictee() { + return filePathRapportDictee; + } + + public void setFilePathRapportDictee(String filePathRapportDictee) { + this.filePathRapportDictee = filePathRapportDictee; + } + + public Boolean getSessionAnnule() { + return sessionAnnule; + } + + public void setSessionAnnule(Boolean sessionAnnule) { + this.sessionAnnule = sessionAnnule; + } + + public String getFilePathSignature() { + return filePathSignature; + } + + public void setFilePathSignature(String filePathSignature) { + this.filePathSignature = filePathSignature; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Date getHeureDebut() { + return heureDebut; + } + + public void setHeureDebut(Date heureDebut) { + this.heureDebut = heureDebut; + } + + public Date getHeureFin() { + return heureFin; + } + + public void setHeureFin(Date heureFin) { + this.heureFin = heureFin; + } + + public Examen getFkExamen() { + return fkExamen; + } + + public void setFkExamen(Examen fkExamen) { + this.fkExamen = fkExamen; + } + + public Medecin getFkMedecin() { + return fkMedecin; + } + + public void setFkMedecin(Medecin fkMedecin) { + this.fkMedecin = fkMedecin; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof Consultation)) { + return false; + } + Consultation other = (Consultation) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.Consultation[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/ControleTresorie.java b/src/main/java/com/triz/trizservice/modeles/ControleTresorie.java deleted file mode 100644 index e5d0f23..0000000 --- a/src/main/java/com/triz/trizservice/modeles/ControleTresorie.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - -import java.io.Serializable; -import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "controle_tresorie") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "ControleTresorie.findAll", query = "SELECT c FROM ControleTresorie c"), - @NamedQuery(name = "ControleTresorie.findById", query = "SELECT c FROM ControleTresorie c WHERE c.id = :id"), - @NamedQuery(name = "ControleTresorie.findByDateControle", query = "SELECT c FROM ControleTresorie c WHERE c.dateControle = :dateControle"), - @NamedQuery(name = "ControleTresorie.findByHeure", query = "SELECT c FROM ControleTresorie c WHERE c.heure = :heure"), - @NamedQuery(name = "ControleTresorie.findByMontant", query = "SELECT c FROM ControleTresorie c WHERE c.montant = :montant")}) -public class ControleTresorie implements Serializable { - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Basic(optional = false) - @Column(name = "id") - private Integer id; - @Column(name = "date_controle") - @Temporal(TemporalType.DATE) - private Date dateControle; - @Column(name = "heure") - @Temporal(TemporalType.TIME) - private Date heure; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Column(name = "montant") - private Double montant; - @JoinColumn(name = "fk_tresorie", referencedColumnName = "id") - @ManyToOne - private Tresorie fkTresorie; - - public ControleTresorie() { - } - - public ControleTresorie(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Date getDateControle() { - return dateControle; - } - - public void setDateControle(Date dateControle) { - this.dateControle = dateControle; - } - - public Date getHeure() { - return heure; - } - - public void setHeure(Date heure) { - this.heure = heure; - } - - public Double getMontant() { - return montant; - } - - public void setMontant(Double montant) { - this.montant = montant; - } - - public Tresorie getFkTresorie() { - return fkTresorie; - } - - public void setFkTresorie(Tresorie fkTresorie) { - this.fkTresorie = fkTresorie; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof ControleTresorie)) { - return false; - } - ControleTresorie other = (ControleTresorie) object; - if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.ControleTresorie[ id=" + id + " ]"; - } - -} diff --git a/src/main/java/com/triz/trizservice/modeles/Etablissement.java b/src/main/java/com/triz/trizservice/modeles/Etablissement.java deleted file mode 100644 index cabc99e..0000000 --- a/src/main/java/com/triz/trizservice/modeles/Etablissement.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - - -import java.io.Serializable; -import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "etablissement", catalog = "triz_tresorie", schema = "public") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "Etablissement.findAll", query = "SELECT e FROM Etablissement e"), - @NamedQuery(name = "Etablissement.findByIdEtabStock", query = "SELECT e FROM Etablissement e WHERE e.idEtabStock = :idEtabStock"), - @NamedQuery(name = "Etablissement.findByNom", query = "SELECT e FROM Etablissement e WHERE e.nom = :nom"), - @NamedQuery(name = "Etablissement.findByActif", query = "SELECT e FROM Etablissement e WHERE e.actif = :actif")}) -public class Etablissement implements Serializable { - - @Size(max = 50) - @Column(name = "nom") - private String nom; - @Size(max = 5) - @Column(name = "actif") - private String actif; - - @Id() - @Basic(optional = false) - @NotNull - @Size(min = 1, max = 50) - @Column(name = "id_etab_stock") - private String idEtabStock; - @OneToMany(mappedBy = "fkEtablissement") - private List tierList; - @OneToMany(mappedBy = "fkEtablissement") - private List anneeFiscaleList; - - @OneToMany(mappedBy = "fkEtablissement") - private List serviceEtablissementUserList; - @OneToMany(mappedBy = "fkEtablissement") - private List servicehistoriqueConnectionList; - - private static final long serialVersionUID = 1L; - - @OneToMany(mappedBy = "fkEtablissement") - private List tresorieList; - - public Etablissement() { - } - - public Etablissement(String idEtabStock) { - this.idEtabStock = idEtabStock; - } - - public String getIdEtabStock() { - return idEtabStock; - } - - public void setIdEtabStock(String idEtabStock) { - this.idEtabStock = idEtabStock; - } - - - @XmlTransient - public List getTierList() { - return tierList; - } - - public void setTierList(List tierList) { - this.tierList = tierList; - } - - @XmlTransient - public List getAnneeFiscaleList() { - return anneeFiscaleList; - } - - public void setAnneeFiscaleList(List anneeFiscaleList) { - this.anneeFiscaleList = anneeFiscaleList; - } - - - - @XmlTransient - public List getTresorieList() { - return tresorieList; - } - - public void setTresorieList(List tresorieList) { - this.tresorieList = tresorieList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (idEtabStock != null ? idEtabStock.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Etablissement)) { - return false; - } - Etablissement other = (Etablissement) object; - if ((this.idEtabStock == null && other.idEtabStock != null) || (this.idEtabStock != null && !this.idEtabStock.equals(other.idEtabStock))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.Etablissement[ idEtabStock=" + idEtabStock + " ]"; - } - - - @XmlTransient - public List getServiceEtablissementUserList() { - return serviceEtablissementUserList; - } - - public void setServiceEtablissementUserList(List serviceEtablissementUserList) { - this.serviceEtablissementUserList = serviceEtablissementUserList; - } - - @XmlTransient - public List getServicehistoriqueConnectionList() { - return servicehistoriqueConnectionList; - } - - public void setServicehistoriqueConnectionList(List servicehistoriqueConnectionList) { - this.servicehistoriqueConnectionList = servicehistoriqueConnectionList; - } - - - public String getNom() { - return nom; - } - - public void setNom(String nom) { - this.nom = nom; - } - - public String getActif() { - return actif; - } - - public void setActif(String actif) { - this.actif = actif; - } - -} diff --git a/src/main/java/com/triz/trizservice/modeles/Examen.java b/src/main/java/com/triz/trizservice/modeles/Examen.java new file mode 100644 index 0000000..828836f --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/Examen.java @@ -0,0 +1,238 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "examen") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "Examen.findAll", query = "SELECT e FROM Examen e"), + @NamedQuery(name = "Examen.findByUrlAccNum", query = "SELECT e FROM Examen e WHERE e.urlAccNum = :urlAccNum"), + @NamedQuery(name = "Examen.findByAnnule", query = "SELECT e FROM Examen e WHERE e.annule = :annule"), + @NamedQuery(name = "Examen.findByDate", query = "SELECT e FROM Examen e WHERE e.date = :date"), + @NamedQuery(name = "Examen.findByHeureDebut", query = "SELECT e FROM Examen e WHERE e.heureDebut = :heureDebut"), + @NamedQuery(name = "Examen.findByHeureFin", query = "SELECT e FROM Examen e WHERE e.heureFin = :heureFin"), + @NamedQuery(name = "Examen.findByRegionExaminee", query = "SELECT e FROM Examen e WHERE e.regionExaminee = :regionExaminee"), + @NamedQuery(name = "Examen.findByLateralite", query = "SELECT e FROM Examen e WHERE e.lateralite = :lateralite"), + @NamedQuery(name = "Examen.findByIndicationClinique", query = "SELECT e FROM Examen e WHERE e.indicationClinique = :indicationClinique"), + @NamedQuery(name = "Examen.findByStudyInstanceUid", query = "SELECT e FROM Examen e WHERE e.studyInstanceUid = :studyInstanceUid")}) +public class Examen implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Size(max = 2147483647) + @Column(name = "url_acc_num") + private String urlAccNum; + @Column(name = "annule") + private Boolean annule; + @Column(name = "date") + @Temporal(TemporalType.DATE) + private Date date; + @Column(name = "heure_debut") + @Temporal(TemporalType.TIME) + private Date heureDebut; + @Column(name = "heure_fin") + @Temporal(TemporalType.TIME) + private Date heureFin; + @Size(max = 2147483647) + @Column(name = "region_examinee") + private String regionExaminee; + @Size(max = 2147483647) + @Column(name = "lateralite") + private String lateralite; + @Size(max = 2147483647) + @Column(name = "indication_clinique") + private String indicationClinique; + @Size(max = 2147483647) + @Column(name = "study_instance_uid") + private String studyInstanceUid; + @OneToMany(mappedBy = "fkExamen") + private List imageClesList; + @OneToMany(mappedBy = "fkExamen") + private List fichierExamenList; + @JoinColumn(name = "fk_queue", referencedColumnName = "id") + @ManyToOne + private Queue fkQueue; + @OneToMany(mappedBy = "fkExamen") + private List consultationList; + + public Examen() { + } + + public Examen(Object id) { + this.id = id; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public String getUrlAccNum() { + return urlAccNum; + } + + public void setUrlAccNum(String urlAccNum) { + this.urlAccNum = urlAccNum; + } + + public Boolean getAnnule() { + return annule; + } + + public void setAnnule(Boolean annule) { + this.annule = annule; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Date getHeureDebut() { + return heureDebut; + } + + public void setHeureDebut(Date heureDebut) { + this.heureDebut = heureDebut; + } + + public Date getHeureFin() { + return heureFin; + } + + public void setHeureFin(Date heureFin) { + this.heureFin = heureFin; + } + + public String getRegionExaminee() { + return regionExaminee; + } + + public void setRegionExaminee(String regionExaminee) { + this.regionExaminee = regionExaminee; + } + + public String getLateralite() { + return lateralite; + } + + public void setLateralite(String lateralite) { + this.lateralite = lateralite; + } + + public String getIndicationClinique() { + return indicationClinique; + } + + public void setIndicationClinique(String indicationClinique) { + this.indicationClinique = indicationClinique; + } + + public String getStudyInstanceUid() { + return studyInstanceUid; + } + + public void setStudyInstanceUid(String studyInstanceUid) { + this.studyInstanceUid = studyInstanceUid; + } + + @XmlTransient + public List getImageClesList() { + return imageClesList; + } + + public void setImageClesList(List imageClesList) { + this.imageClesList = imageClesList; + } + + @XmlTransient + public List getFichierExamenList() { + return fichierExamenList; + } + + public void setFichierExamenList(List fichierExamenList) { + this.fichierExamenList = fichierExamenList; + } + + public Queue getFkQueue() { + return fkQueue; + } + + public void setFkQueue(Queue fkQueue) { + this.fkQueue = fkQueue; + } + + @XmlTransient + public List getConsultationList() { + return consultationList; + } + + public void setConsultationList(List consultationList) { + this.consultationList = consultationList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof Examen)) { + return false; + } + Examen other = (Examen) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.Examen[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/FichierDossier.java b/src/main/java/com/triz/trizservice/modeles/FichierDossier.java new file mode 100644 index 0000000..50a90d7 --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/FichierDossier.java @@ -0,0 +1,131 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.Date; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "fichier_dossier") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "FichierDossier.findAll", query = "SELECT f FROM FichierDossier f"), + @NamedQuery(name = "FichierDossier.findByDate", query = "SELECT f FROM FichierDossier f WHERE f.date = :date"), + @NamedQuery(name = "FichierDossier.findByHeur", query = "SELECT f FROM FichierDossier f WHERE f.heur = :heur"), + @NamedQuery(name = "FichierDossier.findByFilePath", query = "SELECT f FROM FichierDossier f WHERE f.filePath = :filePath")}) +public class FichierDossier implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Column(name = "date") + @Temporal(TemporalType.DATE) + private Date date; + @Column(name = "heur") + @Temporal(TemporalType.TIME) + private Date heur; + @Size(max = 2147483647) + @Column(name = "file_path") + private String filePath; + @JoinColumn(name = "fk_dossier_medical", referencedColumnName = "id") + @ManyToOne + private Patient fkDossierMedical; + + public FichierDossier() { + } + + public FichierDossier(Object id) { + this.id = id; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Date getHeur() { + return heur; + } + + public void setHeur(Date heur) { + this.heur = heur; + } + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } + + public Patient getFkDossierMedical() { + return fkDossierMedical; + } + + public void setFkDossierMedical(Patient fkDossierMedical) { + this.fkDossierMedical = fkDossierMedical; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof FichierDossier)) { + return false; + } + FichierDossier other = (FichierDossier) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.FichierDossier[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/FichierExamen.java b/src/main/java/com/triz/trizservice/modeles/FichierExamen.java new file mode 100644 index 0000000..e53b055 --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/FichierExamen.java @@ -0,0 +1,131 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.Date; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "fichier_examen") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "FichierExamen.findAll", query = "SELECT f FROM FichierExamen f"), + @NamedQuery(name = "FichierExamen.findByDate", query = "SELECT f FROM FichierExamen f WHERE f.date = :date"), + @NamedQuery(name = "FichierExamen.findByHeur", query = "SELECT f FROM FichierExamen f WHERE f.heur = :heur"), + @NamedQuery(name = "FichierExamen.findByFilePath", query = "SELECT f FROM FichierExamen f WHERE f.filePath = :filePath")}) +public class FichierExamen implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Column(name = "date") + @Temporal(TemporalType.DATE) + private Date date; + @Column(name = "heur") + @Temporal(TemporalType.TIME) + private Date heur; + @Size(max = 2147483647) + @Column(name = "file_path") + private String filePath; + @JoinColumn(name = "fk_examen", referencedColumnName = "id") + @ManyToOne + private Examen fkExamen; + + public FichierExamen() { + } + + public FichierExamen(Object id) { + this.id = id; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Date getHeur() { + return heur; + } + + public void setHeur(Date heur) { + this.heur = heur; + } + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } + + public Examen getFkExamen() { + return fkExamen; + } + + public void setFkExamen(Examen fkExamen) { + this.fkExamen = fkExamen; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof FichierExamen)) { + return false; + } + FichierExamen other = (FichierExamen) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.FichierExamen[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/ImageCles.java b/src/main/java/com/triz/trizservice/modeles/ImageCles.java new file mode 100644 index 0000000..1bb90c3 --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/ImageCles.java @@ -0,0 +1,116 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "image_cles") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "ImageCles.findAll", query = "SELECT i FROM ImageCles i"), + @NamedQuery(name = "ImageCles.findByUidDesinstancesSop", query = "SELECT i FROM ImageCles i WHERE i.uidDesinstancesSop = :uidDesinstancesSop"), + @NamedQuery(name = "ImageCles.findByUrlAccNum", query = "SELECT i FROM ImageCles i WHERE i.urlAccNum = :urlAccNum"), + @NamedQuery(name = "ImageCles.findByIdAnnotations", query = "SELECT i FROM ImageCles i WHERE i.idAnnotations = :idAnnotations")}) +public class ImageCles implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2147483647) + @Column(name = "uid_desinstances_sop") + private String uidDesinstancesSop; + @Size(max = 2147483647) + @Column(name = "url_acc_num") + private String urlAccNum; + @Size(max = 2147483647) + @Column(name = "id_annotations") + private String idAnnotations; + @JoinColumn(name = "fk_examen", referencedColumnName = "id") + @ManyToOne + private Examen fkExamen; + + public ImageCles() { + } + + public ImageCles(String uidDesinstancesSop) { + this.uidDesinstancesSop = uidDesinstancesSop; + } + + public String getUidDesinstancesSop() { + return uidDesinstancesSop; + } + + public void setUidDesinstancesSop(String uidDesinstancesSop) { + this.uidDesinstancesSop = uidDesinstancesSop; + } + + public String getUrlAccNum() { + return urlAccNum; + } + + public void setUrlAccNum(String urlAccNum) { + this.urlAccNum = urlAccNum; + } + + public String getIdAnnotations() { + return idAnnotations; + } + + public void setIdAnnotations(String idAnnotations) { + this.idAnnotations = idAnnotations; + } + + public Examen getFkExamen() { + return fkExamen; + } + + public void setFkExamen(Examen fkExamen) { + this.fkExamen = fkExamen; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (uidDesinstancesSop != null ? uidDesinstancesSop.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof ImageCles)) { + return false; + } + ImageCles other = (ImageCles) object; + if ((this.uidDesinstancesSop == null && other.uidDesinstancesSop != null) || (this.uidDesinstancesSop != null && !this.uidDesinstancesSop.equals(other.uidDesinstancesSop))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.ImageCles[ uidDesinstancesSop=" + uidDesinstancesSop + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/Machine.java b/src/main/java/com/triz/trizservice/modeles/Machine.java new file mode 100644 index 0000000..a623e8b --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/Machine.java @@ -0,0 +1,195 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.List; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "machine") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "Machine.findAll", query = "SELECT m FROM Machine m"), + @NamedQuery(name = "Machine.findByNbRdvMax", query = "SELECT m FROM Machine m WHERE m.nbRdvMax = :nbRdvMax"), + @NamedQuery(name = "Machine.findByNbPatientMax", query = "SELECT m FROM Machine m WHERE m.nbPatientMax = :nbPatientMax"), + @NamedQuery(name = "Machine.findByActif", query = "SELECT m FROM Machine m WHERE m.actif = :actif"), + @NamedQuery(name = "Machine.findByDisponible", query = "SELECT m FROM Machine m WHERE m.disponible = :disponible"), + @NamedQuery(name = "Machine.findByIp", query = "SELECT m FROM Machine m WHERE m.ip = :ip"), + @NamedQuery(name = "Machine.findByPort", query = "SELECT m FROM Machine m WHERE m.port = :port"), + @NamedQuery(name = "Machine.findByAeTitle", query = "SELECT m FROM Machine m WHERE m.aeTitle = :aeTitle")}) +public class Machine implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Column(name = "nb_rdv_max") + private Integer nbRdvMax; + @Column(name = "nb_patient_max") + private Integer nbPatientMax; + @Column(name = "actif") + private Boolean actif; + @Column(name = "disponible") + private Boolean disponible; + @Size(max = 2147483647) + @Column(name = "ip") + private String ip; + @Column(name = "port") + private Integer port; + @Column(name = "ae_title") + private Integer aeTitle; + @OneToMany(mappedBy = "fkMachine") + private List typeExamenList; + @JoinColumn(name = "fk_centre", referencedColumnName = "id") + @ManyToOne + private Centre fkCentre; + @JoinColumn(name = "fk_type_machine", referencedColumnName = "id") + @ManyToOne + private TypeMachine fkTypeMachine; + + public Machine() { + } + + public Machine(Object id) { + this.id = id; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public Integer getNbRdvMax() { + return nbRdvMax; + } + + public void setNbRdvMax(Integer nbRdvMax) { + this.nbRdvMax = nbRdvMax; + } + + public Integer getNbPatientMax() { + return nbPatientMax; + } + + public void setNbPatientMax(Integer nbPatientMax) { + this.nbPatientMax = nbPatientMax; + } + + public Boolean getActif() { + return actif; + } + + public void setActif(Boolean actif) { + this.actif = actif; + } + + public Boolean getDisponible() { + return disponible; + } + + public void setDisponible(Boolean disponible) { + this.disponible = disponible; + } + + public String getIp() { + return ip; + } + + public void setIp(String ip) { + this.ip = ip; + } + + public Integer getPort() { + return port; + } + + public void setPort(Integer port) { + this.port = port; + } + + public Integer getAeTitle() { + return aeTitle; + } + + public void setAeTitle(Integer aeTitle) { + this.aeTitle = aeTitle; + } + + @XmlTransient + public List getTypeExamenList() { + return typeExamenList; + } + + public void setTypeExamenList(List typeExamenList) { + this.typeExamenList = typeExamenList; + } + + public Centre getFkCentre() { + return fkCentre; + } + + public void setFkCentre(Centre fkCentre) { + this.fkCentre = fkCentre; + } + + public TypeMachine getFkTypeMachine() { + return fkTypeMachine; + } + + public void setFkTypeMachine(TypeMachine fkTypeMachine) { + this.fkTypeMachine = fkTypeMachine; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof Machine)) { + return false; + } + Machine other = (Machine) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.Machine[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/Medecin.java b/src/main/java/com/triz/trizservice/modeles/Medecin.java new file mode 100644 index 0000000..e780eef --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/Medecin.java @@ -0,0 +1,173 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.List; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "medecin") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "Medecin.findAll", query = "SELECT m FROM Medecin m"), + @NamedQuery(name = "Medecin.findByNbRdvMax", query = "SELECT m FROM Medecin m WHERE m.nbRdvMax = :nbRdvMax"), + @NamedQuery(name = "Medecin.findByNbPatientMax", query = "SELECT m FROM Medecin m WHERE m.nbPatientMax = :nbPatientMax"), + @NamedQuery(name = "Medecin.findByDisponible", query = "SELECT m FROM Medecin m WHERE m.disponible = :disponible"), + @NamedQuery(name = "Medecin.findBySexe", query = "SELECT m FROM Medecin m WHERE m.sexe = :sexe")}) +public class Medecin implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Column(name = "nb_rdv_max") + private Integer nbRdvMax; + @Column(name = "nb_patient_max") + private Integer nbPatientMax; + @Column(name = "disponible") + private Boolean disponible; + @Size(max = 2147483647) + @Column(name = "sexe") + private String sexe; + @JoinColumn(name = "fk_centre", referencedColumnName = "id") + @ManyToOne + private Centre fkCentre; + @JoinColumn(name = "fk_user", referencedColumnName = "userid") + @ManyToOne + private ServiceUser fkUser; + @OneToMany(mappedBy = "fkMedecin") + private List medecinSpecialisteList; + @OneToMany(mappedBy = "fkMedecin") + private List consultationList; + + public Medecin() { + } + + public Medecin(Object id) { + this.id = id; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public Integer getNbRdvMax() { + return nbRdvMax; + } + + public void setNbRdvMax(Integer nbRdvMax) { + this.nbRdvMax = nbRdvMax; + } + + public Integer getNbPatientMax() { + return nbPatientMax; + } + + public void setNbPatientMax(Integer nbPatientMax) { + this.nbPatientMax = nbPatientMax; + } + + public Boolean getDisponible() { + return disponible; + } + + public void setDisponible(Boolean disponible) { + this.disponible = disponible; + } + + public String getSexe() { + return sexe; + } + + public void setSexe(String sexe) { + this.sexe = sexe; + } + + public Centre getFkCentre() { + return fkCentre; + } + + public void setFkCentre(Centre fkCentre) { + this.fkCentre = fkCentre; + } + + public ServiceUser getFkUser() { + return fkUser; + } + + public void setFkUser(ServiceUser fkUser) { + this.fkUser = fkUser; + } + + @XmlTransient + public List getMedecinSpecialisteList() { + return medecinSpecialisteList; + } + + public void setMedecinSpecialisteList(List medecinSpecialisteList) { + this.medecinSpecialisteList = medecinSpecialisteList; + } + + @XmlTransient + public List getConsultationList() { + return consultationList; + } + + public void setConsultationList(List consultationList) { + this.consultationList = consultationList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof Medecin)) { + return false; + } + Medecin other = (Medecin) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.Medecin[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/ServiceWilaya.java b/src/main/java/com/triz/trizservice/modeles/MedecinSpecialiste.java similarity index 53% rename from src/main/java/com/triz/trizservice/modeles/ServiceWilaya.java rename to src/main/java/com/triz/trizservice/modeles/MedecinSpecialiste.java index e0ca2af..e777d2b 100644 --- a/src/main/java/com/triz/trizservice/modeles/ServiceWilaya.java +++ b/src/main/java/com/triz/trizservice/modeles/MedecinSpecialiste.java @@ -9,11 +9,13 @@ import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import javax.xml.bind.annotation.XmlRootElement; /** @@ -21,49 +23,57 @@ import javax.xml.bind.annotation.XmlRootElement; * @author FORCE TECH */ @Entity -@Table(name = "service_wilaya") +@Table(name = "medecin_specialiste") @XmlRootElement @NamedQueries({ - @NamedQuery(name = "ServiceWilaya.findAll", query = "SELECT s FROM ServiceWilaya s"), - @NamedQuery(name = "ServiceWilaya.findByNomWilaya", query = "SELECT s FROM ServiceWilaya s WHERE s.nomWilaya = :nomWilaya"), - @NamedQuery(name = "ServiceWilaya.findById", query = "SELECT s FROM ServiceWilaya s WHERE s.id = :id")}) -public class ServiceWilaya implements Serializable { - - @Size(max = 2147483647) - @Column(name = "nom_wilaya") - private String nomWilaya; + @NamedQuery(name = "MedecinSpecialiste.findAll", query = "SELECT m FROM MedecinSpecialiste m")}) +public class MedecinSpecialiste implements Serializable { private static final long serialVersionUID = 1L; @Id @Basic(optional = false) @NotNull - @Size(min = 1, max = 2) + @Lob @Column(name = "id") - private String id; + private Object id; + @JoinColumn(name = "fk_medecin", referencedColumnName = "id") + @ManyToOne + private Medecin fkMedecin; + @JoinColumn(name = "fk_specialite", referencedColumnName = "name") + @ManyToOne + private SpecialiteMedicale fkSpecialite; - public ServiceWilaya() { + public MedecinSpecialiste() { } - public ServiceWilaya(String id) { + public MedecinSpecialiste(Object id) { this.id = id; } - public String getNomWilaya() { - return nomWilaya; - } - - public void setNomWilaya(String nomWilaya) { - this.nomWilaya = nomWilaya; - } - - public String getId() { + public Object getId() { return id; } - public void setId(String id) { + public void setId(Object id) { this.id = id; } + public Medecin getFkMedecin() { + return fkMedecin; + } + + public void setFkMedecin(Medecin fkMedecin) { + this.fkMedecin = fkMedecin; + } + + public SpecialiteMedicale getFkSpecialite() { + return fkSpecialite; + } + + public void setFkSpecialite(SpecialiteMedicale fkSpecialite) { + this.fkSpecialite = fkSpecialite; + } + @Override public int hashCode() { int hash = 0; @@ -74,10 +84,10 @@ public class ServiceWilaya implements Serializable { @Override public boolean equals(Object object) { // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof ServiceWilaya)) { + if (!(object instanceof MedecinSpecialiste)) { return false; } - ServiceWilaya other = (ServiceWilaya) object; + MedecinSpecialiste other = (MedecinSpecialiste) object; if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { return false; } @@ -86,9 +96,7 @@ public class ServiceWilaya implements Serializable { @Override public String toString() { - return "com.triz.trizservice.modeles.ServiceWilaya[ id=" + id + " ]"; + return "com.triz.trizservice.modeles.MedecinSpecialiste[ id=" + id + " ]"; } - - } diff --git a/src/main/java/com/triz/trizservice/modeles/Mouvement.java b/src/main/java/com/triz/trizservice/modeles/Mouvement.java deleted file mode 100644 index f5afeb5..0000000 --- a/src/main/java/com/triz/trizservice/modeles/Mouvement.java +++ /dev/null @@ -1,299 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "mouvement") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "Mouvement.findAll", query = "SELECT m FROM Mouvement m"), - @NamedQuery(name = "Mouvement.findById", query = "SELECT m FROM Mouvement m WHERE m.id = :id"), - @NamedQuery(name = "Mouvement.findByReference", query = "SELECT m FROM Mouvement m WHERE m.reference = :reference"), - @NamedQuery(name = "Mouvement.findByMontant", query = "SELECT m FROM Mouvement m WHERE m.montant = :montant"), - @NamedQuery(name = "Mouvement.findByDate", query = "SELECT m FROM Mouvement m WHERE m.date = :date"), - @NamedQuery(name = "Mouvement.findByDesignation", query = "SELECT m FROM Mouvement m WHERE m.designation = :designation"), - @NamedQuery(name = "Mouvement.findByBeneficier", query = "SELECT m FROM Mouvement m WHERE m.beneficier = :beneficier"), - @NamedQuery(name = "Mouvement.findByIsDeleted", query = "SELECT m FROM Mouvement m WHERE m.isDeleted = :isDeleted"), - @NamedQuery(name = "Mouvement.findByStockId", query = "SELECT m FROM Mouvement m WHERE m.stockId = :stockId"), - @NamedQuery(name = "Mouvement.findByHeure", query = "SELECT m FROM Mouvement m WHERE m.heure = :heure")}) -public class Mouvement implements Serializable { - - @Size(max = 50) - @Column(name = "reference") - private String reference; - @Size(max = 50) - @Column(name = "designation") - private String designation; - @Size(max = 50) - @Column(name = "beneficier") - private String beneficier; - @Size(max = 5) - @Column(name = "is_deleted") - private String isDeleted; - @Size(max = 50) - @Column(name = "stock_id") - private String stockId; - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Basic(optional = false) - @Column(name = "id") - private Integer id; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Column(name = "montant") - private Double montant; - @Column(name = "date") - @Temporal(TemporalType.DATE) - private Date date; - @Column(name = "heure") - @Temporal(TemporalType.TIME) - private Date heure; - @OneToMany(mappedBy = "fkMouvement") - private List alerteList; - @JoinColumn(name = "fk_annee_fiscale", referencedColumnName = "annee") - @ManyToOne - private AnneeFiscale fkAnneeFiscale; - @JoinColumn(name = "fk_cheque", referencedColumnName = "id") - @ManyToOne - private Cheque fkCheque; - @JoinColumn(name = "fk_user", referencedColumnName = "userid") - @ManyToOne - private ServiceUser fkUser; - @JoinColumn(name = "fk_sort", referencedColumnName = "id") - @ManyToOne - private Sort fkSort; - @JoinColumn(name = "fk_type_destinataire", referencedColumnName = "id") - @ManyToOne - private StockTypeDestinataire fkTypeDestinataire; - @JoinColumn(name = "fk_tier", referencedColumnName = "id") - @ManyToOne - private Tier fkTier; - @JoinColumn(name = "fk_tresorie_source", referencedColumnName = "id") - @ManyToOne - private Tresorie fkTresorieSource; - @JoinColumn(name = "fk_tresorie_destinataire", referencedColumnName = "id") - @ManyToOne - private Tresorie fkTresorieDestinataire; - @JoinColumn(name = "fk_type_mouvement", referencedColumnName = "id") - @ManyToOne - private TypeMouvement fkTypeMouvement; - - public Mouvement() { - } - - public Mouvement(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - - public Double getMontant() { - return montant; - } - - public void setMontant(Double montant) { - this.montant = montant; - } - - public Date getDate() { - return date; - } - - public void setDate(Date date) { - this.date = date; - } - - - public String getIsDeleted() { - return isDeleted; - } - - public void setIsDeleted(String isDeleted) { - this.isDeleted = isDeleted; - } - - public String getStockId() { - return stockId; - } - - public void setStockId(String stockId) { - this.stockId = stockId; - } - - public Date getHeure() { - return heure; - } - - public void setHeure(Date heure) { - this.heure = heure; - } - - @XmlTransient - public List getAlerteList() { - return alerteList; - } - - public void setAlerteList(List alerteList) { - this.alerteList = alerteList; - } - - public AnneeFiscale getFkAnneeFiscale() { - return fkAnneeFiscale; - } - - public void setFkAnneeFiscale(AnneeFiscale fkAnneeFiscale) { - this.fkAnneeFiscale = fkAnneeFiscale; - } - - public Cheque getFkCheque() { - return fkCheque; - } - - public void setFkCheque(Cheque fkCheque) { - this.fkCheque = fkCheque; - } - - public ServiceUser getFkUser() { - return fkUser; - } - - public void setFkUser(ServiceUser fkUser) { - this.fkUser = fkUser; - } - - public Sort getFkSort() { - return fkSort; - } - - public void setFkSort(Sort fkSort) { - this.fkSort = fkSort; - } - - public StockTypeDestinataire getFkTypeDestinataire() { - return fkTypeDestinataire; - } - - public void setFkTypeDestinataire(StockTypeDestinataire fkTypeDestinataire) { - this.fkTypeDestinataire = fkTypeDestinataire; - } - - public Tier getFkTier() { - return fkTier; - } - - public void setFkTier(Tier fkTier) { - this.fkTier = fkTier; - } - - public Tresorie getFkTresorieSource() { - return fkTresorieSource; - } - - public void setFkTresorieSource(Tresorie fkTresorieSource) { - this.fkTresorieSource = fkTresorieSource; - } - - public Tresorie getFkTresorieDestinataire() { - return fkTresorieDestinataire; - } - - public void setFkTresorieDestinataire(Tresorie fkTresorieDestinataire) { - this.fkTresorieDestinataire = fkTresorieDestinataire; - } - - public TypeMouvement getFkTypeMouvement() { - return fkTypeMouvement; - } - - public void setFkTypeMouvement(TypeMouvement fkTypeMouvement) { - this.fkTypeMouvement = fkTypeMouvement; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Mouvement)) { - return false; - } - Mouvement other = (Mouvement) object; - if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.Mouvement[ id=" + id + " ]"; - } - - public String getReference() { - return reference; - } - - public void setReference(String reference) { - this.reference = reference; - } - - public String getDesignation() { - return designation; - } - - public void setDesignation(String designation) { - this.designation = designation; - } - - public String getBeneficier() { - return beneficier; - } - - public void setBeneficier(String beneficier) { - this.beneficier = beneficier; - } - - - - -} diff --git a/src/main/java/com/triz/trizservice/modeles/MouvementTier.java b/src/main/java/com/triz/trizservice/modeles/MouvementTier.java deleted file mode 100644 index 5869db7..0000000 --- a/src/main/java/com/triz/trizservice/modeles/MouvementTier.java +++ /dev/null @@ -1,182 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - -import java.io.Serializable; -import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "mouvement_tier") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "MouvementTier.findAll", query = "SELECT m FROM MouvementTier m"), - @NamedQuery(name = "MouvementTier.findById", query = "SELECT m FROM MouvementTier m WHERE m.id = :id"), - @NamedQuery(name = "MouvementTier.findByReference", query = "SELECT m FROM MouvementTier m WHERE m.reference = :reference"), - @NamedQuery(name = "MouvementTier.findByMontant", query = "SELECT m FROM MouvementTier m WHERE m.montant = :montant"), - @NamedQuery(name = "MouvementTier.findByDate", query = "SELECT m FROM MouvementTier m WHERE m.date = :date"), - @NamedQuery(name = "MouvementTier.findByCodeLetterage", query = "SELECT m FROM MouvementTier m WHERE m.codeLetterage = :codeLetterage"), - @NamedQuery(name = "MouvementTier.findByHeure", query = "SELECT m FROM MouvementTier m WHERE m.heure = :heure")}) -public class MouvementTier implements Serializable { - - @Size(max = 50) - @Column(name = "reference") - private String reference; - @Size(max = 50) - @Column(name = "code_letterage") - private String codeLetterage; - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Basic(optional = false) - @Column(name = "id") - private Integer id; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Column(name = "montant") - private Double montant; - @Column(name = "date") - @Temporal(TemporalType.DATE) - private Date date; - @Column(name = "heure") - @Temporal(TemporalType.TIME) - private Date heure; - @JoinColumn(name = "fk_annee_fiscale", referencedColumnName = "annee") - @ManyToOne - private AnneeFiscale fkAnneeFiscale; - @JoinColumn(name = "fk_tier", referencedColumnName = "id") - @ManyToOne - private Tier fkTier; - @JoinColumn(name = "fk_type_mouvement", referencedColumnName = "id") - @ManyToOne - private TypeMouvement fkTypeMouvement; - - public MouvementTier() { - } - - public MouvementTier(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - - public Double getMontant() { - return montant; - } - - public void setMontant(Double montant) { - this.montant = montant; - } - - public Date getDate() { - return date; - } - - public void setDate(Date date) { - this.date = date; - } - - public String getCodeLetterage() { - return codeLetterage; - } - - public void setCodeLetterage(String codeLetterage) { - this.codeLetterage = codeLetterage; - } - - public Date getHeure() { - return heure; - } - - public void setHeure(Date heure) { - this.heure = heure; - } - - public AnneeFiscale getFkAnneeFiscale() { - return fkAnneeFiscale; - } - - public void setFkAnneeFiscale(AnneeFiscale fkAnneeFiscale) { - this.fkAnneeFiscale = fkAnneeFiscale; - } - - public Tier getFkTier() { - return fkTier; - } - - public void setFkTier(Tier fkTier) { - this.fkTier = fkTier; - } - - public TypeMouvement getFkTypeMouvement() { - return fkTypeMouvement; - } - - public void setFkTypeMouvement(TypeMouvement fkTypeMouvement) { - this.fkTypeMouvement = fkTypeMouvement; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof MouvementTier)) { - return false; - } - MouvementTier other = (MouvementTier) object; - if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.MouvementTier[ id=" + id + " ]"; - } - - public String getReference() { - return reference; - } - - public void setReference(String reference) { - this.reference = reference; - } - - - - -} diff --git a/src/main/java/com/triz/trizservice/modeles/Notification.java b/src/main/java/com/triz/trizservice/modeles/Notification.java new file mode 100644 index 0000000..ae0c23d --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/Notification.java @@ -0,0 +1,157 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "notification") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "Notification.findAll", query = "SELECT n FROM Notification n"), + @NamedQuery(name = "Notification.findByTitre", query = "SELECT n FROM Notification n WHERE n.titre = :titre"), + @NamedQuery(name = "Notification.findByContenu", query = "SELECT n FROM Notification n WHERE n.contenu = :contenu"), + @NamedQuery(name = "Notification.findByDate", query = "SELECT n FROM Notification n WHERE n.date = :date"), + @NamedQuery(name = "Notification.findByHeur", query = "SELECT n FROM Notification n WHERE n.heur = :heur")}) +public class Notification implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Size(max = 2147483647) + @Column(name = "titre") + private String titre; + @Size(max = 2147483647) + @Column(name = "contenu") + private String contenu; + @Column(name = "date") + @Temporal(TemporalType.DATE) + private Date date; + @Column(name = "heur") + @Temporal(TemporalType.TIME) + private Date heur; + @JoinColumn(name = "fk_centre", referencedColumnName = "id") + @ManyToOne + private Centre fkCentre; + @OneToMany(mappedBy = "fkNotification") + private List notifieMedecinList; + + public Notification() { + } + + public Notification(Object id) { + this.id = id; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public String getTitre() { + return titre; + } + + public void setTitre(String titre) { + this.titre = titre; + } + + public String getContenu() { + return contenu; + } + + public void setContenu(String contenu) { + this.contenu = contenu; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Date getHeur() { + return heur; + } + + public void setHeur(Date heur) { + this.heur = heur; + } + + public Centre getFkCentre() { + return fkCentre; + } + + public void setFkCentre(Centre fkCentre) { + this.fkCentre = fkCentre; + } + + @XmlTransient + public List getNotifieMedecinList() { + return notifieMedecinList; + } + + public void setNotifieMedecinList(List notifieMedecinList) { + this.notifieMedecinList = notifieMedecinList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof Notification)) { + return false; + } + Notification other = (Notification) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.Notification[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/ServiceEtablissementUser.java b/src/main/java/com/triz/trizservice/modeles/NotifieMedecin.java similarity index 61% rename from src/main/java/com/triz/trizservice/modeles/ServiceEtablissementUser.java rename to src/main/java/com/triz/trizservice/modeles/NotifieMedecin.java index addf80d..30173b4 100644 --- a/src/main/java/com/triz/trizservice/modeles/ServiceEtablissementUser.java +++ b/src/main/java/com/triz/trizservice/modeles/NotifieMedecin.java @@ -10,6 +10,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.JoinColumn; +import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; @@ -22,47 +23,58 @@ import javax.xml.bind.annotation.XmlRootElement; * @author FORCE TECH */ @Entity -@Table(name = "service_etablissement_user") +@Table(name = "notifie_medecin") @XmlRootElement @NamedQueries({ - @NamedQuery(name = "ServiceEtablissementUser.findAll", query = "SELECT s FROM ServiceEtablissementUser s"), - @NamedQuery(name = "ServiceEtablissementUser.findById", query = "SELECT s FROM ServiceEtablissementUser s WHERE s.id = :id")}) -public class ServiceEtablissementUser implements Serializable { + @NamedQuery(name = "NotifieMedecin.findAll", query = "SELECT n FROM NotifieMedecin n"), + @NamedQuery(name = "NotifieMedecin.findByLue", query = "SELECT n FROM NotifieMedecin n WHERE n.lue = :lue")}) +public class NotifieMedecin implements Serializable { private static final long serialVersionUID = 1L; @Id @Basic(optional = false) @NotNull + @Lob @Column(name = "id") - private Integer id; - @JoinColumn(name = "fk_etablissement", referencedColumnName = "id_etab_stock") + private Object id; + @Column(name = "lue") + private Boolean lue; + @JoinColumn(name = "fk_notification", referencedColumnName = "id") @ManyToOne - private Etablissement fkEtablissement; + private Notification fkNotification; @JoinColumn(name = "fk_user", referencedColumnName = "userid") @ManyToOne private ServiceUser fkUser; - public ServiceEtablissementUser() { + public NotifieMedecin() { } - public ServiceEtablissementUser(Integer id) { + public NotifieMedecin(Object id) { this.id = id; } - public Integer getId() { + public Object getId() { return id; } - public void setId(Integer id) { + public void setId(Object id) { this.id = id; } - public Etablissement getFkEtablissement() { - return fkEtablissement; + public Boolean getLue() { + return lue; } - public void setFkEtablissement(Etablissement fkEtablissement) { - this.fkEtablissement = fkEtablissement; + public void setLue(Boolean lue) { + this.lue = lue; + } + + public Notification getFkNotification() { + return fkNotification; + } + + public void setFkNotification(Notification fkNotification) { + this.fkNotification = fkNotification; } public ServiceUser getFkUser() { @@ -83,10 +95,10 @@ public class ServiceEtablissementUser implements Serializable { @Override public boolean equals(Object object) { // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof ServiceEtablissementUser)) { + if (!(object instanceof NotifieMedecin)) { return false; } - ServiceEtablissementUser other = (ServiceEtablissementUser) object; + NotifieMedecin other = (NotifieMedecin) object; if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { return false; } @@ -95,7 +107,7 @@ public class ServiceEtablissementUser implements Serializable { @Override public String toString() { - return "com.triz.trizservice.modeles.ServiceEtablissementUser[ id=" + id + " ]"; + return "com.triz.trizservice.modeles.NotifieMedecin[ id=" + id + " ]"; } } diff --git a/src/main/java/com/triz/trizservice/modeles/Parametre.java b/src/main/java/com/triz/trizservice/modeles/Parametre.java new file mode 100644 index 0000000..97db8ac --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/Parametre.java @@ -0,0 +1,116 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "parametre") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "Parametre.findAll", query = "SELECT p FROM Parametre p"), + @NamedQuery(name = "Parametre.findByMwlScpAet", query = "SELECT p FROM Parametre p WHERE p.mwlScpAet = :mwlScpAet"), + @NamedQuery(name = "Parametre.findByMwlScpPort", query = "SELECT p FROM Parametre p WHERE p.mwlScpPort = :mwlScpPort")}) +public class Parametre implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Size(max = 2147483647) + @Column(name = "mwl_scp_aet") + private String mwlScpAet; + @Size(max = 2147483647) + @Column(name = "mwl_scp_port") + private String mwlScpPort; + @JoinColumn(name = "fk_centre", referencedColumnName = "id") + @ManyToOne + private Centre fkCentre; + + public Parametre() { + } + + public Parametre(Object id) { + this.id = id; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public String getMwlScpAet() { + return mwlScpAet; + } + + public void setMwlScpAet(String mwlScpAet) { + this.mwlScpAet = mwlScpAet; + } + + public String getMwlScpPort() { + return mwlScpPort; + } + + public void setMwlScpPort(String mwlScpPort) { + this.mwlScpPort = mwlScpPort; + } + + public Centre getFkCentre() { + return fkCentre; + } + + public void setFkCentre(Centre fkCentre) { + this.fkCentre = fkCentre; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof Parametre)) { + return false; + } + Parametre other = (Parametre) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.Parametre[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/Patient.java b/src/main/java/com/triz/trizservice/modeles/Patient.java new file mode 100644 index 0000000..989a89a --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/Patient.java @@ -0,0 +1,286 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "patient") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "Patient.findAll", query = "SELECT p FROM Patient p"), + @NamedQuery(name = "Patient.findByNom", query = "SELECT p FROM Patient p WHERE p.nom = :nom"), + @NamedQuery(name = "Patient.findByPrenom", query = "SELECT p FROM Patient p WHERE p.prenom = :prenom"), + @NamedQuery(name = "Patient.findByDateNaissance", query = "SELECT p FROM Patient p WHERE p.dateNaissance = :dateNaissance"), + @NamedQuery(name = "Patient.findByTelephone", query = "SELECT p FROM Patient p WHERE p.telephone = :telephone"), + @NamedQuery(name = "Patient.findByTelephoneRelative", query = "SELECT p FROM Patient p WHERE p.telephoneRelative = :telephoneRelative"), + @NamedQuery(name = "Patient.findByEmail", query = "SELECT p FROM Patient p WHERE p.email = :email"), + @NamedQuery(name = "Patient.findBySexe", query = "SELECT p FROM Patient p WHERE p.sexe = :sexe"), + @NamedQuery(name = "Patient.findByNin", query = "SELECT p FROM Patient p WHERE p.nin = :nin"), + @NamedQuery(name = "Patient.findByAdresse", query = "SELECT p FROM Patient p WHERE p.adresse = :adresse"), + @NamedQuery(name = "Patient.findByGroupage", query = "SELECT p FROM Patient p WHERE p.groupage = :groupage"), + @NamedQuery(name = "Patient.findByCreeLe", query = "SELECT p FROM Patient p WHERE p.creeLe = :creeLe")}) +public class Patient implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Size(max = 2147483647) + @Column(name = "nom") + private String nom; + @Size(max = 2147483647) + @Column(name = "prenom") + private String prenom; + @Column(name = "date_naissance") + @Temporal(TemporalType.DATE) + private Date dateNaissance; + @Size(max = 2147483647) + @Column(name = "telephone") + private String telephone; + @Size(max = 2147483647) + @Column(name = "telephone_relative") + private String telephoneRelative; + // @Pattern(regexp="[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?", message="Invalid email")//if the field contains email address consider using this annotation to enforce field validation + @Size(max = 2147483647) + @Column(name = "email") + private String email; + @Size(max = 2147483647) + @Column(name = "sexe") + private String sexe; + @Size(max = 2147483647) + @Column(name = "nin") + private String nin; + @Size(max = 2147483647) + @Column(name = "adresse") + private String adresse; + @Size(max = 2147483647) + @Column(name = "groupage") + private String groupage; + @Column(name = "cree_le") + @Temporal(TemporalType.DATE) + private Date creeLe; + @OneToMany(mappedBy = "fkPatient") + private List rdvList; + @OneToMany(mappedBy = "fkDossierMedical") + private List fichierDossierList; + @JoinColumn(name = "fk_centre", referencedColumnName = "id") + @ManyToOne + private Centre fkCentre; + @OneToMany(mappedBy = "fkPatient") + private List typeExamenList; + @OneToMany(mappedBy = "fkPatient") + private List alertesMedicalesList; + @OneToMany(mappedBy = "fkPatient") + private List queueList; + + public Patient() { + } + + public Patient(Object id) { + this.id = id; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public String getNom() { + return nom; + } + + public void setNom(String nom) { + this.nom = nom; + } + + public String getPrenom() { + return prenom; + } + + public void setPrenom(String prenom) { + this.prenom = prenom; + } + + public Date getDateNaissance() { + return dateNaissance; + } + + public void setDateNaissance(Date dateNaissance) { + this.dateNaissance = dateNaissance; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getTelephoneRelative() { + return telephoneRelative; + } + + public void setTelephoneRelative(String telephoneRelative) { + this.telephoneRelative = telephoneRelative; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getSexe() { + return sexe; + } + + public void setSexe(String sexe) { + this.sexe = sexe; + } + + public String getNin() { + return nin; + } + + public void setNin(String nin) { + this.nin = nin; + } + + public String getAdresse() { + return adresse; + } + + public void setAdresse(String adresse) { + this.adresse = adresse; + } + + public String getGroupage() { + return groupage; + } + + public void setGroupage(String groupage) { + this.groupage = groupage; + } + + public Date getCreeLe() { + return creeLe; + } + + public void setCreeLe(Date creeLe) { + this.creeLe = creeLe; + } + + @XmlTransient + public List getRdvList() { + return rdvList; + } + + public void setRdvList(List rdvList) { + this.rdvList = rdvList; + } + + @XmlTransient + public List getFichierDossierList() { + return fichierDossierList; + } + + public void setFichierDossierList(List fichierDossierList) { + this.fichierDossierList = fichierDossierList; + } + + public Centre getFkCentre() { + return fkCentre; + } + + public void setFkCentre(Centre fkCentre) { + this.fkCentre = fkCentre; + } + + @XmlTransient + public List getTypeExamenList() { + return typeExamenList; + } + + public void setTypeExamenList(List typeExamenList) { + this.typeExamenList = typeExamenList; + } + + @XmlTransient + public List getAlertesMedicalesList() { + return alertesMedicalesList; + } + + public void setAlertesMedicalesList(List alertesMedicalesList) { + this.alertesMedicalesList = alertesMedicalesList; + } + + @XmlTransient + public List getQueueList() { + return queueList; + } + + public void setQueueList(List queueList) { + this.queueList = queueList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof Patient)) { + return false; + } + Patient other = (Patient) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.Patient[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/Agence.java b/src/main/java/com/triz/trizservice/modeles/Priority.java similarity index 51% rename from src/main/java/com/triz/trizservice/modeles/Agence.java rename to src/main/java/com/triz/trizservice/modeles/Priority.java index 93bc8ae..5e08f59 100644 --- a/src/main/java/com/triz/trizservice/modeles/Agence.java +++ b/src/main/java/com/triz/trizservice/modeles/Priority.java @@ -9,15 +9,13 @@ import java.util.List; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import javax.persistence.Lob; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.OneToMany; import javax.persistence.Table; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; @@ -27,65 +25,74 @@ import javax.xml.bind.annotation.XmlTransient; * @author FORCE TECH */ @Entity -@Table(name = "agence", catalog = "triz_tresorie", schema = "public") +@Table(name = "priority") @XmlRootElement @NamedQueries({ - @NamedQuery(name = "Agence.findAll", query = "SELECT a FROM Agence a"), - @NamedQuery(name = "Agence.findById", query = "SELECT a FROM Agence a WHERE a.id = :id"), - @NamedQuery(name = "Agence.findByCode", query = "SELECT a FROM Agence a WHERE a.code = :code"), - @NamedQuery(name = "Agence.findByDesignation", query = "SELECT a FROM Agence a WHERE a.designation = :designation")}) -public class Agence implements Serializable { - - @Size(max = 10) - @Column(name = "code") - private String code; - @Size(max = 50) - @Column(name = "designation") - private String designation; + @NamedQuery(name = "Priority.findAll", query = "SELECT p FROM Priority p"), + @NamedQuery(name = "Priority.findByDesignation", query = "SELECT p FROM Priority p WHERE p.designation = :designation"), + @NamedQuery(name = "Priority.findByPoids", query = "SELECT p FROM Priority p WHERE p.poids = :poids")}) +public class Priority implements Serializable { private static final long serialVersionUID = 1L; @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) @Basic(optional = false) + @NotNull + @Lob @Column(name = "id") - private Integer id; - @JoinColumn(name = "fk_banque", referencedColumnName = "id") - @ManyToOne - private Banque fkBanque; - @OneToMany(mappedBy = "fkAgence") - private List tresorieList; + private Object id; + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2147483647) + @Column(name = "designation") + private String designation; + @Column(name = "poids") + private Integer poids; + @OneToMany(mappedBy = "fkPriority") + private List queueList; - public Agence() { + public Priority() { } - public Agence(Integer id) { + public Priority(Object id) { this.id = id; } - public Integer getId() { + public Priority(Object id, String designation) { + this.id = id; + this.designation = designation; + } + + public Object getId() { return id; } - public void setId(Integer id) { + public void setId(Object id) { this.id = id; } - - public Banque getFkBanque() { - return fkBanque; + public String getDesignation() { + return designation; } - public void setFkBanque(Banque fkBanque) { - this.fkBanque = fkBanque; + public void setDesignation(String designation) { + this.designation = designation; + } + + public Integer getPoids() { + return poids; + } + + public void setPoids(Integer poids) { + this.poids = poids; } @XmlTransient - public List getTresorieList() { - return tresorieList; + public List getQueueList() { + return queueList; } - public void setTresorieList(List tresorieList) { - this.tresorieList = tresorieList; + public void setQueueList(List queueList) { + this.queueList = queueList; } @Override @@ -98,10 +105,10 @@ public class Agence implements Serializable { @Override public boolean equals(Object object) { // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Agence)) { + if (!(object instanceof Priority)) { return false; } - Agence other = (Agence) object; + Priority other = (Priority) object; if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { return false; } @@ -110,26 +117,7 @@ public class Agence implements Serializable { @Override public String toString() { - return "com.triz.trizservice.modeles.Agence[ id=" + id + " ]"; - } - - - - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getDesignation() { - return designation; - } - - public void setDesignation(String designation) { - this.designation = designation; + return "com.triz.trizservice.modeles.Priority[ id=" + id + " ]"; } } diff --git a/src/main/java/com/triz/trizservice/modeles/Queue.java b/src/main/java/com/triz/trizservice/modeles/Queue.java new file mode 100644 index 0000000..bf371e0 --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/Queue.java @@ -0,0 +1,201 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "queue") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "Queue.findAll", query = "SELECT q FROM Queue q"), + @NamedQuery(name = "Queue.findByTicket", query = "SELECT q FROM Queue q WHERE q.ticket = :ticket"), + @NamedQuery(name = "Queue.findByStatus", query = "SELECT q FROM Queue q WHERE q.status = :status"), + @NamedQuery(name = "Queue.findByDate", query = "SELECT q FROM Queue q WHERE q.date = :date"), + @NamedQuery(name = "Queue.findByCreatedAt", query = "SELECT q FROM Queue q WHERE q.createdAt = :createdAt")}) +public class Queue implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Size(max = 2147483647) + @Column(name = "ticket") + private String ticket; + @Size(max = 2147483647) + @Column(name = "status") + private String status; + @Column(name = "date") + @Temporal(TemporalType.DATE) + private Date date; + @Column(name = "created_at") + @Temporal(TemporalType.TIME) + private Date createdAt; + @OneToMany(mappedBy = "fkQueue") + private List queueStatusTimeList; + @OneToMany(mappedBy = "fkQueue") + private List examenList; + @JoinColumn(name = "fk_patient", referencedColumnName = "id") + @ManyToOne + private Patient fkPatient; + @JoinColumn(name = "fk_priority", referencedColumnName = "id") + @ManyToOne + private Priority fkPriority; + @JoinColumn(name = "fk_queue_tips", referencedColumnName = "id") + @ManyToOne + private QueueTips fkQueueTips; + @JoinColumn(name = "fk_type_examen", referencedColumnName = "id") + @ManyToOne + private TypeExamen fkTypeExamen; + + public Queue() { + } + + public Queue(Object id) { + this.id = id; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public String getTicket() { + return ticket; + } + + public void setTicket(String ticket) { + this.ticket = ticket; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + @XmlTransient + public List getQueueStatusTimeList() { + return queueStatusTimeList; + } + + public void setQueueStatusTimeList(List queueStatusTimeList) { + this.queueStatusTimeList = queueStatusTimeList; + } + + @XmlTransient + public List getExamenList() { + return examenList; + } + + public void setExamenList(List examenList) { + this.examenList = examenList; + } + + public Patient getFkPatient() { + return fkPatient; + } + + public void setFkPatient(Patient fkPatient) { + this.fkPatient = fkPatient; + } + + public Priority getFkPriority() { + return fkPriority; + } + + public void setFkPriority(Priority fkPriority) { + this.fkPriority = fkPriority; + } + + public QueueTips getFkQueueTips() { + return fkQueueTips; + } + + public void setFkQueueTips(QueueTips fkQueueTips) { + this.fkQueueTips = fkQueueTips; + } + + public TypeExamen getFkTypeExamen() { + return fkTypeExamen; + } + + public void setFkTypeExamen(TypeExamen fkTypeExamen) { + this.fkTypeExamen = fkTypeExamen; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof Queue)) { + return false; + } + Queue other = (Queue) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.Queue[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/QueueStatusTime.java b/src/main/java/com/triz/trizservice/modeles/QueueStatusTime.java new file mode 100644 index 0000000..841c4af --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/QueueStatusTime.java @@ -0,0 +1,117 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.Date; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.validation.constraints.NotNull; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "queue_status_time") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "QueueStatusTime.findAll", query = "SELECT q FROM QueueStatusTime q"), + @NamedQuery(name = "QueueStatusTime.findByTime", query = "SELECT q FROM QueueStatusTime q WHERE q.time = :time")}) +public class QueueStatusTime implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Column(name = "time") + @Temporal(TemporalType.TIME) + private Date time; + @JoinColumn(name = "fk_queue", referencedColumnName = "id") + @ManyToOne + private Queue fkQueue; + @JoinColumn(name = "fk_status", referencedColumnName = "id") + @ManyToOne + private Status fkStatus; + + public QueueStatusTime() { + } + + public QueueStatusTime(Object id) { + this.id = id; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public Date getTime() { + return time; + } + + public void setTime(Date time) { + this.time = time; + } + + public Queue getFkQueue() { + return fkQueue; + } + + public void setFkQueue(Queue fkQueue) { + this.fkQueue = fkQueue; + } + + public Status getFkStatus() { + return fkStatus; + } + + public void setFkStatus(Status fkStatus) { + this.fkStatus = fkStatus; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof QueueStatusTime)) { + return false; + } + QueueStatusTime other = (QueueStatusTime) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.QueueStatusTime[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/QueueTips.java b/src/main/java/com/triz/trizservice/modeles/QueueTips.java new file mode 100644 index 0000000..ee651e2 --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/QueueTips.java @@ -0,0 +1,123 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.List; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Lob; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "queue_tips") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "QueueTips.findAll", query = "SELECT q FROM QueueTips q"), + @NamedQuery(name = "QueueTips.findByDesignation", query = "SELECT q FROM QueueTips q WHERE q.designation = :designation"), + @NamedQuery(name = "QueueTips.findByOrdre", query = "SELECT q FROM QueueTips q WHERE q.ordre = :ordre")}) +public class QueueTips implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2147483647) + @Column(name = "designation") + private String designation; + @Column(name = "ordre") + private Integer ordre; + @OneToMany(mappedBy = "fkQueueTips") + private List queueList; + + public QueueTips() { + } + + public QueueTips(Object id) { + this.id = id; + } + + public QueueTips(Object id, String designation) { + this.id = id; + this.designation = designation; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public String getDesignation() { + return designation; + } + + public void setDesignation(String designation) { + this.designation = designation; + } + + public Integer getOrdre() { + return ordre; + } + + public void setOrdre(Integer ordre) { + this.ordre = ordre; + } + + @XmlTransient + public List getQueueList() { + return queueList; + } + + public void setQueueList(List queueList) { + this.queueList = queueList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof QueueTips)) { + return false; + } + QueueTips other = (QueueTips) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.QueueTips[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/Rdv.java b/src/main/java/com/triz/trizservice/modeles/Rdv.java new file mode 100644 index 0000000..ab245a5 --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/Rdv.java @@ -0,0 +1,162 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.Date; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.validation.constraints.NotNull; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "rdv") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "Rdv.findAll", query = "SELECT r FROM Rdv r"), + @NamedQuery(name = "Rdv.findByDate", query = "SELECT r FROM Rdv r WHERE r.date = :date"), + @NamedQuery(name = "Rdv.findByHeur", query = "SELECT r FROM Rdv r WHERE r.heur = :heur"), + @NamedQuery(name = "Rdv.findByNotifier", query = "SELECT r FROM Rdv r WHERE r.notifier = :notifier"), + @NamedQuery(name = "Rdv.findByAnnuler", query = "SELECT r FROM Rdv r WHERE r.annuler = :annuler"), + @NamedQuery(name = "Rdv.findByDejaNotifier", query = "SELECT r FROM Rdv r WHERE r.dejaNotifier = :dejaNotifier")}) +public class Rdv implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Column(name = "date") + @Temporal(TemporalType.DATE) + private Date date; + @Column(name = "heur") + @Temporal(TemporalType.TIME) + private Date heur; + @Column(name = "notifier") + private Boolean notifier; + @Column(name = "annuler") + private Boolean annuler; + @Column(name = "deja_notifier") + private Boolean dejaNotifier; + @JoinColumn(name = "fk_centre", referencedColumnName = "id") + @ManyToOne + private Centre fkCentre; + @JoinColumn(name = "fk_patient", referencedColumnName = "id") + @ManyToOne + private Patient fkPatient; + + public Rdv() { + } + + public Rdv(Object id) { + this.id = id; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Date getHeur() { + return heur; + } + + public void setHeur(Date heur) { + this.heur = heur; + } + + public Boolean getNotifier() { + return notifier; + } + + public void setNotifier(Boolean notifier) { + this.notifier = notifier; + } + + public Boolean getAnnuler() { + return annuler; + } + + public void setAnnuler(Boolean annuler) { + this.annuler = annuler; + } + + public Boolean getDejaNotifier() { + return dejaNotifier; + } + + public void setDejaNotifier(Boolean dejaNotifier) { + this.dejaNotifier = dejaNotifier; + } + + public Centre getFkCentre() { + return fkCentre; + } + + public void setFkCentre(Centre fkCentre) { + this.fkCentre = fkCentre; + } + + public Patient getFkPatient() { + return fkPatient; + } + + public void setFkPatient(Patient fkPatient) { + this.fkPatient = fkPatient; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof Rdv)) { + return false; + } + Rdv other = (Rdv) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.Rdv[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/Class.java b/src/main/java/com/triz/trizservice/modeles/SalleDeSoin.java similarity index 60% rename from src/main/java/com/triz/trizservice/modeles/Class.java rename to src/main/java/com/triz/trizservice/modeles/SalleDeSoin.java index ae7760e..576843c 100644 --- a/src/main/java/com/triz/trizservice/modeles/Class.java +++ b/src/main/java/com/triz/trizservice/modeles/SalleDeSoin.java @@ -8,12 +8,14 @@ import java.io.Serializable; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import javax.xml.bind.annotation.XmlRootElement; @@ -22,40 +24,57 @@ import javax.xml.bind.annotation.XmlRootElement; * @author FORCE TECH */ @Entity -@Table(name = "class") +@Table(name = "salle_de_soin") @XmlRootElement @NamedQueries({ - @NamedQuery(name = "Class.findAll", query = "SELECT c FROM Class c"), - @NamedQuery(name = "Class.findById", query = "SELECT c FROM Class c WHERE c.id = :id"), - @NamedQuery(name = "Class.findByCode", query = "SELECT c FROM Class c WHERE c.code = :code")}) -public class Class implements Serializable { - - @Size(max = 5) - @Column(name = "code") - private String code; + @NamedQuery(name = "SalleDeSoin.findAll", query = "SELECT s FROM SalleDeSoin s"), + @NamedQuery(name = "SalleDeSoin.findByCode", query = "SELECT s FROM SalleDeSoin s WHERE s.code = :code")}) +public class SalleDeSoin implements Serializable { private static final long serialVersionUID = 1L; @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) @Basic(optional = false) + @NotNull + @Lob @Column(name = "id") - private Integer id; + private Object id; + @Size(max = 2147483647) + @Column(name = "code") + private String code; + @JoinColumn(name = "fk_centre", referencedColumnName = "id") + @ManyToOne + private Centre fkCentre; - public Class() { + public SalleDeSoin() { } - public Class(Integer id) { + public SalleDeSoin(Object id) { this.id = id; } - public Integer getId() { + public Object getId() { return id; } - public void setId(Integer id) { + public void setId(Object id) { this.id = id; } + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public Centre getFkCentre() { + return fkCentre; + } + + public void setFkCentre(Centre fkCentre) { + this.fkCentre = fkCentre; + } @Override public int hashCode() { @@ -67,10 +86,10 @@ public class Class implements Serializable { @Override public boolean equals(Object object) { // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Class)) { + if (!(object instanceof SalleDeSoin)) { return false; } - Class other = (Class) object; + SalleDeSoin other = (SalleDeSoin) object; if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { return false; } @@ -79,15 +98,7 @@ public class Class implements Serializable { @Override public String toString() { - return "com.triz.trizservice.modeles.Class[ id=" + id + " ]"; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; + return "com.triz.trizservice.modeles.SalleDeSoin[ id=" + id + " ]"; } } diff --git a/src/main/java/com/triz/trizservice/modeles/ServiceFonctiongroupe.java b/src/main/java/com/triz/trizservice/modeles/ServiceFonctiongroupe.java index 1338ca1..356fe49 100644 --- a/src/main/java/com/triz/trizservice/modeles/ServiceFonctiongroupe.java +++ b/src/main/java/com/triz/trizservice/modeles/ServiceFonctiongroupe.java @@ -5,6 +5,7 @@ package com.triz.trizservice.modeles; import java.io.Serializable; +import java.util.UUID; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; @@ -38,45 +39,43 @@ public class ServiceFonctiongroupe implements Serializable { - @Size(max = 5) @Column(name = "can_create") - private String canCreate; - @Size(max = 5) + private Boolean canCreate; @Column(name = "can_update") - private String canUpdate; - @Size(max = 5) + private Boolean canUpdate; @Column(name = "can_update_date") - private String canUpdateDate; - @Size(max = 5) + private Boolean canUpdateDate; @Column(name = "can_delete") - private String canDelete; + private Boolean canDelete; + @Column(name = "modifier_ce_jour") + private Boolean modifierCeJour; + @JoinColumn(name = "fk_fonctionnalite", referencedColumnName = "id") + @ManyToOne + private ServiceFonctionnaliter fkFonctionnalite; private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Basic(optional = false) @Column(name = "id") - private Integer id; + private UUID id; @JoinColumn(name = "fk_groupe", referencedColumnName = "id") @ManyToOne private ServiceGroupe fkGroupe; - @JoinColumn(name = "fk_fonction", referencedColumnName = "id") - @ManyToOne - private ServiceFonctionnaliter fkFonction; - + public ServiceFonctiongroupe() { } - public ServiceFonctiongroupe(Integer id) { + public ServiceFonctiongroupe(UUID id) { this.id = id; } - public Integer getId() { + public UUID getId() { return id; } - public void setId(Integer id) { + public void setId(UUID id) { this.id = id; } @@ -88,45 +87,8 @@ public class ServiceFonctiongroupe implements Serializable { this.fkGroupe = fkGroupe; } - public String getCanCreate() { - return canCreate; - } - - public void setCanCreate(String canCreate) { - this.canCreate = canCreate; - } - - public String getCanUpdate() { - return canUpdate; - } - - public void setCanUpdate(String canUpdate) { - this.canUpdate = canUpdate; - } - - public String getCanUpdateDate() { - return canUpdateDate; - } - - public void setCanUpdateDate(String canUpdateDate) { - this.canUpdateDate = canUpdateDate; - } - - public String getCanDelete() { - return canDelete; - } - - public void setCanDelete(String canDelete) { - this.canDelete = canDelete; - } - - public ServiceFonctionnaliter getFkFonction() { - return fkFonction; - } - - public void setFkFonction(ServiceFonctionnaliter fkFonction) { - this.fkFonction = fkFonction; - } + + @Override public int hashCode() { @@ -153,6 +115,54 @@ public class ServiceFonctiongroupe implements Serializable { return "com.triz.trizservice.modeles.ServiceFonctiongroupe[ id=" + id + " ]"; } + public Boolean getCanCreate() { + return canCreate; + } + + public void setCanCreate(Boolean canCreate) { + this.canCreate = canCreate; + } + + public Boolean getCanUpdate() { + return canUpdate; + } + + public void setCanUpdate(Boolean canUpdate) { + this.canUpdate = canUpdate; + } + + public Boolean getCanUpdateDate() { + return canUpdateDate; + } + + public void setCanUpdateDate(Boolean canUpdateDate) { + this.canUpdateDate = canUpdateDate; + } + + public Boolean getCanDelete() { + return canDelete; + } + + public void setCanDelete(Boolean canDelete) { + this.canDelete = canDelete; + } + + public Boolean getModifierCeJour() { + return modifierCeJour; + } + + public void setModifierCeJour(Boolean modifierCeJour) { + this.modifierCeJour = modifierCeJour; + } + + public ServiceFonctionnaliter getFkFonctionnalite() { + return fkFonctionnalite; + } + + public void setFkFonctionnalite(ServiceFonctionnaliter fkFonctionnalite) { + this.fkFonctionnalite = fkFonctionnalite; + } + diff --git a/src/main/java/com/triz/trizservice/modeles/ServiceFonctionnaliter.java b/src/main/java/com/triz/trizservice/modeles/ServiceFonctionnaliter.java index b0ad043..2091b1d 100644 --- a/src/main/java/com/triz/trizservice/modeles/ServiceFonctionnaliter.java +++ b/src/main/java/com/triz/trizservice/modeles/ServiceFonctionnaliter.java @@ -6,6 +6,7 @@ package com.triz.trizservice.modeles; import java.io.Serializable; import java.util.List; +import java.util.UUID; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; @@ -32,7 +33,9 @@ import javax.xml.bind.annotation.XmlTransient; @NamedQuery(name = "ServiceFonctionnaliter.findByNom", query = "SELECT s FROM ServiceFonctionnaliter s WHERE s.nom = :nom")}) public class ServiceFonctionnaliter implements Serializable { - @Size(max = 2147483647) + @Basic(optional = false) + @NotNull() + @Size(min = 1, max = 2147483647) @Column(name = "nom") private String nom; @@ -43,10 +46,7 @@ public class ServiceFonctionnaliter implements Serializable { @Size(min = 1, max = 50) @Column(name = "id") private String id; - @OneToMany(mappedBy = "fkFonction") - private List serviceFonctiongroupeList; - - public ServiceFonctionnaliter() { + public ServiceFonctionnaliter() { } public ServiceFonctionnaliter(String id) { @@ -61,16 +61,6 @@ public class ServiceFonctionnaliter implements Serializable { this.id = id; } - - @XmlTransient - public List getServiceFonctiongroupeList() { - return serviceFonctiongroupeList; - } - - public void setServiceFonctiongroupeList(List serviceFonctiongroupeList) { - this.serviceFonctiongroupeList = serviceFonctiongroupeList; - } - @Override public int hashCode() { int hash = 0; diff --git a/src/main/java/com/triz/trizservice/modeles/ServiceGroupe.java b/src/main/java/com/triz/trizservice/modeles/ServiceGroupe.java index 16c3e25..6963ea7 100644 --- a/src/main/java/com/triz/trizservice/modeles/ServiceGroupe.java +++ b/src/main/java/com/triz/trizservice/modeles/ServiceGroupe.java @@ -6,6 +6,7 @@ package com.triz.trizservice.modeles; import java.io.Serializable; import java.util.List; +import java.util.UUID; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; @@ -35,10 +36,16 @@ import javax.xml.bind.annotation.XmlTransient; @NamedQuery(name = "ServiceGroupe.findByActif", query = "SELECT s FROM ServiceGroupe s WHERE s.actif = :actif")}) public class ServiceGroupe implements Serializable { - @Size(max = 2147483647) + @Basic(optional = false) + @NotNull() + @Size(min = 1, max = 2147483647) @Column(name = "nom_groupe") private String nomGroupe; - @Size(max = 2147483647) + @OneToMany(mappedBy = "fkGroupe") + private List serviceFonctiongroupeList; + @OneToMany(mappedBy = "fkGroupe") + private List serviceMemberList; + @Size(max = 5) @Column(name = "actif") private String actif; @@ -48,28 +55,31 @@ public class ServiceGroupe implements Serializable { @NotNull @Size(min = 1, max = 50) @Column(name = "id") - private String id; - - @JoinColumn(name = "fk_etablissement", referencedColumnName = "id_etab_stock") + private UUID id; + + @JoinColumn(name = "fk_centre", referencedColumnName = "id") @ManyToOne - private Etablissement fkEtablissement; - + private Centre fkCentre; public ServiceGroupe() { } - public ServiceGroupe(String id) { + public ServiceGroupe(UUID id) { this.id = id; } - public String getId() { + + + public UUID getId() { return id; } - public void setId(String id) { + public void setId(UUID id) { this.id = id; } + + public String getNomGroupe() { return nomGroupe; } @@ -78,9 +88,6 @@ public class ServiceGroupe implements Serializable { this.nomGroupe = nomGroupe; } - - - @Override public int hashCode() { int hash = 0; @@ -106,9 +113,6 @@ public class ServiceGroupe implements Serializable { return "com.triz.trizservice.modeles.ServiceGroupe[ id=" + id + " ]"; } - - - public String getActif() { return actif; } @@ -117,13 +121,30 @@ public class ServiceGroupe implements Serializable { this.actif = actif; } - public Etablissement getFkEtablissement() { - return fkEtablissement; + @XmlTransient + public List getServiceFonctiongroupeList() { + return serviceFonctiongroupeList; } - public void setFkEtablissement(Etablissement fkEtablissement) { - this.fkEtablissement = fkEtablissement; + public void setServiceFonctiongroupeList(List serviceFonctiongroupeList) { + this.serviceFonctiongroupeList = serviceFonctiongroupeList; } - - + + @XmlTransient + public List getServiceMemberList() { + return serviceMemberList; + } + + public void setServiceMemberList(List serviceMemberList) { + this.serviceMemberList = serviceMemberList; + } + + public Centre getFkCentre() { + return fkCentre; + } + + public void setFkCentre(Centre fkCentre) { + this.fkCentre = fkCentre; + } + } diff --git a/src/main/java/com/triz/trizservice/modeles/ServiceHistoriqueManipulation.java b/src/main/java/com/triz/trizservice/modeles/ServiceHistoriqueManipulation.java index af4d216..ea64181 100644 --- a/src/main/java/com/triz/trizservice/modeles/ServiceHistoriqueManipulation.java +++ b/src/main/java/com/triz/trizservice/modeles/ServiceHistoriqueManipulation.java @@ -40,6 +40,28 @@ import javax.xml.bind.annotation.XmlRootElement; @NamedQuery(name = "ServiceHistoriqueManipulation.findByNewValeur", query = "SELECT s FROM ServiceHistoriqueManipulation s WHERE s.newValeur = :newValeur")}) public class ServiceHistoriqueManipulation implements Serializable { + @Size(max = 2147483647) + @Column(name = "nom_table") + private String nomTable; + @Size(max = 2147483647) + @Column(name = "new_valeur") + private String newValeur; + @Size(max = 2147483647) + @Column(name = "old_valeur") + private String oldValeur; + @Column(name = "heure_manipulation") + @Temporal(TemporalType.TIME) + private Date heureManipulation; + @Size(max = 2147483647) + @Column(name = "type_manipulation") + private String typeManipulation; + @Size(max = 2147483647) + @Column(name = "id_ligne") + private String idLigne; + @JoinColumn(name = "fk_user", referencedColumnName = "userid") + @ManyToOne + private ServiceUser fkUser; + private static final long serialVersionUID = 1L; @Id @Basic(optional = false) @@ -47,12 +69,6 @@ public class ServiceHistoriqueManipulation implements Serializable { @Column(name = "id") private Long id; @Size(max = 2147483647) - @Column(name = "nom_table") - private String nomTable; - @Size(max = 2147483647) - @Column(name = "id_ligne") - private String idLigne; - @Size(max = 2147483647) @Column(name = "type_manipumation") private String typeManipumation; @Column(name = "date_manipulation") @@ -61,11 +77,6 @@ public class ServiceHistoriqueManipulation implements Serializable { @Column(name = "heur_manipulation") @Temporal(TemporalType.TIME) private Date heurManipulation; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Column(name = "old_valeur") - private Float oldValeur; - @Column(name = "new_valeur") - private Float newValeur; @JoinColumn(name = "fk_manipulateur", referencedColumnName = "userid") @ManyToOne private ServiceUser fkManipulateur; @@ -125,22 +136,6 @@ public class ServiceHistoriqueManipulation implements Serializable { this.heurManipulation = heurManipulation; } - public Float getOldValeur() { - return oldValeur; - } - - public void setOldValeur(Float oldValeur) { - this.oldValeur = oldValeur; - } - - public Float getNewValeur() { - return newValeur; - } - - public void setNewValeur(Float newValeur) { - this.newValeur = newValeur; - } - public ServiceUser getFkManipulateur() { return fkManipulateur; } @@ -173,5 +168,48 @@ public class ServiceHistoriqueManipulation implements Serializable { public String toString() { return "com.triz.trizservice.modeles.ServiceHistoriqueManipulation[ id=" + id + " ]"; } + + + public String getNewValeur() { + return newValeur; + } + + public void setNewValeur(String newValeur) { + this.newValeur = newValeur; + } + + public String getOldValeur() { + return oldValeur; + } + + public void setOldValeur(String oldValeur) { + this.oldValeur = oldValeur; + } + + public Date getHeureManipulation() { + return heureManipulation; + } + + public void setHeureManipulation(Date heureManipulation) { + this.heureManipulation = heureManipulation; + } + + public String getTypeManipulation() { + return typeManipulation; + } + + public void setTypeManipulation(String typeManipulation) { + this.typeManipulation = typeManipulation; + } + + public ServiceUser getFkUser() { + return fkUser; + } + + public void setFkUser(ServiceUser fkUser) { + this.fkUser = fkUser; + } + + } diff --git a/src/main/java/com/triz/trizservice/modeles/ServiceMember.java b/src/main/java/com/triz/trizservice/modeles/ServiceMember.java index 3ad70de..c78f01a 100644 --- a/src/main/java/com/triz/trizservice/modeles/ServiceMember.java +++ b/src/main/java/com/triz/trizservice/modeles/ServiceMember.java @@ -5,6 +5,7 @@ package com.triz.trizservice.modeles; import java.io.Serializable; +import java.util.UUID; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; @@ -41,7 +42,7 @@ public class ServiceMember implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) @Basic(optional = false) @Column(name = "id") - private Integer id; + private UUID id; @Size(max = 50) @JoinColumn(name = "fk_groupe", referencedColumnName = "id") @ManyToOne @@ -53,18 +54,22 @@ public class ServiceMember implements Serializable { public ServiceMember() { } - public ServiceMember(Integer id) { + public ServiceMember(UUID id) { this.id = id; } + + - public Integer getId() { + public UUID getId() { return id; } - public void setId(Integer id) { + public void setId(UUID id) { this.id = id; } + + public ServiceGroupe getFkGroupe() { return fkGroupe; } diff --git a/src/main/java/com/triz/trizservice/modeles/ServiceUser.java b/src/main/java/com/triz/trizservice/modeles/ServiceUser.java index e9c98cd..b6ba2f0 100644 --- a/src/main/java/com/triz/trizservice/modeles/ServiceUser.java +++ b/src/main/java/com/triz/trizservice/modeles/ServiceUser.java @@ -39,39 +39,38 @@ import javax.xml.bind.annotation.XmlTransient; @NamedQuery(name = "ServiceUser.findByActif", query = "SELECT s FROM ServiceUser s WHERE s.actif = :actif")}) public class ServiceUser implements Serializable { - @Size(max = 2147483647) - @Column(name = "userpw") - private String userpw; - @Size(max = 2147483647) + + @Size(max = 50) @Column(name = "nom") private String nom; - @Size(max = 2147483647) + @Size(max = 50) @Column(name = "prenom") private String prenom; @Size(max = 50) @Column(name = "telephone") private String telephone; - @Size(max = 2147483647) + @Size(max = 50) @Column(name = "mail") private String mail; - @Size(max = 2147483647) + @Size(max = 5) @Column(name = "actif") private String actif; - @Size(max = 5) - @Column(name = "forcermap") - private String forcermap; + @OneToMany(mappedBy = "fkUser") + private List serviceUserCentreList; + @OneToMany(mappedBy = "fkUser") + private List notifieMedecinList; + @OneToMany(mappedBy = "fkUser") + private List medecinList; + @Size(max = 2147483647) + @Column(name = "user_pw") + private String userpw; @OneToMany(mappedBy = "fkManipulateur") private List serviceHistoriqueManipulationList; @OneToMany(mappedBy = "fkUser") private List serviceMemberList; - @OneToMany(mappedBy = "fkUser") - private List mouvementList; - @OneToMany(mappedBy = "fkUser") - private List serviceUserTresorieList; - @OneToMany(mappedBy = "fkUser") - private List serviceEtablissementUserList; + private static final long serialVersionUID = 1L; @Id @Basic(optional = false) @@ -140,31 +139,7 @@ public class ServiceUser implements Serializable { public void setServicehistoriqueConnectionList(List servicehistoriqueConnectionList) { this.servicehistoriqueConnectionList = servicehistoriqueConnectionList; } - @XmlTransient - public List getMouvementList() { - return mouvementList; - } - public void setMouvementList(List mouvementList) { - this.mouvementList = mouvementList; - } - @XmlTransient - public List getServiceUserTresorieList() { - return serviceUserTresorieList; - } - public void setServiceUserTresorieList(List serviceUserTresorieList) { - this.serviceUserTresorieList = serviceUserTresorieList; - } - @XmlTransient - public List getServiceEtablissementUserList() { - return serviceEtablissementUserList; - } - public void setServiceEtablissementUserList(List serviceEtablissementUserList) { - this.serviceEtablissementUserList = serviceEtablissementUserList; - } - - - - + @XmlTransient public List getServiceHistoriqueManipulationList() { return serviceHistoriqueManipulationList; @@ -181,6 +156,9 @@ public class ServiceUser implements Serializable { public void setUserpw(String userpw) { this.userpw = userpw; } + + + public String getNom() { return nom; @@ -222,12 +200,31 @@ public class ServiceUser implements Serializable { this.actif = actif; } - public String getForcermap() { - return forcermap; + @XmlTransient + public List getServiceUserCentreList() { + return serviceUserCentreList; } - public void setForcermap(String forcermap) { - this.forcermap = forcermap; + public void setServiceUserCentreList(List serviceUserCentreList) { + this.serviceUserCentreList = serviceUserCentreList; + } + + @XmlTransient + public List getNotifieMedecinList() { + return notifieMedecinList; + } + + public void setNotifieMedecinList(List notifieMedecinList) { + this.notifieMedecinList = notifieMedecinList; + } + + @XmlTransient + public List getMedecinList() { + return medecinList; + } + + public void setMedecinList(List medecinList) { + this.medecinList = medecinList; } diff --git a/src/main/java/com/triz/trizservice/modeles/ServiceUserTresorie.java b/src/main/java/com/triz/trizservice/modeles/ServiceUserCentre.java similarity index 65% rename from src/main/java/com/triz/trizservice/modeles/ServiceUserTresorie.java rename to src/main/java/com/triz/trizservice/modeles/ServiceUserCentre.java index cf54456..cb60b9a 100644 --- a/src/main/java/com/triz/trizservice/modeles/ServiceUserTresorie.java +++ b/src/main/java/com/triz/trizservice/modeles/ServiceUserCentre.java @@ -5,11 +5,13 @@ package com.triz.trizservice.modeles; import java.io.Serializable; +import java.util.UUID; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.JoinColumn; +import javax.persistence.Lob; import javax.persistence.ManyToOne; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; @@ -22,41 +24,48 @@ import javax.xml.bind.annotation.XmlRootElement; * @author FORCE TECH */ @Entity -@Table(name = "service_user_tresorie") +@Table(name = "service_user_centre") @XmlRootElement @NamedQueries({ - @NamedQuery(name = "ServiceUserTresorie.findAll", query = "SELECT s FROM ServiceUserTresorie s"), - @NamedQuery(name = "ServiceUserTresorie.findById", query = "SELECT s FROM ServiceUserTresorie s WHERE s.id = :id")}) -public class ServiceUserTresorie implements Serializable { + @NamedQuery(name = "ServiceUserCentre.findAll", query = "SELECT s FROM ServiceUserCentre s")}) +public class ServiceUserCentre implements Serializable { private static final long serialVersionUID = 1L; @Id @Basic(optional = false) @NotNull @Column(name = "id") - private Integer id; + private UUID id; + @JoinColumn(name = "fk_centre", referencedColumnName = "id") + @ManyToOne + private Centre fkCentre; @JoinColumn(name = "fk_user", referencedColumnName = "userid") @ManyToOne private ServiceUser fkUser; - @JoinColumn(name = "fk_tresorie", referencedColumnName = "id") - @ManyToOne - private Tresorie fkTresorie; - public ServiceUserTresorie() { + public ServiceUserCentre() { } - public ServiceUserTresorie(Integer id) { + public ServiceUserCentre(UUID id) { this.id = id; } - public Integer getId() { + public UUID getId() { return id; } - public void setId(Integer id) { + public void setId(UUID id) { this.id = id; } + public Centre getFkCentre() { + return fkCentre; + } + + public void setFkCentre(Centre fkCentre) { + this.fkCentre = fkCentre; + } + public ServiceUser getFkUser() { return fkUser; } @@ -65,14 +74,6 @@ public class ServiceUserTresorie implements Serializable { this.fkUser = fkUser; } - public Tresorie getFkTresorie() { - return fkTresorie; - } - - public void setFkTresorie(Tresorie fkTresorie) { - this.fkTresorie = fkTresorie; - } - @Override public int hashCode() { int hash = 0; @@ -83,10 +84,10 @@ public class ServiceUserTresorie implements Serializable { @Override public boolean equals(Object object) { // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof ServiceUserTresorie)) { + if (!(object instanceof ServiceUserCentre)) { return false; } - ServiceUserTresorie other = (ServiceUserTresorie) object; + ServiceUserCentre other = (ServiceUserCentre) object; if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { return false; } @@ -95,7 +96,7 @@ public class ServiceUserTresorie implements Serializable { @Override public String toString() { - return "com.triz.trizservice.modeles.ServiceUserTresorie[ id=" + id + " ]"; + return "com.triz.trizservice.modeles.ServiceUserCentre[ id=" + id + " ]"; } } diff --git a/src/main/java/com/triz/trizservice/modeles/ServicehistoriqueConnection.java b/src/main/java/com/triz/trizservice/modeles/ServicehistoriqueConnection.java index 84e81bf..ddcf6bc 100644 --- a/src/main/java/com/triz/trizservice/modeles/ServicehistoriqueConnection.java +++ b/src/main/java/com/triz/trizservice/modeles/ServicehistoriqueConnection.java @@ -6,6 +6,7 @@ package com.triz.trizservice.modeles; import java.io.Serializable; import java.util.Date; +import java.util.UUID; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; @@ -20,6 +21,7 @@ import javax.persistence.NamedQuery; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import javax.xml.bind.annotation.XmlRootElement; @@ -44,10 +46,9 @@ public class ServicehistoriqueConnection implements Serializable { private static final long serialVersionUID = 1L; @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Basic(optional = false) + @NotNull @Column(name = "id") - private Long id; + private UUID id; @Column(name = "date") @Temporal(TemporalType.DATE) private Date date; @@ -57,22 +58,22 @@ public class ServicehistoriqueConnection implements Serializable { @JoinColumn(name = "fk_user", referencedColumnName = "userid") @ManyToOne private ServiceUser fkUser; - @JoinColumn(name = "fk_etablissemnt", referencedColumnName = "id_etab_stock") + @JoinColumn(name = "fk_centre", referencedColumnName = "id") @ManyToOne - private Etablissement fkEtablissement; + private Centre fkCentre; public ServicehistoriqueConnection() { } - public ServicehistoriqueConnection(Long id) { + public ServicehistoriqueConnection(UUID id) { this.id = id; } - public Long getId() { + public UUID getId() { return id; } - public void setId(Long id) { + public void setId(UUID id) { this.id = id; } @@ -133,17 +134,14 @@ public class ServicehistoriqueConnection implements Serializable { this.adresseIp = adresseIp; } - public Etablissement getFkEtablissement() { - return fkEtablissement; + public Centre getFkCentre() { + return fkCentre; } - public void setFkEtablissement(Etablissement fkEtablissement) { - this.fkEtablissement = fkEtablissement; + public void setFkCentre(Centre fkCentre) { + this.fkCentre = fkCentre; } - - - } diff --git a/src/main/java/com/triz/trizservice/modeles/SpecialiteMedicale.java b/src/main/java/com/triz/trizservice/modeles/SpecialiteMedicale.java new file mode 100644 index 0000000..da62898 --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/SpecialiteMedicale.java @@ -0,0 +1,105 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.List; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "specialite_medicale") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "SpecialiteMedicale.findAll", query = "SELECT s FROM SpecialiteMedicale s"), + @NamedQuery(name = "SpecialiteMedicale.findByName", query = "SELECT s FROM SpecialiteMedicale s WHERE s.name = :name"), + @NamedQuery(name = "SpecialiteMedicale.findByDescription", query = "SELECT s FROM SpecialiteMedicale s WHERE s.description = :description")}) +public class SpecialiteMedicale implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2147483647) + @Column(name = "name") + private String name; + @Size(max = 2147483647) + @Column(name = "description") + private String description; + @OneToMany(mappedBy = "fkSpecialite") + private List medecinSpecialisteList; + + public SpecialiteMedicale() { + } + + public SpecialiteMedicale(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @XmlTransient + public List getMedecinSpecialisteList() { + return medecinSpecialisteList; + } + + public void setMedecinSpecialisteList(List medecinSpecialisteList) { + this.medecinSpecialisteList = medecinSpecialisteList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (name != null ? name.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof SpecialiteMedicale)) { + return false; + } + SpecialiteMedicale other = (SpecialiteMedicale) object; + if ((this.name == null && other.name != null) || (this.name != null && !this.name.equals(other.name))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.SpecialiteMedicale[ name=" + name + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/Sort.java b/src/main/java/com/triz/trizservice/modeles/Status.java similarity index 52% rename from src/main/java/com/triz/trizservice/modeles/Sort.java rename to src/main/java/com/triz/trizservice/modeles/Status.java index 60915b3..1af8c2a 100644 --- a/src/main/java/com/triz/trizservice/modeles/Sort.java +++ b/src/main/java/com/triz/trizservice/modeles/Status.java @@ -9,13 +9,13 @@ import java.util.List; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.Lob; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.OneToMany; import javax.persistence.Table; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; @@ -25,50 +25,63 @@ import javax.xml.bind.annotation.XmlTransient; * @author FORCE TECH */ @Entity -@Table(name = "sort") +@Table(name = "status") @XmlRootElement @NamedQueries({ - @NamedQuery(name = "Sort.findAll", query = "SELECT s FROM Sort s"), - @NamedQuery(name = "Sort.findById", query = "SELECT s FROM Sort s WHERE s.id = :id"), - @NamedQuery(name = "Sort.findBySort", query = "SELECT s FROM Sort s WHERE s.sort = :sort")}) -public class Sort implements Serializable { - - @Size(max = 255) - @Column(name = "sort") - private String sort; + @NamedQuery(name = "Status.findAll", query = "SELECT s FROM Status s"), + @NamedQuery(name = "Status.findByDesignation", query = "SELECT s FROM Status s WHERE s.designation = :designation")}) +public class Status implements Serializable { private static final long serialVersionUID = 1L; @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) @Basic(optional = false) + @NotNull + @Lob @Column(name = "id") - private Integer id; - @OneToMany(mappedBy = "fkSort") - private List mouvementList; + private Object id; + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2147483647) + @Column(name = "designation") + private String designation; + @OneToMany(mappedBy = "fkStatus") + private List queueStatusTimeList; - public Sort() { + public Status() { } - public Sort(Integer id) { + public Status(Object id) { this.id = id; } - public Integer getId() { + public Status(Object id, String designation) { + this.id = id; + this.designation = designation; + } + + public Object getId() { return id; } - public void setId(Integer id) { + public void setId(Object id) { this.id = id; } - - @XmlTransient - public List getMouvementList() { - return mouvementList; + public String getDesignation() { + return designation; } - public void setMouvementList(List mouvementList) { - this.mouvementList = mouvementList; + public void setDesignation(String designation) { + this.designation = designation; + } + + @XmlTransient + public List getQueueStatusTimeList() { + return queueStatusTimeList; + } + + public void setQueueStatusTimeList(List queueStatusTimeList) { + this.queueStatusTimeList = queueStatusTimeList; } @Override @@ -81,10 +94,10 @@ public class Sort implements Serializable { @Override public boolean equals(Object object) { // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Sort)) { + if (!(object instanceof Status)) { return false; } - Sort other = (Sort) object; + Status other = (Status) object; if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { return false; } @@ -93,15 +106,7 @@ public class Sort implements Serializable { @Override public String toString() { - return "com.triz.trizservice.modeles.Sort[ id=" + id + " ]"; - } - - public String getSort() { - return sort; - } - - public void setSort(String sort) { - this.sort = sort; + return "com.triz.trizservice.modeles.Status[ id=" + id + " ]"; } } diff --git a/src/main/java/com/triz/trizservice/modeles/StockTypeDestinataire.java b/src/main/java/com/triz/trizservice/modeles/StockTypeDestinataire.java deleted file mode 100644 index db1311b..0000000 --- a/src/main/java/com/triz/trizservice/modeles/StockTypeDestinataire.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - -import java.io.Serializable; -import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "stock_type_destinataire") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "StockTypeDestinataire.findAll", query = "SELECT s FROM StockTypeDestinataire s"), - @NamedQuery(name = "StockTypeDestinataire.findById", query = "SELECT s FROM StockTypeDestinataire s WHERE s.id = :id"), - @NamedQuery(name = "StockTypeDestinataire.findByDesignation", query = "SELECT s FROM StockTypeDestinataire s WHERE s.designation = :designation"), - @NamedQuery(name = "StockTypeDestinataire.findByStockTypeDestinataire", query = "SELECT s FROM StockTypeDestinataire s WHERE s.stockTypeDestinataire = :stockTypeDestinataire")}) -public class StockTypeDestinataire implements Serializable { - - @Size(max = 50) - @Column(name = "designation") - private String designation; - @Size(max = 50) - @Column(name = "stock_type_destinataire") - private String stockTypeDestinataire; - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Basic(optional = false) - @Column(name = "id") - private Integer id; - @OneToMany(mappedBy = "fkTypeDestinataire") - private List mouvementList; - - public StockTypeDestinataire() { - } - - public StockTypeDestinataire(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - - public String getStockTypeDestinataire() { - return stockTypeDestinataire; - } - - public void setStockTypeDestinataire(String stockTypeDestinataire) { - this.stockTypeDestinataire = stockTypeDestinataire; - } - - @XmlTransient - public List getMouvementList() { - return mouvementList; - } - - public void setMouvementList(List mouvementList) { - this.mouvementList = mouvementList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof StockTypeDestinataire)) { - return false; - } - StockTypeDestinataire other = (StockTypeDestinataire) object; - if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.StockTypeDestinataire[ id=" + id + " ]"; - } - - public String getDesignation() { - return designation; - } - - public void setDesignation(String designation) { - this.designation = designation; - } - - - - - - - -} diff --git a/src/main/java/com/triz/trizservice/modeles/Tier.java b/src/main/java/com/triz/trizservice/modeles/Tier.java deleted file mode 100644 index 3eab556..0000000 --- a/src/main/java/com/triz/trizservice/modeles/Tier.java +++ /dev/null @@ -1,356 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "tier") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "Tier.findAll", query = "SELECT t FROM Tier t"), - @NamedQuery(name = "Tier.findById", query = "SELECT t FROM Tier t WHERE t.id = :id"), - @NamedQuery(name = "Tier.findByCode", query = "SELECT t FROM Tier t WHERE t.code = :code"), - @NamedQuery(name = "Tier.findByDesignation", query = "SELECT t FROM Tier t WHERE t.designation = :designation"), - @NamedQuery(name = "Tier.findByAddresse", query = "SELECT t FROM Tier t WHERE t.addresse = :addresse"), - @NamedQuery(name = "Tier.findByNumRC", query = "SELECT t FROM Tier t WHERE t.numRC = :numRC"), - @NamedQuery(name = "Tier.findByNif", query = "SELECT t FROM Tier t WHERE t.nif = :nif"), - @NamedQuery(name = "Tier.findByArticleImpo", query = "SELECT t FROM Tier t WHERE t.articleImpo = :articleImpo"), - @NamedQuery(name = "Tier.findByMinLiq", query = "SELECT t FROM Tier t WHERE t.minLiq = :minLiq"), - @NamedQuery(name = "Tier.findByMaxLiq", query = "SELECT t FROM Tier t WHERE t.maxLiq = :maxLiq"), - @NamedQuery(name = "Tier.findBySoldInitial", query = "SELECT t FROM Tier t WHERE t.soldInitial = :soldInitial"), - @NamedQuery(name = "Tier.findByDateSoldeInit", query = "SELECT t FROM Tier t WHERE t.dateSoldeInit = :dateSoldeInit"), - @NamedQuery(name = "Tier.findByDureeMax", query = "SELECT t FROM Tier t WHERE t.dureeMax = :dureeMax"), - @NamedQuery(name = "Tier.findByNumCompteTier", query = "SELECT t FROM Tier t WHERE t.numCompteTier = :numCompteTier"), - @NamedQuery(name = "Tier.findByBp", query = "SELECT t FROM Tier t WHERE t.bp = :bp"), - @NamedQuery(name = "Tier.findByNis", query = "SELECT t FROM Tier t WHERE t.nis = :nis"), - @NamedQuery(name = "Tier.findByIdStockFournisseur", query = "SELECT t FROM Tier t WHERE t.idStockFournisseur = :idStockFournisseur"), - @NamedQuery(name = "Tier.findByIdStockClient", query = "SELECT t FROM Tier t WHERE t.idStockClient = :idStockClient"), - @NamedQuery(name = "Tier.findByIsDeleted", query = "SELECT t FROM Tier t WHERE t.isDeleted = :isDeleted")}) -public class Tier implements Serializable { - - @Size(max = 10) - @Column(name = "code") - private String code; - @Size(max = 50) - @Column(name = "designation") - private String designation; - @Size(max = 1000) - @Column(name = "addresse") - private String addresse; - @Size(max = 50) - @Column(name = "num_rc") - private String numRc; - @Size(max = 50) - @Column(name = "nif") - private String nif; - @Size(max = 50) - @Column(name = "article_impo") - private String articleImpo; - @Size(max = 50) - @Column(name = "num_compte_tier") - private String numCompteTier; - @Size(max = 50) - @Column(name = "bp") - private String bp; - @Size(max = 50) - @Column(name = "nis") - private String nis; - @Size(max = 50) - @Column(name = "id_stock_fournisseur") - private String idStockFournisseur; - @Size(max = 50) - @Column(name = "id_stock_client") - private String idStockClient; - @Size(max = 5) - @Column(name = "is_deleted") - private String isDeleted; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Column(name = "min_liq") - private Double minLiq; - @Column(name = "max_liq") - private Double maxLiq; - @Column(name = "sold_initial") - private Double soldInitial; - @Column(name = "date_solde_init") - @Temporal(TemporalType.DATE) - private Date dateSoldeInit; - @Column(name = "duree_max") - private Integer dureeMax; - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Basic(optional = false) - @Column(name = "id") - private Integer id; - @Size(max = 50) - @Column(name = "numRC") - private String numRC; - - @JoinColumn(name = "fk_compte_comptable", referencedColumnName = "id") - @ManyToOne - private CompteComptable fkCompteComptable; - @JoinColumn(name = "fk_etablissement", referencedColumnName = "id_etab_stock") - @ManyToOne - private Etablissement fkEtablissement; - @OneToMany(mappedBy = "fkTier") - private List mouvementTierList; - @OneToMany(mappedBy = "fkTier") - private List mouvementList; - - public Tier() { - } - - public Tier(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - - public String getNumRC() { - return numRC; - } - - public void setNumRC(String numRC) { - this.numRC = numRC; - } - - - public String getArticleImpo() { - return articleImpo; - } - - public void setArticleImpo(String articleImpo) { - this.articleImpo = articleImpo; - } - - public Double getMinLiq() { - return minLiq; - } - - public void setMinLiq(Double minLiq) { - this.minLiq = minLiq; - } - - public Double getMaxLiq() { - return maxLiq; - } - - public void setMaxLiq(Double maxLiq) { - this.maxLiq = maxLiq; - } - - public Double getSoldInitial() { - return soldInitial; - } - - public void setSoldInitial(Double soldInitial) { - this.soldInitial = soldInitial; - } - - public Date getDateSoldeInit() { - return dateSoldeInit; - } - - public void setDateSoldeInit(Date dateSoldeInit) { - this.dateSoldeInit = dateSoldeInit; - } - - public Integer getDureeMax() { - return dureeMax; - } - - public void setDureeMax(Integer dureeMax) { - this.dureeMax = dureeMax; - } - - public String getNumCompteTier() { - return numCompteTier; - } - - public void setNumCompteTier(String numCompteTier) { - this.numCompteTier = numCompteTier; - } - - - public String getIdStockFournisseur() { - return idStockFournisseur; - } - - public void setIdStockFournisseur(String idStockFournisseur) { - this.idStockFournisseur = idStockFournisseur; - } - - public String getIdStockClient() { - return idStockClient; - } - - public void setIdStockClient(String idStockClient) { - this.idStockClient = idStockClient; - } - - public String getIsDeleted() { - return isDeleted; - } - - public void setIsDeleted(String isDeleted) { - this.isDeleted = isDeleted; - } - - public CompteComptable getFkCompteComptable() { - return fkCompteComptable; - } - - public void setFkCompteComptable(CompteComptable fkCompteComptable) { - this.fkCompteComptable = fkCompteComptable; - } - - public Etablissement getFkEtablissement() { - return fkEtablissement; - } - - public void setFkEtablissement(Etablissement fkEtablissement) { - this.fkEtablissement = fkEtablissement; - } - - @XmlTransient - public List getMouvementTierList() { - return mouvementTierList; - } - - public void setMouvementTierList(List mouvementTierList) { - this.mouvementTierList = mouvementTierList; - } - - @XmlTransient - public List getMouvementList() { - return mouvementList; - } - - public void setMouvementList(List mouvementList) { - this.mouvementList = mouvementList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Tier)) { - return false; - } - Tier other = (Tier) object; - if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.Tier[ id=" + id + " ]"; - } - - - public String getNumRc() { - return numRc; - } - - public void setNumRc(String numRc) { - this.numRc = numRc; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getDesignation() { - return designation; - } - - public void setDesignation(String designation) { - this.designation = designation; - } - - public String getAddresse() { - return addresse; - } - - public void setAddresse(String addresse) { - this.addresse = addresse; - } - - - public String getNif() { - return nif; - } - - public void setNif(String nif) { - this.nif = nif; - } - - - - public String getBp() { - return bp; - } - - public void setBp(String bp) { - this.bp = bp; - } - - public String getNis() { - return nis; - } - - public void setNis(String nis) { - this.nis = nis; - } - - - - - -} diff --git a/src/main/java/com/triz/trizservice/modeles/Tresorie.java b/src/main/java/com/triz/trizservice/modeles/Tresorie.java deleted file mode 100644 index 8500234..0000000 --- a/src/main/java/com/triz/trizservice/modeles/Tresorie.java +++ /dev/null @@ -1,334 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "tresorie", catalog = "triz_tresorie", schema = "public") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "Tresorie.findAll", query = "SELECT t FROM Tresorie t"), - @NamedQuery(name = "Tresorie.findById", query = "SELECT t FROM Tresorie t WHERE t.id = :id"), - @NamedQuery(name = "Tresorie.findByNumero", query = "SELECT t FROM Tresorie t WHERE t.numero = :numero"), - @NamedQuery(name = "Tresorie.findByCode", query = "SELECT t FROM Tresorie t WHERE t.code = :code"), - @NamedQuery(name = "Tresorie.findByCle", query = "SELECT t FROM Tresorie t WHERE t.cle = :cle"), - @NamedQuery(name = "Tresorie.findByDesignation", query = "SELECT t FROM Tresorie t WHERE t.designation = :designation"), - @NamedQuery(name = "Tresorie.findByMinLiq", query = "SELECT t FROM Tresorie t WHERE t.minLiq = :minLiq"), - @NamedQuery(name = "Tresorie.findByMaxLiq", query = "SELECT t FROM Tresorie t WHERE t.maxLiq = :maxLiq"), - @NamedQuery(name = "Tresorie.findBySoldInitial", query = "SELECT t FROM Tresorie t WHERE t.soldInitial = :soldInitial"), - @NamedQuery(name = "Tresorie.findByDateSoldeInitial", query = "SELECT t FROM Tresorie t WHERE t.dateSoldeInitial = :dateSoldeInitial"), - @NamedQuery(name = "Tresorie.findByNbrCheque", query = "SELECT t FROM Tresorie t WHERE t.nbrCheque = :nbrCheque"), - @NamedQuery(name = "Tresorie.findByNumCompteComptable", query = "SELECT t FROM Tresorie t WHERE t.numCompteComptable = :numCompteComptable"), - @NamedQuery(name = "Tresorie.findByIsDeleted", query = "SELECT t FROM Tresorie t WHERE t.isDeleted = :isDeleted"), - @NamedQuery(name = "Tresorie.findByStockId", query = "SELECT t FROM Tresorie t WHERE t.stockId = :stockId")}) -public class Tresorie implements Serializable { - - @Size(max = 10) - @Column(name = "numero") - private String numero; - @Size(max = 10) - @Column(name = "code") - private String code; - @Size(max = 2) - @Column(name = "cle") - private String cle; - @Size(max = 50) - @Column(name = "designation") - private String designation; - @Size(max = 5) - @Column(name = "is_deleted") - private String isDeleted; - @Size(max = 50) - @Column(name = "stock_id") - private String stockId; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - @Column(name = "min_liq") - private Double minLiq; - @Column(name = "max_liq") - private Double maxLiq; - @Column(name = "solde_initial") - private Double soldeInitial; - - @OneToMany(mappedBy = "fkTresorie") - private List serviceUserTresorieList; - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Basic(optional = false) - @Column(name = "id") - private Integer id; - // @Max(value=?) @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation - - @Column(name = "sold_Initial") - private Double soldInitial; - @Column(name = "date_solde_initial") - @Temporal(TemporalType.DATE) - private Date dateSoldeInitial; - @Column(name = "nbr_cheque") - private Integer nbrCheque; - @Column(name = "num_compte_comptable") - private Integer numCompteComptable; - @OneToMany(mappedBy = "fkTresorie") - private List controleTresorieList; - @OneToMany(mappedBy = "fkTresorie") - private List chequierList; - @JoinColumn(name = "fk_etablissement", referencedColumnName = "id_etab_stock") - @ManyToOne - private Etablissement fkEtablissement; - @JoinColumn(name = "fk_agence", referencedColumnName = "id") - @ManyToOne - private Agence fkAgence; - @JoinColumn(name = "fk_compte_comptable", referencedColumnName = "id") - @ManyToOne - private CompteComptable fkCompteComptable; - @JoinColumn(name = "fk_type_tresorie", referencedColumnName = "id") - @ManyToOne - private TypeTresorie fkTypeTresorie; - @OneToMany(mappedBy = "fkTresorieSource") - private List mouvementList; - @OneToMany(mappedBy = "fkTresorieDestinataire") - private List mouvementList1; - - public Tresorie() { - } - - public Tresorie(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - - public Double getMinLiq() { - return minLiq; - } - - public void setMinLiq(Double minLiq) { - this.minLiq = minLiq; - } - - public Double getMaxLiq() { - return maxLiq; - } - - public void setMaxLiq(Double maxLiq) { - this.maxLiq = maxLiq; - } - - public Double getSoldInitial() { - return soldInitial; - } - - public void setSoldInitial(Double soldInitial) { - this.soldInitial = soldInitial; - } - - public Date getDateSoldeInitial() { - return dateSoldeInitial; - } - - public void setDateSoldeInitial(Date dateSoldeInitial) { - this.dateSoldeInitial = dateSoldeInitial; - } - - public Integer getNbrCheque() { - return nbrCheque; - } - - public void setNbrCheque(Integer nbrCheque) { - this.nbrCheque = nbrCheque; - } - - public Integer getNumCompteComptable() { - return numCompteComptable; - } - - public void setNumCompteComptable(Integer numCompteComptable) { - this.numCompteComptable = numCompteComptable; - } - - - public String getStockId() { - return stockId; - } - - public void setStockId(String stockId) { - this.stockId = stockId; - } - - @XmlTransient - public List getControleTresorieList() { - return controleTresorieList; - } - - public void setControleTresorieList(List controleTresorieList) { - this.controleTresorieList = controleTresorieList; - } - - @XmlTransient - public List getChequierList() { - return chequierList; - } - - public void setChequierList(List chequierList) { - this.chequierList = chequierList; - } - - public Etablissement getFkEtablissement() { - return fkEtablissement; - } - - public void setFkEtablissement(Etablissement fkEtablissement) { - this.fkEtablissement = fkEtablissement; - } - - public Agence getFkAgence() { - return fkAgence; - } - - public void setFkAgence(Agence fkAgence) { - this.fkAgence = fkAgence; - } - - public CompteComptable getFkCompteComptable() { - return fkCompteComptable; - } - - public void setFkCompteComptable(CompteComptable fkCompteComptable) { - this.fkCompteComptable = fkCompteComptable; - } - - public TypeTresorie getFkTypeTresorie() { - return fkTypeTresorie; - } - - public void setFkTypeTresorie(TypeTresorie fkTypeTresorie) { - this.fkTypeTresorie = fkTypeTresorie; - } - - @XmlTransient - public List getMouvementList() { - return mouvementList; - } - - public void setMouvementList(List mouvementList) { - this.mouvementList = mouvementList; - } - - @XmlTransient - public List getMouvementList1() { - return mouvementList1; - } - - public void setMouvementList1(List mouvementList1) { - this.mouvementList1 = mouvementList1; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof Tresorie)) { - return false; - } - Tresorie other = (Tresorie) object; - if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.Tresorie[ id=" + id + " ]"; - } - @XmlTransient - public List getServiceUserTresorieList() { - return serviceUserTresorieList; - } - public void setServiceUserTresorieList(List serviceUserTresorieList) { - this.serviceUserTresorieList = serviceUserTresorieList; - } - public String getIsDeleted() { - return isDeleted; - } - public void setIsDeleted(String isDeleted) { - this.isDeleted = isDeleted; - } - - public String getNumero() { - return numero; - } - - public void setNumero(String numero) { - this.numero = numero; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getCle() { - return cle; - } - - public void setCle(String cle) { - this.cle = cle; - } - - public String getDesignation() { - return designation; - } - - public void setDesignation(String designation) { - this.designation = designation; - } - - - - - -} diff --git a/src/main/java/com/triz/trizservice/modeles/TypeAlerteMedical.java b/src/main/java/com/triz/trizservice/modeles/TypeAlerteMedical.java new file mode 100644 index 0000000..95bf7d6 --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/TypeAlerteMedical.java @@ -0,0 +1,112 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.List; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Lob; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "type_alerte_medical") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "TypeAlerteMedical.findAll", query = "SELECT t FROM TypeAlerteMedical t"), + @NamedQuery(name = "TypeAlerteMedical.findByType", query = "SELECT t FROM TypeAlerteMedical t WHERE t.type = :type")}) +public class TypeAlerteMedical implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2147483647) + @Column(name = "type") + private String type; + @OneToMany(mappedBy = "fkTypeAlerteMedical") + private List alertesMedicalesList; + + public TypeAlerteMedical() { + } + + public TypeAlerteMedical(Object id) { + this.id = id; + } + + public TypeAlerteMedical(Object id, String type) { + this.id = id; + this.type = type; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + @XmlTransient + public List getAlertesMedicalesList() { + return alertesMedicalesList; + } + + public void setAlertesMedicalesList(List alertesMedicalesList) { + this.alertesMedicalesList = alertesMedicalesList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof TypeAlerteMedical)) { + return false; + } + TypeAlerteMedical other = (TypeAlerteMedical) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.TypeAlerteMedical[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/TypeExamen.java b/src/main/java/com/triz/trizservice/modeles/TypeExamen.java new file mode 100644 index 0000000..e0955fb --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/TypeExamen.java @@ -0,0 +1,162 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "type_examen") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "TypeExamen.findAll", query = "SELECT t FROM TypeExamen t"), + @NamedQuery(name = "TypeExamen.findByNom", query = "SELECT t FROM TypeExamen t WHERE t.nom = :nom"), + @NamedQuery(name = "TypeExamen.findByPoids", query = "SELECT t FROM TypeExamen t WHERE t.poids = :poids"), + @NamedQuery(name = "TypeExamen.findByTempsEstime", query = "SELECT t FROM TypeExamen t WHERE t.tempsEstime = :tempsEstime")}) +public class TypeExamen implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Lob + @Column(name = "id") + private Object id; + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2147483647) + @Column(name = "nom") + private String nom; + @Column(name = "poids") + private Integer poids; + @Column(name = "temps_estime") + @Temporal(TemporalType.TIME) + private Date tempsEstime; + @JoinColumn(name = "fk_machine", referencedColumnName = "id") + @ManyToOne + private Machine fkMachine; + @JoinColumn(name = "fk_patient", referencedColumnName = "id") + @ManyToOne + private Patient fkPatient; + @OneToMany(mappedBy = "fkTypeExamen") + private List queueList; + + public TypeExamen() { + } + + public TypeExamen(Object id) { + this.id = id; + } + + public TypeExamen(Object id, String nom) { + this.id = id; + this.nom = nom; + } + + public Object getId() { + return id; + } + + public void setId(Object id) { + this.id = id; + } + + public String getNom() { + return nom; + } + + public void setNom(String nom) { + this.nom = nom; + } + + public Integer getPoids() { + return poids; + } + + public void setPoids(Integer poids) { + this.poids = poids; + } + + public Date getTempsEstime() { + return tempsEstime; + } + + public void setTempsEstime(Date tempsEstime) { + this.tempsEstime = tempsEstime; + } + + public Machine getFkMachine() { + return fkMachine; + } + + public void setFkMachine(Machine fkMachine) { + this.fkMachine = fkMachine; + } + + public Patient getFkPatient() { + return fkPatient; + } + + public void setFkPatient(Patient fkPatient) { + this.fkPatient = fkPatient; + } + + @XmlTransient + public List getQueueList() { + return queueList; + } + + public void setQueueList(List queueList) { + this.queueList = queueList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof TypeExamen)) { + return false; + } + TypeExamen other = (TypeExamen) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.TypeExamen[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/modeles/TypeTresorie.java b/src/main/java/com/triz/trizservice/modeles/TypeMachine.java similarity index 57% rename from src/main/java/com/triz/trizservice/modeles/TypeTresorie.java rename to src/main/java/com/triz/trizservice/modeles/TypeMachine.java index c36c40c..9fa7dc2 100644 --- a/src/main/java/com/triz/trizservice/modeles/TypeTresorie.java +++ b/src/main/java/com/triz/trizservice/modeles/TypeMachine.java @@ -9,13 +9,13 @@ import java.util.List; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.Lob; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.OneToMany; import javax.persistence.Table; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; @@ -25,51 +25,68 @@ import javax.xml.bind.annotation.XmlTransient; * @author FORCE TECH */ @Entity -@Table(name = "type_tresorie", catalog = "triz_tresorie", schema = "public") +@Table(name = "type_machine") @XmlRootElement @NamedQueries({ - @NamedQuery(name = "TypeTresorie.findAll", query = "SELECT t FROM TypeTresorie t"), - @NamedQuery(name = "TypeTresorie.findById", query = "SELECT t FROM TypeTresorie t WHERE t.id = :id"), - @NamedQuery(name = "TypeTresorie.findByType", query = "SELECT t FROM TypeTresorie t WHERE t.type = :type")}) -public class TypeTresorie implements Serializable { - - @Size(max = 255) - @Column(name = "type") - private String type; - @OneToMany(mappedBy = "fkTypeTresorie") - private List tresorieList; + @NamedQuery(name = "TypeMachine.findAll", query = "SELECT t FROM TypeMachine t"), + @NamedQuery(name = "TypeMachine.findByType", query = "SELECT t FROM TypeMachine t WHERE t.type = :type"), + @NamedQuery(name = "TypeMachine.findByCode", query = "SELECT t FROM TypeMachine t WHERE t.code = :code")}) +public class TypeMachine implements Serializable { private static final long serialVersionUID = 1L; @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) @Basic(optional = false) + @NotNull + @Lob @Column(name = "id") - private Integer id; - + private Object id; + @Size(max = 2147483647) + @Column(name = "type") + private String type; + @Size(max = 2147483647) + @Column(name = "code") + private String code; + @OneToMany(mappedBy = "fkTypeMachine") + private List machineList; - public TypeTresorie() { + public TypeMachine() { } - public TypeTresorie(Integer id) { + public TypeMachine(Object id) { this.id = id; } - public Integer getId() { + public Object getId() { return id; } - public void setId(Integer id) { + public void setId(Object id) { this.id = id; } - - @XmlTransient - public List getTresorieList() { - return tresorieList; + public String getType() { + return type; } - public void setTresorieList(List tresorieList) { - this.tresorieList = tresorieList; + public void setType(String type) { + this.type = type; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + @XmlTransient + public List getMachineList() { + return machineList; + } + + public void setMachineList(List machineList) { + this.machineList = machineList; } @Override @@ -82,10 +99,10 @@ public class TypeTresorie implements Serializable { @Override public boolean equals(Object object) { // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof TypeTresorie)) { + if (!(object instanceof TypeMachine)) { return false; } - TypeTresorie other = (TypeTresorie) object; + TypeMachine other = (TypeMachine) object; if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { return false; } @@ -94,18 +111,7 @@ public class TypeTresorie implements Serializable { @Override public String toString() { - return "com.triz.trizservice.modeles.TypeTresorie[ id=" + id + " ]"; - } - - - - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; + return "com.triz.trizservice.modeles.TypeMachine[ id=" + id + " ]"; } } diff --git a/src/main/java/com/triz/trizservice/modeles/TypeMouvement.java b/src/main/java/com/triz/trizservice/modeles/TypeMouvement.java deleted file mode 100644 index 483aab2..0000000 --- a/src/main/java/com/triz/trizservice/modeles/TypeMouvement.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.triz.trizservice.modeles; - -import java.io.Serializable; -import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; - -/** - * - * @author FORCE TECH - */ -@Entity -@Table(name = "type_mouvement") -@XmlRootElement -@NamedQueries({ - @NamedQuery(name = "TypeMouvement.findAll", query = "SELECT t FROM TypeMouvement t"), - @NamedQuery(name = "TypeMouvement.findById", query = "SELECT t FROM TypeMouvement t WHERE t.id = :id"), - @NamedQuery(name = "TypeMouvement.findByType", query = "SELECT t FROM TypeMouvement t WHERE t.type = :type")}) -public class TypeMouvement implements Serializable { - - @Size(max = 255) - @Column(name = "type") - private String type; - - private static final long serialVersionUID = 1L; - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Basic(optional = false) - @Column(name = "id") - private Integer id; - @OneToMany(mappedBy = "fkTypeMouvement") - private List alerteList; - @OneToMany(mappedBy = "fkTypeMouvement") - private List mouvementTierList; - @OneToMany(mappedBy = "fkTypeMouvement") - private List mouvementList; - - public TypeMouvement() { - } - - public TypeMouvement(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - - @XmlTransient - public List getAlerteList() { - return alerteList; - } - - public void setAlerteList(List alerteList) { - this.alerteList = alerteList; - } - - @XmlTransient - public List getMouvementTierList() { - return mouvementTierList; - } - - public void setMouvementTierList(List mouvementTierList) { - this.mouvementTierList = mouvementTierList; - } - - @XmlTransient - public List getMouvementList() { - return mouvementList; - } - - public void setMouvementList(List mouvementList) { - this.mouvementList = mouvementList; - } - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - // TODO: Warning - this method won't work in the case the id fields are not set - if (!(object instanceof TypeMouvement)) { - return false; - } - TypeMouvement other = (TypeMouvement) object; - if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { - return false; - } - return true; - } - - @Override - public String toString() { - return "com.triz.trizservice.modeles.TypeMouvement[ id=" + id + " ]"; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - -} diff --git a/src/main/java/com/triz/trizservice/modeles/Wilaya.java b/src/main/java/com/triz/trizservice/modeles/Wilaya.java new file mode 100644 index 0000000..f983f88 --- /dev/null +++ b/src/main/java/com/triz/trizservice/modeles/Wilaya.java @@ -0,0 +1,112 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.triz.trizservice.modeles; + +import java.io.Serializable; +import java.util.List; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +/** + * + * @author FORCE TECH + */ +@Entity +@Table(name = "wilaya") +@XmlRootElement +@NamedQueries({ + @NamedQuery(name = "Wilaya.findAll", query = "SELECT w FROM Wilaya w"), + @NamedQuery(name = "Wilaya.findByCode", query = "SELECT w FROM Wilaya w WHERE w.code = :code"), + @NamedQuery(name = "Wilaya.findByName", query = "SELECT w FROM Wilaya w WHERE w.name = :name")}) +public class Wilaya implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2) + @Column(name = "code") + private String code; + @Basic(optional = false) + @NotNull + @Size(min = 1, max = 2147483647) + @Column(name = "name") + private String name; + @OneToMany(mappedBy = "fkWilaya") + private List centreList; + + public Wilaya() { + } + + public Wilaya(String code) { + this.code = code; + } + + public Wilaya(String code, String name) { + this.code = code; + this.name = name; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @XmlTransient + public List getCentreList() { + return centreList; + } + + public void setCentreList(List centreList) { + this.centreList = centreList; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (code != null ? code.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof Wilaya)) { + return false; + } + Wilaya other = (Wilaya) object; + if ((this.code == null && other.code != null) || (this.code != null && !this.code.equals(other.code))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "com.triz.trizservice.modeles.Wilaya[ code=" + code + " ]"; + } + +} diff --git a/src/main/java/com/triz/trizservice/security/impl/CostumSuccesHandler.java b/src/main/java/com/triz/trizservice/security/impl/CostumSuccesHandler.java index 4ddb432..e15838d 100644 --- a/src/main/java/com/triz/trizservice/security/impl/CostumSuccesHandler.java +++ b/src/main/java/com/triz/trizservice/security/impl/CostumSuccesHandler.java @@ -4,9 +4,9 @@ */ package com.triz.trizservice.security.impl; -import com.triz.trizservice.modeles.Etablissement; -import com.triz.trizservice.modeles.ServiceEtablissementUser; +import com.triz.trizservice.modeles.Centre; import com.triz.trizservice.modeles.ServiceUser; +import com.triz.trizservice.modeles.ServiceUserCentre; import com.triz.trizservice.modeles.ServicehistoriqueConnection; import com.triz.trizservice.service.TransactionService; import com.triz.util.UtilContext; @@ -20,6 +20,7 @@ import org.springframework.security.core.Authentication; import com.triz.util.UtilURL; import java.util.Date; import java.util.List; +import java.util.UUID; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,13 +49,14 @@ public class CostumSuccesHandler extends SavedRequestAwareAuthenticationSuccessH super.onAuthenticationSuccess(request, response, authentication); } - private void saveConnection(ServiceUser user, Etablissement etablissement) { + private void saveConnection(ServiceUser user, Centre etablissement) { ServicehistoriqueConnection his = new ServicehistoriqueConnection(); + his.setId(UUID.randomUUID()); his.setFkUser(user); his.setDate(new Date()); his.setHeur(new Date()); his.setAdresseIp(""); - his.setFkEtablissement(etablissement); + his.setFkCentre(etablissement); transactionService.save(his); } @@ -64,13 +66,14 @@ public class CostumSuccesHandler extends SavedRequestAwareAuthenticationSuccessH ServiceUser user = context.getCurrentUser(); System.out.println("-------------------- multi etablissement"); - List listUserEtab = transactionService.getAllStockEtablissementFromUsersEtablissementByUser(user); + List listUserEtab = transactionService.getAllStockEtablissementFromUsersEtablissementByUser(user); System.out.println("-------------------- listUserEtab " + listUserEtab); UtilURL.showURL(); if (listUserEtab.size() == 1) { - Etablissement etablissement = listUserEtab.get(0); - ServiceEtablissementUser userEtablissement = transactionService.getAllUserEtablissementByEtablissementByUser(etablissement, user); - UtilURL.setIdEtablissement(etablissement.getIdEtabStock()); + Centre etablissement = listUserEtab.get(0); + System.out.println("centreSelected " + etablissement.getName()); + ServiceUserCentre userEtablissement = transactionService.getAllUserCentreByCentreByUser(etablissement, user); + UtilURL.setIdCentre(etablissement.getId()); UtilURL.setFonctionnalite(transactionService.getFonctionServerByUsersByEtablissement(context.getCurrentUser(), etablissement)); saveConnection(user, etablissement); // if ("production".equals(etablissement.getType_etablissemnt())) { @@ -90,7 +93,7 @@ public class CostumSuccesHandler extends SavedRequestAwareAuthenticationSuccessH if (listUserEtab.size() > 1) { ServicehistoriqueConnection hist = transactionService.getLastStockHistoriqueConnectionByUsers(user); if (hist != null) { - Etablissement lasteEtablissement = hist.getFkEtablissement(); + Centre lasteEtablissement = hist.getFkCentre(); // if ("true".equals(hist.getIsTableauBord())) { // if ("true".equals(user.getShowTableauDeBord())) { // UtilURL.setIsTableauDeBord(true); @@ -104,8 +107,8 @@ public class CostumSuccesHandler extends SavedRequestAwareAuthenticationSuccessH if (lasteEtablissement != null) { if (listUserEtab.contains(lasteEtablissement)) { // saveConnection(user, "false", lasteEtablissement); - ServiceEtablissementUser userEtablissement = transactionService.getAllUserEtablissementByEtablissementByUser(lasteEtablissement, user); - UtilURL.setIdEtablissement(lasteEtablissement.getIdEtabStock()); + ServiceUserCentre userEtablissement = transactionService.getAllUserCentreByCentreByUser(lasteEtablissement, user); + UtilURL.setIdCentre(lasteEtablissement.getId()); UtilURL.setFonctionnalite(transactionService.getFonctionServerByUsersByEtablissement(context.getCurrentUser(), lasteEtablissement)); // if ("production".equals(lasteEtablissement.getType_etablissemnt())) { // UtilURL.setIsProuction(true); diff --git a/src/main/java/com/triz/trizservice/security/impl/LoginServiceImpl.java b/src/main/java/com/triz/trizservice/security/impl/LoginServiceImpl.java index 0fb6ffa..4ee7a77 100644 --- a/src/main/java/com/triz/trizservice/security/impl/LoginServiceImpl.java +++ b/src/main/java/com/triz/trizservice/security/impl/LoginServiceImpl.java @@ -92,7 +92,7 @@ public class LoginServiceImpl implements AuthenticationProvider { if (!groups.isEmpty()) { for (ServiceMember group : groups) { System.out.println("group: " + group.getFkGroupe()); - adminAuthorities.add(new SimpleGrantedAuthority("ROLE_" + group.getFkGroupe().getId().toUpperCase())); + adminAuthorities.add(new SimpleGrantedAuthority("ROLE_" + group.getFkGroupe().getNomGroupe().toUpperCase())); } } User user = new User(loginName.trim(), pwd.trim(), enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, adminAuthorities); diff --git a/src/main/java/com/triz/trizservice/service/DaoService.java b/src/main/java/com/triz/trizservice/service/DaoService.java index a21ee89..dabf60b 100644 --- a/src/main/java/com/triz/trizservice/service/DaoService.java +++ b/src/main/java/com/triz/trizservice/service/DaoService.java @@ -5,9 +5,7 @@ */ package com.triz.trizservice.service; -import com.triz.trizservice.modeles.AnneeFiscale; -import com.triz.trizservice.modeles.Etablissement; -import com.triz.trizservice.modeles.ServiceEtablissementUser; +import com.triz.trizservice.modeles.Centre; import com.triz.trizservice.modeles.ServiceFonctiongroupe; import com.triz.trizservice.modeles.ServiceFonctionnaliter; import com.triz.trizservice.modeles.ServiceGroupe; @@ -16,8 +14,9 @@ import com.triz.trizservice.modeles.ServiceMember; import com.triz.trizservice.modeles.ServiceUser; import com.triz.trizservice.modeles.ServicehistoriqueConnection; import com.triz.trizservice.modeles.ServiceHistoriqueManipulation; -import com.triz.trizservice.modeles.ServiceWilaya; import com.triz.trizservice.modeles.ServiceHistoriqueManipulation; +import com.triz.trizservice.modeles.ServiceUserCentre; +import com.triz.trizservice.modeles.Wilaya; import java.util.List; /** @@ -98,18 +97,16 @@ public interface DaoService { public List getListHistoriqueManipulationByUsersByEntreprise(ServiceUser user); - public Etablissement getEtablissementById(String id); + public Centre getEtablissementById(Object id); - public List getAllStockEtablissementFromUsersEtablissementByUser(ServiceUser user); + public List getAllStockEtablissementFromUsersEtablissementByUser(ServiceUser user); - public ServiceEtablissementUser getAllUserEtablissementByEtablissementByUser(Etablissement etablissement, ServiceUser user); + public ServiceUserCentre getAllUserCentreByCentreByUser(Centre etablissement, ServiceUser user); - public List getFonctionServerByUsersByEtablissement(ServiceUser user, Etablissement etablissement); + public List getFonctionServerByUsersByEtablissement(ServiceUser user, Centre etablissement); public ServicehistoriqueConnection getLastStockHistoriqueConnectionByUsers(ServiceUser user); - public AnneeFiscale getAnneFiscalByEtablissementByActif(Etablissement etablissement); - - public List getAllWilaya(); + public List getAllWilaya(); } diff --git a/src/main/java/com/triz/trizservice/service/TransactionService.java b/src/main/java/com/triz/trizservice/service/TransactionService.java index 1a36714..02edfc9 100644 --- a/src/main/java/com/triz/trizservice/service/TransactionService.java +++ b/src/main/java/com/triz/trizservice/service/TransactionService.java @@ -6,9 +6,8 @@ */ package com.triz.trizservice.service; -import com.triz.trizservice.modeles.AnneeFiscale; -import com.triz.trizservice.modeles.Etablissement; -import com.triz.trizservice.modeles.ServiceEtablissementUser; + +import com.triz.trizservice.modeles.Centre; import com.triz.trizservice.modeles.ServiceFonctiongroupe; import com.triz.trizservice.modeles.ServiceFonctionnaliter; import com.triz.trizservice.modeles.ServiceGroupe; @@ -17,8 +16,9 @@ import com.triz.trizservice.modeles.ServiceMember; import com.triz.trizservice.modeles.ServiceUser; import com.triz.trizservice.modeles.ServicehistoriqueConnection; import com.triz.trizservice.modeles.ServiceHistoriqueManipulation; -import com.triz.trizservice.modeles.ServiceWilaya; import com.triz.trizservice.modeles.ServiceHistoriqueManipulation; +import com.triz.trizservice.modeles.ServiceUserCentre; +import com.triz.trizservice.modeles.Wilaya; import java.util.List; /** @@ -99,17 +99,15 @@ public interface TransactionService { public List getListHistoriqueManipulationByUsersByEntreprise(ServiceUser user); - public Etablissement getEtablissementById(String id); + public Centre getEtablissementById(Object id); - public List getAllStockEtablissementFromUsersEtablissementByUser(ServiceUser user); + public List getAllStockEtablissementFromUsersEtablissementByUser(ServiceUser user); - public ServiceEtablissementUser getAllUserEtablissementByEtablissementByUser(Etablissement etablissement,ServiceUser user); + public ServiceUserCentre getAllUserCentreByCentreByUser(Centre etablissement,ServiceUser user); - public List getFonctionServerByUsersByEtablissement(ServiceUser user,Etablissement etablissement); + public List getFonctionServerByUsersByEtablissement(ServiceUser user,Centre etablissement); public ServicehistoriqueConnection getLastStockHistoriqueConnectionByUsers(ServiceUser user); - public AnneeFiscale getAnneFiscalByEtablissementByActif(Etablissement etablissement); - - public List getAllWilaya(); + public List getAllWilaya(); } diff --git a/src/main/java/com/triz/trizservice/service/impl/DaoServiceImpl.java b/src/main/java/com/triz/trizservice/service/impl/DaoServiceImpl.java index 1728bb8..4cd90ec 100644 --- a/src/main/java/com/triz/trizservice/service/impl/DaoServiceImpl.java +++ b/src/main/java/com/triz/trizservice/service/impl/DaoServiceImpl.java @@ -5,9 +5,7 @@ */ package com.triz.trizservice.service.impl; -import com.triz.trizservice.modeles.AnneeFiscale; -import com.triz.trizservice.modeles.Etablissement; -import com.triz.trizservice.modeles.ServiceEtablissementUser; +import com.triz.trizservice.modeles.Centre; import com.triz.trizservice.service.DaoService; import com.triz.trizservice.modeles.ServiceFonctiongroupe; import com.triz.trizservice.modeles.ServiceFonctionnaliter; @@ -16,8 +14,9 @@ import com.triz.trizservice.modeles.ServiceIncrementation; import com.triz.trizservice.modeles.ServiceMember; import com.triz.trizservice.modeles.ServiceUser; import com.triz.trizservice.modeles.ServicehistoriqueConnection; -import com.triz.trizservice.modeles.ServiceWilaya; import com.triz.trizservice.modeles.ServiceHistoriqueManipulation; +import com.triz.trizservice.modeles.ServiceUserCentre; +import com.triz.trizservice.modeles.Wilaya; import java.util.Date; import java.util.List; import javax.annotation.Resource; @@ -177,12 +176,12 @@ public class DaoServiceImpl implements DaoService { @Override public List getFonctionServerByGroups(ServiceGroupe groupe) { - return getCurrentSession().createQuery("select sf from ServiceFonctionnaliter sf,ServiceFonctiongroupe sfg where sf.id=sfg.fkFonction and sfg.fkGroupe =:groupeS").setParameter("groupeS", groupe).list(); + return getCurrentSession().createQuery("select sf from ServiceFonctionnaliter sf,ServiceFonctiongroupe sfg where sf.nom=sfg.fkFonctionnalite.nom and sfg.fkGroupe =:groupeS").setParameter("groupeS", groupe).list(); } @Override public List getFonctionServerByUsers(ServiceUser user) { - return getCurrentSession().createQuery("select sf from ServiceFonctionnaliter sf,ServiceFonctiongroupe sfg, ServiceMember mem where sf.id=sfg.fkFonction and sfg.fkGroupe = mem.fkGroupe and mem.fkUser= :user ").setParameter("user", user).list(); + return getCurrentSession().createQuery("select sf from ServiceFonctionnaliter sf,ServiceFonctiongroupe sfg, ServiceMember mem where sf.id=sfg.fkFonctionnalite.id and sfg.fkGroupe = mem.fkGroupe and mem.fkUser= :user ").setParameter("user", user).list(); } @Override @@ -203,7 +202,7 @@ public class DaoServiceImpl implements DaoService { @Override public ServiceFonctiongroupe getFonctionGroupByFonctionIdAndGoupe(String id, ServiceGroupe group) { - return (ServiceFonctiongroupe) getCurrentSession().createQuery("select fg from ServiceFonctiongroupe fg where fg.fkFonction.id =:fonction and fg.fkGroupe.id =:group").setParameter("fonction", id).setParameter("group", group.getId()).setMaxResults(1).uniqueResult(); + return (ServiceFonctiongroupe) getCurrentSession().createQuery("select fg from ServiceFonctiongroupe fg where fg.fkFonctionnalite.id =:fonction and fg.fkGroupe.id =:group").setParameter("fonction", id).setParameter("group", group.getId()).setMaxResults(1).uniqueResult(); } @Override @@ -248,34 +247,34 @@ public class DaoServiceImpl implements DaoService { } @Override - public Etablissement getEtablissementById(String id) { - return (Etablissement) getCurrentSession().createQuery("select ca from Etablissement ca where ca.idEtabStock = :id ").setParameter("id", id).setMaxResults(1).uniqueResult(); + public Centre getEtablissementById(Object id) { + return (Centre) getCurrentSession().createQuery("select ca from Centre ca where ca.id = :id ").setParameter("id", id).setMaxResults(1).uniqueResult(); } @Override - public List getAllStockEtablissementFromUsersEtablissementByUser(ServiceUser user) { + public List getAllStockEtablissementFromUsersEtablissementByUser(ServiceUser user) { CriteriaBuilder cb = getCurrentSession().getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Etablissement.class); - Root root = cq.from(ServiceEtablissementUser.class); + CriteriaQuery cq = cb.createQuery(Centre.class); + Root root = cq.from(ServiceUserCentre.class); - cq.select(root.get("fkEtablissement")) // sélectionne la relation + cq.select(root.get("fkCentre")) // sélectionne la relation .where( cb.and( cb.equal(root.get("fkUser"), user), - cb.equal(root.get("fkEtablissement").get("actif"), "true") + cb.equal(root.get("fkCentre").get("actif"), "true") ) ); return getCurrentSession().createQuery(cq).getResultList(); } @Override - public ServiceEtablissementUser getAllUserEtablissementByEtablissementByUser(Etablissement etablissement, ServiceUser user) { - return (ServiceEtablissementUser) getCurrentSession().createCriteria(ServiceEtablissementUser.class).add(Restrictions.eq("fkEtablissement", etablissement)).add(Restrictions.eq("fkUser", user)).setMaxResults(1).uniqueResult(); + public ServiceUserCentre getAllUserCentreByCentreByUser(Centre etablissement,ServiceUser user) { + return (ServiceUserCentre) getCurrentSession().createCriteria(ServiceUserCentre.class).add(Restrictions.eq("fkCentre", etablissement)).add(Restrictions.eq("fkUser", user)).setMaxResults(1).uniqueResult(); } @Override - public List getFonctionServerByUsersByEtablissement(ServiceUser user, Etablissement etablissement) { - return getCurrentSession().createQuery("select sf from ServiceFonctionnaliter sf,ServiceFonctiongroupe sfg, ServiceMember mem where sf.id=sfg.fkFonction and sfg.fkGroupe= mem.fkGroupe and mem.fkUser=:user and mem.fkGroupe.fkEtablissement=:etab ").setParameter("etab", etablissement).setParameter("user", user).list(); + public List getFonctionServerByUsersByEtablissement(ServiceUser user, Centre etablissement) { + return getCurrentSession().createQuery("select sf from ServiceFonctionnaliter sf,ServiceFonctiongroupe sfg, ServiceMember mem where sf.id=sfg.fkFonctionnalite and sfg.fkGroupe= mem.fkGroupe and mem.fkUser=:user and mem.fkGroupe.fkCentre=:etab ").setParameter("etab", etablissement).setParameter("user", user).list(); } @Override @@ -283,13 +282,9 @@ public class DaoServiceImpl implements DaoService { return (ServicehistoriqueConnection) getCurrentSession().createCriteria(ServicehistoriqueConnection.class).add(Restrictions.eq("fkUser", user)).addOrder(Order.desc("id")).setMaxResults(1).uniqueResult(); } - @Override - public AnneeFiscale getAnneFiscalByEtablissementByActif(Etablissement etablissement) { - return (AnneeFiscale)getCurrentSession().createQuery("select sf from AnneeFiscale sf where sf.actif='true' and sf.fkEtablissement=:etab").setParameter("etab", etablissement).setMaxResults(1).uniqueResult(); - } @Override - public List getAllWilaya() { - return getCurrentSession().createQuery("select m from ServiceWilaya m ").list(); + public List getAllWilaya() { + return getCurrentSession().createQuery("select m from Wilaya m ").list(); } } diff --git a/src/main/java/com/triz/trizservice/service/impl/TransactionServiceImpl.java b/src/main/java/com/triz/trizservice/service/impl/TransactionServiceImpl.java index 89fe7cc..bf2a5e9 100644 --- a/src/main/java/com/triz/trizservice/service/impl/TransactionServiceImpl.java +++ b/src/main/java/com/triz/trizservice/service/impl/TransactionServiceImpl.java @@ -5,9 +5,7 @@ */ package com.triz.trizservice.service.impl; -import com.triz.trizservice.modeles.AnneeFiscale; -import com.triz.trizservice.modeles.Etablissement; -import com.triz.trizservice.modeles.ServiceEtablissementUser; +import com.triz.trizservice.modeles.Centre; import com.triz.trizservice.modeles.ServiceFonctiongroupe; import com.triz.trizservice.modeles.ServiceFonctionnaliter; import com.triz.trizservice.modeles.ServiceGroupe; @@ -16,8 +14,9 @@ import com.triz.trizservice.modeles.ServiceMember; import com.triz.trizservice.modeles.ServiceUser; import com.triz.trizservice.modeles.ServicehistoriqueConnection; import com.triz.trizservice.modeles.ServiceHistoriqueManipulation; -import com.triz.trizservice.modeles.ServiceWilaya; import com.triz.trizservice.modeles.ServiceHistoriqueManipulation; +import com.triz.trizservice.modeles.ServiceUserCentre; +import com.triz.trizservice.modeles.Wilaya; import com.triz.trizservice.service.DaoService; import com.triz.trizservice.service.TransactionService; import java.util.List; @@ -251,25 +250,25 @@ public class TransactionServiceImpl implements TransactionService { @Transactional("transactionManager") @Override - public Etablissement getEtablissementById(String id) { + public Centre getEtablissementById(Object id) { return daoService.getEtablissementById(id); } @Transactional("transactionManager") @Override - public List getAllStockEtablissementFromUsersEtablissementByUser(ServiceUser user) { + public List getAllStockEtablissementFromUsersEtablissementByUser(ServiceUser user) { return daoService.getAllStockEtablissementFromUsersEtablissementByUser(user); } @Transactional("transactionManager") @Override - public ServiceEtablissementUser getAllUserEtablissementByEtablissementByUser(Etablissement etablissement, ServiceUser user) { - return daoService.getAllUserEtablissementByEtablissementByUser(etablissement, user); + public ServiceUserCentre getAllUserCentreByCentreByUser(Centre etablissement,ServiceUser user){ + return daoService.getAllUserCentreByCentreByUser(etablissement, user); } @Transactional("transactionManager") @Override - public List getFonctionServerByUsersByEtablissement(ServiceUser user, Etablissement etablissement) { + public List getFonctionServerByUsersByEtablissement(ServiceUser user, Centre etablissement) { return daoService.getFonctionServerByUsersByEtablissement(user, etablissement); } @@ -279,15 +278,11 @@ public class TransactionServiceImpl implements TransactionService { return daoService.getLastHistoriqueConnectionByUsers(user); } - @Transactional("transactionManager") - @Override - public AnneeFiscale getAnneFiscalByEtablissementByActif(Etablissement etablissement) { - return daoService.getAnneFiscalByEtablissementByActif(etablissement); - } + @Transactional("transactionManager") @Override - public List getAllWilaya() { + public List getAllWilaya() { return daoService.getAllWilaya(); } } diff --git a/src/main/java/com/triz/util/UtilContext.java b/src/main/java/com/triz/util/UtilContext.java index 9457b48..570a070 100644 --- a/src/main/java/com/triz/util/UtilContext.java +++ b/src/main/java/com/triz/util/UtilContext.java @@ -9,12 +9,10 @@ import com.lowagie.text.Document; import com.lowagie.text.DocumentException; import com.lowagie.text.PageSize; import com.lowagie.text.Paragraph; -import com.triz.trizservice.modeles.AnneeFiscale; -import com.triz.trizservice.modeles.Etablissement; +import com.triz.trizservice.modeles.Centre; import com.triz.trizservice.modeles.ServiceIncrementation; import com.triz.trizservice.modeles.ServiceUser; import com.triz.trizservice.modeles.ServiceHistoriqueManipulation; -import com.triz.trizservice.modeles.StockTypeDestinataire; import com.triz.trizservice.service.TransactionService; import java.io.ByteArrayInputStream; @@ -422,14 +420,14 @@ public class UtilContext { return ""; } - public void saveNewManipulation(String nomTable, String idLigne, String typeManipulation, Date date, Date heur, ServiceUser user, Double oldValour, Double newValeur) { + public void saveNewManipulation(String nomTable, String idLigne, String typeManipulation, Date date, Date heur, ServiceUser user, String oldValour, String newValeur) { historiqueManipulation = new ServiceHistoriqueManipulation(); historiqueManipulation.setFkManipulateur(user); historiqueManipulation.setIdLigne(idLigne); historiqueManipulation.setNomTable(nomTable); historiqueManipulation.setTypeManipumation(typeManipulation); - historiqueManipulation.setOldValeur(oldValour.floatValue()); - historiqueManipulation.setNewValeur(newValeur.floatValue()); + historiqueManipulation.setOldValeur(oldValour); + historiqueManipulation.setNewValeur(newValeur); historiqueManipulation.setDateManipulation(new Date()); historiqueManipulation.setHeurManipulation(new Date()); service.save(historiqueManipulation); @@ -445,27 +443,20 @@ public class UtilContext { return false; } - public Etablissement getCurrentEtablissement() { + public Centre getCurrentEtablissement() { System.out.println("UtilURLStock.getStock_CODE_SYSTEM() " + UtilURL.getStock_CODE_SYSTEM()); - Etablissement etablissemnt = service.getEtablissementById(UtilURL.getStock_CODE_SYSTEM()); + Centre etablissemnt = service.getEtablissementById(UtilURL.getStock_CODE_SYSTEM()); if (etablissemnt != null) { return etablissemnt; } return null; } - public AnneeFiscale getCurrentAnneeFiscal() { - System.out.println("UtilURLStock.getStock_CODE_SYSTEM() " + UtilURL.getStock_CODE_SYSTEM()); - AnneeFiscale annee = service.getAnneFiscalByEtablissementByActif(getCurrentEtablissement()); - if (annee != null) { - return annee; - } - return null; - } + public boolean canChangeEtablissement() { ServiceUser user = getCurrentUser(); - List listeEtablissement = service.getAllStockEtablissementFromUsersEtablissementByUser(user); + List listeEtablissement = service.getAllStockEtablissementFromUsersEtablissementByUser(user); if (listeEtablissement != null) { if (!listeEtablissement.isEmpty()) { if (listeEtablissement.size() > 1) { diff --git a/src/main/java/com/triz/util/UtilControleAccess.java b/src/main/java/com/triz/util/UtilControleAccess.java index 05d2c8d..4020330 100644 --- a/src/main/java/com/triz/util/UtilControleAccess.java +++ b/src/main/java/com/triz/util/UtilControleAccess.java @@ -72,7 +72,7 @@ public class UtilControleAccess { userSelect = context.getCurrentUser(); } ServiceFonctiongroupe helpingFonctionGroupe = new ServiceFonctiongroupe(); - List list = new ArrayList<>(); + List list = new ArrayList<>(); listMemberShip = service.getAllMemberShipByUser(userSelect); for (ServiceMember member : listMemberShip) { @@ -83,7 +83,7 @@ public class UtilControleAccess { } if (!list.isEmpty()) { - if (list.contains("true")) { + if (list.contains(true)) { return true; } else { return false; @@ -99,7 +99,7 @@ public class UtilControleAccess { userSelect = context.getCurrentUser(); } ServiceFonctiongroupe helpingFonctionGroupe = new ServiceFonctiongroupe(); - List list = new ArrayList<>(); + List list = new ArrayList<>(); listMemberShip = service.getAllMemberShipByUser(userSelect); for (ServiceMember member : listMemberShip) { @@ -110,7 +110,7 @@ public class UtilControleAccess { } if (!list.isEmpty()) { - if (list.contains("true")) { + if (list.contains(true)) { return true; } else { return false; @@ -127,7 +127,7 @@ public class UtilControleAccess { } ServiceFonctiongroupe helpingFonctionGroupe = new ServiceFonctiongroupe(); - List list = new ArrayList<>(); + List list = new ArrayList<>(); if (listMemberShip == null) { listMemberShip = service.getAllMemberShipByUser(userSelect); } @@ -142,7 +142,7 @@ public class UtilControleAccess { System.out.println("helpingFonctionGroupe: " + helpingFonctionGroupe); System.out.println("list: " + list); if (!list.isEmpty()) { - if (list.contains("true")) { + if (list.contains(true)) { return true; } else { return false; @@ -158,7 +158,7 @@ public class UtilControleAccess { } ServiceFonctiongroupe helpingFonctionGroupe = new ServiceFonctiongroupe(); - List list = new ArrayList<>(); + List list = new ArrayList<>(); if (listMemberShip == null) { listMemberShip = service.getAllMemberShipByUser(userSelect); } @@ -166,14 +166,14 @@ public class UtilControleAccess { for (ServiceMember member : listMemberShip) { helpingFonctionGroupe = service.getFonctionGroupByFonctionIdAndGoupe(fonction1, member.getFkGroupe()); if (helpingFonctionGroupe != null) { - list.add("true"); + list.add(true); System.out.println("helpingFonctionGroupe.getCanUpdate() : " + helpingFonctionGroupe.getCanUpdate()); } } System.out.println("helpingFonctionGroupe: " + helpingFonctionGroupe); System.out.println("list: " + list); if (!list.isEmpty()) { - if (list.contains("true")) { + if (list.contains(true)) { return true; } else { return false; diff --git a/src/main/java/com/triz/util/UtilGetParametre.java b/src/main/java/com/triz/util/UtilGetParametre.java index ea5a8d2..1c81aa3 100644 --- a/src/main/java/com/triz/util/UtilGetParametre.java +++ b/src/main/java/com/triz/util/UtilGetParametre.java @@ -161,24 +161,24 @@ public class UtilGetParametre { } - public static String getIdEtablissement() { + public static String getIdCentre() { FacesContext facesContext = FacesContext.getCurrentInstance(); HttpServletRequest request = (HttpServletRequest) facesContext.getExternalContext().getRequest(); if(request!=null){ HttpSession mySessin = request.getSession(); - return (String)mySessin.getAttribute("idEtablissementStock"); + return (String)mySessin.getAttribute("idCentre"); } return null; } - public static void setIdEtablissement(String idEtablissement) { + public static void setIdCentre(String idEtablissement) { FacesContext facesContext = FacesContext.getCurrentInstance(); HttpServletRequest request = (HttpServletRequest) facesContext.getExternalContext().getRequest(); if(request!=null){ HttpSession mySessin = request.getSession(); - mySessin.setAttribute("idEtablissementStock", idEtablissement); + mySessin.setAttribute("idCentre", idEtablissement); // UtilGetParametre.idEtablissement = idEtablissement; } } diff --git a/src/main/java/com/triz/util/UtilURL.java b/src/main/java/com/triz/util/UtilURL.java index c76472d..db234b0 100644 --- a/src/main/java/com/triz/util/UtilURL.java +++ b/src/main/java/com/triz/util/UtilURL.java @@ -11,6 +11,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; import java.util.List; +import java.util.UUID; import javax.faces.context.FacesContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -208,23 +209,23 @@ public final class UtilURL { return (List) mySessin.getAttribute("fonctionStock"); } - public static String getStock_CODE_SYSTEM() { - return getIdEtablissement(); + public static Object getStock_CODE_SYSTEM() { + return getIdCentre(); } - public static String getIdEtablissement() { + public static UUID getIdCentre() { FacesContext facesContext = FacesContext.getCurrentInstance(); HttpServletRequest request = (HttpServletRequest) facesContext.getExternalContext().getRequest(); HttpSession mySessin = request.getSession(); - return (String) mySessin.getAttribute("idEtablissementStock"); + return (UUID) mySessin.getAttribute("idCentre"); } - public static void setIdEtablissement(String idEtablissement) { + public static void setIdCentre(UUID idEtablissement) { FacesContext facesContext = FacesContext.getCurrentInstance(); HttpServletRequest request = (HttpServletRequest) facesContext.getExternalContext().getRequest(); HttpSession mySessin = request.getSession(); - mySessin.setAttribute("idEtablissementStock", idEtablissement); + mySessin.setAttribute("idCentre", idEtablissement); } public static void setFonctionnaliteServer(List fonction) { diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index e97c39c..227cf3f 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -635,6 +635,33 @@ com.triz.trizservice.modeles.Alerte com.triz.trizservice.modeles.Mouvement com.triz.trizservice.modeles.ServiceHistoriqueManipulation + com.triz.trizservice.modeles.TypeAlerteMedical + com.triz.trizservice.modeles.QueueStatusTime + com.triz.trizservice.modeles.Machine + com.triz.trizservice.modeles.Medecin + com.triz.trizservice.modeles.NotifieMedecin + com.triz.trizservice.modeles.TypeMachine + com.triz.trizservice.modeles.FichierExamen + com.triz.trizservice.modeles.Priority + com.triz.trizservice.modeles.SpecialiteMedicale + com.triz.trizservice.modeles.Status + com.triz.trizservice.modeles.ImageCles + com.triz.trizservice.modeles.ServiceUserCentre + com.triz.trizservice.modeles.Patient + com.triz.trizservice.modeles.QueueTips + com.triz.trizservice.modeles.Parametre + com.triz.trizservice.modeles.AlertesMedicales + com.triz.trizservice.modeles.Notification + com.triz.trizservice.modeles.Wilaya + com.triz.trizservice.modeles.Examen + com.triz.trizservice.modeles.Rdv + com.triz.trizservice.modeles.MedecinSpecialiste + com.triz.trizservice.modeles.TypeExamen + com.triz.trizservice.modeles.FichierDossier + com.triz.trizservice.modeles.SalleDeSoin + com.triz.trizservice.modeles.Centre + com.triz.trizservice.modeles.Queue + com.triz.trizservice.modeles.Consultation false diff --git a/src/main/resources/db/migration/V000__main_schema.sql b/src/main/resources/db/migration/V000__main_schema.sql index 0262f62..288040d 100644 --- a/src/main/resources/db/migration/V000__main_schema.sql +++ b/src/main/resources/db/migration/V000__main_schema.sql @@ -7,3 +7,616 @@ * Created: 26 juil. 2026 */ +-- ===================================================================== +-- SCRIPT DE CREATION - BASE DE DONNEES TrizRIS +-- Genere depuis le diagramme de classe (classDiaramTrizRIS_drawio.png) +-- et croise avec les notes manuscrites fournies. +-- PostgreSQL 13+ +-- ===================================================================== +-- +-- NOTES DE VALIDATION / HYPOTHESES (a relire avant execution) : +-- +-- 1. FK typees varchar dans le diagramme alors que la PK cible est uuid +-- (Patient.Fk_centre, AlertesMedicales.Fk_patient, Parametre.Fk_centre, +-- medecin_specialiste.fk_medecin/fk_specialite, typeExamen.Fk_patient) +-- => corrigees en uuid, comme demande. +-- +-- 2. specialite_medicale garde "name" comme PK (varchar), conformement +-- au diagramme. La FK medecin_specialiste.fk_specialite est donc en +-- varchar (et non uuid) pour matcher ce type. +-- Pour type_alerte_medical, type_machine et status, qui n'avaient pas +-- de champ id dans le diagramme mais sont pointes par une FK, j'ai +-- ajoute un id uuid en PK (aucune cle naturelle claire pour elles). +-- +-- 3. Les deux tables "fichier" du diagramme sont separees en : +-- - fichier_dossier (liee au dossier medical / Patient) +-- - fichier_examen (liee a Examen) +-- +-- 4. rdv avait un champ "date" duplique (date + date without time zone). +-- Je n'ai garde qu'un seul champ "date" (type date). A confirmer si +-- un des deux devait plutot etre un "time". +-- +-- 5. typeExamen.Fk_patient est conserve tel quel (uuid -> patient.id) +-- meme si c'est inhabituel pour une table de type/reference. A +-- valider avec toi si ce champ est vraiment voulu sur typeExamen +-- plutot que sur une table de mouvement (queue/rdv). +-- +-- 6. Relations non explicitement materialisees par un champ Fk_xxx dans +-- le diagramme mais suggerees par une fleche : j'ai ajoute les FK +-- suivantes (a confirmer) : +-- - salle_de_soin.fk_centre -> centre(id) +-- - machine.fk_type_machine -> type_machine(id) +-- - alertes_medicales.fk_type_alerte_medical -> type_alerte_medical(id) +-- - service_historique_connection.fk_user -> service_user(userid) +-- - service_historique_manipulation.fk_user -> service_user(userid) +-- - service_member.fk_user / fk_groupe -> service_user / service_groupe +-- - service_fonctiongroupe.fk_groupe / fk_fonctionnalite +-- +-- 7. service_user.userid est utilise comme cle primaire naturelle +-- (c'est le premier champ de la table, de type varchar(50), et +-- plusieurs autres tables du service_* le referencent). +-- +-- 8. queue_tips est desormais reference par queue.fk_queue_tips -> queue_tips(id). +-- +-- 9. Noms de colonnes normalises en snake_case, sans accents (ex : +-- RegionExaminee -> region_examinee, Lateralite -> lateralite). +-- Les fautes de frappe du diagramme (ex: "derscription") sont +-- conservees telles quelles pour ne pas casser un mapping Hibernate +-- existant -- a corriger cote code si besoin. +-- +-- ===================================================================== + +CREATE EXTENSION IF NOT EXISTS pgcrypto; + +-- ===================================================================== +-- TIER 0 : TABLES SANS DEPENDANCE (references / lookup) +-- ===================================================================== + +CREATE TABLE wilaya ( + code varchar(2) PRIMARY KEY, + name text NOT NULL +); + +CREATE TABLE type_alerte_medical ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + type varchar NOT NULL UNIQUE + -- valeurs attendues (cf note orange du diagramme) : + -- Allergie, maladie, Traitements en cours, Antecedents chirurgicaux, + -- Antecedents familiaux, Implants, Handicaps +); + +CREATE TABLE queue_tips ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + designation varchar NOT NULL, + ordre integer +); + +CREATE TABLE priority ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + designation varchar NOT NULL, + poids integer +); + +CREATE TABLE status ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + designation varchar NOT NULL UNIQUE + -- valeurs attendues (cf bulle "statuts actuelle de patient") : + -- enAttente, enCours, finis, interprete, termine, Archive +); + +CREATE TABLE type_machine ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + type varchar, + code varchar +); + +CREATE TABLE specialite_medicale ( + name varchar PRIMARY KEY, + description text +); + +CREATE TABLE service_fonctionnaliter ( + id varchar PRIMARY KEY not null, + nom varchar NOT NULL +); + +CREATE TABLE service_groupe ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + nom_groupe varchar NOT NULL +); + +CREATE TABLE service_user ( + userid varchar(50) PRIMARY KEY, + user_pw varchar(50) NOT NULL, + nom varchar(50), + prenom varchar(50), + telephone varchar(50), + mail varchar(50), + actif varchar(5) +); + +-- ===================================================================== +-- TIER 1 +-- ===================================================================== + +CREATE TABLE centre ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + name text NOT NULL, + adresse text, + latitude float, + longitude float, + fk_wilaya varchar(2) REFERENCES wilaya(code) +); + +-- ===================================================================== +-- TIER 2 : depend de centre / service_user / type_machine / service_groupe +-- ===================================================================== + +CREATE TABLE parametre ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_centre uuid REFERENCES centre(id), + mwl_scp_aet varchar, + mwl_scp_port varchar +); + +CREATE TABLE salle_de_soin ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + code text, + fk_centre uuid REFERENCES centre(id) -- hypothese, cf note 6 +); + +CREATE TABLE notification ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_centre uuid REFERENCES centre(id), + titre varchar, + contenu varchar, + date date, + heur time without time zone +); + +CREATE TABLE patient ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_centre uuid REFERENCES centre(id), + nom varchar, + prenom varchar, + date_naissance date, + telephone varchar, + telephone_relative varchar, + email varchar, + sexe varchar, + nin varchar, + adresse varchar, + groupage varchar, + cree_le date +); + +CREATE TABLE medecin ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + nb_rdv_max integer, + nb_patient_max integer, + disponible boolean, + sexe varchar, + fk_centre uuid REFERENCES centre(id), + fk_user varchar(50) REFERENCES service_user(userid) +); + +CREATE TABLE machine ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_centre uuid REFERENCES centre(id), + fk_type_machine uuid REFERENCES type_machine(id), -- hypothese, cf note 6 + nb_rdv_max integer, + nb_patient_max integer, + actif boolean, + disponible boolean, + ip varchar, + port integer, + ae_title integer +); + +-- Table de liaison N-N : un utilisateur peut appartenir a 1 ou plusieurs centres, +-- et un centre peut avoir plusieurs utilisateurs. +CREATE TABLE service_user_centre ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_user varchar(50) REFERENCES service_user(userid), + fk_centre uuid REFERENCES centre(id), + UNIQUE (fk_user, fk_centre) +); + +CREATE TABLE service_member ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_user varchar(50) REFERENCES service_user(userid), -- hypothese, cf note 6 + fk_groupe uuid REFERENCES service_groupe(id) -- hypothese, cf note 6 +); + +CREATE TABLE service_fonctiongroupe ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_groupe uuid REFERENCES service_groupe(id), -- hypothese, cf note 6 + fk_fonctionnalite varchar REFERENCES service_fonctionnaliter(id), -- hypothese, cf note 6 + can_create boolean, + can_update boolean, + can_update_date boolean, + can_delete boolean, + modifier_ce_jour boolean +); + +CREATE TABLE service_historique_connection ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_user varchar(50) REFERENCES service_user(userid), -- hypothese, cf note 6 + date date, + heur time without time zone, + adresse_ip varchar +); + +CREATE TABLE service_historique_manipulation ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_user varchar(50) REFERENCES service_user(userid), -- hypothese, cf note 6 + nom_table varchar, + new_valeur text, + old_valeur text, + heure_manipulation time without time zone, + date_manipulation date, + type_manipulation varchar, + id_ligne varchar +); + +-- ===================================================================== +-- TIER 3 : depend de patient / medecin / notification / specialite_medicale +-- ===================================================================== + +CREATE TABLE medecin_specialiste ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_specialite varchar REFERENCES specialite_medicale(name), + fk_medecin uuid REFERENCES medecin(id) +); + +CREATE TABLE type_examen ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + nom text UNIQUE NOT NULL, + poids integer, -- poids/frequence de l'examen + fk_patient uuid REFERENCES patient(id), -- cf note 5, a confirmer + fk_machine uuid REFERENCES machine(id), + temps_estime time +); + +CREATE TABLE alertes_medicales ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + derscription varchar, -- faute conservee du diagramme, cf note 9 + fk_patient uuid REFERENCES patient(id), + fk_type_alerte_medical uuid REFERENCES type_alerte_medical(id), -- hypothese, cf note 6 + date date +); + +CREATE TABLE fichier_dossier ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_dossier_medical uuid REFERENCES patient(id), -- "dossier medical" = patient, cf note 3 + date date, + heur time without time zone, + file_path varchar +); + +CREATE TABLE rdv ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_patient uuid REFERENCES patient(id), + fk_centre uuid REFERENCES centre(id), + date date, -- champ duplique fusionne, cf note 4 + heur time without time zone, + notifier boolean, + annuler boolean, + deja_notifier boolean +); + +CREATE TABLE notifie_medecin ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + lue boolean, + fk_user varchar(50) REFERENCES service_user(userid), + fk_notification uuid REFERENCES notification(id) +); + +-- ===================================================================== +-- TIER 4 : depend de patient / priority / type_examen +-- ===================================================================== + +CREATE TABLE queue ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_patient uuid REFERENCES patient(id), + fk_priority uuid REFERENCES priority(id), + fk_type_examen uuid REFERENCES type_examen(id), + fk_queue_tips uuid REFERENCES queue_tips(id), + ticket varchar, + status varchar, -- statut courant "cache", cf table status/queue_status_time pour l'historique + date date, + created_at time without time zone +); + +-- ===================================================================== +-- TIER 5 : depend de queue +-- ===================================================================== + +CREATE TABLE examen ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + url_acc_num varchar, + annule boolean, + date date, + heure_debut time without time zone, + heure_fin time without time zone, + region_examinee varchar, + lateralite varchar, -- gauche / droite / bilaterale + indication_clinique varchar, + study_instance_uid varchar, + fk_queue uuid REFERENCES queue(id) +); + +-- ===================================================================== +-- TIER 6 : depend de examen / medecin / status / queue +-- ===================================================================== + +CREATE TABLE consultation ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + rapport_ecrit varchar, + file_path_rapport_dictee varchar, + session_annule boolean, + file_path_signature varchar, + date date, + fk_examen uuid REFERENCES examen(id), + fk_medecin uuid REFERENCES medecin(id), + heure_debut time without time zone, + heure_fin time without time zone +); + +CREATE TABLE image_cles ( + uid_desinstances_sop varchar PRIMARY KEY, + fk_examen uuid REFERENCES examen(id), + url_acc_num varchar, + id_annotations varchar +); + +CREATE TABLE fichier_examen ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_examen uuid REFERENCES examen(id), + date date, + heur time without time zone, + file_path varchar +); + +CREATE TABLE queue_status_time ( + id uuid PRIMARY KEY DEFAULT gen_random_uuid(), + fk_status uuid REFERENCES status(id), + fk_queue uuid REFERENCES queue(id), + time time without time zone +); + +-- ===================================================================== +-- INDEX SUR LES CLES ETRANGERES (bonnes pratiques - jointures/perf) +-- ===================================================================== + +CREATE INDEX idx_centre_fk_wilaya ON centre(fk_wilaya); +CREATE INDEX idx_parametre_fk_centre ON parametre(fk_centre); +CREATE INDEX idx_salle_de_soin_fk_centre ON salle_de_soin(fk_centre); +CREATE INDEX idx_notification_fk_centre ON notification(fk_centre); +CREATE INDEX idx_patient_fk_centre ON patient(fk_centre); +CREATE INDEX idx_medecin_fk_centre ON medecin(fk_centre); +CREATE INDEX idx_medecin_fk_user ON medecin(fk_user); +CREATE INDEX idx_machine_fk_centre ON machine(fk_centre); +CREATE INDEX idx_machine_fk_type_machine ON machine(fk_type_machine); +CREATE INDEX idx_service_user_centre_fk_user ON service_user_centre(fk_user); +CREATE INDEX idx_service_user_centre_fk_centre ON service_user_centre(fk_centre); +CREATE INDEX idx_service_member_fk_user ON service_member(fk_user); +CREATE INDEX idx_service_member_fk_groupe ON service_member(fk_groupe); +CREATE INDEX idx_service_fonctiongroupe_fk_groupe ON service_fonctiongroupe(fk_groupe); +CREATE INDEX idx_service_fonctiongroupe_fk_fonctionnalite ON service_fonctiongroupe(fk_fonctionnalite); +CREATE INDEX idx_service_hist_connection_fk_user ON service_historique_connection(fk_user); +CREATE INDEX idx_service_hist_manipulation_fk_user ON service_historique_manipulation(fk_user); +CREATE INDEX idx_medecin_specialiste_fk_specialite ON medecin_specialiste(fk_specialite); +CREATE INDEX idx_medecin_specialiste_fk_medecin ON medecin_specialiste(fk_medecin); +CREATE INDEX idx_type_examen_fk_patient ON type_examen(fk_patient); +CREATE INDEX idx_type_examen_fk_machine ON type_examen(fk_machine); +CREATE INDEX idx_alertes_medicales_fk_patient ON alertes_medicales(fk_patient); +CREATE INDEX idx_alertes_medicales_fk_type ON alertes_medicales(fk_type_alerte_medical); +CREATE INDEX idx_fichier_dossier_fk_dossier ON fichier_dossier(fk_dossier_medical); +CREATE INDEX idx_rdv_fk_patient ON rdv(fk_patient); +CREATE INDEX idx_rdv_fk_centre ON rdv(fk_centre); +CREATE INDEX idx_notifie_medecin_fk_user ON notifie_medecin(fk_user); +CREATE INDEX idx_notifie_medecin_fk_notification ON notifie_medecin(fk_notification); +CREATE INDEX idx_queue_fk_patient ON queue(fk_patient); +CREATE INDEX idx_queue_fk_priority ON queue(fk_priority); +CREATE INDEX idx_queue_fk_type_examen ON queue(fk_type_examen); +CREATE INDEX idx_queue_fk_queue_tips ON queue(fk_queue_tips); +CREATE INDEX idx_examen_fk_queue ON examen(fk_queue); +CREATE INDEX idx_consultation_fk_examen ON consultation(fk_examen); +CREATE INDEX idx_consultation_fk_medecin ON consultation(fk_medecin); +CREATE INDEX idx_image_cles_fk_examen ON image_cles(fk_examen); +CREATE INDEX idx_fichier_examen_fk_examen ON fichier_examen(fk_examen); +CREATE INDEX idx_queue_status_time_fk_status ON queue_status_time(fk_status); +CREATE INDEX idx_queue_status_time_fk_queue ON queue_status_time(fk_queue); + +ALTER TABLE service_groupe +ADD COLUMN fk_centre uuid, +ADD CONSTRAINT fk_service_groupe_centre +FOREIGN KEY (fk_centre) +REFERENCES centre(id); +-- ===================================================================== +-- FIN DU SCRIPT +-- ===================================================================== + +-- ===================================================================== +-- INITIALISATION : UTILISATEUR ADMIN + GROUPE + FONCTIONNALITE +-- Adapte aux noms de tables/colonnes du schema actuel (schema_trizris.sql) +-- ===================================================================== +-- +-- Differences corrigees par rapport au script d'origine : +-- - service_user : colonnes reelles = userid, user_pw, nom, prenom, +-- telephone, mail, actif (pas de "userpw" ni de +-- "forcermap", qui n'existent pas dans ce schema) +-- - service_groupe : colonnes reelles = id (uuid auto), nom_groupe +-- (pas de colonne "actif") +-- - service_groupe.id : uuid genere automatiquement, on ne peut pas +-- forcer la valeur 'admin' dessus -> on insere +-- nom_groupe='admin' et on recupere l'id genere +-- - service_fonctionnaliter : colonnes reelles = id (uuid auto), nom +-- (on ne peut pas forcer id='User', donc nom='User' +-- et id auto-genere) +-- - service_fonctiongroupe : la colonne se nomme fk_fonctionnalite +-- (et non fk_fonction) +-- - "service_wilaya" : n'existe pas dans le schema -> table wilaya +-- - wilaya : colonnes reelles = code varchar(2), name text +-- (pas de colonne "id" ni "nom_wilaya") -> +-- code = id d'origine sur 2 chiffres (ex: 1 -> '01') +-- ===================================================================== + +-- --- Utilisateur admin --- +INSERT INTO service_user (userid, user_pw, nom, prenom, telephone, mail, actif) +VALUES ('admin', 'admin', 'admin', 'admin', '0560548029', 'contact@hydrotriz.com', 'true'); + + + + +-- ===================================================================== +-- WILAYAS +-- code = ancien id sur 2 chiffres, name = nom_wilaya +-- ===================================================================== + +INSERT INTO wilaya (code, name) VALUES + ('01', 'Adrar'), + ('02', 'Chlef'), + ('03', 'Laghouat'), + ('04', 'Oum El Bouaghi'), + ('05', 'Batna'), + ('06', 'Béjaïa'), + ('07', 'Biskra'), + ('08', 'Béchar'), + ('09', 'Blida'), + ('10', 'Bouira'), + ('11', 'Tamanrasset'), + ('12', 'Tébessa'), + ('13', 'Tlemcen'), + ('14', 'Tiaret'), + ('15', 'Tizi Ouzou'), + ('16', 'Alger'), + ('17', 'Djelfa'), + ('18', 'Jijel'), + ('19', 'Sétif'), + ('20', 'Saïda'), + ('21', 'Skikda'), + ('22', 'Sidi Bel Abbès'), + ('23', 'Annaba'), + ('24', 'Guelma'), + ('25', 'Constantine'), + ('26', 'Médéa'), + ('27', 'Mostaganem'), + ('28', 'MSila'), + ('29', 'Mascara'), + ('30', 'Ouargla'), + ('31', 'Oran'), + ('32', 'El Bayadh'), + ('33', 'Illizi'), + ('34', 'Bordj Bou Arréridj'), + ('35', 'Boumerdès'), + ('36', 'El Tarf'), + ('37', 'Tindouf'), + ('38', 'Tissemsilt'), + ('39', 'El Oued'), + ('40', 'Khenchela'), + ('41', 'Souk Ahras'), + ('42', 'Tipaza'), + ('43', 'Mila'), + ('44', 'Aïn Defla'), + ('45', 'Naâma'), + ('46', 'Aïn Témouchent'), + ('47', 'Ghardaïa'), + ('48', 'Relizane'), + ('49', 'Timimoun'), + ('50', 'Bordj Badji Mokhtar'), + ('51', 'Ouled Djellal'), + ('52', 'Béni Abbès'), + ('53', 'In Salah'), + ('54', 'In Guezzam'), + ('55', 'Touggourt'), + ('56', 'Djanet'), + ('57', 'El MGhair'), + ('58', 'El Meniaa'); + +-- ===================================================================== +-- INSERTION DES STATUTS DE PATIENT DANS LA TABLE status +-- ===================================================================== + +-- Suppression des lignes existantes avant reinsertion +-- (attention : echouera si des lignes de status sont deja referencees +-- par queue_status_time.fk_status -- videz/adaptez cette table avant si besoin) +DELETE FROM status; + +INSERT INTO status (designation) VALUES + ('En attente'), -- dans la file d'attente + ('En cours'), -- dans la salle + ('Finis'), -- pret a interprete + ('Interprete'), -- par medecin + ('Termine'), -- receptionne + ('Archive'); -- apres archive + +-- ===================================================================== +-- FIN DU SCRIPT +-- ===================================================================== + +-- ===================================================================== +-- CENTRE PAR DEFAUT + AFFECTATION DE L'ADMIN +-- Hypothese : centre par defaut rattache a la wilaya de Blida (code '09') +-- -> a adapter (nom, adresse, latitude/longitude, wilaya) si besoin. +-- ===================================================================== + +INSERT INTO centre (name, adresse, fk_wilaya) +VALUES ('Centre', 'Boulevard 11 Decembre 1960, etage 4 N10, Blida', '09'); + +INSERT INTO service_user_centre (fk_user, fk_centre) +SELECT 'admin', id FROM centre WHERE name = 'Centre' LIMIT 1; + +-- ===================================================================== +-- FIN DU SCRIPT +-- ===================================================================== + +-- --- Groupe admin --- +INSERT INTO service_groupe (nom_groupe,fk_centre) +SELECT 'admin',f.id +FROM centre f +WHERE f.name='Centre' LIMIT 1; + + +-- --- Rattachement admin -> groupe admin --- +INSERT INTO service_member (fk_user, fk_groupe) +SELECT 'admin', id FROM service_groupe WHERE nom_groupe = 'admin' LIMIT 1; + +-- --- Fonctionnalite "User" --- +INSERT INTO service_fonctionnaliter (id,nom) +VALUES ('User','User'); + +-- --- Droits du groupe admin sur la fonctionnalite "User" --- +INSERT INTO service_fonctiongroupe (fk_groupe, fk_fonctionnalite, can_create, can_update, can_update_date, can_delete) +SELECT g.id, f.id, true, true, true, true +FROM service_groupe g, service_fonctionnaliter f +WHERE g.nom_groupe = 'admin' AND f.nom = 'User'; + +ALTER TABLE service_historique_connection +ADD COLUMN fk_centre uuid, +ADD CONSTRAINT fk_service_historique_connection_centre +FOREIGN KEY (fk_centre) +REFERENCES centre(id); + +ALTER TABLE service_groupe +ADD COLUMN actif varchar(5); + +ALTER TABLE centre +ADD COLUMN actif varchar(5) + +INSERT INTO service_fonctionnaliter (id, nom) VALUES +('accueil', 'Accueil'), + +('rdv', 'Rendez-vous'), +('attente', 'File d''attente'), +('exam', 'Examens'), +('dossier', 'Dossier patients'), + +('pacs', 'DICOM / PACS'), +('param', 'Paramètres'), + +('users', 'Utilisateurs & Audit'), +('medecins', 'Médecins'), +('groupes', 'Groupes et fonctionnalités'); + diff --git a/src/main/resources/langue/message_fr.properties b/src/main/resources/langue/message_fr.properties index b6fbf59..6ade043 100644 --- a/src/main/resources/langue/message_fr.properties +++ b/src/main/resources/langue/message_fr.properties @@ -6,7 +6,7 @@ distribution.nomapplication=TrizTresorie distribution.client=SARL DPLM distribution.societte=SARL TRIZTECH -distribution.mail=contact@hydrotriz.com +distribution.mail=contact@triztech.dz distribution.copyright=Copyright ONDA 2025 \u00a9 Tous droits r\u00e9serv\u00e9s distribution.page.welcome=Bonjour distribution.page.boutton.frensh=Fran\u00e7ais @@ -36,7 +36,7 @@ distribution.status=Statut distribution.datedebut=Date d\u00e9but distribution.datefin=Date fin distribution.select=S\u00e9lectionner -distribution.buttons.valider=Valider +distribution.buttons.valider=Se connecter distribution.buttons.connexion=Connexion distribution.buttons.deconnexion=D\u00e9connexion distribution.buttons.changerEntreprise=Changer Entreprise @@ -808,7 +808,7 @@ distribution.page.prix.consulterprix=Consulter un produit distribution.page.prix.modifierprix.message=Prix {0} modifi\u00e9 avec succ\u00e8s distribution.page.prix.liste.prix.pmp=PMP (TTC) -distribution.page.etablissement=Etablissement +distribution.page.etablissement=Centre distribution.page.etablissement.id=ID Etablissement distribution.page.etablissement.isPreparateur=Est il un pr\u00e9parateur ? distribution.page.etablissement.code=Code Etablissement @@ -4303,5 +4303,5 @@ service.page.Abonnement.prolongement = Prolongement service.page.Abonnement.historique=Historique des Demandes service.page.Telephone.ajouter = Ajouter Telephone service.page.Telephone.liste.message.non=Pas de telephone enregistr\u00e9 ! -distribution.buttons.changerEtablissement=changer Etablissement -distribution.page.etablissement.selectionner=Veuillez s\u00e9l\u00e9ctionner un \u00e9tablissement +distribution.buttons.changerEtablissement=changer Centre +distribution.page.etablissement.selectionner=Veuillez s\u00e9l\u00e9ctionner un centre diff --git a/src/main/resources/resources/demo/styles/auth/_login.scss b/src/main/resources/resources/demo/styles/auth/_login.scss index 962c815..44888ec 100644 --- a/src/main/resources/resources/demo/styles/auth/_login.scss +++ b/src/main/resources/resources/demo/styles/auth/_login.scss @@ -1,6 +1,6 @@ .pages-body { &.login-page { - background: url("\#{resource['demo:images/auth/login-bg.jpg']}"); + background-color: #F0F4F8; background-size: cover; .pages-panel { diff --git a/src/main/resources/resources/demo/styles/demo.css b/src/main/resources/resources/demo/styles/demo.css index 6829db3..d8acd5f 100644 --- a/src/main/resources/resources/demo/styles/demo.css +++ b/src/main/resources/resources/demo/styles/demo.css @@ -163,7 +163,7 @@ } .pages-body.login-page { - background: url("#{resource['demo:images/auth/login-bg.jpg']}"); + background-color: #F0F4F8; background-size: cover; } .pages-body.login-page .pages-panel .pages-header { diff --git a/src/main/resources/resources/layout/styles/layout-light.css b/src/main/resources/resources/layout/styles/layout-light.css index ab10614..059c30a 100644 --- a/src/main/resources/resources/layout/styles/layout-light.css +++ b/src/main/resources/resources/layout/styles/layout-light.css @@ -3693,6 +3693,7 @@ body a { padding: 2rem; padding-top: 1rem; flex: 1 1 0; + background-color: #f1f5f9; } .layout-ajax-loader-icon { diff --git a/src/main/resources/resources/layout/styles/layout/layout-common/styles/_main.scss b/src/main/resources/resources/layout/styles/layout/layout-common/styles/_main.scss index c4407c9..5f1d211 100644 --- a/src/main/resources/resources/layout/styles/layout/layout-common/styles/_main.scss +++ b/src/main/resources/resources/layout/styles/layout/layout-common/styles/_main.scss @@ -45,6 +45,7 @@ body { padding: 2rem; padding-top: 1rem; flex: 1 1 0; + background-color: #f1f5f9; } } } diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml index bf5b891..7b317d4 100644 --- a/src/main/webapp/META-INF/context.xml +++ b/src/main/webapp/META-INF/context.xml @@ -1,2 +1,2 @@ - + diff --git a/src/main/webapp/WEB-INF/applicationContext.xml b/src/main/webapp/WEB-INF/applicationContext.xml index 5441fa6..e1c31b1 100644 --- a/src/main/webapp/WEB-INF/applicationContext.xml +++ b/src/main/webapp/WEB-INF/applicationContext.xml @@ -40,7 +40,7 @@ diff --git a/src/main/webapp/WEB-INF/layout/sections/breadcrumb.xhtml b/src/main/webapp/WEB-INF/layout/sections/breadcrumb.xhtml index 0b81b4a..f227b54 100644 --- a/src/main/webapp/WEB-INF/layout/sections/breadcrumb.xhtml +++ b/src/main/webapp/WEB-INF/layout/sections/breadcrumb.xhtml @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui"> - + - - - - - - + display: flex !important; + align-items: center !important; + justify-content: center !important; + + color: #FFFFFF !important; + font-weight: 600; + font-size: 13px; + + flex-shrink: 0; + } + + .user-initials-square .ui-button-text { + padding: 0 !important; + color: #FFFFFF !important; + } + + .user-initials-square:hover { + background-color: #0B7A70 !important; + } + + /* ========================================= */ + /* FOOTER MENU */ + /* ========================================= */ + + .custom-inline-menu-footer { + position: fixed !important; + bottom: 0 !important; + left: 0 !important; + + width: var(--sidebar-width, 238px) !important; + + display: flex; + align-items: center; + justify-content: space-between; + + background-color: #0D1B2E; + border-top: 1px solid rgba(255,255,255,0.08); + + padding: 10px; + box-sizing: border-box; + + z-index: 1000; + } + + /* ========================================= */ + /* PROFIL */ + /* ========================================= */ + + .footer-profile-block { + display: flex; + align-items: center; + gap: 10px; + + flex: 1; + min-width: 0; + } + + .footer-profile-name { + color: #FFFFFF; + font-size: 13px; + font-weight: 500; + + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + + max-width: 95px; + } + + /* ========================================= */ + /* ACTIONS */ + /* ========================================= */ + + .footer-actions-block { + display: flex; + align-items: center; + gap: 12px; + + flex-shrink: 0; + } + + .footer-actions-block .layout-footer-action { + width: auto !important; + height: auto !important; + + padding: 4px !important; + + background: transparent !important; + border: none !important; + box-shadow: none !important; + } + + /* ========================================= */ + /* INLINE MENU */ + /* ========================================= */ + + .layout-inline-menu, + .layout-inline-menu-action-panel, + .layout-inline-menu-action, + .layout-inline-menu-bottom { + background-color: #0D1B2E !important; + } + + .layout-inline-menu, + .layout-inline-menu-action-panel, + .layout-menu-container { + margin-bottom: 0 !important; + padding-bottom: 0 !important; + } + + .layout-menu-wrapper, + .layout-menu-container, + .layout-menu { + margin-bottom: 0 !important; + padding-bottom: 0 !important; + } + + + +
+ + #{utilContext.currentUser.nom} #{utilContext.currentUser.prenom} +
+ + +
+ + + + +
- +
@@ -59,17 +195,17 @@ - - + +
diff --git a/src/main/webapp/WEB-INF/layout/sections/menu.xhtml b/src/main/webapp/WEB-INF/layout/sections/menu.xhtml index b03b35e..f6460ca 100644 --- a/src/main/webapp/WEB-INF/layout/sections/menu.xhtml +++ b/src/main/webapp/WEB-INF/layout/sections/menu.xhtml @@ -7,6 +7,69 @@ xmlns:pu="http://primefaces.org/ultima"> + + + @@ -17,50 +80,120 @@ - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + + + + + + + + + - - - - + + + + + + + + + + + + + - diff --git a/src/main/webapp/WEB-INF/layout/sections/topbar.xhtml b/src/main/webapp/WEB-INF/layout/sections/topbar.xhtml index f93e626..ebc5117 100644 --- a/src/main/webapp/WEB-INF/layout/sections/topbar.xhtml +++ b/src/main/webapp/WEB-INF/layout/sections/topbar.xhtml @@ -7,169 +7,344 @@ xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"> + + +
-
+
-
+
-
-