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

Merge 2016.3 Gold D patches

Browse Source 
svn path=/Website/trunk/; revision=33175
This commit is contained in:
Jos Groot Lipman
2017-03-16 15:06:05 +00:00
parent 63ceaa96a1
commit 02a36246b8
9 changed files with 128 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
APPL/API2/model_fac_idp.inc
View File

@@ -91,11 +91,6 @@ function fac_idp()
"label": L("fac_idp_remote_logouturl"),
"typ": "varchar"
},
"usermapping": {
"dbs": "fac_idp_usermapping",
"label": L("fac_idp_usermapping"),
"typ": "varchar"
},
"ipfilter": {
"dbs": "fac_idp_ipfilter",
"label": L("fac_idp_ipfilter"),

2
APPL/BES/bes_edit_srtdeel.asp
View File

@@ -192,7 +192,7 @@ else
<tr>
<td class="label"><label for="image" class=""><%= L("lcl_bes_image") %>:</label></td><td>
<input class="fld" name="image" id="image" value="">
<input class="fld" name="image" id="image" value="<%=safe.htmlattr(art.image)%>">
&nbsp;<i class="fa fa-lg fa-folder-open mbutton" onclick="edit_image()">&nbsp;</i>
</td>

2
APPL/MLD/mld_edit_opdr.js
View File

@@ -306,7 +306,7 @@ function mld_submit(json)
// Er moet minimaal 0 voor een van de kostenvelden zin ingevuld.
if ( $("#tot_kosten").hasClass("required") )
if ( $("#mat_kosten").val() == "" && $("#uren").val() == "" )
if ( $("#mat_kosten").val() == "" && $("#corr_kosten").val() == "" && ($("#uren").val() == "" || $("#uurtarief").val() == "") )
return false;
var autoConf = opdr_key < 0 &&

165
APPL/Shared/Suggest/persoonFilter.inc
View File

@@ -76,70 +76,80 @@ function getFiltClausePersoon(pfiltcode, params)
break;
case 'BEHF': // Mogelijke behandelaar (voor toekenning)
// Dat is: als ik FO ben: fo-collegas
var afd_key = new Perslid(params.prs_key).prs_afdeling_key();
// Let op: *mijn* rechten (params.autlevel) doen niet ter zake. Het gaat om de rechten van de collega
lfiltClause = " AND p.prs_perslid_key IN"
+ " (SELECT prs_perslid_key"
+ " FROM fac_v_webgebruiker g, fac_functie f"
+ " WHERE g.fac_functie_key = f.fac_functie_key"
+ " AND g.ins_discipline_key = " + params.disc_key
+ " AND (g.fac_gebruiker_prs_level_write = -1"
+ " OR (g.fac_gebruiker_prs_level_write = 0"
+ " AND d.prs_bedrijf_key = (SELECT aa.prs_bedrijf_key"
+ " FROM prs_v_afdeling aa"
+ " WHERE aa.prs_afdeling_key = " + afd_key + "))"
+ " OR (g.fac_gebruiker_prs_level_write > 0"
+ " AND p.prs_afdeling_key IN "
+ " (SELECT prs_afdeling_key FROM prs_v_afdeling_familie a"
+ " WHERE a.prs_afdeling_elder_key IN"
+ " (SELECT aa.prs_afdeling_elder_key"
+ " FROM prs_v_afdeling_familie aa"
+ " WHERE aa.prs_afdeling_key = " + afd_key
+ " AND aa.niveau = g.fac_gebruiker_prs_level_write))"
+ " ))";
if (params.loc_key > 0)
lfiltClause += " AND (g.fac_gebruiker_alg_level_write = -1"
+ " OR (g.fac_gebruiker_alg_level_write < 9"
+ " AND " + params.loc_key + " IN "
+ " (SELECT alg_locatie_key FROM fac_v_my_locations "
+ " WHERE prs_perslid_key = p.prs_perslid_key"
+ " AND niveau = fac_gebruiker_alg_level_write)"
+ " ))";
lfiltClause +=" AND fac_functie_code = 'WEB_MLDFOF') ";
if (params.prs_key > 0)
{
var afd_key = new Perslid(params.prs_key).prs_afdeling_key();
// Let op: *mijn* rechten (params.autlevel) doen niet ter zake. Het gaat om de rechten van de collega
lfiltClause = " AND p.prs_perslid_key IN"
+ " (SELECT prs_perslid_key"
+ " FROM fac_v_webgebruiker g, fac_functie f"
+ " WHERE g.fac_functie_key = f.fac_functie_key"
+ " AND g.ins_discipline_key = " + params.disc_key
+ " AND (g.fac_gebruiker_prs_level_write = -1"
+ " OR (g.fac_gebruiker_prs_level_write = 0"
+ " AND d.prs_bedrijf_key = (SELECT aa.prs_bedrijf_key"
+ " FROM prs_v_afdeling aa"
+ " WHERE aa.prs_afdeling_key = " + afd_key + "))"
+ " OR (g.fac_gebruiker_prs_level_write > 0"
+ " AND p.prs_afdeling_key IN "
+ " (SELECT prs_afdeling_key FROM prs_v_afdeling_familie a"
+ " WHERE a.prs_afdeling_elder_key IN"
+ " (SELECT aa.prs_afdeling_elder_key"
+ " FROM prs_v_afdeling_familie aa"
+ " WHERE aa.prs_afdeling_key = " + afd_key
+ " AND aa.niveau = g.fac_gebruiker_prs_level_write))"
+ " ))";
if (params.loc_key > 0)
lfiltClause += " AND (g.fac_gebruiker_alg_level_write = -1"
+ " OR (g.fac_gebruiker_alg_level_write < 9"
+ " AND " + params.loc_key + " IN "
+ " (SELECT alg_locatie_key FROM fac_v_my_locations "
+ " WHERE prs_perslid_key = p.prs_perslid_key"
+ " AND niveau = fac_gebruiker_alg_level_write)"
+ " ))";
lfiltClause +=" AND fac_functie_code = 'WEB_MLDFOF') ";
}
else
lfiltClause = " AND 1 = 0";
break;
case 'BEHB': // Mogelijke behandelaar (voor toekenning)
// Dat is: als ik BO ben de bo-collegas.
var afd_key = new Perslid(params.prs_key).prs_afdeling_key(); // afdeling van de melder!
// Let op: *mijn* rechten (params.autlevel) doen niet ter zake. Het gaat om de rechten van de collega
lfiltClause = " AND p.prs_perslid_key IN"
+ " (SELECT prs_perslid_key"
+ " FROM fac_v_webgebruiker g, fac_functie f"
+ " WHERE g.fac_functie_key = f.fac_functie_key"
+ " AND g.ins_discipline_key = " + params.disc_key
+ " AND (g.fac_gebruiker_prs_level_write = -1"
+ " OR (g.fac_gebruiker_prs_level_write = 0"
+ " AND d.prs_bedrijf_key = (SELECT aa.prs_bedrijf_key"
+ " FROM prs_v_afdeling aa"
+ " WHERE aa.prs_afdeling_key = " + afd_key + "))"
+ " OR (g.fac_gebruiker_prs_level_write > 0"
+ " AND p.prs_afdeling_key IN "
+ " (SELECT prs_afdeling_key FROM prs_v_afdeling_familie a"
+ " WHERE a.prs_afdeling_elder_key IN"
+ " (SELECT aa.prs_afdeling_elder_key"
+ " FROM prs_v_afdeling_familie aa"
+ " WHERE aa.prs_afdeling_key = " + afd_key
+ " AND aa.niveau = g.fac_gebruiker_prs_level_write))"
+ " ))";
if (params.loc_key > 0)
lfiltClause += " AND (g.fac_gebruiker_alg_level_write = -1"
+ " OR (g.fac_gebruiker_alg_level_write < 9"
+ " AND EXISTS"
+ " (SELECT alg_locatie_key FROM fac_v_my_locations fl"
+ " WHERE prs_perslid_key = p.prs_perslid_key"
+ " AND niveau = fac_gebruiker_alg_level_write"
+ " AND fl.alg_locatie_key = " + params.loc_key + ")"
+ " ))";
lfiltClause +=" AND (fac_functie_code = 'WEB_MLDBOF' OR fac_functie_code = 'WEB_MLDBO2')) ";
if (params.prs_key > 0)
{
var afd_key = new Perslid(params.prs_key).prs_afdeling_key(); // afdeling van de melder!
// Let op: *mijn* rechten (params.autlevel) doen niet ter zake. Het gaat om de rechten van de collega
lfiltClause = " AND p.prs_perslid_key IN"
+ " (SELECT prs_perslid_key"
+ " FROM fac_v_webgebruiker g, fac_functie f"
+ " WHERE g.fac_functie_key = f.fac_functie_key"
+ " AND g.ins_discipline_key = " + params.disc_key
+ " AND (g.fac_gebruiker_prs_level_write = -1"
+ " OR (g.fac_gebruiker_prs_level_write = 0"
+ " AND d.prs_bedrijf_key = (SELECT aa.prs_bedrijf_key"
+ " FROM prs_v_afdeling aa"
+ " WHERE aa.prs_afdeling_key = " + afd_key + "))"
+ " OR (g.fac_gebruiker_prs_level_write > 0"
+ " AND p.prs_afdeling_key IN "
+ " (SELECT prs_afdeling_key FROM prs_v_afdeling_familie a"
+ " WHERE a.prs_afdeling_elder_key IN"
+ " (SELECT aa.prs_afdeling_elder_key"
+ " FROM prs_v_afdeling_familie aa"
+ " WHERE aa.prs_afdeling_key = " + afd_key
+ " AND aa.niveau = g.fac_gebruiker_prs_level_write))"
+ " ))";
if (params.loc_key > 0)
lfiltClause += " AND (g.fac_gebruiker_alg_level_write = -1"
+ " OR (g.fac_gebruiker_alg_level_write < 9"
+ " AND EXISTS"
+ " (SELECT alg_locatie_key FROM fac_v_my_locations fl"
+ " WHERE prs_perslid_key = p.prs_perslid_key"
+ " AND niveau = fac_gebruiker_alg_level_write"
+ " AND fl.alg_locatie_key = " + params.loc_key + ")"
+ " ))";
lfiltClause +=" AND (fac_functie_code = 'WEB_MLDBOF' OR fac_functie_code = 'WEB_MLDBO2')) ";
}
else
lfiltClause = " AND 1 = 0";
break;
case 'FING': // externe partijen toegang tot facilitor
lfiltClause = " AND p.prs_perslid_key IN ("
@@ -321,26 +331,31 @@ function getFiltClausePersoon(pfiltcode, params)
break;
case 'SUBS': // Vervangers
var pkey = params.prs_key;
var bdr_key = new Perslid(pkey).afdeling().prs_bedrijf_key();
var afd_key = new Perslid(pkey).prs_afdeling_key();
if (S("prs_collegas_used") == 0) // Bedrijf niveau zit niet in prs_v_afdeling_familie
if (params.prs_key > 0)
{
var bdr_key = new Perslid(pkey).afdeling().prs_bedrijf_key();
var afd_key = new Perslid(pkey).prs_afdeling_key();
if (S("prs_collegas_used") == 0) // Bedrijf niveau zit niet in prs_v_afdeling_familie
{
lfiltClause += " AND p.prs_afdeling_key IN"
+ " (SELECT a.prs_afdeling_key FROM prs_v_afdeling a"
+ " WHERE a.prs_bedrijf_key = " + bdr_key + " )"
}
// PRS autorisatie
if (S("prs_collegas_used") > 0) // Efficiente versie van FAC_V_MY_PRS_AFDELINGEN_WRITE
{
lfiltClause +=" AND p.prs_afdeling_key IN "
+ " (SELECT prs_afdeling_key FROM prs_v_afdeling_familie a"
+ " WHERE a.prs_afdeling_elder_key IN"
+ " (SELECT aa.prs_afdeling_elder_key"
+ " FROM prs_v_afdeling_familie aa"
+ " WHERE aa.prs_afdeling_key = " + afd_key
+ " AND aa.niveau = " + S("prs_collegas_used") + "))"
}
// PRS autorisatie
if (S("prs_collegas_used") > 0) // Efficiente versie van FAC_V_MY_PRS_AFDELINGEN_WRITE
{
lfiltClause +=" AND p.prs_afdeling_key IN "
+ " (SELECT prs_afdeling_key FROM prs_v_afdeling_familie a"
+ " WHERE a.prs_afdeling_elder_key IN"
+ " (SELECT aa.prs_afdeling_elder_key"
+ " FROM prs_v_afdeling_familie aa"
+ " WHERE aa.prs_afdeling_key = " + afd_key
+ " AND aa.niveau = " + S("prs_collegas_used") + "))"
}
}
else
lfiltClause = " AND 1 = 0";
break;
default: __Log("KIES JUISTE FILTERCODE!!!");
lfiltClause = " AND 1 = 2";

2
CUST/AAAH/xsl/OfficeDepot.xsl
View File

@@ -20,7 +20,7 @@
<From>
<xsl:element name="Credential">
<xsl:attribute name="domain">Healthcarealliance</xsl:attribute>
<Identity>5662655</Identity>
<Identity>5668821</Identity>
</xsl:element>
</From>
<To>

26
CUST/GRKL/xsl/cust.xsl
View File

@@ -389,6 +389,32 @@ U bent behandelaar van deze melding. Klik <xsl:element name="a"><xsl:attribute n
<td><b><xsl:value-of select="//lcl/FAC/plaats"/>:</b></td>
<td><xsl:value-of select="uitvoerende/bedrijf/post_postcode"/>&#xA0;<xsl:value-of select="uitvoerende/bedrijf/post_plaats"/></td>
</tr>
<tr>
<td><br/><b><xsl:value-of select="//lcl/FAC/locatie"/>:</b></td>
<td><br/><xsl:value-of select="melding/plaats/regio/district/locatie/code"/>&#xA0;<xsl:if test="melding/plaats/regio/district/locatie/omschrijving!=''">(<xsl:value-of select="melding/plaats/regio/district/locatie/omschrijving"/>)</xsl:if></td>
</tr>
<tr>
<xsl:choose>
<xsl:when test="melding/plaats/@type='T'">
<td><b><xsl:value-of select="//lcl/FAC/terrein"/>:</b></td>
<td><xsl:value-of select="melding/plaats/regio/district/locatie/terrein/code"/>-<xsl:value-of select="melding/plaats/regio/district/locatie/terrein/naam"/></td>
</xsl:when>
<xsl:otherwise>
<td><b><xsl:value-of select="//lcl/FAC/gebouw"/>:</b></td>
<td><xsl:value-of select="melding/plaats/regio/district/locatie/gebouw/code"/>-<xsl:value-of select="melding/plaats/regio/district/locatie/gebouw/naam"/></td>
</xsl:otherwise>
</xsl:choose>
</tr>
<xsl:if test="melding/plaats/regio/district/locatie/gebouw/verdieping!=''">
<td><b><xsl:value-of select="//lcl/FAC/bouwlaag"/>:</b></td>
<td colspan="3"><xsl:value-of select="melding/plaats/regio/district/locatie/gebouw/verdieping/code"/></td>
</xsl:if>
<xsl:if test="melding/plaats/regio/district/locatie/gebouw/verdieping/ruimte!=''">
<tr>
<td><b><xsl:value-of select="//lcl/FAC/ruimte"/>:</b></td>
<td><xsl:value-of select="melding/plaats/regio/district/locatie/gebouw/verdieping/ruimte/nr"/>&#xA0;<xsl:if test="melding/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving!=''">(<xsl:value-of select="melding/plaats/regio/district/locatie/gebouw/verdieping/ruimte/omschrijving"/>)</xsl:if></td>
</tr>
</xsl:if>
<tr>
<td><br/><b><xsl:value-of select="//lcl/FAC/omschrijving"/>:</b></td>
<td colspan="3"><br/><xsl:call-template name="linebreaks"><xsl:with-param name="string" select="omschrijving"/></xsl:call-template></td>

3
CUST/IVET/rap_sch.asp
View File

@@ -30,7 +30,6 @@ var showall = getQParamInt("showall", 0) == 1;
<body class="tabpage">
<%
// akzaspecifiek
if (floorKey != -1)
{
sql = " SELECT r.room_key"
@@ -76,7 +75,7 @@ var showall = getQParamInt("showall", 0) == 1;
function refDoc(oRs)
{
if (oRs("schoonmaakdoc").value > 24)
if (oRs("schoonmaakdoc").value > 50)
return safe.html(oRs("schoonmaakprog").value);
//var url = "http://portal.ah.intra/CouOpe/NL/AHLokFun/facser/Documents/programma%20" + oRs("schoonmaakdoc").value + "%20MSD%20AH%20,%20Labschool.xls";

2
CUST/QUAW/xsl/cust.xsl
View File

@@ -218,11 +218,13 @@
<tr>
<td/>
<td align="left" colspan="3">
<br/>
<p>Om direct naar je melding te gaan klik
<xsl:element name="a">
<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>?<xsl:value-of select="//bookmarks/melding"/><xsl:value-of select="key"/>&amp;sso=1
</xsl:attribute>
hier</xsl:element></p>
<br/>
</td>
</tr>
<xsl:comment>als we binnen een opdracht zijn, tonen we de meldingtekst niet</xsl:comment>

10
CUST/VLKC/import/readsoft.xsl
View File

@@ -27,10 +27,11 @@
<xsl:variable name="kostprijs">
<xsl:choose>
<xsl:when test="Invoice/Fields/Field[@Name='NettoBedrag']!=''">
<xsl:choose>
<!--xsl:choose>
<xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'"><xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='NettoBedrag']), '0.00')"/></xsl:when>
<xsl:otherwise><xsl:value-of select="Invoice/Fields/Field[@Name='NettoBedrag']"/></xsl:otherwise>
</xsl:choose>
</xsl:choose-->
<xsl:value-of select="Invoice/Fields/Field[@Name='NettoBedrag']"/>
</xsl:when>
<xsl:otherwise>0</xsl:otherwise>
</xsl:choose>
@@ -41,10 +42,11 @@
<xsl:variable name="btwbedrag">
<xsl:choose>
<xsl:when test="Invoice/Fields/Field[@Name='BTWBedrag']!=''">
<xsl:choose>
<!--xsl:choose>
<xsl:when test="substring(Invoice/Fields/Field[@Name='Debet/Credit'],1,6)='Credit'"><xsl:value-of select="format-number(0 - number(Invoice/Fields/Field[@Name='BTWBedrag']), '0.00')"/></xsl:when>
<xsl:otherwise><xsl:value-of select="Invoice/Fields/Field[@Name='BTWBedrag']"/></xsl:otherwise>
</xsl:choose>
</xsl:choose-->
<xsl:value-of select="Invoice/Fields/Field[@Name='BTWBedrag']"/>
</xsl:when>
<xsl:otherwise>0</xsl:otherwise>
</xsl:choose>