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

Merge branch 'release' into 'master'

Update type under Opprinnelig henvisning for Epikrise (utv->publ)

See merge request !405
parents cfae64d8 6892b2bc
<?xml version="1.0" encoding="utf-8"?>
<!--
Endringslogg:
- 01.07.21: v5.1.4 - Vis riktig type (MsgDescr) under Opprinnelig henvisning
- 04.06.21: v5.1.3 - Lagt til xsl:output for å definere at output formatet skal være html
- 31.05.21: v5.1.2 - Tillate MimeType (vedlegg) med store bokstaver
- 12.05.21: v5.1.1 - Fjern tomme <div>'s
......@@ -48,8 +49,8 @@ Om:
<xsl:output method="html" encoding="UTF-8" indent="yes" omit-xml-declaration="yes" />
<!-- Variabel for hvilken versjon av visningsfilen -->
<xsl:variable name="versjon" select="'epikrise v.uavhengig - v5.1.3'"/>
<xsl:variable name="versjon" select="'epikrise v.uavhengig - v5.1.4'"/>
<!-- Variabeler for standard antall kolonner i tabellene, og for standard cellebredde i tabellene -->
<xsl:variable name="std-col" select="8"/>
<xsl:variable name="std-td" select="200"/>
......@@ -1188,7 +1189,9 @@ Om:
</tr>
<tr>
<th>Visningsversjon</th>
<td colspan="3"><xsl:value-of select="$versjon"/></td>
<td width="{$std-td}"><xsl:value-of select="$versjon"/></td>
<th>Visningsstil</th>
<td><xsl:value-of select="$stil"/></td>
</tr>
</tbody>
</table>
......@@ -1410,22 +1413,11 @@ Om:
<!-- Visning av Henvisning -->
<xsl:template name="ServReq">
<xsl:variable name="color2">
<xsl:choose>
<xsl:when test="child::*[local-name()='ServType'][@V='M' or @V='C' or @V='O']">red</xsl:when>
<xsl:otherwise>black</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<div class="eh-row-5">
<xsl:if test="child::*[local-name()='MsgDescr']">
<div class="eh-col-1">
<div class="eh-label">Type</div>
<div class="eh-field">
<xsl:value-of select="child::*[local-name()='MsgDescr']"/> <!-- For versjon av epikrise hvor MsgDescr er kith:ST -->
<xsl:for-each select="child::*[local-name()='ServType'][@V!='N']">
&#160;<span style="color={$color2};"><xsl:call-template name="k-7309"/></span>
</xsl:for-each>
</div>
<div class="eh-field"><xsl:value-of select="child::*[local-name()='MsgDescr']/@DN"/></div>
</div>
</xsl:if>
<xsl:if test="child::*[local-name()='IssueDate']">
......@@ -1460,17 +1452,35 @@ Om:
</div>
</div>
</xsl:if>
</div>
<!-- Endring pr 22.05.2017 -->
<!-- Finn antall diagnoser for å lage en tittel som er Diagnose/Diagnoser -->
<xsl:choose>
<xsl:when test="count(child::*[local-name()='Diagnosis'])>1">
<div class="eh-col-1">
<div class="eh-label">Diagnoser:</div>
<xsl:for-each select="child::*[local-name()='Diagnosis']">
<div class="eh-col-1">
<div class="eh-field">
<div class="eh-row-5">
<xsl:choose>
<xsl:when test="count(child::*[local-name()='Diagnosis'])>1">
<div class="eh-col-1">
<div class="eh-label">Diagnoser:</div>
<xsl:for-each select="child::*[local-name()='Diagnosis']">
<div class="eh-col-1">
<div class="eh-field">
<xsl:value-of select="child::*[local-name()='Concept']/@DN"/>,&#160;
<xsl:value-of select="child::*[local-name()='Concept']/@V"/>&#160;
<xsl:if test="contains(child::*[local-name()='Concept']/@S, '7170')">(ICPC)&#160;</xsl:if>
<xsl:if test="contains(child::*[local-name()='Concept']/@S, '7110')">(ICD-10)&#160;</xsl:if>
<xsl:for-each select="child::*[local-name()='Modifier']">
<xsl:value-of select="child::*[local-name()='Value']/@V"/>,&#160;
<xsl:value-of select="child::*[local-name()='Value']/@DN"/>&#160;
</xsl:for-each>
</div>
</div>
</xsl:for-each>
</div>
</xsl:when>
<xsl:otherwise>
<div class="eh-col-1">
<div class="eh-label">Diagnose:</div>
<div class="eh-field">
<xsl:for-each select="child::*[local-name()='Diagnosis']">
<xsl:value-of select="child::*[local-name()='Concept']/@DN"/>,&#160;
<xsl:value-of select="child::*[local-name()='Concept']/@V"/>&#160;
<xsl:if test="contains(child::*[local-name()='Concept']/@S, '7170')">(ICPC)&#160;</xsl:if>
......@@ -1479,31 +1489,12 @@ Om:
<xsl:value-of select="child::*[local-name()='Value']/@V"/>,&#160;
<xsl:value-of select="child::*[local-name()='Value']/@DN"/>&#160;
</xsl:for-each>
</div>
</div>
</xsl:for-each>
</div>
</xsl:when>
<xsl:otherwise>
<div class="eh-col-1">
<div class="eh-label">Diagnose:</div>
<div class="eh-field">
<xsl:for-each select="child::*[local-name()='Diagnosis']">
<xsl:value-of select="child::*[local-name()='Concept']/@DN"/>,&#160;
<xsl:value-of select="child::*[local-name()='Concept']/@V"/>&#160;
<xsl:if test="contains(child::*[local-name()='Concept']/@S, '7170')">(ICPC)&#160;</xsl:if>
<xsl:if test="contains(child::*[local-name()='Concept']/@S, '7110')">(ICD-10)&#160;</xsl:if>
<xsl:for-each select="child::*[local-name()='Modifier']">
<xsl:value-of select="child::*[local-name()='Value']/@V"/>,&#160;
<xsl:value-of select="child::*[local-name()='Value']/@DN"/>&#160;
</xsl:for-each>
</xsl:for-each>
</div>
</div>
</div>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
</xsl:choose>
</div>
<!-- Endring pr 22.05.2017 SLUTT-->
<xsl:for-each select="child::*[local-name()='ReasonAsText']">
......
......@@ -1264,10 +1264,14 @@
</div>
</xsl:if>
<div class="eh-row-5">
<div class="eh-col-1 eh-last-child">
<div class="eh-col-2">
<div class="eh-label">Visningsversjon</div>
<div class="eh-field"><xsl:value-of select="$versjon"/></div>
</div>
<div class="eh-col-1 eh-last-child">
<div class="eh-label">Visningsstil</div>
<div class="eh-field"><xsl:value-of select="$stil"/></div>
</div>
</div>
</div>
</div>
......
......@@ -128,14 +128,18 @@
<xsl:value-of select="/descendant::mh:MsgId[1]"/>
</td>
</tr>
<xsl:if test="$versjon">
<tr>
<tr>
<xsl:if test="$versjon">
<th>Visningsversjon</th>
<td colspan="3">
<td>
<xsl:value-of select="$versjon"/>
</td>
</tr>
</xsl:if>
</xsl:if>
<th>Visningsstil</th>
<td>
<xsl:value-of select="$stil"/>
</td>
</tr>
</tbody>
</table>
</div>
......
......@@ -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>
......@@ -1175,10 +1192,14 @@ Om:
</div>
</xsl:if>
<div class="eh-row-5">
<div class="eh-col-1 eh-last-child">
<div class="eh-col-2">
<div class="eh-label">Visningsversjon</div>
<div class="eh-field"><xsl:value-of select="$versjon"/></div>
</div>
<div class="eh-col-1 eh-last-child">
<div class="eh-label">Visningsstil</div>
<div class="eh-field"><xsl:value-of select="$stil"/></div>
</div>
</div>
</div>
</div>
......
......@@ -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>
......@@ -522,9 +537,13 @@ Om:
</tr>
<tr>
<th>Visningsversjon</th>
<td colspan="3">
<td width="{$std-td}px">
<xsl:value-of select="$versjon"/>
</td>
<th>Visningsstil</th>
<td>
<xsl:value-of select="$stil"/>
</td>
</tr>
</tbody>
</table>
......
......@@ -1137,10 +1137,14 @@ Om:
</xsl:if>
</div>
<div class="eh-row-5">
<div class="eh-col-1 eh-last-child">
<div class="eh-col-2">
<div class="eh-label">Visningsversjon</div>
<div class="eh-field"><xsl:value-of select="$versjon"/></div>
</div>
<div class="eh-col-1 eh-last-child">
<div class="eh-label">Visningsstil</div>
<div class="eh-field"><xsl:value-of select="$stil"/></div>
</div>
</div>
</div>
</div>
......
Supports Markdown
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