PCHD#56052 gebouw naam bij res

svn path=/Website/branches/v2018.2/; revision=40493
This commit is contained in:
Dennis Hartmann
2019-01-10 14:03:58 +00:00
parent 1b661c13ba
commit 5d5c636d9a

View File

@@ -151,7 +151,7 @@
</xsl:choose>
</td>
<td align="left" width="34%">
<xsl:value-of select="backoffice_contact/naam_full"/>
<xsl:value-of select="backoffice_contact/naam_full"/>
</td>
</tr>
<tr>
@@ -202,7 +202,7 @@
<td align="left" width="34%">
<xsl:value-of select="backoffice_contact/email"/>
</td>
</tr>
<tr>
<td colspan="4">
@@ -414,7 +414,7 @@
<td align="left" width="34%">
<xsl:value-of select="backoffice_contact/email"/>
</td>
</tr>
</xsl:if>
@@ -442,16 +442,16 @@
<xsl:value-of select="melding/discipline/omschrijving"/>
</td>
</tr>
<xsl:if test="melding/deel/omschrijving!=''">
<tr>
<td align="right">
<b>ObjectId:</b>
</td>
<td align="left">
<!-- <xsl:if test="melding/deel/omschrijving=''">-</xsl:if> -->
<xsl:value-of select="melding/deel/omschrijving"/> (<xsl:value-of select="melding/deel/srtdeel/omschrijving"/>)
<xsl:value-of select="melding/deel/omschrijving"/> (<xsl:value-of select="melding/deel/srtdeel/omschrijving"/>)
</td>
</tr>
@@ -803,6 +803,233 @@
</xsl:template>
<xsl:template name="rsv_ruimte">
<xsl:param name="min_volgnr"/>
<tr>
<xsl:choose>
<xsl:when test="res_ruimte!=''">
<td class="tekstkop" colspan="10" frame="box"><u>
<xsl:if test="dirtlevel!='0'">
<span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;
</xsl:if>
<xsl:value-of select="van/datum"/>&#xA0;
<xsl:value-of select="//lcl/RES/deelreservering"/>&#xA0;<xsl:value-of select="../key"/>&#xA0;/<xsl:value-of select="volgnr"/>&#xA0;
<xsl:if test="string(res_activiteit/omschrijving)!=''">(<xsl:value-of select="res_activiteit/omschrijving"/>)&#xA0;</xsl:if>
<xsl:value-of select="res_ruimte/plaats/regio/district/locatie/omschrijving"/> -&#xA0;<xsl:value-of select="res_ruimte/plaats/regio/district/locatie/adres"/></u>
</td>
</xsl:when>
<!-- "roomservice" -->
<xsl:otherwise>
<td class="tekstkop" colspan="10" frame="box" style="border-style:solid;border-width:0px;"><u>
<xsl:if test="dirtlevel!='0'">
<span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;
</xsl:if>
<xsl:value-of select="van/datum"/>
<xsl:if test="string(van/datum)!=string(tot/datum)">
&#xA0;-&#xA0;<xsl:value-of select="tot/datum"/>
</xsl:if>&#xA0;
<xsl:value-of select="//lcl/RES/deelreservering"/>&#xA0;<xsl:value-of select="../key"/>&#xA0;/<xsl:value-of select="volgnr"/>&#xA0;
<xsl:value-of select="plaats/plaatsaanduiding"/></u>
</td>
</xsl:otherwise>
</xsl:choose>
</tr>
<xsl:if test="string(omschrijving)!=string(//reservering/rsv_ruimte[volgnr=$min_volgnr]/omschrijving)">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/omschrijving"/></td>
<td class="value" colspan="9">
: <xsl:value-of select="omschrijving"/>
</td>
</tr>
</xsl:if>
<xsl:if test="string(contact_user/naam_full)!=string(//reservering/rsv_ruimte[volgnr=$min_volgnr]/contact_user/naam_full)">
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/aanvrager"/></td>
<td class="value" colspan="9">
: <xsl:value-of select="contact_user/naam_full"/>/ <xsl:value-of select="contact_user/werkplek/plaats/regio/district/locatie/omschrijving"/></td>
</tr>
</xsl:if>
<tr>
<td class="label"><xsl:value-of select="//lcl/RES/status"/></td>
<td class="value" colspan="5">: <xsl:value-of select="status_fo"/>
</td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/RES/gastheer_vrouw"/></td>
<td class="value" colspan="5">: <xsl:value-of select="host_user/naam_full"/></td>
</tr>
<tr>
<td class="label"><xsl:value-of select="//lcl/FAC/kostenplaats"/></td>
<td class="value" colspan="5">: <xsl:value-of select="kostenplaats/nr"/>&#xA0;
<xsl:value-of select="kostenplaats/omschrijving"/>
</td>
</tr>
<xsl:if test="string(opmerking)!=''">
<tr>
<td class="label"> <xsl:value-of select="//lcl/FAC/opmerking"/></td>
<td class="value" colspan="9">
: <xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="opmerking"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
<tr>
<td colspan="10" style="border-top:1px solid #000;"/>
</tr>
<tr>
<th class="resth" width="24%" align="left"><xsl:value-of select="//lcl/FAC/omschrijving"/></th>
<th class="resth" width="14%" align="left"><xsl:value-of select="//lcl/RES/aantal"/></th>
<!--<th width="80">Datum</th>-->
<th class="resth" width="14%" style="text-align:right"><xsl:value-of select="//lcl/RES/begintijd"/></th>
<th class="resth" width="14%" style="text-align:right"><xsl:value-of select="//lcl/RES/eindtijd"/></th>
<th class="resth" width="16%" align="center"><xsl:value-of select="//lcl/RES/opstelling"/></th>
<th class="resth" width="17%" style="text-align:right"><xsl:value-of select="//lcl/RES/prijs"/></th>
</tr>
<xsl:if test="res_ruimte!=''">
<tr>
<td width="24%" class="resresult" style="text-align:left;"><xsl:if test="dirtlevel!='0'"><span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;</xsl:if>
<xsl:value-of select="res_ruimte/nr"/>
<br/>(max. <xsl:value-of select="res_ruimte/bezoekers"/>&#xA0;<xsl:value-of select="//lcl/FAC/personen"/>)</td>
<td width="14%" class="resresult" style="text-align:left">
<xsl:value-of select="bezoekers"/>&#xA0;<xsl:value-of select="//lcl/FAC/personen"/></td>
<!--<td class="result" style="text-align:right">
<xsl:value-of select="van/datum"/>
</td>-->
<td width="14%" class="resresult" style="text-align:right">
<xsl:value-of select="van/tijd"/>
</td>
<td width="14%" class="resresult" style="text-align:right">
<xsl:value-of select="tot/tijd"/>
</td>
<td width="16%" class="resresult" style="text-align:center">
<xsl:value-of select="res_ruimte/opstelling"/>
</td>
<td width="17%" class="resresult" style="text-align:right">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
<!-- rsv_deel-lijst gesorteerd op van-tijd -->
<xsl:for-each select="rsv_deel">
<xsl:sort select="van/tijd"/>
<tr>
<td class="resresult"><xsl:if test="dirtlevel!='0'"><span class="fatal"><xsl:value-of select="//lcl/RES/ongeldig"/></span>&#xA0;</xsl:if>
<xsl:value-of select="res_deel/deel/omschrijving"/>
</td>
<td class="resresult">
<xsl:value-of select="aantal"/>
</td>
<!--<td class="result" style="text-align:right">
<xsl:value-of select="van/datum"/>
</td>-->
<td class="resresult" style="text-align:right">
<xsl:value-of select="van/tijd"/>
</td>
<td class="resresult" style="text-align:right">
<xsl:value-of select="tot/tijd"/>
</td>
<td></td>
<td class="resresult" style="text-align:right">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
</tr>
</xsl:for-each>
<!-- rsv_artikel-lijst gesorteerd op van-tijd -->
<xsl:for-each select="rsv_artikel">
<xsl:sort select="levering/tijd"/>
<tr>
<td class="resresult">
<xsl:value-of select="res_artikel/omschrijving"/>
</td>
<td class="resresult">
<xsl:value-of select="aantal"/>
</td>
<!--<td class="result" style="text-align:right">
<xsl:value-of select="levering/datum"/>
</td>-->
<td class="resresult" style="text-align:right">
<xsl:value-of select="levering/tijd"/>
</td>
<td></td>
<td></td>
<td class="resresult" style="text-align:right">
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="prijs"/>
</xsl:call-template>
</td>
</tr>
</xsl:for-each>
<!-- totaal per deelreservering -->
<tr height="1">
<td colspan="10" style="border-top:1px solid #000;"/>
</tr>
<tr>
<td class="tekst" colspan="4"></td>
<td class="tekst" colspan="2" style="text-align:right;"><b>
<xsl:call-template name="europrijs">
<xsl:with-param name="prijs" select="sum(prijs[string(number(.))!='NaN'])+sum(rsv_deel/prijs[string(number(.))!='NaN'])+sum(rsv_artikel/prijs[string(number(.))!='NaN'])"/>
</xsl:call-template></b>
</td>
</tr>
<!-- afspraak-lijst gesorteerd op naam -->
<xsl:for-each select="afspraak/bezoeker">
<xsl:sort select="naam"/>
<xsl:choose>
<xsl:when test="position() = 1">
<tr>
<td class="tekst">
<br/><xsl:value-of select="//lcl/BEZ/bezoekers"/></td>
</tr>
<tr>
<th><xsl:value-of select="//lcl/FAC/naam"/></th>
<th colspan="3"><xsl:value-of select="//lcl/FAC/bedrijf"/></th>
<th colspan="4"><xsl:value-of select="//lcl/BEZ/parkeerplaats"/></th>
</tr>
</xsl:when>
</xsl:choose>
<tr>
<td class="result">
<xsl:value-of select="naam"/>
</td>
<td class="result" colspan="3">
<xsl:value-of select="bedrijf"/>
</td>
<td class="result" colspan="4">
<xsl:value-of select="deel/omschrijving"/>
</td>
</tr>
</xsl:for-each>
<!-- kenmerk -->
<xsl:if test="kenmerk">
<tr>
<td colspan="5">
<table>
<xsl:for-each select="kenmerk[count(@xmlnode)=0]">
<xsl:sort select="@volgnummer" data-type="number"/>
<xsl:if test=".!=''">
<tr>
<td class="label">
<xsl:value-of select="@naam"/></td>
<td class="value">
: <xsl:value-of select="."/>
</td>
</tr>
</xsl:if>
</xsl:for-each>
</table>
</td>
</tr>
</xsl:if>
</xsl:template>
<xsl:template match="rapport">
<xsl:if test="@view ='PCHD_V_RAP_CATRES1'">
<html>