Legger til endringer gjort på bussen i 2023

navikt · Apr 27, 2024 · c2cb1cd · c2cb1cd
1 parent 49fff08
commit c2cb1cd
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 4 deletions.
diff --git a/...rv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOBeregningsResultat2016.xsd b/...rv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOBeregningsResultat2016.xsd
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema targetNamespace="http://nav-lib-pen/no/nav/lib/pen/gbo"
 	xmlns:bons0="http://nav-lib-pen/no/nav/lib/pen/gbo"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:bons1="http://stelvio-commons-lib/no/nav/gbo">
+	<xsd:import schemaLocation="../../../gbo/GBOEndringsInfo.xsd"
+		namespace="http://stelvio-commons-lib/no/nav/gbo">
+	</xsd:import>
 	<xsd:include schemaLocation="GBOBeregningsResultat2025.xsd" />
 	<xsd:include schemaLocation="GBOBeregningsResultat.xsd" />
 	<xsd:include schemaLocation="GBOPensjonUnderUtbetaling.xsd" />
@@ -29,6 +33,12 @@
 				name="beregningsResultat2025"
 				type="bons0:GBOBeregningsResultat2025">
 			</xsd:element>
+			<xsd:element minOccurs="0" name="benyttetSivilstand"
+				type="xsd:string">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="endringsInfo"
+				type="bons1:GBOEndringsInfo">
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
 </xsd:schema>
diff --git a/...rv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOBeregningsResultat2025.xsd b/...rv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOBeregningsResultat2025.xsd
@@ -1,8 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?><xsd:schema targetNamespace="http://nav-lib-pen/no/nav/lib/pen/gbo" xmlns:bons0="http://nav-lib-pen/no/nav/lib/pen/gbo" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<xsd:include schemaLocation="GBOBeregningsinformasjon2025.xsd"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://nav-lib-pen/no/nav/lib/pen/gbo"
+	xmlns:bons0="http://nav-lib-pen/no/nav/lib/pen/gbo"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:bons1="http://stelvio-commons-lib/no/nav/gbo">
+	<xsd:import schemaLocation="../../../gbo/GBOEndringsInfo.xsd"
+		namespace="http://stelvio-commons-lib/no/nav/gbo">
+	</xsd:import>
+	<xsd:include schemaLocation="GBOPensjonUnderUtbetaling.xsd"></xsd:include>
+	<xsd:include schemaLocation="GBOBeregningsinformasjon2025.xsd" />
 	<xsd:complexType name="GBOBeregningsResultat2025">
 		<xsd:sequence>
-			<xsd:element minOccurs="0" name="beregningsinformasjonKapittel20" type="bons0:GBOBeregningsinformasjon2025">
+			<xsd:element minOccurs="0"
+				name="beregningsinformasjonKapittel20"
+				type="bons0:GBOBeregningsinformasjon2025">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="virkFom"
+				type="xsd:string">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="virkTom"
+				type="xsd:string">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="pensjonUnderUtbetaling"
+				type="bons0:GBOPensjonUnderUtbetaling">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="endringsInfo"
+				type="bons1:GBOEndringsInfo">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="benyttetSivilstand"
+				type="xsd:string">
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>

diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOVedtak.xsd b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/lib/pen/gbo/GBOVedtak.xsd
@@ -3,6 +3,7 @@
 	xmlns:bons0="http://nav-lib-pen/no/nav/lib/pen/gbo"
 	xmlns:bons1="http://stelvio-commons-lib/no/nav/gbo"
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xsd:include schemaLocation="GBOBeregningsResultat2025.xsd"></xsd:include>
 	<xsd:include schemaLocation="GBOBeregningsResultat2016.xsd" />
 	<xsd:include schemaLocation="GBOBeregningsResultatUforetrygd.xsd" />
 	<xsd:include schemaLocation="GBOSammenstotstilfelle.xsd" />
@@ -129,6 +130,10 @@
 				type="bons0:GBOBeregningsResultatUforetrygd"
 				maxOccurs="unbounded">
 			</xsd:element>
+			<xsd:element minOccurs="0"
+				name="beregningsResultat2025Liste"
+				type="bons0:GBOBeregningsResultat2025" maxOccurs="unbounded">
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
 </xsd:schema>
diff --git a/...vbestilling-legacy/src/main/resources/lib/pen/gbo/GBOVilkarsprovAlderspensjonResultat.xsd b/...vbestilling-legacy/src/main/resources/lib/pen/gbo/GBOVilkarsprovAlderspensjonResultat.xsd
@@ -3,6 +3,8 @@
 	targetNamespace="http://nav-lib-pen/no/nav/lib/pen/gbo"
 	xmlns:bons0="http://nav-lib-pen/no/nav/lib/pen/gbo"
 	xmlns:bons1="http://stelvio-commons-lib/no/nav/gbo">
+	<xsd:include schemaLocation="GBOVilkarsprovInformasjon2025.xsd"></xsd:include>
+	<xsd:include schemaLocation="GBOBeregningsResultat2025.xsd"></xsd:include>
 	<xsd:include schemaLocation="GBOVilkarsprovInformasjon2016.xsd"></xsd:include>
 	<xsd:include schemaLocation="GBOBeregningsResultat2016.xsd"></xsd:include>
 	<xsd:import schemaLocation="../../../gbo/GBOEndringsInfo.xsd"
@@ -33,6 +35,12 @@
 			<xsd:element minOccurs="0" name="endringsInfo"
 				type="bons1:GBOEndringsInfo">
 			</xsd:element>
+			<xsd:element minOccurs="0" name="beregningVedUttak2025"
+				type="bons0:GBOBeregningsResultat2025">
+			</xsd:element>
+			<xsd:element minOccurs="0" name="vilkarsprovInformasjon2025"
+				type="bons0:GBOVilkarsprovInformasjon2025">
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
 </xsd:schema>