Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge dev to test #28

Merged
merged 76 commits into from
Aug 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
6ea1eff
FIX : Ajout pgrep pour lancement des batch dans dockerfile
pierre-maraval Jul 12, 2024
5bcb808
Feat : ajout entity DemandeSupp
pierre-maraval Jul 12, 2024
4e42885
Feat : Ajout méthode stockage fichier pour demande de suppression
pierre-maraval Jul 12, 2024
b57b302
Feat : Ajout dto pour demandeSupp + builder
pierre-maraval Jul 12, 2024
ec4e5d6
Merge pull request #25 from abes-esr/ITEM-104-priorite-1-nouvelle-pag…
SamuelQuetin Jul 12, 2024
3d5ba41
Ajout donnée dans webdto + service + mapper
SamuelQuetin Jul 15, 2024
27fcd7f
Ajout fichier init Supp
Jul 16, 2024
f015af6
update
Jul 17, 2024
7e78224
Ajout fichierEnrichiSupp dans componnent,
SamuelQuetin Jul 17, 2024
b162dcc
Ajout methode dans repo pour chercher les demandes de suppression
Jul 18, 2024
5c79a8f
Ajout modif etat
Jul 18, 2024
960314b
modif supp
Jul 29, 2024
40d3af6
Merge pull request #26 from abes-esr/ITEM-104-PRIORITÉ-1-NOUVELLE-PAG…
jvk88511334 Jul 29, 2024
a090467
Merge branch 'develop' into ITEM-54_PRIORITÉ_1-2_CAS_1_Suppression_à_…
jvk88511334 Jul 29, 2024
6dea6e0
Merge pull request #27 from abes-esr/ITEM-54_PRIORITÉ_1-2_CAS_1_Suppr…
jvk88511334 Jul 29, 2024
f033b24
Tentative Modif create Release
Jul 30, 2024
70378a5
Tentative Modif create Release
Jul 30, 2024
acebafd
Tentative Modif create Release
Jul 30, 2024
42a82cb
Tentative Modif create Release
Jul 30, 2024
785162d
Tentative Modif create Release
Jul 30, 2024
2d0ea22
Tentative Modif create Release
Jul 30, 2024
73d989c
Tentative Modif create Release
Jul 30, 2024
717bf79
Tentative Modif create Release
Jul 30, 2024
2cc0d12
Tentative Modif create Release
Jul 30, 2024
783f014
Tentative Modif create Release
Jul 30, 2024
e722f04
Tentative Modif create Release
Jul 30, 2024
bebe10b
Tentative Modif create Release
Jul 30, 2024
819a680
Tentative Modif create Release
Jul 30, 2024
719a7f8
Tentative Modif create Release
Jul 30, 2024
d56c1e4
Tentative Modif create Release
Jul 30, 2024
f3b23c1
Tentative Modif create Release
Jul 30, 2024
834ace1
Tentative Modif create Release
Jul 30, 2024
c43981d
Tentative Modif create Release
Jul 30, 2024
db4a314
Tentative Modif create Release
Jul 30, 2024
10b5029
Tentative Modif create Release
Jul 30, 2024
01543ab
Tentative Modif create Release
Jul 30, 2024
6bbb943
Tentative Modif create Release
Jul 30, 2024
04bfd35
Tentative Modif create Release
Jul 30, 2024
98ccafa
Tentative Modif create Release
Jul 30, 2024
bb99408
Tentative Modif create Release
Jul 30, 2024
4b824f5
Tentative Modif create Release
Jul 30, 2024
dbb6d0e
Tentative Modif create Release
Jul 30, 2024
739c3c9
Merge main to develop [skip ci]
Jul 30, 2024
b9d6379
Merge main to develop [skip ci]
Jul 30, 2024
dbe9779
Merge main to develop [skip ci]
Jul 30, 2024
0c092d1
Merge main to develop [skip ci]
Jul 30, 2024
e1d380e
Tentative Modif create Release
Jul 30, 2024
bc4b00b
Merge main to develop [skip ci]
Jul 30, 2024
af34f0d
Version 2.4.12-SNAPSHOT [skip ci]
Jul 30, 2024
8fac4ca
Merge remote-tracking branch 'origin/develop' into develop
Jul 30, 2024
e0d8784
Tentative Modif create Release
Jul 30, 2024
e2bce7c
Merge remote-tracking branch 'origin/develop' into develop
Jul 30, 2024
8f36818
Feat : Ajout modification champ type suppression pour demandes de sup…
pierre-maraval Aug 20, 2024
29df624
Feat : Ajout appel procédure stockée epntoppn, alimentation fichier p…
pierre-maraval Aug 20, 2024
72dac8e
- Ajout du @Qualifier
jvk88511334 Aug 20, 2024
0f0480e
FIX : correction pb construction json sur appel epn2ppn
pierre-maraval Aug 20, 2024
3e0f4dd
FIX TU suite à correction méthode construction json
pierre-maraval Aug 20, 2024
c955625
FIX Ajout méthode de changement d'état d'une demande de suppression
pierre-maraval Aug 20, 2024
5e3b8f8
FIX gestion des états sur demandes de supp
pierre-maraval Aug 20, 2024
5316224
FIX suppression changement d'état demande suppression lors de la prép…
pierre-maraval Aug 21, 2024
d19b6a0
FIX ajout retour à la sélection du type de fichier de suppression
pierre-maraval Aug 21, 2024
4012d2e
Merge pull request #30 from abes-esr/ITEM-62-priorite-1-3-cas-2-suppr…
SamuelQuetin Aug 21, 2024
e703c59
FEAT Ajout ligne fichier supp
SamuelQuetin Aug 21, 2024
70a64cd
Merge pull request #31 from abes-esr/ITEM-169-BACK]-Modifier-l'upload
jvk88511334 Aug 21, 2024
dffa587
Merge remote-tracking branch 'origin/develop' into ITEM-56_PRIORITÉ_3…
SamuelQuetin Aug 21, 2024
99fbdb8
FEAT ajout jsonTypeName pour demandeSupWebDTO
SamuelQuetin Aug 21, 2024
8fb17ef
Merge pull request #32 from abes-esr/ITEM-56_PRIORITÉ_3_TABLEAU_DE_BO…
pierre-maraval Aug 21, 2024
c1f1edc
Feat Ajout batch sur les demandes de supp
Aug 22, 2024
1a30c33
FIX
Aug 22, 2024
531c96c
DevOps : ajout script shell lancement batch suppression + cron + dépl…
pierre-maraval Aug 23, 2024
a398363
Fix : suppression logs trop bavards
pierre-maraval Aug 23, 2024
a03de2a
Fix suppression du filtre pour recuperer aussi les demandes en etat 2
SamuelQuetin Aug 23, 2024
2b209bc
Merge pull request #33 from abes-esr/Fix-le-front-recuperait-pas-tout…
pierre-maraval Aug 23, 2024
29b4439
FIX : ajout environnement d'exécution dans tous les mails envoyés par…
pierre-maraval Aug 23, 2024
ce5d5b7
Merge pull request #34 from abes-esr/ITEM-194-back-afficher-lenvironn…
SamuelQuetin Aug 23, 2024
c9ff6ab
FIX : mise à jour version spring boot
pierre-maraval Aug 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
FEAT ajout jsonTypeName pour demandeSupWebDTO
SamuelQuetin committed Aug 21, 2024
commit 99fbdb85d5f7a965e520c54f01244075b3ebc8cb
Original file line number Diff line number Diff line change
@@ -373,6 +373,6 @@ public Demande majTypeSupp(Integer demandeId, TYPE_SUPPRESSION typeSuppression)
demandeSupp.setTypeSuppression(typeSuppression);
return this.save(demandeSupp);
}
return null;
return demandeSupp;
}
}
8 changes: 8 additions & 0 deletions web/src/main/java/fr/abes/item/dto/DemandeSuppWebDto.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
package fr.abes.item.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import fr.abes.item.core.constant.TYPE_SUPPRESSION;
import fr.abes.item.core.entities.item.DemandeSupp;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.text.DateFormat;
import java.text.SimpleDateFormat;

@Getter
@Setter
@JsonTypeName("SUPP")
@NoArgsConstructor
public class DemandeSuppWebDto extends DemandeWebDto {
@JsonProperty("typeSuppression")
private String typeSuppression;