Merge pull request #34 from IKNL/release/1.0.0-rc2

Release/1.0.0 rc2

Author: MariekeMassa

.github/workflows/stu3_firely_terminal.yaml

@@ -38,7 +38,7 @@ jobs:
           java-version: '21'
 
       - name: Firely.Terminal (GitHub Actions)
-        uses: FirelyTeam/firely-terminal-pipeline@v0.7.20-alpha3
+        uses: FirelyTeam/firely-terminal-pipeline@v0.7.32-alpha2
         with:
           PATH_TO_CONFORMANCE_RESOURCES: input/resources
           PATH_TO_EXAMPLES: input/resources
@@ -60,9 +60,8 @@ jobs:
           SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }}
           SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
           SUSHI_ENABLED: false
-          FIRELY_TERMINAL_VERSION: 3.5.0-beta-1
+          ##FIRELY_TERMINAL_VERSION: 3.5.0
           ##JAVA_VALIDATOR_VERSION: 6.7.1
-          FIRELY_TERMINAL_VALIDATOR_ENGINE: Default
 
       - name: Upload validation artifacts
         uses: actions/upload-artifact@v4
@@ -79,6 +78,10 @@ jobs:
           bundle-file: validation.json
           include: errors
           filters: |
+            # Manual check in latest version of SNOMED does find the code '1351964001'. The error might be due to a older version of SNOMED available in tx.fhir.org/r4 
+            |VALUESET_INCLUDE_INVALID_CONCEPT_CODE|*1351964001*|
+            |Terminology_TX_NoValid_1_CC|*1351964001*|
+            
             # Suppressed issues because of error in invariate in base fhir spec
             Questionnaire-ACP-zib2017.json||*que-7*|
 
@@ -87,7 +90,7 @@ jobs:
             StructureDefinition-ACP-HealthProfessional-Practitioner.json||*launches straight into slicing without the slicing being set up properly*| 
             StructureDefinition-ACP-MedicalDevice.json||*launches straight into slicing without the slicing being set up properly*| 
             StructureDefinition-ACP-OrganDonationChoiceRegistration.json||*launches straight into slicing without the slicing being set up properly*| 
-            StructureDefinition-ACP-OtherImportantInformation.json||*launches straight into slicing without the slicing being set up properly*| 
+            StructureDefinition-ACP-SenseOfPurpose.json||*launches straight into slicing without the slicing being set up properly*| 
             StructureDefinition-ACP-Patient.json||*launches straight into slicing without the slicing being set up properly*| 
             StructureDefinition-ACP-PositionRegardingEuthanasia.json||*launches straight into slicing without the slicing being set up properly*| 
             StructureDefinition-ACP-PreferredPlaceOfDeath.json||*launches straight into slicing without the slicing being set up properly*| 

Requirements-fromNarrative.json

@@ -0,0 +1,10 @@
+{
+  "resourceType" : "Requirements",
+  "id" : "fromNarrative",
+  "url" : "https://api.iknl.nl/docs/pzp/stu3/Requirements/fromNarrative",
+  "name" : "FromNarrative",
+  "title" : "Narrative Conformance Statements",
+  "status" : "active",
+  "experimental" : false,
+  "description" : "Conformance statements found throughout the narrative of the IG consolidated into this computable resource for traceability purposes"
+}

_genonce.bat

@@ -4,6 +4,7 @@ SET input_cache_path=%CD%\input-cache
 
 ECHO Checking internet connection...
 PING tx.fhir.org -4 -n 1 -w 1000 | FINDSTR TTL && GOTO isonline
+powershell -command "try { $response = Invoke-WebRequest -Uri 'https://tx.fhir.org' -TimeoutSec 10 -ErrorAction Stop; if ($response.StatusCode -eq 200) { exit 0 } else { exit 1 } } catch { exit 1 }" && GOTO isonline
 ECHO We're offline...
 SET txoption=-tx n/a
 GOTO igpublish

_updatePublisher.bat

@@ -23,6 +23,7 @@ IF "%~1"=="/f" SET skipPrompts=y
 ECHO.
 ECHO Checking internet connection...
 PING tx.fhir.org -4 -n 1 -w 4000 | FINDSTR TTL && GOTO isonline
+powershell -command "try { $response = Invoke-WebRequest -Uri 'https://tx.fhir.org' -TimeoutSec 10 -ErrorAction Stop; if ($response.StatusCode -eq 200) { exit 0 } else { exit 1 } } catch { exit 1 }" && GOTO isonline
 ECHO We're offline, nothing to do...
 GOTO end
 
@@ -134,16 +135,18 @@ GOTO done
 
 
 
+
 ECHO.
-ECHO Updating scripts
-IF "%skipPrompts%"=="y" (
-	SET updateScripts=Y
-) ELSE (
-	SET /p updateScripts="Update scripts? (Y/N) "
-)
-IF /I "%updateScripts%"=="Y" (
-	GOTO scripts
-)
+ECHO Skipping script updates to preserve custom modifications
+REM ECHO Updating scripts
+REM IF "%skipPrompts%"=="y" (
+REM 	SET updateScripts=Y
+REM ) ELSE (
+REM 	SET /p updateScripts="Update scripts? (Y/N) "
+REM )
+REM IF /I "%updateScripts%"=="Y" (
+REM 	GOTO scripts
+REM )
 GOTO end
 
 

input/IKNL_PZP_IG.xml

@@ -4,7 +4,7 @@
   xsi:schemaLocation="http://hl7.org/fhir ../input-cache/schemas/R3/fhir-single.xsd">
   <id value="iknl.fhir.stu3.pzp" />
   <url value="https://api.iknl.nl/docs/pzp/stu3/ImplementationGuide/iknl.fhir.stu3.pzp" />
-  <version value="1.0.0-rc1" />
+  <version value="1.0.0-rc2" />
   <name value="PZP" />
   <title value="IKNL PZP STU3" />
   <status value="active" />
@@ -73,7 +73,7 @@
     -->
     <parameter>
       <code value="copyrightyear" />
-      <value value="2025+" />
+      <value value="2026+" />
     </parameter>
     <!-- releaselabel should be the ballot status for HL7-published IGs. -->
     <parameter>