Skip to content

Commit

Permalink
Loading
Loading status checks…
Fix modification
Browse files Browse the repository at this point in the history
  • Loading branch information
@Daudeuf
Daudeuf committed Jan 19, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
1 parent afac70c commit 908c73e
Showing 8 changed files with 118 additions and 38 deletions.
25 changes: 20 additions & 5 deletions src/main/java/fr/elpine/astre/metier/objet/Affectation.java
View file
Original file line number Diff line number Diff line change
@@ -76,11 +76,26 @@ public Affectation(Module module, Intervenant intervenant, CategorieHeure typeHe


public void setId ( int id ) { this.id = id; }
public void setNbGroupe ( int nbGroupe ) { this.nbGroupe = nbGroupe; this.modifie = ((Integer) this.rollbackDatas.get("nbGroupe")) != nbGroupe; }
public void setNbSemaine ( int nbSemaine ) { this.nbSemaine = nbSemaine; this.modifie = ((Integer) this.rollbackDatas.get("nbGroupe")) != nbSemaine; }
public void setNbHeure ( Fraction nbHeure ) { this.nbHeure = nbHeure; this.modifie = !((Fraction) this.rollbackDatas.get("nbHeure")).equals(nbHeure); }
public void setCommentaire ( String commentaire ) { this.commentaire = commentaire; this.modifie = !this.rollbackDatas.get("commentaire").equals(commentaire); }
public void setTypeHeure ( CategorieHeure typeHeure ) { this.typeHeure = typeHeure; this.modifie = this.rollbackDatas.get("typeHeure") != typeHeure; }
public void setNbGroupe ( int nbGroupe ) { this.nbGroupe = nbGroupe; this.modifState(); }
public void setNbSemaine ( int nbSemaine ) { this.nbSemaine = nbSemaine; this.modifState(); }
public void setNbHeure ( Fraction nbHeure ) { this.nbHeure = nbHeure; this.modifState(); }
public void setCommentaire ( String commentaire ) { this.commentaire = commentaire; this.modifState(); }
public void setTypeHeure ( CategorieHeure typeHeure ) { this.typeHeure = typeHeure; this.modifState(); }

private void modifState()
{
this.modifie = false;

if ( this.hasGrpAndNbSemaine() ) {
if (!this.rollbackDatas.get("nbGroupe").equals(this.nbGroupe)) this.modifie = true;
if (!this.rollbackDatas.get("nbSemaine").equals(this.nbSemaine)) this.modifie = true;
} else if ( this.hasNbHeure() ) {
if ( !((Fraction) this.rollbackDatas.get("nbHeure")).equals(this.nbHeure) ) this.modifie = true;
}

if ( !this.rollbackDatas.get("commentaire").equals(this.commentaire) ) this.modifie = true;
if ( this.rollbackDatas.get("typeHeure") != typeHeure ) this.modifie = true;
}

/* Calculs */
public double getTotalEqtd() {
11 changes: 9 additions & 2 deletions src/main/java/fr/elpine/astre/metier/objet/Annee.java
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@

import fr.elpine.astre.Controleur;
import fr.elpine.astre.metier.Astre;
import fr.elpine.astre.metier.outil.Fraction;

import java.sql.Date;
import java.util.ArrayList;
@@ -56,8 +57,14 @@ public Annee(String nom, String dateDeb, String dateFin)
public Date getDateDeb () { return dateDeb; }
public Date getDateFin () { return dateFin; }

public void setDateDeb (Date dateDeb ) { this.dateDeb = dateDeb; this.modifie = ((Date) this.rollbackDatas.get("dateDeb")).compareTo(dateDeb) != 0; }
public void setDateFin (Date dateFin ) { this.dateFin = dateFin; this.modifie = ((Date) this.rollbackDatas.get("dateFin")).compareTo(dateFin) != 0; }
public void setDateDeb (Date dateDeb ) { this.dateDeb = dateDeb; this.modifState(); }
public void setDateFin (Date dateFin ) { this.dateFin = dateFin; this.modifState(); }

private void modifState()
{
this.modifie = ((Date) this.rollbackDatas.get("dateDeb")).compareTo(dateDeb) != 0;
if ( ((Date) this.rollbackDatas.get("dateFin")).compareTo(dateFin) != 0 ) this.modifie = true;
}

/* Synchronisation */
public boolean isAjoute() { return this.ajoute; }
14 changes: 11 additions & 3 deletions src/main/java/fr/elpine/astre/metier/objet/Attribution.java
View file
Original file line number Diff line number Diff line change
@@ -62,9 +62,17 @@ public Attribution(Fraction nbHeurePN, Fraction nbHeure, Module module, Categori
public Module getModule () { return module; }
public CategorieHeure getCatHr () { return catHr; }

public void setNbHeurePN (Fraction nbHeurePN ) { this.nbHeurePN = nbHeurePN; this.modifie = !((Fraction) this.rollbackDatas.get("nbHeurePN")).equals(nbHeurePN); }
public void setNbHeure (Fraction nbHeure ) { this.nbHeure = nbHeure; this.modifie = !((Fraction) this.rollbackDatas.get("nbHeure")).equals(nbHeure); }
public void setNbSemaine (int nbSemaine ) { this.nbSemaine = nbSemaine; this.modifie = ((Integer) this.rollbackDatas.get("nbSemaine")) != nbSemaine; }
public void setNbHeurePN (Fraction nbHeurePN ) { this.nbHeurePN = nbHeurePN; this.modifState(); }
public void setNbHeure (Fraction nbHeure ) { this.nbHeure = nbHeure; this.modifState(); }
public void setNbSemaine (int nbSemaine ) { this.nbSemaine = nbSemaine; this.modifState(); }

private void modifState()
{
this.modifie = !((Fraction) this.rollbackDatas.get("nbHeurePN")).equals(this.nbHeurePN);
if ( !((Fraction) this.rollbackDatas.get("nbHeure")).equals(this.nbHeure) ) this.modifie = true;
if ( this.hasNbSemaine() )
if ( !this.rollbackDatas.get("nbSemaine").equals(this.nbSemaine) ) this.modifie = true;
}

/* Calculs */

25 changes: 18 additions & 7 deletions src/main/java/fr/elpine/astre/metier/objet/CategorieHeure.java
View file
Original file line number Diff line number Diff line change
@@ -66,13 +66,24 @@ public CategorieHeure(String nom, Fraction equivalentTD,boolean ressource, boole

/* SETTER */

public void setEquivalentTD ( Fraction equivalentTD ) { this.equivalentTD = equivalentTD ; this.modifie = !((Fraction) this.rollbackDatas.get("equivalentTD")).equals(equivalentTD); }
public void setRessource ( boolean estRessource ) { this.ressource = estRessource ; this.modifie = ((boolean) this.rollbackDatas.get("estRessource")) != estRessource; }
public void setSae ( boolean estSae ) { this.sae = estSae ; this.modifie = ((boolean) this.rollbackDatas.get("estSae")) != estSae; }
public void setPpp ( boolean estPpp ) { this.ppp = estPpp ; this.modifie = ((boolean) this.rollbackDatas.get("estPpp")) != estPpp; }
public void setStage ( boolean estStage ) { this.stage = estStage ; this.modifie = ((boolean) this.rollbackDatas.get("estStage")) != estStage; }
public void setTypeGroupe ( String typeGroupe ) { this.typeGroupe = typeGroupe ; this.modifie = !this.rollbackDatas.get("typeGroupe").equals(typeGroupe); }
public void setHebdo ( boolean hebdo ) { this.hebdo = hebdo ; this.modifie = ((boolean) this.rollbackDatas.get("hebdo")) != hebdo; }
public void setEquivalentTD ( Fraction equivalentTD ) { this.equivalentTD = equivalentTD ; this.modifState(); }
public void setRessource ( boolean estRessource ) { this.ressource = estRessource ; this.modifState(); }
public void setSae ( boolean estSae ) { this.sae = estSae ; this.modifState(); }
public void setPpp ( boolean estPpp ) { this.ppp = estPpp ; this.modifState(); }
public void setStage ( boolean estStage ) { this.stage = estStage ; this.modifState(); }
public void setTypeGroupe ( String typeGroupe ) { this.typeGroupe = typeGroupe ; this.modifState(); }
public void setHebdo ( boolean hebdo ) { this.hebdo = hebdo ; this.modifState(); }

private void modifState()
{
this.modifie = !((Fraction) this.rollbackDatas.get("equivalentTD")).equals(this.equivalentTD);
if ( ((boolean) this.rollbackDatas.get("ressource")) != ressource ) this.modifie = true;
if ( ((boolean) this.rollbackDatas.get("sae")) != sae ) this.modifie = true;
if ( ((boolean) this.rollbackDatas.get("ppp")) != ppp ) this.modifie = true;
if ( ((boolean) this.rollbackDatas.get("stage")) != stage ) this.modifie = true;
if ( !this.rollbackDatas.get("typeGroupe").equals(this.typeGroupe) ) this.modifie = true;
if ( ((boolean) this.rollbackDatas.get("hebdo")) != hebdo ) this.modifie = true;
}

/* Synchronisation */
public boolean isAjoute() { return this.ajoute; }
16 changes: 12 additions & 4 deletions src/main/java/fr/elpine/astre/metier/objet/CategorieIntervenant.java
View file
Original file line number Diff line number Diff line change
@@ -52,10 +52,18 @@ public CategorieIntervenant(String code, String nom, Fraction nbHeureMaxDefault,

/* SETTER */

public void setNom ( String nom ) { this.nom = nom ; this.modifie = !this.rollbackDatas.get("nom").equals(nom); }
public void setNbHeureMaxDefault ( Fraction nbHeureMaxDefault ) { this.nbHeureMaxDefault = nbHeureMaxDefault ; this.modifie = !((Fraction) this.rollbackDatas.get("nbHeureMaxDefault")).equals(nbHeureMaxDefault); }
public void setNbHeureServiceDefault ( Fraction nbHeureServiceDefault ) { this.nbHeureServiceDefault = nbHeureServiceDefault ; this.modifie = !((Fraction) this.rollbackDatas.get("nbHeureServiceDefault")).equals(nbHeureServiceDefault); }
public void setRatioTPDefault (Fraction ratioTPDefault ) { this.ratioTPDefault = ratioTPDefault; this.modifie = !((Fraction) this.rollbackDatas.get("ratioTPDefault")).equals(ratioTPDefault); }
public void setNom ( String nom ) { this.nom = nom ; this.modifState(); }
public void setNbHeureMaxDefault ( Fraction nbHeureMaxDefault ) { this.nbHeureMaxDefault = nbHeureMaxDefault ; this.modifState(); }
public void setNbHeureServiceDefault ( Fraction nbHeureServiceDefault ) { this.nbHeureServiceDefault = nbHeureServiceDefault ; this.modifState(); }
public void setRatioTPDefault (Fraction ratioTPDefault ) { this.ratioTPDefault = ratioTPDefault; this.modifState(); }

private void modifState()
{
this.modifie = !this.rollbackDatas.get("nom").equals(this.nom);
if ( !((Fraction) this.rollbackDatas.get("nbHeureMaxDefault")).equals(this.nbHeureMaxDefault) ) this.modifie = true;
if ( !((Fraction) this.rollbackDatas.get("nbHeureServiceDefault")).equals(this.nbHeureServiceDefault) ) this.modifie = true;
if ( !((Fraction) this.rollbackDatas.get("ratioTPDefault")).equals(this.ratioTPDefault) ) this.modifie = true;
}

/* Synchronisation */
public boolean isAjoute() { return this.ajoute; }
25 changes: 18 additions & 7 deletions src/main/java/fr/elpine/astre/metier/objet/Intervenant.java
View file
Original file line number Diff line number Diff line change
@@ -65,22 +65,33 @@ public Intervenant(String nom, String prenom, String mail, CategorieIntervenant
/* SETTER */

public void setId (int id ) { this.id = id; }
public void setNom (String nom ) { this.nom = nom ; this.modifie = !this.rollbackDatas.get("nom").equals(nom); }
public void setPrenom (String prenom ) { this.prenom = prenom ; this.modifie = !this.rollbackDatas.get("prenom").equals(prenom); }
public void setNom (String nom ) { this.nom = nom ; this.modifState(); }
public void setPrenom (String prenom ) { this.prenom = prenom ; this.modifState(); }
public boolean setMail (String mail )
{
if ( mail.matches("^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,7}$"))
{
this.mail = mail;
this.modifie = !this.rollbackDatas.get("mail").equals(mail);
this.modifState();
return true;
}
return false;
}
public void setHeureService (Fraction heureService ) { this.heureService = heureService ; this.modifie = !((Fraction) this.rollbackDatas.get("heureService")).equals(heureService); }
public void setHeureMax (Fraction heureMax ) { this.heureMax = heureMax ; this.modifie = !((Fraction) this.rollbackDatas.get("heureMax")).equals(heureMax); }
public void setRatioTP (Fraction ratioTP ) { this.ratioTP = ratioTP ; this.modifie = !((Fraction) this.rollbackDatas.get("ratioTP")).equals(ratioTP); }
public void setCategorie (CategorieIntervenant categorie) { this.categorie = categorie ; this.modifie = this.rollbackDatas.get("categorie") != categorie; }
public void setHeureService (Fraction heureService ) { this.heureService = heureService ; this.modifState(); }
public void setHeureMax (Fraction heureMax ) { this.heureMax = heureMax ; this.modifState(); }
public void setRatioTP (Fraction ratioTP ) { this.ratioTP = ratioTP ; this.modifState(); }
public void setCategorie (CategorieIntervenant categorie) { this.categorie = categorie ; this.modifState(); }

private void modifState()
{
this.modifie = !this.rollbackDatas.get("nom").equals(this.nom);
if ( !this.rollbackDatas.get("prenom").equals(this.prenom) ) this.modifie = true;
if ( !this.rollbackDatas.get("mail").equals(this.mail) ) this.modifie = true;
if ( !((Fraction) this.rollbackDatas.get("heureService")).equals(this.heureService) ) this.modifie = true;
if ( !((Fraction) this.rollbackDatas.get("heureMax")).equals(this.heureMax) ) this.modifie = true;
if ( !((Fraction) this.rollbackDatas.get("ratioTP")).equals(this.ratioTP) ) this.modifie = true;
if ( this.rollbackDatas.get("categorie") != categorie ) this.modifie = true;
}

/* Calculs */

23 changes: 17 additions & 6 deletions src/main/java/fr/elpine/astre/metier/objet/Module.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package fr.elpine.astre.metier.objet;

import fr.elpine.astre.Controleur;
import fr.elpine.astre.metier.outil.Fraction;
import javafx.scene.paint.Color;

import java.util.ArrayList;
@@ -66,12 +67,22 @@ public ArrayList<CategorieHeure> getEnsCatHr()

/* SETTER */

public void setCode ( String code ) { this.code = code ; this.modifie = !this.rollbackDatas.get("code").equals(code); }
public void setNom ( String nom ) { this.nom = nom ; this.modifie = !this.rollbackDatas.get("nom").equals(nom); }
public void setAbreviation ( String abreviation ) { this.abreviation = abreviation ; this.modifie = !this.rollbackDatas.get("abreviation").equals(abreviation); }
public void setCouleur ( Color couleur ) { this.couleur = couleur ; this.modifie = !((Color) this.rollbackDatas.get("couleur")).equals(couleur); }
public void setTypeModule ( String typeModule ) { this.typeModule = typeModule ; this.modifie = !this.rollbackDatas.get("typeModule").equals(typeModule); }
public void setValidation ( boolean validation ) { this.validation = validation ; this.modifie = ((boolean) this.rollbackDatas.get("validation")) != validation; }
public void setCode ( String code ) { this.code = code ; this.modifState(); }
public void setNom ( String nom ) { this.nom = nom ; this.modifState(); }
public void setAbreviation ( String abreviation ) { this.abreviation = abreviation ; this.modifState(); }
public void setCouleur ( Color couleur ) { this.couleur = couleur ; this.modifState(); }
public void setTypeModule ( String typeModule ) { this.typeModule = typeModule ; this.modifState(); }
public void setValidation ( boolean validation ) { this.validation = validation ; this.modifState(); }

private void modifState()
{
this.modifie = !this.rollbackDatas.get("code").equals(this.code);
if ( !this.rollbackDatas.get("nom").equals(this.nom) ) this.modifie = true;
if ( !this.rollbackDatas.get("abreviation").equals(this.abreviation) ) this.modifie = true;
if ( !this.rollbackDatas.get("couleur").equals(couleur) ) this.modifie = true;
if ( !this.rollbackDatas.get("typeModule").equals(this.typeModule) ) this.modifie = true;
if ( ((boolean) this.rollbackDatas.get("validation")) != validation ) this.modifie = true;
}


/* Calculs */
17 changes: 13 additions & 4 deletions src/main/java/fr/elpine/astre/metier/objet/Semestre.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package fr.elpine.astre.metier.objet;

import fr.elpine.astre.Controleur;
import javafx.scene.paint.Color;

import java.util.ArrayList;
import java.util.HashMap;
@@ -52,10 +53,18 @@ public Semestre(int numero, int nbGrpTD, int nbGrpTP, int nbEtd, int nbSemaine,

/* SETTER */

public void setNbGrpTD ( int nbGrpTD ) { this.nbGrpTD = nbGrpTD; this.modifie = ((int) this.rollbackDatas.get("nbGrpTD")) != nbGrpTD; }
public void setNbGrpTP ( int nbGrpTP ) { this.nbGrpTP = nbGrpTP; this.modifie = ((int) this.rollbackDatas.get("nbGrpTP")) != nbGrpTP; }
public void setNbEtd ( int nbEtd ) { this.nbEtd = nbEtd; this.modifie = ((int) this.rollbackDatas.get("nbEtd")) != nbEtd; }
public void setNbSemaine ( int nbSemaine ) { this.nbSemaine = nbSemaine; this.modifie = ((int) this.rollbackDatas.get("nbSemaine")) != nbSemaine; }
public void setNbGrpTD ( int nbGrpTD ) { this.nbGrpTD = nbGrpTD; this.modifState(); }
public void setNbGrpTP ( int nbGrpTP ) { this.nbGrpTP = nbGrpTP; this.modifState(); }
public void setNbEtd ( int nbEtd ) { this.nbEtd = nbEtd; this.modifState(); }
public void setNbSemaine ( int nbSemaine ) { this.nbSemaine = nbSemaine; this.modifState(); }

private void modifState()
{
this.modifie = ((int) this.rollbackDatas.get("nbGrpTD")) != nbGrpTD;
if ( ((int) this.rollbackDatas.get("nbGrpTP")) != nbGrpTP ) this.modifie = true;
if ( ((int) this.rollbackDatas.get("nbEtd")) != nbEtd ) this.modifie = true;
if ( ((int) this.rollbackDatas.get("nbSemaine")) != nbSemaine ) this.modifie = true;
}


/* Synchronisation */

0 comments on commit 908c73e

Please sign in to comment.