Skip to content

Commit

Permalink
Merge pull request #226 from ansforge/chore/update-licenses
Browse files Browse the repository at this point in the history
fix/csv_parser: nomenclature handling & update resources as of 2025
  • Loading branch information
Clemsazert authored Jan 8, 2025
2 parents 5014fa9 + 9c4a034 commit 8a44048
Show file tree
Hide file tree
Showing 76 changed files with 313 additions and 30 deletions.
3 changes: 2 additions & 1 deletion csv_parser/csv_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,9 @@ def get_nomenclature(elem):
nomenclature_name = elem['Détails de format'][elem['Détails de format'].index(':')+1:].strip()
path_file = ''
nomenclature_files = os.listdir(os.path.join("..", "nomenclature_parser", "out", "latest", "csv"))
file_extension = ".csv"
for filename in nomenclature_files:
if filename.startswith(nomenclature_name):
if filename[:-len(file_extension)] == nomenclature_name:
path_file = os.path.join("..", "nomenclature_parser", "out", "latest", "csv", filename)

if path_file != '':
Expand Down
Binary file modified csv_parser/out/EMSI/EMSI.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/EMSI/EMSI.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/GEO-POS/GEO-POS.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/GEO-POS/GEO-POS.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/GEO-REQ/GEO-REQ.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/GEO-REQ/GEO-REQ.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/GEO-RES/GEO-RES.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/GEO-RES/GEO-RES.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RC-DE/RC-DE.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RC-DE/RC-DE.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RC-EDA/RC-EDA.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RC-EDA/RC-EDA.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RC-REF/RC-REF.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RC-REF/RC-REF.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RS-BPV/RS-BPV.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RS-BPV/RS-BPV.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RS-DR/RS-DR.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RS-DR/RS-DR.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RS-EDA/RS-EDA.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RS-EDA/RS-EDA.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RS-ER/RS-ER.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RS-ER/RS-ER.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RS-ERROR/RS-ERROR.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RS-ERROR/RS-ERROR.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RS-RI/RS-RI.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RS-RI/RS-RI.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RS-RPIS/RS-RPIS.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RS-RPIS/RS-RPIS.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RS-RR/RS-RR.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RS-RR/RS-RR.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RS-SR/RS-SR.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RS-SR/RS-SR.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/RS-URL/RS-URL.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RS-URL/RS-URL.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/TECHNICAL/TECHNICAL.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/TECHNICAL/TECHNICAL.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.uml_diagram.pdf
Binary file not shown.
Binary file modified csv_parser/out/customContent/customContent.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/customContent/customContent.uml_diagram.pdf
Binary file not shown.
8 changes: 7 additions & 1 deletion csv_parser/out/hubsante.asyncapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2765,7 +2765,13 @@ components:
\ : \xE0 utiliser \xE0 minima pour transmettre le statut CLOTURE \xE0\
\ la tablette"
enum:
- ANNULEE
- PROGRAM
- ACTIF
- ACHEVE
- VALIDE
- CLOTURE
- CLASSE
- ARCHIVE
examples:
- None
priority:
Expand Down
8 changes: 7 additions & 1 deletion generator/input/RS-EDA-MAJ.openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,13 @@ components:
\ : \xE0 utiliser \xE0 minima pour transmettre le statut CLOTURE \xE0\
\ la tablette"
enum:
- ANNULEE
- PROGRAM
- ACTIF
- ACHEVE
- VALIDE
- CLOTURE
- CLASSE
- ARCHIVE
examples:
- None
priority:
Expand Down
8 changes: 7 additions & 1 deletion generator/input/RS-EDA.openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,13 @@ components:
\ : \xE0 utiliser \xE0 minima pour transmettre le statut CLOTURE \xE0\
\ la tablette"
enum:
- ANNULEE
- PROGRAM
- ACTIF
- ACHEVE
- VALIDE
- CLOTURE
- CLASSE
- ARCHIVE
examples:
- None
attribution:
Expand Down
14 changes: 13 additions & 1 deletion src/main/java/com/hubsante/model/health/CaseDetails.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,19 @@ public class CaseDetails {
* CLOTURE à la tablette
*/
public enum StatusEnum {
ANNULEE(String.valueOf("ANNULEE"));
PROGRAM(String.valueOf("PROGRAM")),

ACTIF(String.valueOf("ACTIF")),

ACHEVE(String.valueOf("ACHEVE")),

VALIDE(String.valueOf("VALIDE")),

CLOTURE(String.valueOf("CLOTURE")),

CLASSE(String.valueOf("CLASSE")),

ARCHIVE(String.valueOf("ARCHIVE"));

private String value;

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/EMSI.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "EMSI.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "emsi",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/GEO-POS.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "GEO-POS.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "geoPositionsUpdate",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/GEO-REQ.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "GEO-REQ.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "geoResourcesRequest",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/GEO-RES.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "GEO-RES.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "geoResourcesDetails",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/RC-DE.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RC-DE.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "DistributionElement",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/RC-EDA.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RC-EDA.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "createCase",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/RC-REF.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RC-REF.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "reference",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/RS-BPV.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RS-BPV.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "interventionReport",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/RS-DR.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RS-DR.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "resourcesRequest",
Expand Down
10 changes: 8 additions & 2 deletions src/main/resources/json-schema/RS-EDA-MAJ.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RS-EDA-MAJ.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "createCaseHealthUpdate",
Expand Down Expand Up @@ -422,7 +422,13 @@
"example": "example.json#/qualification/details/status",
"description": "A valoriser avec l'état du dossier dans le système émetteur\nSpécificité 15-15 : peut être ignoré en réception, partagé à titre indicatif uniquement\nSpécificité 15-SMUR : à utiliser à minima pour transmettre le statut CLOTURE à la tablette",
"enum": [
"ANNULEE"
"PROGRAM",
"ACTIF",
"ACHEVE",
"VALIDE",
"CLOTURE",
"CLASSE",
"ARCHIVE"
]
},
"priority": {
Expand Down
10 changes: 8 additions & 2 deletions src/main/resources/json-schema/RS-EDA.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RS-EDA.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "createCaseHealth",
Expand Down Expand Up @@ -677,7 +677,13 @@
"example": "example.json#/qualification/details/status",
"description": "A valoriser avec l'état du dossier dans le système émetteur\nSpécificité 15-15 : peut être ignoré en réception, partagé à titre indicatif uniquement\nSpécificité 15-SMUR : à utiliser à minima pour transmettre le statut CLOTURE à la tablette",
"enum": [
"ANNULEE"
"PROGRAM",
"ACTIF",
"ACHEVE",
"VALIDE",
"CLOTURE",
"CLASSE",
"ARCHIVE"
]
},
"attribution": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/RS-ER.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RS-ER.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "resourcesEngagement",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/RS-ERROR.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RS-ERROR.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "error",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/RS-RI.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RS-RI.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "resourcesInfo",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/RS-RPIS.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RS-RPIS.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "rpis",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/RS-RR.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RS-RR.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "resourcesResponse",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/RS-SR.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RS-SR.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "resourcesStatus",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/RS-URL.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "RS-URL.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "documentLink",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/TECHNICAL.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "TECHNICAL.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "technical",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/TECHNICAL_NOREQ.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "TECHNICAL_NOREQ.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "technicalNoreq",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/customContent.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "classpath:/json-schema/schema#",
"x-id": "customContent.schema.json#",
"version": "25.01.07",
"version": "25.01.08",
"example": "example.json#",
"type": "object",
"title": "customContent",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<createCaseHealthUpdate xmlns="urn:emergency:cisu:3.0:createCaseHealthUpdate">
<caseId>fr.fire.cga-044.SC-20240526-044-cga-AL8</caseId>
<qualification>
<details>
<status>CLOTURE</status>
</details>
</qualification>
</createCaseHealthUpdate>
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<createCaseHealthUpdate xmlns="urn:emergency:cisu:3.0:createCaseHealthUpdate">
<caseId>fr.health.samu440.DRFR154402413800236</caseId>
<qualification>
<details>
<status>ACTIF</status>
<priority>P1</priority>
</details>
</qualification>
<patient>
<patientId>fr.health.samu440.patient.DRFR154402413800236.1</patientId>
<detail>
<weight>44</weight>
<height>155</height>
</detail>
</patient>
<patient>
<patientId>fr.health.samu440.patient.DRFR154402413800236.2</patientId>
<detail>
<weight>34</weight>
<height>143</height>
</detail>
</patient>
<medicalNote>
<patientId>fr.health.samu440.patient.DRFR154402413800236.2</patientId>
<operator>
<label>Pierre Castet</label>
<role>MEDECIN</role>
</operator>
<medicalNoteId>fr.health.samu440.medicalNote.000233</medicalNoteId>
<creation>2024-05-18T18:20:00+02:00</creation>
<freetext>Se plaint de difficulté respiratoire et de maux de tête. Hospitalisations antérieures pour crises d'asthme sévères (dernière en octobre 2023). Allergies connues : pollen, acariens</freetext>
</medicalNote>
<medicalNote>
<patientId>fr.health.samu440.patient.DRFR154402413800236.1</patientId>
<operator>
<label>Pierre Castet</label>
<role>MEDECIN</role>
</operator>
<medicalNoteId>fr.health.samu440.medicalNote.000234</medicalNoteId>
<creation>2024-05-18T18:21:00+02:00</creation>
<freetext>Enfant conscient, légèrement somnolent, se plaignant de maux de tête et de nausées. Légère confusion, répond correctement aux questions simples</freetext>
</medicalNote>
</createCaseHealthUpdate>
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<createCaseHealthUpdate xmlns="urn:emergency:cisu:3.0:createCaseHealthUpdate">
<caseId>fr.health.samu440.DRFR154402413800236</caseId>
<qualification>
<details>
<status>ACTIF</status>
<priority>P1</priority>
</details>
</qualification>
<decision>
<patientId>fr.health.samu440.patient.DRFR154402413800236.1</patientId>
<creation>2024-05-18T18:33:00+02:00</creation>
<operator>
<role>MEDECIN</role>
</operator>
<decisionType>PASPLUS</decisionType>
</decision>
<decision>
<patientId>fr.health.samu440.patient.DRFR154402413800236.2</patientId>
<creation>2024-05-18T18:31:00+02:00</creation>
<operator>
<role>MEDECIN</role>
</operator>
<decisionType>ORIENT</decisionType>
<resourceType>SIS</resourceType>
<medicalTransport>true</medicalTransport>
</decision>
</createCaseHealthUpdate>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<createCaseHealthUpdate xmlns="urn:emergency:cisu:3.0:createCaseHealthUpdate">
<caseId>fr.health.samu440.DRFR154402413800236</caseId>
<qualification>
<details>
<status>CLOTURE</status>
</details>
</qualification>
</createCaseHealthUpdate>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<createCaseHealthUpdate xmlns="urn:emergency:cisu:3.0:createCaseHealthUpdate">
<caseId>fr.health.samu680.DRFR154402413800555</caseId>
<qualification>
<details>
<status>CLOTURE</status>
</details>
</qualification>
</createCaseHealthUpdate>
Loading

0 comments on commit 8a44048

Please sign in to comment.