Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified csv_parser/models/model.xlsx
Binary file not shown.
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.
2 changes: 1 addition & 1 deletion csv_parser/out/RC-RI/RC-RI.example.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"operationId": "DRFR15DDXAAJJJ0000.M001",
"orgId": "fr.health.samu440",
"centerName": "CHU Nantes",
"vehicleType": "SMUR",
"vehicleType": "VECTEUR_SANTE",
"name": "SMUR 123",
"centerCity": 44109,
"team": {
Expand Down
2 changes: 1 addition & 1 deletion csv_parser/out/RC-RI/RC-RI.input.csv
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fr.health.samu690.request.DRFR15690242370035.3",requestId,0..1,,string,"REGEX: ^
,ID Organisation propriétaire,,,,,"A valoriser avec l'identifiant de l'organisation à laquelle appartient la ressource, normé comme suit :
{pays}.{domaine}.{organisation}",fr.health.samu440,orgId,0..1,,string,
,Nom du centre d’affectation,,,,,A valoriser avec le lieu de garage principal,CHU Nantes,centerName,0..1,,string,
,Type de vecteur,,,,,A valoriser avec le type de vecteur mobilisé : cf. nomenclature associée,SMUR,vehicleType,1..1,,string,"ENUM: SMUR, SIS"
,Type de vecteur,,,,,A valoriser avec le type de vecteur mobilisé : cf. nomenclature associée,VECTEUR_SANTE,vehicleType,1..1,,string,"ENUM: VECTEUR_SANTE, SIS"
,Nom du vecteur,,,,,A valoriser avec le nom donné à la ressource par l’organisation d’appartenance,SMUR 123,name,0..1,,string,
,Commune du centre d’affectation,,,,,A valoriser avec le code INSEE de la commune du centre d'affectation,44109,centerCity,0..1,,string,REGEX: ^[0-9]{5}$
,Equipe vecteur,,,,,Objet qui décrit l'équipe à bord du vecteur,,team,0..1,X,team,
Expand Down
Binary file modified csv_parser/out/RC-RI/RC-RI.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RC-RI/RC-RI.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-SAS-RDV/RS-SAS-RDV.schema.docx
Binary file not shown.
Binary file modified csv_parser/out/RS-SAS-RDV/RS-SAS-RDV.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.
4 changes: 2 additions & 2 deletions generator/input/RC-RI.openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ components:
description: "A valoriser avec le type de vecteur mobilis\xE9 : cf. nomenclature\
\ associ\xE9e"
enum:
- SMUR
- VECTEUR_SANTE
- SIS
examples:
- SMUR
- VECTEUR_SANTE
name:
type: string
title: Nom du vecteur
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public class Resource {
* A valoriser avec le type de vecteur mobilisé : cf. nomenclature associée
*/
public enum VehicleTypeEnum {
SMUR("SMUR"),
VECTEUR_SANTE("VECTEUR_SANTE"),

SIS("SIS");

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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"example": "example.json#",
"type": "object",
"title": "reference",
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/json-schema/RC-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": "RC-RI.schema.json#",
"version": "26.05.12",
"version": "26.06.15",
"example": "example.json#",
"type": "object",
"title": "resourcesInfoCisu",
Expand Down Expand Up @@ -109,7 +109,7 @@
"example": "example.json#/resource/0/vehicleType",
"description": "A valoriser avec le type de vecteur mobilisé : cf. nomenclature associée",
"enum": [
"SMUR",
"VECTEUR_SANTE",
"SIS"
]
},
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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"example": "example.json#",
"type": "object",
"title": "resourcesRequest",
Expand Down
2 changes: 1 addition & 1 deletion 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": "26.05.12",
"version": "26.06.15",
"example": "example.json#",
"type": "object",
"title": "createCaseHealthUpdate",
Expand Down
2 changes: 1 addition & 1 deletion 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": "26.05.12",
"version": "26.06.15",
"example": "example.json#",
"type": "object",
"title": "createCaseHealth",
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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"example": "example.json#",
"type": "object",
"title": "resourcesResponse",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/json-schema/RS-SAS-RDV.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-SAS-RDV.schema.json#",
"version": "26.05.12",
"version": "26.06.15",
"example": "example.json#",
"type": "object",
"title": "appointment",
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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"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": "26.05.12",
"version": "26.06.15",
"example": "example.json#",
"type": "object",
"title": "customContent",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"medicalLevel": "MED",
"name": "Equipe SMUR 4"
},
"vehicleType": "SMUR",
"vehicleType": "VECTEUR_SANTE",
"name": "VLM4",
"datetime": "2024-05-26T13:22:00+02:00",
"resourceId": "fr.health.samu440.resource.VLM4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<datetime>2024-05-26T13:22:00+02:00</datetime>
<resourceId>fr.health.samu440.resource.VLM4</resourceId>
<orgId>fr.health.samu440</orgId>
<vehicleType>SMUR</vehicleType>
<vehicleType>VECTEUR_SANTE</vehicleType>
<name>VLM4</name>
<team>
<medicalLevel>MED</medicalLevel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"datetime": "2024-05-18T18:22:00+02:00",
"resourceId": "fr.health.samu440.resource.VLM1",
"orgId": "fr.health.samu440",
"vehicleType": "SMUR",
"vehicleType": "VECTEUR_SANTE",
"name": "VLM1",
"centerCity": "44109",
"state": {
Expand All @@ -25,7 +25,7 @@
"datetime": "2024-05-18T18:22:00+02:00",
"resourceId": "fr.health.samu440.resource.VLM2",
"orgId": "fr.health.samu440",
"vehicleType": "SMUR",
"vehicleType": "VECTEUR_SANTE",
"name": "VLM2",
"centerCity": "44109",
"state": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<resourceId>fr.health.samu440.resource.VLM1</resourceId>
<operationId>DRFR15DDXAAJJJ0000.M001</operationId>
<orgId>fr.health.samu440</orgId>
<vehicleType>SMUR</vehicleType>
<vehicleType>VECTEUR_SANTE</vehicleType>
<name>VLM1</name>
<centerCity>44109</centerCity>
<team>
Expand All @@ -23,7 +23,7 @@
<resourceId>fr.health.samu440.resource.VLM2</resourceId>
<operationId>DRFR15DDXAAJJJ0000.M001</operationId>
<orgId>fr.health.samu440</orgId>
<vehicleType>SMUR</vehicleType>
<vehicleType>VECTEUR_SANTE</vehicleType>
<name>VLM2</name>
<centerCity>44109</centerCity>
<team>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/xsd/RC-RI.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ OU - si un ID unique de la demande n'était pas disponible :
</annotation>
<simpleType>
<restriction base="string">
<enumeration value="SMUR"/>
<enumeration value="VECTEUR_SANTE"/>
<enumeration value="SIS"/>
</restriction>
</simpleType>
Expand Down