Commits · develop · pub / Numérique et Écologie / NumEcoEval

Jan 23, 2025
- correction du backoff en seconde · 2bae424d
  LEMERCIER Denis authored 2 months ago
  
  2bae424d
- Correction issue 11 - backoff par defaut a 30 secondes · 43c6be34
  LEMERCIER Denis authored 2 months ago
  
  43c6be34
Nov 13, 2024
- Merge branch 'ajout_duree_vie_calcul' into 'develop' · 3d97c230
  OURY Sarah authored 4 months ago
  
  Ajout du champ duree de vie dans la libraire de calcul See merge request !39
  3d97c230
- Ajout du champ duree de vie dans la libraire de calcul · 0728a30f
  LEMERCIER Denis authored 4 months ago and OURY Sarah committed 4 months ago
  
  0728a30f
Oct 10, 2024
- Correction de la trace pour l'utilisation d'un equipement physique · 630894a7
  LEMERCIER Denis authored 5 months ago
  
  630894a7
Aug 27, 2024
- Merge branch 'cleaning_network_columns' into 'develop' · 3c8d6738
  LEMERCIER Denis authored 7 months ago
  
  Cleaning network columns See merge request !36
  3c8d6738
- Cleaning network columns · 69073ebb
  OURY Sarah authored 7 months ago and LEMERCIER Denis committed 7 months ago
  
  69073ebb
- Merge branch 'fix_pb_nomOrganisation_anciennes_api' into 'develop' · 73d51ac9
  LEMERCIER Denis authored 7 months ago
  
  [SOY] Fix pb nom organisation anciennes api See merge request !37
  73d51ac9
- [SOY] Fix pb nom organisation anciennes api · 38ce8675
  OURY Sarah authored 7 months ago and LEMERCIER Denis committed 7 months ago
  
  38ce8675
Aug 26, 2024
- Merge branch 'referentiels_customizes_par_orga' into 'develop' · 1b51d839
  LEMERCIER Denis authored 7 months ago
  
  [SOY] Customisation des referentiels par organisation See merge request !30
  1b51d839
- [SOY] Customisation des referentiels par organisation · b1355cf6
  OURY Sarah authored 7 months ago and LEMERCIER Denis committed 7 months ago
  
  b1355cf6
Aug 12, 2024
- Initialisation nouvelle version 2.2.0-SNAPSHOT · 6fc99afd
  OURY Sarah authored 7 months ago
  
  6fc99afd
Aug 02, 2024

Merge branch 'main' into 'develop' · 8f3d46e5

OURY Sarah authored 8 months ago

# Conflicts:
#   e2e/input_template/EquipementPhysique_hors_serveur.csv
#   services/api-event-calculs/pom.xml
#   services/api-event-calculs/src/main/java/org/mte/numecoeval/calculs/infrastructure/service/enrichissement/EnrichissementEquipementPhysiqueService.java
#   services/api-event-calculs/src/test/java/org/mte/numecoeval/calculs/infrastructure/service/calcul/EnrichissementEquipementPhysiqueServiceTest.java
#   services/api-event-donneesentrees/pom.xml
#   services/api-expositiondonneesentrees/pom.xml
#   services/api-referentiel/pom.xml
#   services/calculs/pom.xml
#   services/calculs/src/main/java/org/mte/numecoeval/calculs/domain/data/demande/DemandeCalculImpactOperationNonIT.java
#   services/common/pom.xml
#   services/core/pom.xml

8f3d46e5

Merge branch 'fix_colonnes_obligatoires' into 'develop' · 0fb7b8ef
OURY Sarah authored 8 months ago
```
colonnes goTelecharge et nbJourUtiliseAn plus obligatoires

See merge request !34
```
0fb7b8ef
colonnes goTelecharge et nbJourUtiliseAn plus obligatoires · e6ebabe6
OURY Sarah authored 8 months ago

e6ebabe6

Aug 01, 2024
- Merge branch 'fix_bug_discrimminator' into 'develop' · f27fd0bf
  LAIGNEAU Clément authored 8 months ago
  
  Fix bug discrimminator et cache See merge request !33
  f27fd0bf
- Fix bug discrimminator et cache · 57dbb430
  OURY Sarah authored 8 months ago and LAIGNEAU Clément committed 8 months ago
  
  57dbb430
Jul 23, 2024
- Merge branch 'utilisation_nouvelles_api' into 'develop' · 4b98245f
  LEMERCIER Denis authored 8 months ago
  
  [SOY] Utilisation nouvelles api See merge request !26
  4b98245f
- [SOY] Utilisation nouvelles api · 7ae79123
  OURY Sarah authored 8 months ago and LEMERCIER Denis committed 8 months ago
  
  7ae79123
Jul 22, 2024
- Merge branch 'filtrer_etape_critere' into 'develop' · 342b8a1e
  LEMERCIER Denis authored 8 months ago
  
  [SOY] Filtrer etape critere See merge request !29
  342b8a1e
- [SOY] Filtrer etape critere · 889dc03d
  OURY Sarah authored 8 months ago and LEMERCIER Denis committed 8 months ago
  
  889dc03d
Jul 10, 2024
- Merge branch 'cherry-pick-d02c8c7d ' into 'develop' · bd443759
  OURY Sarah authored 8 months ago
  
  [SOY] corrections pour rendre le paramètre modele non obligatoire dans les calculs See merge request !32
  bd443759
- [SOY] corrections pour rendre le paramètre modele non obligatoire dans les calculs · 6e7a2a13
  OURY Sarah authored 8 months ago
  
  6e7a2a13
- Merge branch 'fix_modele' into 'main' · 61276dcb
  LEMERCIER Denis authored 8 months ago
  
  [SOY] corrections pour rendre le paramètre modele non obligatoire dans les calculs See merge request !31
  2.0.1
  
  61276dcb
- [SOY] corrections pour rendre le paramètre modele non obligatoire dans les calculs · d02c8c7d
  OURY Sarah authored 8 months ago and LEMERCIER Denis committed 8 months ago
  
  d02c8c7d
- preparation release 2.0.1 · d0d4671b
  OURY Sarah authored 8 months ago
  
  d0d4671b
Jun 28, 2024
- Merge branch 'nettoyage' into 'develop' · c9be059e
  LEMERCIER Denis authored 9 months ago
  
  [SOY] Nettoyage See merge request !21
  c9be059e
- [SOY] Nettoyage · 05ca9353
  OURY Sarah authored 9 months ago and LEMERCIER Denis committed 9 months ago
  
  05ca9353
Jun 14, 2024
- préparation release 2.1.0 · 592aecd2
  OURY Sarah authored 9 months ago
  
  592aecd2
- Préparation release 2.0.0 · f4733062
  OURY Sarah authored 9 months ago
  
  2.0.0
  
  f4733062
- Merge branch 'PR_FLE_relectureDoc' into 'main' · 7d5ec9e6
  OURY Sarah authored 9 months ago
  
  Pr fle relecture doc See merge request !25
  7d5ec9e6
- maj doc · 672f3a50
  fabien.lamire authored 9 months ago and OURY Sarah committed 9 months ago
  
  672f3a50
Jun 13, 2024
- Merge branch 'cherry-pick-2ada84c8 ' into 'main' · 92d0f734
  LEMERCIER Denis authored 9 months ago
  
  [SOY] bug corrected See merge request !24
  92d0f734
- [SOY] bug corrected · c36e22f7
  LEMERCIER Denis authored 9 months ago
  
  c36e22f7
- Merge branch 'bug_mixelec' into 'develop' · 3b2d2543
  LEMERCIER Denis authored 9 months ago
  
  [SOY] bug corrected See merge request !23
  3b2d2543
- [SOY] bug corrected · 2ada84c8
  OURY Sarah authored 9 months ago and LEMERCIER Denis committed 9 months ago
  
  2ada84c8
- preparation next release · 105a27f1
  OURY Sarah authored 9 months ago
  
  105a27f1
- maj changelog ajout nouvelle version · 7b9f69f5
  OURY Sarah authored 9 months ago
  
  7b9f69f5
- Preparation release 1.4.0 · f577b4e7
  OURY Sarah authored 9 months ago
  
  f577b4e7
- changement version pom.xml · 653ebec0
  OURY Sarah authored 9 months ago
  
  653ebec0