Merge pull request #19 from navikt/egenmeldigsdager

Added in Egenmeldingsdager
navikt · Aug 14, 2023 · 354ee39 · 354ee39
2 parents d182bc4 + 58fb793
commit 354ee39
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml
@@ -10,6 +10,12 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
+      - name: setup java 11
+        uses: actions/setup-java@v3
+        id: setup-java
+        with:
+          distribution: "temurin"
+          java-version: "11"
       - name: Gradle wrapper validation
         uses: gradle/[email protected]
       - name: Setup gradle dependency cache

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,6 +11,12 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
+      - name: setup java 11
+        uses: actions/setup-java@v3
+        id: setup-java
+        with:
+          distribution: "temurin"
+          java-version: "11"
       - name: Gradle wrapper validation
         uses: gradle/[email protected]
       - name: Setup gradle dependency cache

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -52,7 +52,7 @@ subprojects {
     }
 
     configure<JavaPluginConvention> {
-        sourceCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
     }
 
     ext["xjbOutputDir"] = file("$buildDir/generated-sources/jaxb2")

diff --git a/sykmelding-arbeidsgiver/src/main/xsd/sykmeldingArbeidsgiver.xsd b/sykmelding-arbeidsgiver/src/main/xsd/sykmeldingArbeidsgiver.xsd
@@ -91,9 +91,9 @@
     <xsd:annotation>
       <xsd:documentation>Perioder for denne sykmeldingen.
 
-Sammenhengende perioder
+        Sammenhengende perioder
 
-Ikke overlappende perioder</xsd:documentation>
+        Ikke overlappende perioder</xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
       <xsd:element name="fom" type="xsd:date">
@@ -225,6 +225,23 @@ Ikke overlappende perioder</xsd:documentation>
       </xsd:element>
     </xsd:choice>
   </xsd:complexType>
+  <xsd:complexType name="Egenmeldingsdager">
+    <xsd:annotation>
+      <xsd:documentation>egenmeldingsdager</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="dager" type="sykmeldingArbeidsgiver:Dager">
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="Dager">
+    <xsd:annotation>
+      <xsd:documentation>antall dager</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence minOccurs="0">
+      <xsd:element name="dager" type="xsd:date"/>
+    </xsd:sequence>
+  </xsd:complexType>
   <xsd:complexType name="Sykmelding">
     <xsd:annotation>
       <xsd:documentation>Sykmeldingen</xsd:documentation>
@@ -249,7 +266,7 @@ Ikke overlappende perioder</xsd:documentation>
         <xsd:annotation>
           <xsd:documentation>Mulighet for aktivitet /arbeidsevne (A)
 
-Sammenhengende, ikke overlappende perioder for denne sykmeldingen.</xsd:documentation>
+            Sammenhengende, ikke overlappende perioder for denne sykmeldingen.</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
       <xsd:element minOccurs="0" name="prognose" type="sykmeldingArbeidsgiver:Prognose">
@@ -269,6 +286,7 @@ Sammenhengende, ikke overlappende perioder for denne sykmeldingen.</xsd:document
       </xsd:element>
       <xsd:element name="kontaktMedPasient" type="sykmeldingArbeidsgiver:KontaktMedPasient"/>
       <xsd:element name="behandler" type="sykmeldingArbeidsgiver:Behandler"/>
+      <xsd:element minOccurs="0" name="egenmeldingsdager" type="sykmeldingArbeidsgiver:Egenmeldingsdager"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:element name="sykmeldingArbeidsgiver" type="sykmeldingArbeidsgiver:SykmeldingArbeidsgiver"/>