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

Merge 2016.1 patches

Browse Source 
svn path=/Website/trunk/; revision=30645
This commit is contained in:
Jos Groot Lipman
2016-09-08 11:55:06 +00:00
parent 756857b8a3 313d54894c
commit 2bacb4f9f9
7 changed files with 59 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
APPL/API/api_mldsoap.asp
View File

@@ -85,6 +85,7 @@ var detected ="?";
var meldingen = xmlReq.getElementsByTagName("melding");
for (i = 0; i < meldingen.length; i++)
{
resultcode = -1;
// Lees per node de (optionele) tags en waarden.
var fields = []; // Bij te werken velden.
var ext_id = meldingen[i].getAttribute("key");

2
APPL/MLD/mld_show_melding.asp
View File

@@ -450,7 +450,7 @@ function parentButton()
ROCHECKBOXTR("fldkto", L("lcl_mld_kto_invite"), mld_melding.kto, { suppressEmpty: true });
if (mld_melding.kto_type)
if (mld_melding.kto_type && mld_melding.kto_key > 0)
mld.referentielink(mld_melding.kto_type, mld_melding.kto_key, L("lcl_mld_kto"));
if (mld_melding.haschild)

2
CUST/AAIT/import/C4A_import.xsl
View File

@@ -68,7 +68,7 @@
<xsl:value-of select="verzoek"/>
</meldingtekst>
<onderwerp>
<xsl:value-of select="korte_omschrijving"/>
<xsl:value-of select="substring(korte_omschrijving,1,60)"/>
</onderwerp>
</xsl:element>
</xsl:for-each>

0
CUST/DJIN/export/KPI/.gitignore vendored Normal file
View File

25
CUST/DJIN/export/gen_export_KPI.bat Normal file
View File

@@ -0,0 +1,25 @@
REM GEN_EXPORT_KPI.BAT
REM
REM DJIN
REM
REM Exporteert 5-tal KPI-bestanden als CSV (DJIN#37160).
REM
REM Context : roep deze file aan indien nodig, of schedule deze
REM Vereist : de randvoorwaarde voor het gebruik van gen_export
REM
REM $Revision$
REM $Id$
REM
REM (c) 2016 Facilitor B.V.
REM
REM ================================================== create exportfile(s)
CALL ..\..\..\utils\gen_export\gen_export.bat KPI_MLD_STD
CALL ..\..\..\utils\gen_export\gen_export.bat KPI_MLD_URG
CALL ..\..\..\utils\gen_export\gen_export.bat KPI_MLD_VVG
CALL ..\..\..\utils\gen_export\gen_export.bat KPI_KLR
CALL ..\..\..\utils\gen_export\gen_export.bat KPI_RES

23
CUST/HOUT/xsl/cust.xsl
View File

@@ -51,6 +51,8 @@
<!--==============================================-->
<!-- DEFAULT BON -->
<!--==============================================-->
<!--121=FM Facilities Management = oud?-->
<xsl:when test="discipline/srtdiscipline/key=121">
<tr height="30px">
<td colspan="3"/>
@@ -91,6 +93,12 @@
<td align="right" width="16%"><b>Aanvrager:</b></td>
<td align="left"><xsl:value-of select="voor/naam_full"/></td>
</tr>
<xsl:if test="onderwerp != ''">
<tr>
<td align="right" width="16%"><b>Onderwerp:</b></td>
<td align="left"><xsl:value-of select="onderwerp"/></td>
</tr>
</xsl:if>
<tr>
<td align="right" width="16%"><b>Omschrijving:</b></td>
<td align="left">
@@ -159,6 +167,12 @@ as defined in our General Terms and Conditions.<br/>
</xsl:element>
</td>
</tr>
<xsl:if test="onderwerp != ''">
<tr>
<td align="right" width="16%"><b>Onderwerp:</b></td>
<td align="left"><b><xsl:value-of select="onderwerp"/></b></td>
</tr>
</xsl:if>
<tr>
<td align="right" width="16%">
<b>Datum:</b>
@@ -381,7 +395,7 @@ as defined in our General Terms and Conditions.<br/>
<xsl:otherwise>Laag</xsl:otherwise>
</xsl:choose>
</td>
</tr>
</tr>
<tr>
<td colspan="4" height="20px"/>
</tr>
@@ -390,6 +404,7 @@ as defined in our General Terms and Conditions.<br/>
</tr>
<tr>
<td class="value" colspan="4">
<xsl:if test="melding/onderwerp != ''"><xsl:value-of select="melding/onderwerp"/><br/></xsl:if>
<xsl:call-template name="linebreaks"><xsl:with-param name="string" select="melding/omschrijving"/></xsl:call-template>
</td>
</tr>
@@ -512,6 +527,12 @@ This communication is sent to you from Houthoff Buruma Coöperatief U.A. This e-
<xsl:value-of select="melding_key"/>
</td>
</tr>
<xsl:if test="melding/onderwerp != ''">
<tr>
<td><b>Onderwerp:</b></td>
<td align="left"><xsl:value-of select="melding/onderwerp"/></td>
</tr>
</xsl:if>
<tr>
<td>
<b>Aan:</b>

61
CUST/IVET/cust.css
View File

@@ -22,6 +22,13 @@ div.ui-layout-toggler {
background-image: none;
}
/* Koppen in tabbladen die zijn in/uit te klappen door aan te klikken */
div.fcltframeheader {
background-color: #c7ecea;
background-image: none;
color: #37424A;
}
/* zoek en bestelveld */
#productsearch {
background-color: orange;
@@ -30,24 +37,13 @@ div.ui-layout-toggler {
height:15px;
}
/* Kader tabblad 'Mijn Facilitor', inclusief "border-bottom" */
#mywelcome, #mymessages, #myactions {
background-color: #00877c;
}
/* Koppen in tabbladen die zijn in/uit te klappen door aan te klikken */
div.fcltframeheader {
background-color: #c7ecea;
background-image: none;
color: #37424A;
}
/* Kader (gegevens)onderdelen in tabbladen */
#showbody .fcltblockhead, #editbody .fcltblockhead {
background-color: #00877c;
color: white;
}
#search, #search div.fcltblockhead {
#search div.fcltblockhead {
background-color: #00877c;
border: 1px solid #00877c;
color: white;
@@ -75,45 +71,6 @@ body.modal .fcltblockhead {
background-color: #e7f8f5;
}
.flexlabel {
background-color: #c7ecea;
}
/* Service-menu */
div#ProfFAC, div#ProfFAC ul li li {
background-color: #e7f8f5;
}
div#ProfFAC ul li {
background-color: #c7ecea;
}
div#ProfFAC ul li span.menukop {
color: #37424A;
}
/* Zelfservice-menu */
div#PersFAC, div#PersFAC ul li li {
background-color: #e7f8f5;
}
div#PersFAC ul li {
background-color: #c7ecea;
}
div#PersFAC ul li span.menukop {
color: #37424A;
}
/* Beheer-menu */
div#MgtFAC {
background-color: #e7f8f5;
}
div#MgtFAC ul li {
background-color: #c7ecea;
}
/* IVET#19606: Label-wrapping aan (per 5.0.11 standaard uit)! */
label {
white-space: normal;
}
li.mk:hover span.menukop {
color: #fff!important;
}