diff --git a/csv_parser/models/model.xlsx b/csv_parser/models/model.xlsx index aa90f0f34..0c8a8575d 100644 Binary files a/csv_parser/models/model.xlsx and b/csv_parser/models/model.xlsx differ diff --git a/csv_parser/out/EMSI/EMSI.schema.docx b/csv_parser/out/EMSI/EMSI.schema.docx index 5109fc329..2b41abe02 100644 Binary files a/csv_parser/out/EMSI/EMSI.schema.docx and b/csv_parser/out/EMSI/EMSI.schema.docx differ diff --git a/csv_parser/out/EMSI/EMSI.uml_diagram.pdf b/csv_parser/out/EMSI/EMSI.uml_diagram.pdf index 8f133e6e3..9d1df80f3 100644 Binary files a/csv_parser/out/EMSI/EMSI.uml_diagram.pdf and b/csv_parser/out/EMSI/EMSI.uml_diagram.pdf differ diff --git a/csv_parser/out/GEO-POS/GEO-POS.schema.docx b/csv_parser/out/GEO-POS/GEO-POS.schema.docx index 7f9a00e6d..0462869cf 100644 Binary files a/csv_parser/out/GEO-POS/GEO-POS.schema.docx and b/csv_parser/out/GEO-POS/GEO-POS.schema.docx differ diff --git a/csv_parser/out/GEO-POS/GEO-POS.uml_diagram.pdf b/csv_parser/out/GEO-POS/GEO-POS.uml_diagram.pdf index 5404bfdcd..73a49c025 100644 Binary files a/csv_parser/out/GEO-POS/GEO-POS.uml_diagram.pdf and b/csv_parser/out/GEO-POS/GEO-POS.uml_diagram.pdf differ diff --git a/csv_parser/out/GEO-REQ/GEO-REQ.schema.docx b/csv_parser/out/GEO-REQ/GEO-REQ.schema.docx index 39c64c20a..973458b1e 100644 Binary files a/csv_parser/out/GEO-REQ/GEO-REQ.schema.docx and b/csv_parser/out/GEO-REQ/GEO-REQ.schema.docx differ diff --git a/csv_parser/out/GEO-REQ/GEO-REQ.uml_diagram.pdf b/csv_parser/out/GEO-REQ/GEO-REQ.uml_diagram.pdf index bcb61fbce..903f333fb 100644 Binary files a/csv_parser/out/GEO-REQ/GEO-REQ.uml_diagram.pdf and b/csv_parser/out/GEO-REQ/GEO-REQ.uml_diagram.pdf differ diff --git a/csv_parser/out/GEO-RES/GEO-RES.schema.docx b/csv_parser/out/GEO-RES/GEO-RES.schema.docx index 355d78875..e6a95661d 100644 Binary files a/csv_parser/out/GEO-RES/GEO-RES.schema.docx and b/csv_parser/out/GEO-RES/GEO-RES.schema.docx differ diff --git a/csv_parser/out/GEO-RES/GEO-RES.uml_diagram.pdf b/csv_parser/out/GEO-RES/GEO-RES.uml_diagram.pdf index e2bb37f9e..21359226e 100644 Binary files a/csv_parser/out/GEO-RES/GEO-RES.uml_diagram.pdf and b/csv_parser/out/GEO-RES/GEO-RES.uml_diagram.pdf differ diff --git a/csv_parser/out/RC-DE/RC-DE.schema.docx b/csv_parser/out/RC-DE/RC-DE.schema.docx index aa9d83bb3..92a7931aa 100644 Binary files a/csv_parser/out/RC-DE/RC-DE.schema.docx and b/csv_parser/out/RC-DE/RC-DE.schema.docx differ diff --git a/csv_parser/out/RC-DE/RC-DE.uml_diagram.pdf b/csv_parser/out/RC-DE/RC-DE.uml_diagram.pdf index c1d11eefa..adf3a7f22 100644 Binary files a/csv_parser/out/RC-DE/RC-DE.uml_diagram.pdf and b/csv_parser/out/RC-DE/RC-DE.uml_diagram.pdf differ diff --git a/csv_parser/out/RC-EDA/RC-EDA.schema.docx b/csv_parser/out/RC-EDA/RC-EDA.schema.docx index 78a450149..635278663 100644 Binary files a/csv_parser/out/RC-EDA/RC-EDA.schema.docx and b/csv_parser/out/RC-EDA/RC-EDA.schema.docx differ diff --git a/csv_parser/out/RC-EDA/RC-EDA.uml_diagram.pdf b/csv_parser/out/RC-EDA/RC-EDA.uml_diagram.pdf index c3f1e1f30..119bdf3a5 100644 Binary files a/csv_parser/out/RC-EDA/RC-EDA.uml_diagram.pdf and b/csv_parser/out/RC-EDA/RC-EDA.uml_diagram.pdf differ diff --git a/csv_parser/out/RC-REF/RC-REF.schema.docx b/csv_parser/out/RC-REF/RC-REF.schema.docx index 6eaa71f12..c993bb681 100644 Binary files a/csv_parser/out/RC-REF/RC-REF.schema.docx and b/csv_parser/out/RC-REF/RC-REF.schema.docx differ diff --git a/csv_parser/out/RC-REF/RC-REF.uml_diagram.pdf b/csv_parser/out/RC-REF/RC-REF.uml_diagram.pdf index 34b9b38a6..a363267ea 100644 Binary files a/csv_parser/out/RC-REF/RC-REF.uml_diagram.pdf and b/csv_parser/out/RC-REF/RC-REF.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-BPV/RS-BPV.schema.docx b/csv_parser/out/RS-BPV/RS-BPV.schema.docx index dc083de74..6c17cd078 100644 Binary files a/csv_parser/out/RS-BPV/RS-BPV.schema.docx and b/csv_parser/out/RS-BPV/RS-BPV.schema.docx differ diff --git a/csv_parser/out/RS-BPV/RS-BPV.uml_diagram.pdf b/csv_parser/out/RS-BPV/RS-BPV.uml_diagram.pdf index 2c402e536..ae3b60171 100644 Binary files a/csv_parser/out/RS-BPV/RS-BPV.uml_diagram.pdf and b/csv_parser/out/RS-BPV/RS-BPV.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-DR/RS-DR.schema.docx b/csv_parser/out/RS-DR/RS-DR.schema.docx index 0224a958e..6422017b5 100644 Binary files a/csv_parser/out/RS-DR/RS-DR.schema.docx and b/csv_parser/out/RS-DR/RS-DR.schema.docx differ diff --git a/csv_parser/out/RS-DR/RS-DR.uml_diagram.pdf b/csv_parser/out/RS-DR/RS-DR.uml_diagram.pdf index fb7f0aa57..87ca0a9d2 100644 Binary files a/csv_parser/out/RS-DR/RS-DR.uml_diagram.pdf and b/csv_parser/out/RS-DR/RS-DR.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.schema.docx b/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.schema.docx index 0cb73277c..263dfc5b1 100644 Binary files a/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.schema.docx and b/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.schema.docx differ diff --git a/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.uml_diagram.pdf b/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.uml_diagram.pdf index 7c312643d..b0f252109 100644 Binary files a/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.uml_diagram.pdf and b/csv_parser/out/RS-EDA-MAJ/RS-EDA-MAJ.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-EDA/RS-EDA.schema.docx b/csv_parser/out/RS-EDA/RS-EDA.schema.docx index 61e184c88..4f5230f03 100644 Binary files a/csv_parser/out/RS-EDA/RS-EDA.schema.docx and b/csv_parser/out/RS-EDA/RS-EDA.schema.docx differ diff --git a/csv_parser/out/RS-EDA/RS-EDA.uml_diagram.pdf b/csv_parser/out/RS-EDA/RS-EDA.uml_diagram.pdf index 71b0f70bb..1fb67c6a3 100644 Binary files a/csv_parser/out/RS-EDA/RS-EDA.uml_diagram.pdf and b/csv_parser/out/RS-EDA/RS-EDA.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-ER/RS-ER.schema.docx b/csv_parser/out/RS-ER/RS-ER.schema.docx index 3da719c68..6b9ead5ea 100644 Binary files a/csv_parser/out/RS-ER/RS-ER.schema.docx and b/csv_parser/out/RS-ER/RS-ER.schema.docx differ diff --git a/csv_parser/out/RS-ER/RS-ER.uml_diagram.pdf b/csv_parser/out/RS-ER/RS-ER.uml_diagram.pdf index 6cab6bdf2..6aa452cec 100644 Binary files a/csv_parser/out/RS-ER/RS-ER.uml_diagram.pdf and b/csv_parser/out/RS-ER/RS-ER.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-ERROR/RS-ERROR.schema.docx b/csv_parser/out/RS-ERROR/RS-ERROR.schema.docx index 7209f16d7..ae50454ec 100644 Binary files a/csv_parser/out/RS-ERROR/RS-ERROR.schema.docx and b/csv_parser/out/RS-ERROR/RS-ERROR.schema.docx differ diff --git a/csv_parser/out/RS-ERROR/RS-ERROR.uml_diagram.pdf b/csv_parser/out/RS-ERROR/RS-ERROR.uml_diagram.pdf index a1bf441a8..9ccb050cf 100644 Binary files a/csv_parser/out/RS-ERROR/RS-ERROR.uml_diagram.pdf and b/csv_parser/out/RS-ERROR/RS-ERROR.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-RI/RS-RI.schema.docx b/csv_parser/out/RS-RI/RS-RI.schema.docx index 109ff0c7e..7b2bac811 100644 Binary files a/csv_parser/out/RS-RI/RS-RI.schema.docx and b/csv_parser/out/RS-RI/RS-RI.schema.docx differ diff --git a/csv_parser/out/RS-RI/RS-RI.uml_diagram.pdf b/csv_parser/out/RS-RI/RS-RI.uml_diagram.pdf index ddd27a692..54f4c25b6 100644 Binary files a/csv_parser/out/RS-RI/RS-RI.uml_diagram.pdf and b/csv_parser/out/RS-RI/RS-RI.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-RPIS/RS-RPIS.schema.docx b/csv_parser/out/RS-RPIS/RS-RPIS.schema.docx index cd615db05..2863f177b 100644 Binary files a/csv_parser/out/RS-RPIS/RS-RPIS.schema.docx and b/csv_parser/out/RS-RPIS/RS-RPIS.schema.docx differ diff --git a/csv_parser/out/RS-RPIS/RS-RPIS.uml_diagram.pdf b/csv_parser/out/RS-RPIS/RS-RPIS.uml_diagram.pdf index 9f24e105c..e576b3d3e 100644 Binary files a/csv_parser/out/RS-RPIS/RS-RPIS.uml_diagram.pdf and b/csv_parser/out/RS-RPIS/RS-RPIS.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-RR/RS-RR.schema.docx b/csv_parser/out/RS-RR/RS-RR.schema.docx index 1b9ae834e..314a746b5 100644 Binary files a/csv_parser/out/RS-RR/RS-RR.schema.docx and b/csv_parser/out/RS-RR/RS-RR.schema.docx differ diff --git a/csv_parser/out/RS-RR/RS-RR.uml_diagram.pdf b/csv_parser/out/RS-RR/RS-RR.uml_diagram.pdf index 5274644bc..4f75747bc 100644 Binary files a/csv_parser/out/RS-RR/RS-RR.uml_diagram.pdf and b/csv_parser/out/RS-RR/RS-RR.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-SR/RS-SR.schema.docx b/csv_parser/out/RS-SR/RS-SR.schema.docx index dfd9699e7..fc327394b 100644 Binary files a/csv_parser/out/RS-SR/RS-SR.schema.docx and b/csv_parser/out/RS-SR/RS-SR.schema.docx differ diff --git a/csv_parser/out/RS-SR/RS-SR.uml_diagram.pdf b/csv_parser/out/RS-SR/RS-SR.uml_diagram.pdf index 36eccba7a..912929b6a 100644 Binary files a/csv_parser/out/RS-SR/RS-SR.uml_diagram.pdf and b/csv_parser/out/RS-SR/RS-SR.uml_diagram.pdf differ diff --git a/csv_parser/out/RS-URL/RS-URL.schema.docx b/csv_parser/out/RS-URL/RS-URL.schema.docx index b9495a12b..0ed3b949e 100644 Binary files a/csv_parser/out/RS-URL/RS-URL.schema.docx and b/csv_parser/out/RS-URL/RS-URL.schema.docx differ diff --git a/csv_parser/out/RS-URL/RS-URL.uml_diagram.pdf b/csv_parser/out/RS-URL/RS-URL.uml_diagram.pdf index 404621fdc..b3da8ce1b 100644 Binary files a/csv_parser/out/RS-URL/RS-URL.uml_diagram.pdf and b/csv_parser/out/RS-URL/RS-URL.uml_diagram.pdf differ diff --git a/csv_parser/out/TECHNICAL/TECHNICAL.schema.docx b/csv_parser/out/TECHNICAL/TECHNICAL.schema.docx index c743c8119..871f3e130 100644 Binary files a/csv_parser/out/TECHNICAL/TECHNICAL.schema.docx and b/csv_parser/out/TECHNICAL/TECHNICAL.schema.docx differ diff --git a/csv_parser/out/TECHNICAL/TECHNICAL.uml_diagram.pdf b/csv_parser/out/TECHNICAL/TECHNICAL.uml_diagram.pdf index 6326ac1ca..e103a9980 100644 Binary files a/csv_parser/out/TECHNICAL/TECHNICAL.uml_diagram.pdf and b/csv_parser/out/TECHNICAL/TECHNICAL.uml_diagram.pdf differ diff --git a/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.schema.docx b/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.schema.docx index 936849635..5f7d1cacb 100644 Binary files a/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.schema.docx and b/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.schema.docx differ diff --git a/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.uml_diagram.pdf b/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.uml_diagram.pdf index 4d2d81311..0dcdf7210 100644 Binary files a/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.uml_diagram.pdf and b/csv_parser/out/TECHNICAL_NOREQ/TECHNICAL_NOREQ.uml_diagram.pdf differ diff --git a/csv_parser/out/customContent/customContent.schema.docx b/csv_parser/out/customContent/customContent.schema.docx index 6ef83282b..321302186 100644 Binary files a/csv_parser/out/customContent/customContent.schema.docx and b/csv_parser/out/customContent/customContent.schema.docx differ diff --git a/csv_parser/out/customContent/customContent.uml_diagram.pdf b/csv_parser/out/customContent/customContent.uml_diagram.pdf index 91308f27e..1e04491f8 100644 Binary files a/csv_parser/out/customContent/customContent.uml_diagram.pdf and b/csv_parser/out/customContent/customContent.uml_diagram.pdf differ diff --git a/nomenclature_parser/in/Nomenclatures RC-EDA et messages RS.xlsx b/nomenclature_parser/in/Nomenclatures RC-EDA et messages RS.xlsx index ff6ddc226..0cab732a4 100644 Binary files a/nomenclature_parser/in/Nomenclatures RC-EDA et messages RS.xlsx and b/nomenclature_parser/in/Nomenclatures RC-EDA et messages RS.xlsx differ diff --git a/nomenclature_parser/out/latest/Sommaire Nomenclature Hub.docx b/nomenclature_parser/out/latest/Sommaire Nomenclature Hub.docx index 0a1eb4516..05b24a28b 100644 Binary files a/nomenclature_parser/out/latest/Sommaire Nomenclature Hub.docx and b/nomenclature_parser/out/latest/Sommaire Nomenclature Hub.docx differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.LEVEL.pdf b/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.LEVEL.pdf index a18f82b32..a757f9713 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.LEVEL.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.LEVEL.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.LINK_ROLE.pdf b/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.LINK_ROLE.pdf index d25fc3672..ce0936787 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.LINK_ROLE.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.LINK_ROLE.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.MODE.pdf b/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.MODE.pdf index 8c44bc63d..79e058a19 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.MODE.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.MODE.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.MSGTYPE.pdf b/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.MSGTYPE.pdf index c28f63365..4d01c258b 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.MSGTYPE.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.MSGTYPE.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.SECLASS.pdf b/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.SECLASS.pdf index 148ab9d74..954d0bec1 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.SECLASS.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-CONTEXT.SECLASS.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.CAUSE.pdf b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.CAUSE.pdf index 7ecfc243f..7887c2815 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.CAUSE.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.CAUSE.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.EGEO.TYPE.pdf b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.EGEO.TYPE.pdf index 97ff1e154..f0da17bb8 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.EGEO.TYPE.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.EGEO.TYPE.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.EGEO.WEATHER.pdf b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.EGEO.WEATHER.pdf index ac9f5666a..40ae2097e 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.EGEO.WEATHER.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.EGEO.WEATHER.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.ACTOR.pdf b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.ACTOR.pdf index debb7b8ba..9b8e790bf 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.ACTOR.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.ACTOR.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.CATEGORY.pdf b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.CATEGORY.pdf index 4899e141c..e9dd3a4d0 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.CATEGORY.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.CATEGORY.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.ENV.pdf b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.ENV.pdf index 9b5ac83b6..574785f78 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.ENV.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.ENV.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.LOCTYPE.pdf b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.LOCTYPE.pdf index 124f7f5be..ea007e3b7 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.LOCTYPE.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.ETYPE.LOCTYPE.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.POSITION.TYPE.pdf b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.POSITION.TYPE.pdf index 35e01eb27..decff467a 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.POSITION.TYPE.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.POSITION.TYPE.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.RISK_ASSESSMNT.pdf b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.RISK_ASSESSMNT.pdf index 5a3963fbd..9448ecff2 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.RISK_ASSESSMNT.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.RISK_ASSESSMNT.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.SCALE.pdf b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.SCALE.pdf index 1a83036ea..a69ef9a1a 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.SCALE.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.SCALE.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.SOURCE.pdf b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.SOURCE.pdf index d2e4aa1b5..a5239359a 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.SOURCE.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.SOURCE.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.STATUS.pdf b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.STATUS.pdf index 123b69e0d..648be8202 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-EVENT.STATUS.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-EVENT.STATUS.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-MISSION.TYPE.pdf b/nomenclature_parser/out/latest/pdf/EMSI-MISSION.TYPE.pdf index 4fa37bef1..4787de9ef 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-MISSION.TYPE.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-MISSION.TYPE.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-RESOURCE.RTYPE.CAPABILITY.pdf b/nomenclature_parser/out/latest/pdf/EMSI-RESOURCE.RTYPE.CAPABILITY.pdf index c2cd1208d..1b3bd41c5 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-RESOURCE.RTYPE.CAPABILITY.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-RESOURCE.RTYPE.CAPABILITY.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-RESOURCE.RTYPE.CLASS.pdf b/nomenclature_parser/out/latest/pdf/EMSI-RESOURCE.RTYPE.CLASS.pdf index b67c7bba9..42210e013 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-RESOURCE.RTYPE.CLASS.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-RESOURCE.RTYPE.CLASS.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-RESOURCE.UM.pdf b/nomenclature_parser/out/latest/pdf/EMSI-RESOURCE.UM.pdf index 2093c9d61..0bfe92527 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-RESOURCE.UM.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-RESOURCE.UM.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/EMSI-RGEO.POSITION.TYPE.pdf b/nomenclature_parser/out/latest/pdf/EMSI-RGEO.POSITION.TYPE.pdf index ddec341a5..9987abd64 100644 Binary files a/nomenclature_parser/out/latest/pdf/EMSI-RGEO.POSITION.TYPE.pdf and b/nomenclature_parser/out/latest/pdf/EMSI-RGEO.POSITION.TYPE.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.attribution.pdf b/nomenclature_parser/out/latest/pdf/HubSante.attribution.pdf index ea8f8e27f..4cdecaf68 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.attribution.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.attribution.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.cadre.pdf b/nomenclature_parser/out/latest/pdf/HubSante.cadre.pdf index fb556b014..548a9d235 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.cadre.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.cadre.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.canal.pdf b/nomenclature_parser/out/latest/pdf/HubSante.canal.pdf index 3e1ee0eed..07d1b9aec 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.canal.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.canal.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.communication.pdf b/nomenclature_parser/out/latest/pdf/HubSante.communication.pdf index f8cc66694..124d48c07 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.communication.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.communication.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.delai.pdf b/nomenclature_parser/out/latest/pdf/HubSante.delai.pdf index 5b4844e25..346b37429 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.delai.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.delai.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.effet.pdf b/nomenclature_parser/out/latest/pdf/HubSante.effet.pdf index 9633b8c87..096a38402 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.effet.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.effet.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.etape.pdf b/nomenclature_parser/out/latest/pdf/HubSante.etape.pdf index 59ece24ea..66fba178b 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.etape.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.etape.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.etat.pdf b/nomenclature_parser/out/latest/pdf/HubSante.etat.pdf index 63c9bbd9f..f03ef7fbc 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.etat.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.etat.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.etatDemande.pdf b/nomenclature_parser/out/latest/pdf/HubSante.etatDemande.pdf index 5f9d36985..4eb47a2b8 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.etatDemande.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.etatDemande.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.fait.pdf b/nomenclature_parser/out/latest/pdf/HubSante.fait.pdf index b6ee6b47a..982acd7ef 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.fait.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.fait.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.filiere.pdf b/nomenclature_parser/out/latest/pdf/HubSante.filiere.pdf index 39272d191..c41546b57 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.filiere.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.filiere.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.idLieu.pdf b/nomenclature_parser/out/latest/pdf/HubSante.idLieu.pdf index 1b9e14932..a9894874b 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.idLieu.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.idLieu.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.intervention.pdf b/nomenclature_parser/out/latest/pdf/HubSante.intervention.pdf index 9d3722237..470c83c9b 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.intervention.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.intervention.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.langue.pdf b/nomenclature_parser/out/latest/pdf/HubSante.langue.pdf index 911b571b9..760d6f9b4 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.langue.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.langue.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.lieu.pdf b/nomenclature_parser/out/latest/pdf/HubSante.lieu.pdf index 0497db001..dd24e91b2 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.lieu.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.lieu.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.motif.pdf b/nomenclature_parser/out/latest/pdf/HubSante.motif.pdf index f7a70e736..e98eea83f 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.motif.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.motif.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.nbVictimes.pdf b/nomenclature_parser/out/latest/pdf/HubSante.nbVictimes.pdf index fd19fcbbc..ab83fed65 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.nbVictimes.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.nbVictimes.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.niveauSoin.pdf b/nomenclature_parser/out/latest/pdf/HubSante.niveauSoin.pdf index 29b354582..520211f46 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.niveauSoin.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.niveauSoin.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.objetSource.pdf b/nomenclature_parser/out/latest/pdf/HubSante.objetSource.pdf index b31935ad2..716bd4cce 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.objetSource.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.objetSource.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.origine.pdf b/nomenclature_parser/out/latest/pdf/HubSante.origine.pdf index 541e3f412..7b37e4ad6 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.origine.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.origine.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.patient.pdf b/nomenclature_parser/out/latest/pdf/HubSante.patient.pdf index 880495f72..d2b660f80 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.patient.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.patient.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.precision.pdf b/nomenclature_parser/out/latest/pdf/HubSante.precision.pdf index 6a517a3bf..edd1f0be3 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.precision.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.precision.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.priorite.pdf b/nomenclature_parser/out/latest/pdf/HubSante.priorite.pdf index 3336225e6..8d0bf4e62 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.priorite.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.priorite.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.reponseDemande.pdf b/nomenclature_parser/out/latest/pdf/HubSante.reponseDemande.pdf index 975cca4e5..8eb6adc68 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.reponseDemande.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.reponseDemande.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.risque.pdf b/nomenclature_parser/out/latest/pdf/HubSante.risque.pdf index f65db79ef..a84dc713f 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.risque.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.risque.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.role.pdf b/nomenclature_parser/out/latest/pdf/HubSante.role.pdf index 7f206fff5..ce5fb85b3 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.role.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.role.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.sexe.pdf b/nomenclature_parser/out/latest/pdf/HubSante.sexe.pdf index 98d0f4560..5eaac8135 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.sexe.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.sexe.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.signalement.pdf b/nomenclature_parser/out/latest/pdf/HubSante.signalement.pdf index 9161f9cf8..762724734 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.signalement.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.signalement.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.statutVecteur.pdf b/nomenclature_parser/out/latest/pdf/HubSante.statutVecteur.pdf index edaccfe34..0aef8a282 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.statutVecteur.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.statutVecteur.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.systeme.pdf b/nomenclature_parser/out/latest/pdf/HubSante.systeme.pdf index 298f11e73..6ff534bb4 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.systeme.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.systeme.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.typeAppelant.pdf b/nomenclature_parser/out/latest/pdf/HubSante.typeAppelant.pdf index bd52ee3fc..c14338805 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.typeAppelant.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.typeAppelant.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.typeCom.pdf b/nomenclature_parser/out/latest/pdf/HubSante.typeCom.pdf index 46704e0b8..90bc8fbcc 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.typeCom.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.typeCom.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.typeDecision.pdf b/nomenclature_parser/out/latest/pdf/HubSante.typeDecision.pdf index 69a36271f..7ef356c20 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.typeDecision.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.typeDecision.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.typeIdPatient.pdf b/nomenclature_parser/out/latest/pdf/HubSante.typeIdPatient.pdf index c0a3734cd..cf70ee7fa 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.typeIdPatient.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.typeIdPatient.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.typeOrientation.pdf b/nomenclature_parser/out/latest/pdf/HubSante.typeOrientation.pdf index c4164b648..4417a5b7a 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.typeOrientation.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.typeOrientation.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.typePEC.pdf b/nomenclature_parser/out/latest/pdf/HubSante.typePEC.pdf index 81218e7a9..a7c891325 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.typePEC.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.typePEC.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.typeRessource.pdf b/nomenclature_parser/out/latest/pdf/HubSante.typeRessource.pdf index 491c336ed..351d472b4 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.typeRessource.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.typeRessource.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/HubSante.typeVecteur.pdf b/nomenclature_parser/out/latest/pdf/HubSante.typeVecteur.pdf index a354394c0..ba5bfda0f 100644 Binary files a/nomenclature_parser/out/latest/pdf/HubSante.typeVecteur.pdf and b/nomenclature_parser/out/latest/pdf/HubSante.typeVecteur.pdf differ diff --git a/nomenclature_parser/out/latest/pdf/ISO 3166-ISO3166-2.pdf b/nomenclature_parser/out/latest/pdf/ISO 3166-ISO3166-2.pdf index 385306afb..9e18c0574 100644 Binary files a/nomenclature_parser/out/latest/pdf/ISO 3166-ISO3166-2.pdf and b/nomenclature_parser/out/latest/pdf/ISO 3166-ISO3166-2.pdf differ diff --git a/nomenclature_parser/out/latest/word/EMSI-CONTEXT.LEVEL.docx b/nomenclature_parser/out/latest/word/EMSI-CONTEXT.LEVEL.docx index 859ddc73d..5d3aae96c 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-CONTEXT.LEVEL.docx and b/nomenclature_parser/out/latest/word/EMSI-CONTEXT.LEVEL.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-CONTEXT.LINK_ROLE.docx b/nomenclature_parser/out/latest/word/EMSI-CONTEXT.LINK_ROLE.docx index 0a716a609..a4d677581 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-CONTEXT.LINK_ROLE.docx and b/nomenclature_parser/out/latest/word/EMSI-CONTEXT.LINK_ROLE.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-CONTEXT.MODE.docx b/nomenclature_parser/out/latest/word/EMSI-CONTEXT.MODE.docx index 7109f4455..ac27b1ca0 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-CONTEXT.MODE.docx and b/nomenclature_parser/out/latest/word/EMSI-CONTEXT.MODE.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-CONTEXT.MSGTYPE.docx b/nomenclature_parser/out/latest/word/EMSI-CONTEXT.MSGTYPE.docx index 8f6d1ed2a..1e6b6ba90 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-CONTEXT.MSGTYPE.docx and b/nomenclature_parser/out/latest/word/EMSI-CONTEXT.MSGTYPE.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-CONTEXT.SECLASS.docx b/nomenclature_parser/out/latest/word/EMSI-CONTEXT.SECLASS.docx index 2e6a049a7..983a2fa79 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-CONTEXT.SECLASS.docx and b/nomenclature_parser/out/latest/word/EMSI-CONTEXT.SECLASS.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-EVENT.CAUSE.docx b/nomenclature_parser/out/latest/word/EMSI-EVENT.CAUSE.docx index 8f8bf6673..6b0dcdfc2 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-EVENT.CAUSE.docx and b/nomenclature_parser/out/latest/word/EMSI-EVENT.CAUSE.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-EVENT.EGEO.TYPE.docx b/nomenclature_parser/out/latest/word/EMSI-EVENT.EGEO.TYPE.docx index 784ade974..fba428917 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-EVENT.EGEO.TYPE.docx and b/nomenclature_parser/out/latest/word/EMSI-EVENT.EGEO.TYPE.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-EVENT.EGEO.WEATHER.docx b/nomenclature_parser/out/latest/word/EMSI-EVENT.EGEO.WEATHER.docx index 184e49b2a..09ca8a3b9 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-EVENT.EGEO.WEATHER.docx and b/nomenclature_parser/out/latest/word/EMSI-EVENT.EGEO.WEATHER.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.ACTOR.docx b/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.ACTOR.docx index 696971518..6bf931421 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.ACTOR.docx and b/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.ACTOR.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.CATEGORY.docx b/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.CATEGORY.docx index 2f735e18d..775538af7 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.CATEGORY.docx and b/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.CATEGORY.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.ENV.docx b/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.ENV.docx index 475014644..0132dc994 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.ENV.docx and b/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.ENV.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.LOCTYPE.docx b/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.LOCTYPE.docx index e002d50de..6a69862fa 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.LOCTYPE.docx and b/nomenclature_parser/out/latest/word/EMSI-EVENT.ETYPE.LOCTYPE.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-EVENT.POSITION.TYPE.docx b/nomenclature_parser/out/latest/word/EMSI-EVENT.POSITION.TYPE.docx index f5ac924fa..35b8a07ab 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-EVENT.POSITION.TYPE.docx and b/nomenclature_parser/out/latest/word/EMSI-EVENT.POSITION.TYPE.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-EVENT.RISK_ASSESSMNT.docx b/nomenclature_parser/out/latest/word/EMSI-EVENT.RISK_ASSESSMNT.docx index 810c2f21c..1d9c7d84e 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-EVENT.RISK_ASSESSMNT.docx and b/nomenclature_parser/out/latest/word/EMSI-EVENT.RISK_ASSESSMNT.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-EVENT.SCALE.docx b/nomenclature_parser/out/latest/word/EMSI-EVENT.SCALE.docx index 26fe4b878..e04cd0ceb 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-EVENT.SCALE.docx and b/nomenclature_parser/out/latest/word/EMSI-EVENT.SCALE.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-EVENT.SOURCE.docx b/nomenclature_parser/out/latest/word/EMSI-EVENT.SOURCE.docx index e58998e61..1113c9aef 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-EVENT.SOURCE.docx and b/nomenclature_parser/out/latest/word/EMSI-EVENT.SOURCE.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-EVENT.STATUS.docx b/nomenclature_parser/out/latest/word/EMSI-EVENT.STATUS.docx index 1de027309..fdc02f805 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-EVENT.STATUS.docx and b/nomenclature_parser/out/latest/word/EMSI-EVENT.STATUS.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-MISSION.TYPE.docx b/nomenclature_parser/out/latest/word/EMSI-MISSION.TYPE.docx index fd016404d..0e935e283 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-MISSION.TYPE.docx and b/nomenclature_parser/out/latest/word/EMSI-MISSION.TYPE.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-RESOURCE.RTYPE.CAPABILITY.docx b/nomenclature_parser/out/latest/word/EMSI-RESOURCE.RTYPE.CAPABILITY.docx index 9dbf55690..55d20711b 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-RESOURCE.RTYPE.CAPABILITY.docx and b/nomenclature_parser/out/latest/word/EMSI-RESOURCE.RTYPE.CAPABILITY.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-RESOURCE.RTYPE.CLASS.docx b/nomenclature_parser/out/latest/word/EMSI-RESOURCE.RTYPE.CLASS.docx index cbbe773cc..636992870 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-RESOURCE.RTYPE.CLASS.docx and b/nomenclature_parser/out/latest/word/EMSI-RESOURCE.RTYPE.CLASS.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-RESOURCE.UM.docx b/nomenclature_parser/out/latest/word/EMSI-RESOURCE.UM.docx index 9a52de560..f3e60f56a 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-RESOURCE.UM.docx and b/nomenclature_parser/out/latest/word/EMSI-RESOURCE.UM.docx differ diff --git a/nomenclature_parser/out/latest/word/EMSI-RGEO.POSITION.TYPE.docx b/nomenclature_parser/out/latest/word/EMSI-RGEO.POSITION.TYPE.docx index 814cf5e38..200b5974f 100644 Binary files a/nomenclature_parser/out/latest/word/EMSI-RGEO.POSITION.TYPE.docx and b/nomenclature_parser/out/latest/word/EMSI-RGEO.POSITION.TYPE.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.attribution.docx b/nomenclature_parser/out/latest/word/HubSante.attribution.docx index a931129f6..e724523b2 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.attribution.docx and b/nomenclature_parser/out/latest/word/HubSante.attribution.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.cadre.docx b/nomenclature_parser/out/latest/word/HubSante.cadre.docx index 48078b4df..881d43fc4 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.cadre.docx and b/nomenclature_parser/out/latest/word/HubSante.cadre.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.canal.docx b/nomenclature_parser/out/latest/word/HubSante.canal.docx index 28b37da2b..692b7d54b 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.canal.docx and b/nomenclature_parser/out/latest/word/HubSante.canal.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.communication.docx b/nomenclature_parser/out/latest/word/HubSante.communication.docx index ecc7d78e0..a5195099e 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.communication.docx and b/nomenclature_parser/out/latest/word/HubSante.communication.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.delai.docx b/nomenclature_parser/out/latest/word/HubSante.delai.docx index 35bbf8801..68299c32e 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.delai.docx and b/nomenclature_parser/out/latest/word/HubSante.delai.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.effet.docx b/nomenclature_parser/out/latest/word/HubSante.effet.docx index bcbc6ccd6..d7bdd5d56 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.effet.docx and b/nomenclature_parser/out/latest/word/HubSante.effet.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.etape.docx b/nomenclature_parser/out/latest/word/HubSante.etape.docx index d0e724378..ad49cfb93 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.etape.docx and b/nomenclature_parser/out/latest/word/HubSante.etape.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.etat.docx b/nomenclature_parser/out/latest/word/HubSante.etat.docx index 349a2ad0b..d2e5268b5 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.etat.docx and b/nomenclature_parser/out/latest/word/HubSante.etat.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.etatDemande.docx b/nomenclature_parser/out/latest/word/HubSante.etatDemande.docx index 8ace7e759..bf730e3e3 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.etatDemande.docx and b/nomenclature_parser/out/latest/word/HubSante.etatDemande.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.fait.docx b/nomenclature_parser/out/latest/word/HubSante.fait.docx index 5c0d24da6..81808088e 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.fait.docx and b/nomenclature_parser/out/latest/word/HubSante.fait.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.filiere.docx b/nomenclature_parser/out/latest/word/HubSante.filiere.docx index cff891020..763ef6038 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.filiere.docx and b/nomenclature_parser/out/latest/word/HubSante.filiere.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.idLieu.docx b/nomenclature_parser/out/latest/word/HubSante.idLieu.docx index 49aab073e..833595803 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.idLieu.docx and b/nomenclature_parser/out/latest/word/HubSante.idLieu.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.intervention.docx b/nomenclature_parser/out/latest/word/HubSante.intervention.docx index 2c6b2dc6d..15578160c 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.intervention.docx and b/nomenclature_parser/out/latest/word/HubSante.intervention.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.langue.docx b/nomenclature_parser/out/latest/word/HubSante.langue.docx index 333e406bc..0cdbb22c1 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.langue.docx and b/nomenclature_parser/out/latest/word/HubSante.langue.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.lieu.docx b/nomenclature_parser/out/latest/word/HubSante.lieu.docx index d905cd907..178775cbf 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.lieu.docx and b/nomenclature_parser/out/latest/word/HubSante.lieu.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.motif.docx b/nomenclature_parser/out/latest/word/HubSante.motif.docx index 208681ebb..b62255373 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.motif.docx and b/nomenclature_parser/out/latest/word/HubSante.motif.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.nbVictimes.docx b/nomenclature_parser/out/latest/word/HubSante.nbVictimes.docx index 9971f4e66..ebd48309c 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.nbVictimes.docx and b/nomenclature_parser/out/latest/word/HubSante.nbVictimes.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.niveauSoin.docx b/nomenclature_parser/out/latest/word/HubSante.niveauSoin.docx index 1b3ec799b..c41ae63e5 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.niveauSoin.docx and b/nomenclature_parser/out/latest/word/HubSante.niveauSoin.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.objetSource.docx b/nomenclature_parser/out/latest/word/HubSante.objetSource.docx index 822721186..f1eaaf7fe 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.objetSource.docx and b/nomenclature_parser/out/latest/word/HubSante.objetSource.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.origine.docx b/nomenclature_parser/out/latest/word/HubSante.origine.docx index e75394a05..a109028c0 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.origine.docx and b/nomenclature_parser/out/latest/word/HubSante.origine.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.patient.docx b/nomenclature_parser/out/latest/word/HubSante.patient.docx index 2d37a35b1..40e74aa48 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.patient.docx and b/nomenclature_parser/out/latest/word/HubSante.patient.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.precision.docx b/nomenclature_parser/out/latest/word/HubSante.precision.docx index 7261679bb..87e853b5c 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.precision.docx and b/nomenclature_parser/out/latest/word/HubSante.precision.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.priorite.docx b/nomenclature_parser/out/latest/word/HubSante.priorite.docx index de614854c..1969bb04d 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.priorite.docx and b/nomenclature_parser/out/latest/word/HubSante.priorite.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.reponseDemande.docx b/nomenclature_parser/out/latest/word/HubSante.reponseDemande.docx index 11c9733df..cc5473374 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.reponseDemande.docx and b/nomenclature_parser/out/latest/word/HubSante.reponseDemande.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.risque.docx b/nomenclature_parser/out/latest/word/HubSante.risque.docx index a5e451148..39abfe7b5 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.risque.docx and b/nomenclature_parser/out/latest/word/HubSante.risque.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.role.docx b/nomenclature_parser/out/latest/word/HubSante.role.docx index 250959565..f7a353c01 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.role.docx and b/nomenclature_parser/out/latest/word/HubSante.role.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.sexe.docx b/nomenclature_parser/out/latest/word/HubSante.sexe.docx index 75266c12e..bd05bfcc9 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.sexe.docx and b/nomenclature_parser/out/latest/word/HubSante.sexe.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.signalement.docx b/nomenclature_parser/out/latest/word/HubSante.signalement.docx index ad13e8d3c..16069e076 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.signalement.docx and b/nomenclature_parser/out/latest/word/HubSante.signalement.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.statutVecteur.docx b/nomenclature_parser/out/latest/word/HubSante.statutVecteur.docx index 9181592e3..fbcd2f8cb 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.statutVecteur.docx and b/nomenclature_parser/out/latest/word/HubSante.statutVecteur.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.systeme.docx b/nomenclature_parser/out/latest/word/HubSante.systeme.docx index e96f901f2..92077fdb7 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.systeme.docx and b/nomenclature_parser/out/latest/word/HubSante.systeme.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.typeAppelant.docx b/nomenclature_parser/out/latest/word/HubSante.typeAppelant.docx index 0f1f90f2a..34d2bbacb 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.typeAppelant.docx and b/nomenclature_parser/out/latest/word/HubSante.typeAppelant.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.typeCom.docx b/nomenclature_parser/out/latest/word/HubSante.typeCom.docx index e3e257a94..493514240 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.typeCom.docx and b/nomenclature_parser/out/latest/word/HubSante.typeCom.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.typeDecision.docx b/nomenclature_parser/out/latest/word/HubSante.typeDecision.docx index 42fe8d03e..17ba67615 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.typeDecision.docx and b/nomenclature_parser/out/latest/word/HubSante.typeDecision.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.typeIdPatient.docx b/nomenclature_parser/out/latest/word/HubSante.typeIdPatient.docx index 4af23d0f3..887fd6f54 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.typeIdPatient.docx and b/nomenclature_parser/out/latest/word/HubSante.typeIdPatient.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.typeOrientation.docx b/nomenclature_parser/out/latest/word/HubSante.typeOrientation.docx index 10170f7e8..8184027ed 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.typeOrientation.docx and b/nomenclature_parser/out/latest/word/HubSante.typeOrientation.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.typePEC.docx b/nomenclature_parser/out/latest/word/HubSante.typePEC.docx index a13407dde..dc4d0565c 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.typePEC.docx and b/nomenclature_parser/out/latest/word/HubSante.typePEC.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.typeRessource.docx b/nomenclature_parser/out/latest/word/HubSante.typeRessource.docx index 82c298814..7e09cf9b0 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.typeRessource.docx and b/nomenclature_parser/out/latest/word/HubSante.typeRessource.docx differ diff --git a/nomenclature_parser/out/latest/word/HubSante.typeVecteur.docx b/nomenclature_parser/out/latest/word/HubSante.typeVecteur.docx index 376706b1f..3a1835046 100644 Binary files a/nomenclature_parser/out/latest/word/HubSante.typeVecteur.docx and b/nomenclature_parser/out/latest/word/HubSante.typeVecteur.docx differ diff --git a/nomenclature_parser/out/latest/word/ISO 3166-ISO3166-2.docx b/nomenclature_parser/out/latest/word/ISO 3166-ISO3166-2.docx index 072b8f2be..a16a95d13 100644 Binary files a/nomenclature_parser/out/latest/word/ISO 3166-ISO3166-2.docx and b/nomenclature_parser/out/latest/word/ISO 3166-ISO3166-2.docx differ diff --git a/src/main/java/com/hubsante/model/EdxlHandler.java b/src/main/java/com/hubsante/model/EdxlHandler.java index d03e8896c..b3fe039b0 100644 --- a/src/main/java/com/hubsante/model/EdxlHandler.java +++ b/src/main/java/com/hubsante/model/EdxlHandler.java @@ -15,39 +15,27 @@ */ package com.hubsante.model; +import com.fasterxml.jackson.core.JacksonException; +import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.hubsante.model.edxl.EdxlEnvelope; import com.hubsante.model.edxl.EdxlMessage; import lombok.extern.slf4j.Slf4j; +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; + @Slf4j public class EdxlHandler { - public XmlMapper xmlMapper; - - public ObjectMapper jsonMapper; - - public EdxlHandler() { - xmlMapper = (XmlMapper) new XmlMapper() - .registerModule(new JavaTimeModule()) - .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY) - .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) - .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) - .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE); + public XmlMapper xmlMapper = Utils.getXmlMapper(); - xmlMapper.configure(com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true); - - jsonMapper = new ObjectMapper() - .registerModule(new JavaTimeModule()) - .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY) - .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) - .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE); - } + public ObjectMapper jsonMapper = Utils.getJsonMapper(); public EdxlMessage deserializeJsonEDXL(String json) throws JsonProcessingException { return jsonMapper.readValue(json, EdxlMessage.class); diff --git a/src/main/java/com/hubsante/model/Utils.java b/src/main/java/com/hubsante/model/Utils.java new file mode 100644 index 000000000..930113761 --- /dev/null +++ b/src/main/java/com/hubsante/model/Utils.java @@ -0,0 +1,75 @@ +/** + * Copyright © 2023-2025 Agence du Numerique en Sante (ANS) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hubsante.model; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; + +import java.io.IOException; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; + +public class Utils { + + public static JavaTimeModule createCustomJavaTimeModule() { + JavaTimeModule javaTimeModule = new JavaTimeModule(); + + javaTimeModule.addSerializer(OffsetDateTime.class, + new com.fasterxml.jackson.databind.ser.std.StdSerializer(OffsetDateTime.class) { + + @Override + public void serialize(OffsetDateTime value, com.fasterxml.jackson.core.JsonGenerator gen, + com.fasterxml.jackson.databind.SerializerProvider provider) throws IOException { + String formatted = value.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX")); + // Replace 'Z' with '+00:00' during serialization + if (formatted.endsWith("Z")) { + formatted = formatted.substring(0, formatted.length() - 1) + "+00:00"; + } + + gen.writeString(formatted); + } + } + ); + + return javaTimeModule; + } + + public static XmlMapper getXmlMapper() { + XmlMapper xmlMapper = new XmlMapper(); + xmlMapper = (XmlMapper) new XmlMapper() + .registerModule(createCustomJavaTimeModule()) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY) + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) + .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE); + + xmlMapper.configure(com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true); + return xmlMapper; + } + + public static ObjectMapper getJsonMapper() { + ObjectMapper jsonMapper = new ObjectMapper() + .registerModule(createCustomJavaTimeModule()) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY) + .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) + .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE); + + return jsonMapper; + } +} diff --git a/src/main/java/com/hubsante/model/builders/CreateCaseHealthWrapperBuilder.java b/src/main/java/com/hubsante/model/builders/CreateCaseHealthWrapperBuilder.java new file mode 100644 index 000000000..7fafe5ec3 --- /dev/null +++ b/src/main/java/com/hubsante/model/builders/CreateCaseHealthWrapperBuilder.java @@ -0,0 +1,46 @@ +/** + * Copyright © 2023-2025 Agence du Numerique en Sante (ANS) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hubsante.model.builders; + +import com.hubsante.model.health.CreateCaseHealth; +import com.hubsante.model.health.CreateCaseHealthWrapper; +import com.hubsante.model.rcde.DistributionElement; + +public class CreateCaseHealthWrapperBuilder { + + private DistributionElement distributionElement; + private CreateCaseHealth createCaseHealth; + + public CreateCaseHealthWrapperBuilder(DistributionElement distributionElement, CreateCaseHealth createCaseHealth) { + this.distributionElement = distributionElement; + this.createCaseHealth = createCaseHealth; + } + + public CreateCaseHealthWrapper build() { + CreateCaseHealthWrapper createCaseHealthMessage = new CreateCaseHealthWrapper(); + createCaseHealthMessage.setMessageId(distributionElement.getMessageId()); + createCaseHealthMessage.setSender(distributionElement.getSender()); + createCaseHealthMessage.setSentAt(distributionElement.getSentAt()); + if (!distributionElement.getKind().equals(DistributionElement.KindEnum.REPORT)) { + throw new IllegalArgumentException("CreateCaseWrapper must be of kind REPORT"); + } + createCaseHealthMessage.setKind(distributionElement.getKind()); + createCaseHealthMessage.setStatus(distributionElement.getStatus()); + createCaseHealthMessage.setRecipient(distributionElement.getRecipient()); + createCaseHealthMessage.setCreateCaseHealth(createCaseHealth); + return createCaseHealthMessage; + } +} diff --git a/src/main/resources/json-schema/EMSI.schema.json b/src/main/resources/json-schema/EMSI.schema.json index 9a749a4bf..3c8aefd34 100644 --- a/src/main/resources/json-schema/EMSI.schema.json +++ b/src/main/resources/json-schema/EMSI.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "emsi", diff --git a/src/main/resources/json-schema/GEO-POS.schema.json b/src/main/resources/json-schema/GEO-POS.schema.json index cf088bb60..5ece8b54e 100644 --- a/src/main/resources/json-schema/GEO-POS.schema.json +++ b/src/main/resources/json-schema/GEO-POS.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "geoPositionsUpdate", diff --git a/src/main/resources/json-schema/GEO-REQ.schema.json b/src/main/resources/json-schema/GEO-REQ.schema.json index 11691a293..571e2c47d 100644 --- a/src/main/resources/json-schema/GEO-REQ.schema.json +++ b/src/main/resources/json-schema/GEO-REQ.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "geoResourcesRequest", diff --git a/src/main/resources/json-schema/GEO-RES.schema.json b/src/main/resources/json-schema/GEO-RES.schema.json index 40b90fc5a..1735af0f3 100644 --- a/src/main/resources/json-schema/GEO-RES.schema.json +++ b/src/main/resources/json-schema/GEO-RES.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "geoResourcesDetails", diff --git a/src/main/resources/json-schema/RC-DE.schema.json b/src/main/resources/json-schema/RC-DE.schema.json index a9421b3fb..edf7751fd 100644 --- a/src/main/resources/json-schema/RC-DE.schema.json +++ b/src/main/resources/json-schema/RC-DE.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "distributionElement", diff --git a/src/main/resources/json-schema/RC-EDA.schema.json b/src/main/resources/json-schema/RC-EDA.schema.json index cf2e57851..e8347b6b8 100644 --- a/src/main/resources/json-schema/RC-EDA.schema.json +++ b/src/main/resources/json-schema/RC-EDA.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "createCase", diff --git a/src/main/resources/json-schema/RC-REF.schema.json b/src/main/resources/json-schema/RC-REF.schema.json index be1598b89..109041e0c 100644 --- a/src/main/resources/json-schema/RC-REF.schema.json +++ b/src/main/resources/json-schema/RC-REF.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "reference", diff --git a/src/main/resources/json-schema/RS-BPV.schema.json b/src/main/resources/json-schema/RS-BPV.schema.json index 83f5a0190..7d80b6c31 100644 --- a/src/main/resources/json-schema/RS-BPV.schema.json +++ b/src/main/resources/json-schema/RS-BPV.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "interventionReport", diff --git a/src/main/resources/json-schema/RS-DR.schema.json b/src/main/resources/json-schema/RS-DR.schema.json index e45514ba5..2fe9ba31d 100644 --- a/src/main/resources/json-schema/RS-DR.schema.json +++ b/src/main/resources/json-schema/RS-DR.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "resourcesRequest", diff --git a/src/main/resources/json-schema/RS-EDA-MAJ.schema.json b/src/main/resources/json-schema/RS-EDA-MAJ.schema.json index 6ca66a2b1..5cff2b793 100644 --- a/src/main/resources/json-schema/RS-EDA-MAJ.schema.json +++ b/src/main/resources/json-schema/RS-EDA-MAJ.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "createCaseHealthUpdate", diff --git a/src/main/resources/json-schema/RS-EDA.schema.json b/src/main/resources/json-schema/RS-EDA.schema.json index 857d42096..f480e08d3 100644 --- a/src/main/resources/json-schema/RS-EDA.schema.json +++ b/src/main/resources/json-schema/RS-EDA.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "createCaseHealth", diff --git a/src/main/resources/json-schema/RS-ER.schema.json b/src/main/resources/json-schema/RS-ER.schema.json index dbee6822e..72c868618 100644 --- a/src/main/resources/json-schema/RS-ER.schema.json +++ b/src/main/resources/json-schema/RS-ER.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "resourcesEngagement", diff --git a/src/main/resources/json-schema/RS-ERROR.schema.json b/src/main/resources/json-schema/RS-ERROR.schema.json index d9e8e0903..ce59eadc8 100644 --- a/src/main/resources/json-schema/RS-ERROR.schema.json +++ b/src/main/resources/json-schema/RS-ERROR.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "error", diff --git a/src/main/resources/json-schema/RS-RI.schema.json b/src/main/resources/json-schema/RS-RI.schema.json index d4359b232..43823a06c 100644 --- a/src/main/resources/json-schema/RS-RI.schema.json +++ b/src/main/resources/json-schema/RS-RI.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "resourcesInfo", diff --git a/src/main/resources/json-schema/RS-RPIS.schema.json b/src/main/resources/json-schema/RS-RPIS.schema.json index db3f7e199..56914ad9f 100644 --- a/src/main/resources/json-schema/RS-RPIS.schema.json +++ b/src/main/resources/json-schema/RS-RPIS.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "rpis", diff --git a/src/main/resources/json-schema/RS-RR.schema.json b/src/main/resources/json-schema/RS-RR.schema.json index 209e15c61..6507fc88c 100644 --- a/src/main/resources/json-schema/RS-RR.schema.json +++ b/src/main/resources/json-schema/RS-RR.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "resourcesResponse", diff --git a/src/main/resources/json-schema/RS-SR.schema.json b/src/main/resources/json-schema/RS-SR.schema.json index fb520fc6c..98a2c4823 100644 --- a/src/main/resources/json-schema/RS-SR.schema.json +++ b/src/main/resources/json-schema/RS-SR.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "resourcesStatus", diff --git a/src/main/resources/json-schema/RS-URL.schema.json b/src/main/resources/json-schema/RS-URL.schema.json index f7db4fc31..6406143bc 100644 --- a/src/main/resources/json-schema/RS-URL.schema.json +++ b/src/main/resources/json-schema/RS-URL.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "documentLink", diff --git a/src/main/resources/json-schema/TECHNICAL.schema.json b/src/main/resources/json-schema/TECHNICAL.schema.json index afd11c9e7..0bad64544 100644 --- a/src/main/resources/json-schema/TECHNICAL.schema.json +++ b/src/main/resources/json-schema/TECHNICAL.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "technical", diff --git a/src/main/resources/json-schema/TECHNICAL_NOREQ.schema.json b/src/main/resources/json-schema/TECHNICAL_NOREQ.schema.json index 547ccc57c..1245ce19b 100644 --- a/src/main/resources/json-schema/TECHNICAL_NOREQ.schema.json +++ b/src/main/resources/json-schema/TECHNICAL_NOREQ.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "technicalNoreq", diff --git a/src/main/resources/json-schema/customContent.schema.json b/src/main/resources/json-schema/customContent.schema.json index 80c4c2737..0674298d3 100644 --- a/src/main/resources/json-schema/customContent.schema.json +++ b/src/main/resources/json-schema/customContent.schema.json @@ -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.30", + "version": "25.02.09", "example": "example.json#", "type": "object", "title": "customContent", diff --git a/src/main/resources/sample/valid/TECHNICAL/complete.json b/src/main/resources/sample/valid/TECHNICAL/complete.json index 2f6110167..3a1b31f95 100644 --- a/src/main/resources/sample/valid/TECHNICAL/complete.json +++ b/src/main/resources/sample/valid/TECHNICAL/complete.json @@ -36,7 +36,7 @@ "phoneNumberField": "0123456789", "dateField": "2020-01-01", "emailField": "email@domain.com", - "datetimeField": "2022-09-27T08:25:54+02:00", + "datetimeField": "2022-09-27T08:25:54+00:00", "objectLevel1": { "object1Level2": { "object1Level3": { diff --git a/src/main/resources/sample/valid/TECHNICAL/complete.xml b/src/main/resources/sample/valid/TECHNICAL/complete.xml index a7de50d35..ba035092a 100644 --- a/src/main/resources/sample/valid/TECHNICAL/complete.xml +++ b/src/main/resources/sample/valid/TECHNICAL/complete.xml @@ -29,7 +29,7 @@ 0123456789 2020-01-01 email@domain.com - 2022-09-27T08:25:54+02:00 + 2022-09-27T08:25:54+00:00 diff --git a/src/test/java/com/hubsante/model/builders/CreateCaseHealthWrapperBuilderTest.java b/src/test/java/com/hubsante/model/builders/CreateCaseHealthWrapperBuilderTest.java new file mode 100644 index 000000000..25463651c --- /dev/null +++ b/src/test/java/com/hubsante/model/builders/CreateCaseHealthWrapperBuilderTest.java @@ -0,0 +1,67 @@ +/** + * Copyright © 2023-2025 Agence du Numerique en Sante (ANS) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hubsante.model.builders; + +import com.hubsante.model.EdxlHandler; +import com.hubsante.model.health.CreateCaseHealth; +import com.hubsante.model.health.CreateCaseHealthWrapper; +import com.hubsante.model.rcde.DistributionElement; +import com.hubsante.model.rcde.Recipient; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +public class CreateCaseHealthWrapperBuilderTest { + private final String MESSAGE_ID = "id-12345"; + private final String SENDER_ID = "sender-x"; + private final String RECIPIENT_ID = "recipient-y"; + private EdxlHandler converter = new EdxlHandler(); + + private CreateCaseHealth createCaseHealth = new CreateCaseHealth(); + + @Test + @DisplayName("should build a RS-EDA Message") + public void shouldBuildRS_EDAMessage() throws IOException { + Recipient recipient = new Recipient().name(RECIPIENT_ID).URI("hubex:" + RECIPIENT_ID); + List recipientList = Stream.of(recipient).collect(Collectors.toList()); + + DistributionElement distributionElement = new DistributionElementBuilder(MESSAGE_ID, SENDER_ID, recipientList) + .build(); + CreateCaseHealthWrapper wrapper = new CreateCaseHealthWrapperBuilder(distributionElement, createCaseHealth).build(); + assertEquals(MESSAGE_ID, wrapper.getMessageId()); + assertEquals(createCaseHealth, wrapper.getCreateCaseHealth()); + } + + @Test + @DisplayName("should not build a RC_EDA with invalid kind") + public void shouldNotBuildRC_EDAWithInvalidKind() throws IOException { + Recipient recipient = new Recipient().name(RECIPIENT_ID).URI("hubex:" + RECIPIENT_ID); + List recipientList = Stream.of(recipient).collect(Collectors.toList()); + + DistributionElement distributionElement = new DistributionElementBuilder(MESSAGE_ID, SENDER_ID, recipientList) + .kind(DistributionElement.KindEnum.ACK) + .build(); + + assertThrows(IllegalArgumentException.class, () -> new CreateCaseHealthWrapperBuilder(distributionElement, createCaseHealth).build()); + } +} diff --git a/src/test/java/com/hubsante/model/edxlhandler/TechnicalHandlerTest.java b/src/test/java/com/hubsante/model/edxlhandler/TechnicalHandlerTest.java index 58d156712..ed963017b 100644 --- a/src/test/java/com/hubsante/model/edxlhandler/TechnicalHandlerTest.java +++ b/src/test/java/com/hubsante/model/edxlhandler/TechnicalHandlerTest.java @@ -15,43 +15,23 @@ */ package com.hubsante.model.edxlhandler; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.hubsante.model.Utils; import com.hubsante.model.technical.Technical; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import java.io.IOException; import static com.hubsante.model.utils.TestFileUtils.getMessageByFileName; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.*; public class TechnicalHandlerTest { - private static XmlMapper xmlMapper; + private static XmlMapper xmlMapper = Utils.getXmlMapper(); - private static ObjectMapper jsonMapper; - - @BeforeAll - public static void setUp() { - jsonMapper = new ObjectMapper().registerModule(new JavaTimeModule()) - .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY) - .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) - .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE); - - xmlMapper = (XmlMapper) new XmlMapper().registerModule(new JavaTimeModule()) - .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY) - .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) - .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) - .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE); - - xmlMapper.configure(com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true); - } + private static ObjectMapper jsonMapper = Utils.getJsonMapper(); @Test @DisplayName("Complete TECHNICAL messages should deserialize to same object from json and xml files") @@ -63,6 +43,14 @@ public void testCompleteTechnicalDeserialization() throws IOException { Technical xmlTechnical = xmlMapper.readValue(xml, Technical.class); assertEquals(jsonTechnical, xmlTechnical); + + String jsonSerialized = jsonMapper.writeValueAsString(jsonTechnical); + assertTrue(jsonSerialized.contains("2022-09-27T08:25:54+00:00")); + assertFalse(jsonSerialized.contains("2022-09-27T08:25:54Z")); + + String xmlSerialized = xmlMapper.writeValueAsString(xmlTechnical); + assertTrue(xmlSerialized.contains("2022-09-27T08:25:54+00:00")); + assertFalse(xmlSerialized.contains("2022-09-27T08:25:54Z")); } @Test @@ -112,5 +100,4 @@ public void testRegexCompliantValues() throws IOException { String xml = getMessageByFileName("TECHNICAL/regex-validation.xml"); assertDoesNotThrow(() -> xmlMapper.readValue(xml, Technical.class)); } - }