admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BONS#51835 rapport 'Totaal lijst cliënten in zorg MDW' uitbreiden met personeelsnummer

Browse Source 
svn path=/Website/branches/v2017.2/; revision=36559
This commit is contained in:
Ruud Lipper
2018-01-11 13:04:44 +00:00
parent 955239bb02
commit 3d9524ef15
1 changed files with 58 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
APPL/CARE/xsl/care.xsl
View File

@@ -544,8 +544,8 @@
</style>
<table border="0" bordercolor="#ffffff" width="100%">
<xsl:for-each select="//facilitor/rapport/rapport_data/data_row">
<xsl:if test="position() = 1">
<tr>
<td>BSN</td>
@@ -598,21 +598,21 @@
<td class="tekst"><xsl:value-of select="TIJDSEENHEIDZORGPERIODE"/></td>
<td class="tekst"><xsl:value-of select="DECLARATIEBEDRAG"/></td>
<td class="tekst"><xsl:value-of select="DEBETCREDIT"/></td>
<td class="tekst"><xsl:value-of select="REFERENTIENUMMERCREDIT"/></td>
<td class="tekst"><xsl:value-of select="REFERENTIENUMMERCREDIT"/></td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
<xsl:if test="@view = 'care_v_rap2_factuur_uren_R'">
<style>
.num0dec {mso-number-format:0;} .num2dec {mso-number-format:Fixed;} .tekst {mso-number-format:"\@";}
</style>
<table border="0" bordercolor="#ffffff" width="100%">
<xsl:for-each select="//facilitor/rapport/rapport_data/data_row">
<xsl:if test="position() = 1">
<tr>
<td>Factuurnr</td>
@@ -667,58 +667,60 @@
<td class="tekst"><xsl:value-of select="substring(EIND_INDICATIE,9,2)" />-<xsl:value-of select="substring(EIND_INDICATIE,6,2)" />-<xsl:value-of select="substring(EIND_INDICATIE,1,4)" /></td>
<td class="tekst"><xsl:value-of select="SOORT_HV"/></td>
<td class="tekst"><xsl:value-of select="INDICATIE_UREN"/></td>
<td class="tekst"><xsl:value-of select="UREN_BESTEED"/></td>
<td class="tekst"><xsl:value-of select="UREN_BESTEED"/></td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
<xsl:if test="@view = 'care_v_rap_tot_clientzorg' or @view = 'CARE_V_RAP_TOT_CLIENTZORG_MDW'">
<style>
.num0dec {mso-number-format:0;} .num2dec {mso-number-format:Fixed;} .tekst {mso-number-format:"\@";}
.nowrap {white-space: nowrap;)
</style>
<table border="0" bordercolor="#ffffff" width="100%">
<xsl:for-each select="//facilitor/rapport/rapport_data/data_row">
<xsl:if test="position() = 1">
<tr>
<td>Periode</td>
<td>Periode</td>
<td>Gemeente</td>
<td>Status</td>
<td>BSN</td>
<td>Voorletters</td>
<td>Tussenvoegsel</td>
<td>Naam</td>
<td>Meisjesnaam</td>
<td>Naam2</td>
<td>Geboortedatum</td>
<td>Geslacht</td>
<td>Straat</td>
<td>Huisnummer</td>
<td>Postcode</td>
<td>Woonplaats</td>
<td>Telefoonnummer</td>
<td>Mobielnummer</td>
<td>Contactpersoon</td>
<td>Email</td>
<td>Opmerking</td>
<td>Bijzonderheden</td>
<td>Beschikkingsnummer</td>
<td>Start indiciatie</td>
<td>Eind indicatie</td>
<td>Soort HV</td>
<td>Indicatie uren</td>
<td>Uren besteed</td>
<xsl:if test="//facilitor/rapport/@view = 'CARE_V_RAP_TOT_CLIENTZORG_MDW'">
<td>Medewerker</td>
</xsl:if>
<td>Status</td>
<td>BSN</td>
<td>Voorletters</td>
<td>Tussenvoegsel</td>
<td>Naam</td>
<td>Meisjesnaam</td>
<td>Naam2</td>
<td>Geboortedatum</td>
<td>Geslacht</td>
<td>Straat</td>
<td>Huisnummer</td>
<td>Postcode</td>
<td>Woonplaats</td>
<td>Telefoonnummer</td>
<td>Mobielnummer</td>
<td>Contactpersoon</td>
<td>Email</td>
<td>Opmerking</td>
<td>Bijzonderheden</td>
<td>Beschikkingsnummer</td>
<td class="nowrap">Start indiciatie</td>
<td class="nowrap">Eind indicatie</td>
<td class="nowrap">Soort HV</td>
<td class="nowrap">Indicatie uren</td>
<td class="nowrap">Uren besteed</td>
<xsl:if test="//facilitor/rapport/@view = 'CARE_V_RAP_TOT_CLIENTZORG_MDW'">
<td>Medewerker</td>
<td>Personeelsnummer</td>
</xsl:if>
</tr>
</xsl:if>
<tr>
<td class="tekst"><xsl:value-of select="FCLT_F_PERIODE"/></td>
<td class="tekst"><xsl:value-of select="FCLT_F_GEMEENTE"/></td>
<td class="tekst"><xsl:value-of select="FCLT_F_STATUS"/></td>
<td class="tekst"><xsl:value-of select="FCLT_F_STATUS"/></td>
<td class="tekst"><xsl:value-of select="BSN"/></td>
<td class="tekst"><xsl:value-of select="VOORLETTERS"/></td>
<td class="tekst"><xsl:value-of select="TUSSENVOEGSEL"/></td>
@@ -742,14 +744,17 @@
<td class="tekst"><xsl:value-of select="substring(EIND_INDICATIE,9,2)" />-<xsl:value-of select="substring(EIND_INDICATIE,6,2)" />-<xsl:value-of select="substring(EIND_INDICATIE,1,4)" /></td>
<td class="tekst"><xsl:value-of select="SOORT_HV"/></td>
<td class="tekst"><xsl:value-of select="INDICATIE_UREN"/></td>
<td class="tekst"><xsl:value-of select="UREN_BESTEED"/></td>
<xsl:if test="//facilitor/rapport/@view = 'CARE_V_RAP_TOT_CLIENTZORG_MDW'"><td class="tekst"><xsl:value-of select="FCLT_F_MEDEWERKER"/></td></xsl:if>
<td class="tekst"><xsl:value-of select="UREN_BESTEED"/></td>
<xsl:if test="//facilitor/rapport/@view = 'CARE_V_RAP_TOT_CLIENTZORG_MDW'">
<td class="tekst"><xsl:value-of select="FCLT_F_MEDEWERKER"/></td>
<td class="tekst"><xsl:value-of select="PERSONEELSNUMMER"/></td>
</xsl:if>
</tr>
</xsl:for-each>
</table>
</xsl:if>
</xsl:if>
<xsl:if test="@view = 'care_v_rap_cak' or @view = 'care_v_rap_cak_chg'">
<script>
@@ -796,13 +801,13 @@
</td>
</tr>
</xsl:if>
<xsl:if test="rapport_data/data_row[GEKOZEN='4']/PERIODE != '0'">
<tr>
<td>
<center>
<b style="color:red">CAK bestand kan niet gemaakt worden, omdat er fouten in de basisgegevens aanwezig zijn. <br/>
<b style="color:red">CAK bestand kan niet gemaakt worden, omdat er fouten in de basisgegevens aanwezig zijn. <br/>
Draai het rapport 'Basis controle voor het CAK' en corrigeer eerst de fouten</b>
</center>
</td>
@@ -925,7 +930,7 @@
</tr>
<xsl:for-each select="//facilitor/rapport/rapport_data/data_row">
<xsl:sort select="NAAM"/>
<tr>
<td><xsl:value-of select="NAAM"/></td>
<td><xsl:value-of select="BSN"/></td>
@@ -940,7 +945,7 @@
<td><xsl:value-of select="PERIODE"/></td>
<td><xsl:value-of select="FACTUURNUMMER"/></td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
@@ -976,7 +981,7 @@
</tr>
<xsl:for-each select="//facilitor/rapport/rapport_data/data_row">
<xsl:sort select="HIDE_F_NR"/>
<tr>
<td><xsl:value-of select="RECORD_START"/></td>
<td><xsl:value-of select="position()"/></td>
@@ -1002,7 +1007,7 @@
<td><xsl:value-of select="GEMEENTE_CODE"/></td>
<td><xsl:value-of select="FCLT_X_PERIODE"/></td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
@@ -1010,7 +1015,7 @@
<xsl:if test="@view = 'care_v_rap_prs_planbord' or @view = 'care_v_rap_prs_team_planbord'">
<script>
<xsl:text disable-output-escaping="yes">
function prs_showverzorger (p_prs_perslid_key){
@@ -1121,7 +1126,7 @@
<xsl:if test="@view = 'care_v_rap_km_per_dag'" >
<script>
<xsl:text disable-output-escaping="yes">
function opdr_uren_edit(p_role, p_prs_perslid, p_fromdate, p_jaarweek){
@@ -1166,7 +1171,7 @@
<xsl:if test="@view = 'care_v_rap_my_km_per_dag'" >
<script>
<xsl:text disable-output-escaping="yes">
function opdr_uren_edit(p_role, p_prs_perslid, p_fromdate, p_jaarweek){