Commit cf54597f authored by Sebastian Brelin's avatar Sebastian Brelin
Browse files

Merge branch 'add-param-for-vismenylinje' into 'develop'

Add param for vismenylinje

See merge request utvikling/standarder!876
parents 6fcdda1b a7b4b4a2
......@@ -65,6 +65,17 @@ Om:
or boolean(/doc11:Message/doc11:Status[@V = 'TEST'])
or boolean(/mh:MsgHead/mh:MsgInfo/mh:ProcessingStatus[@V = 'D'])" />
<xsl:param name="VisMenylinje"/>
<xsl:variable name="menylinje">
<xsl:choose>
<xsl:when test="$VisMenylinje = 'false'">
<xsl:value-of select="false()"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="true()"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:template match="/">
<html>
<head>
......@@ -95,7 +106,9 @@ Om:
<!-- Visning av meldingshodet. Tilpasset vinduskonvolutt ved utskrift -->
<xsl:template match="mh:MsgHead"> <!-- v2.0 -->
<xsl:call-template name="Topp"/>
<xsl:call-template name="Innhold"/>
<xsl:call-template name="Innhold">
<xsl:with-param name="menylinje" select="$menylinje"/>
</xsl:call-template>
<xsl:call-template name="EgetBunnTillegg_v2"/>
</xsl:template>
......@@ -104,6 +117,8 @@ Om:
<!-- utelater meldingsid og kommunikasjonsinformasjon -->
<xsl:call-template name="Header"/>
<xsl:call-template name="ResultBody"/>
<xsl:with-param name="menylinje" select="$menylinje"/>
</xsl:call-template>
<xsl:call-template name="Footer">
<xsl:with-param name="stil" select="$stil"/>
<xsl:with-param name="versjon" select="$versjon"/>
......@@ -329,9 +344,11 @@ Om:
</xsl:variable>
<div class="{$stil}">
<xsl:call-template name="FellesMeny">
<xsl:with-param name="position" select="position()"/>
</xsl:call-template>
<xsl:if test="$menylinje = 'true'">
<xsl:call-template name="FellesMeny">
<xsl:with-param name="position" select="position()"/>
</xsl:call-template>
</xsl:if>
<!-- Overskrift for henvisningen -->
<h1>
......
......@@ -33,6 +33,17 @@
<xsl:variable name="versjon" select="'plo1.6 - v3.2.1'"/>
<xsl:variable name="IsTestMessage" select="boolean(/mh:MsgHead/mh:MsgInfo/mh:ProcessingStatus[@V = 'D'])" />
<xsl:param name="VisMenylinje"/>
<xsl:variable name="menylinje">
<xsl:choose>
<xsl:when test="$VisMenylinje = 'false'">
<xsl:value-of select="false()"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="true()"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:template match="/">
<html>
......@@ -63,7 +74,9 @@
<!-- Visning av meldingshodet. Tilpasset vinduskonvolutt ved utskrift -->
<xsl:template name="MsgHead">
<xsl:call-template name="Topp"/>
<xsl:call-template name="Innhold"/>
<xsl:call-template name="Innhold">
<xsl:with-param name="menylinje" select="$menylinje"/>
</xsl:call-template>
<xsl:call-template name="Footer">
<xsl:with-param name="stil" select="$stil"/>
<xsl:with-param name="versjon" select="$versjon"/>
......@@ -101,7 +114,9 @@
</xsl:if>
</xsl:if>
</h1>
<xsl:call-template name="FellesMeny"/>
<xsl:if test="$menylinje = 'true'">
<xsl:call-template name="FellesMeny"/>
</xsl:if>
<xsl:call-template name="Dokument"/>
</div>
</xsl:template>
......
......@@ -69,6 +69,17 @@ Om:
or boolean(/doc15:Message/doc15:Status[@V = 'TEST'])
or boolean(/doc16:Message/doc16:Status[@V = 'TEST'])" />
<xsl:param name="VisMenylinje"/>
<xsl:variable name="menylinje">
<xsl:choose>
<xsl:when test="$VisMenylinje = 'false'">
<xsl:value-of select="false()"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="true()"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<!-- Meldingsstart -->
<xsl:template match="/">
<html>
......@@ -100,7 +111,9 @@ Om:
<xsl:for-each select="child::*[local-name()='ServReq']">
<!-- utelater meldingsid og kommunikasjonsinformasjon -->
<xsl:call-template name="Header"/>
<xsl:call-template name="ResultBody"/>
<xsl:call-template name="ResultBody">
<xsl:with-param name="menylinje" select="$menylinje"/>
</xsl:call-template>
<xsl:call-template name="Footer">
<xsl:with-param name="stil" select="$stil"/>
<xsl:with-param name="versjon" select="$versjon"/>
......@@ -344,11 +357,13 @@ Om:
<xsl:call-template name="k-7309"/>
</xsl:for-each>
</h1>
<div>
<xsl:call-template name="FellesMeny">
<xsl:with-param name="position" select="position()"/>
</xsl:call-template>
</div>
<xsl:if test="$menylinje = 'true'">
<div>
<xsl:call-template name="FellesMeny">
<xsl:with-param name="position" select="position()"/>
</xsl:call-template>
</div>
</xsl:if>
<xsl:variable name="id1">
<xsl:value-of select="concat('ServReq',$position)"/>
</xsl:variable>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment