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

Merge 2016.2 Gold B changes

Browse Source 
svn path=/Website/trunk/; revision=31581
This commit is contained in:
Jos Groot Lipman
2016-11-21 09:05:35 +00:00
parent 7f3af23e1f
commit ef4dbf9442
15 changed files with 2684 additions and 2965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/BES/bes_edit_bestelling.asp
View File

@@ -673,7 +673,7 @@ else // nieuwe bestelling. Defaults bepalen
+ ", l.mld_adres_naam, l.mld_adres_upper" + ", l.mld_adres_naam, l.mld_adres_upper"
+ (aflever_readonly? " FROM mld_adres l" : " FROM mld_v_afleveradres l") + (aflever_readonly? " FROM mld_adres l" : " FROM mld_v_afleveradres l")
+ " WHERE 1=1" + " WHERE 1=1"
+ getFiltClauseLocatie("EXP").where; + getFiltClauseLocatie("EXP").where
+ (ALGreadlevel >= 0 + (ALGreadlevel >= 0
? " AND l.alg_locatie_key IN (SELECT alg_locatie_key FROM fac_v_my_locations " ? " AND l.alg_locatie_key IN (SELECT alg_locatie_key FROM fac_v_my_locations "
+ " WHERE prs_perslid_key = " + user_key + " WHERE prs_perslid_key = " + user_key

6
APPL/FAC/Facilitor.asp
View File

@@ -311,8 +311,10 @@ if (device.test(device.isTouch)) { %>
div.scrollTop(Math.min(top, bottom - div.height() + 5)); div.scrollTop(Math.min(top, bottom - div.height() + 5));
}); });
$("#menutabs").filterMenuByText("#menufilter"); <% if (!device.test(device.isTouch)) { %>
$("#menufilter").focus(); $("#menutabs").filterMenuByText("#menufilter");
$("#menufilter").focus();
<% } %>
}); // jQuery.ready }); // jQuery.ready
<% if (Session("logging")&2) { %> <% if (Session("logging")&2) { %>

3
APPL/FAC/fac_edit_adres.asp
View File

@@ -120,7 +120,8 @@ BLOCK_START("facAlg", L("lcl_fac_adres_nawblock"));
startlevel: 2, startlevel: 2,
eindlevel: 2, eindlevel: 2,
readonly: false, readonly: false,
whenEmpty: L("lcl_search_generic") whenEmpty: L("lcl_search_generic"),
filtercode: "FAC"
}); });
RWFIELDTR("mld_adr_nm", "fld", L("lcl_prs_address_naam"), mld_adr_nm, {maxlength: 60, required: true}); RWFIELDTR("mld_adr_nm", "fld", L("lcl_prs_address_naam"), mld_adr_nm, {maxlength: 60, required: true});

56
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -625,6 +625,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
var opstel_selected = -1; var opstel_selected = -1;
var opstel_img_count = 0; var opstel_img_count = 0;
var min_duur = data.min_duur; var min_duur = data.min_duur;
var ruimte_opstel_RO = $("#ruimte_opstel_ro").length; // Is het veld ruimte_opstel_ro aanwezig, dan is ruimte-opstelling readonly.
// sel_room is globaal! // sel_room is globaal!
sel_room.RoomConfigs = data.RoomConfigs; sel_room.RoomConfigs = data.RoomConfigs;
sel_room.res_ruimte_key = data.res_ruimte_key; sel_room.res_ruimte_key = data.res_ruimte_key;
@@ -656,34 +657,36 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
else else
{ // Werk opstellingen listbox bij { // Werk opstellingen listbox bij
var ruimte_opstel = document.u2.ruimte_opstel; var ruimte_opstel = document.u2.ruimte_opstel;
if (!ruimte_opstel_RO)
for( i=ruimte_opstel.options.length-1; i>=0; i-- )
ruimte_opstel.options.remove(i);
if (sel_room.default_opstel_key == -1 && sel_room.RoomConfigs.length > 1)
{ {
oOption = document.createElement("OPTION"); for( i=ruimte_opstel.options.length-1; i>=0; i-- )
oOption.text = ""; ruimte_opstel.options.remove(i);
oOption.value = -1;
ruimte_opstel.options.add(oOption);
}
for( i=0; i<sel_room.RoomConfigs.length; i++ ) if (sel_room.default_opstel_key == -1 && sel_room.RoomConfigs.length > 1)
{
if (!sel_room.RoomConfigs[i].verwijderd)
{ {
oOption = document.createElement("OPTION"); oOption = document.createElement("OPTION");
oOption.text = sel_room.RoomConfigs[i].opstelling_omschrijving + " (" + sel_room.RoomConfigs[i].bezoekers + " " + L("lcl_res_pers") + ")"; oOption.text = "";
oOption.value = sel_room.RoomConfigs[i].ruimte_opstel_key; oOption.value = -1;
oOption.rcIndex = i; // Bewaar deze index bij de optie als referentie naar sel_room.RoomConfigs[i] voor het ophalen van opstelling-image in de onChange ruimte_opstel.options.add(oOption);
if (sel_room.RoomConfigs[i].ruimte_opstel_key == (sel_room.org_opstel_key>0?sel_room.org_opstel_key:sel_room.default_opstel_key)) }
{
oOption.selected = true; for( i=0; i<sel_room.RoomConfigs.length; i++ )
opstel_selected = i; {
} if (!sel_room.RoomConfigs[i].verwijderd)
if (sel_room.RoomConfigs[i].imagePath != "") {
opstel_img_count++; oOption = document.createElement("OPTION");
ruimte_opstel.options.add(oOption); oOption.text = sel_room.RoomConfigs[i].opstelling_omschrijving + " (" + sel_room.RoomConfigs[i].bezoekers + " " + L("lcl_res_pers") + ")";
oOption.value = sel_room.RoomConfigs[i].ruimte_opstel_key;
oOption.rcIndex = i; // Bewaar deze index bij de optie als referentie naar sel_room.RoomConfigs[i] voor het ophalen van opstelling-image in de onChange
if (sel_room.RoomConfigs[i].ruimte_opstel_key == (sel_room.org_opstel_key>0?sel_room.org_opstel_key:sel_room.default_opstel_key))
{
oOption.selected = true;
opstel_selected = i;
}
if (sel_room.RoomConfigs[i].imagePath != "")
opstel_img_count++;
ruimte_opstel.options.add(oOption);
}
} }
} }
} }
@@ -716,7 +719,8 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
else else
$('#resphoto').hide(); $('#resphoto').hide();
RuimteOpstelChanged(); if (!ruimte_opstel_RO)
RuimteOpstelChanged();
} }
if (data.ruimte_omschrijving) if (data.ruimte_omschrijving)

2
APPL/Shared/Suggest/SuggestLocatie.asp
View File

@@ -88,7 +88,7 @@ if (autlevel > -1) // Efficiente versie van FAC_V_MY_PR**S_AFDELINGEN_WRITE
+ filtClause.from + filtClause.from
+ " WHERE (UPPER(" + S("alg_loc_string") + ") LIKE " + safe.quoted_sql_wild(chars + "%") + " WHERE (UPPER(" + S("alg_loc_string") + ") LIKE " + safe.quoted_sql_wild(chars + "%")
+ " OR UPPER(alg_locatie_code) LIKE " + safe.quoted_sql_wild(chars + "%") + ")" + " OR UPPER(alg_locatie_code) LIKE " + safe.quoted_sql_wild(chars + "%") + ")"
+ existBuilding //+ existBuilding
+ filtClause.where + filtClause.where
+ " ORDER BY 2" + " ORDER BY 2"
WriteResult(sql, bAll, "naam", "alg_locatie_key", "code", "postcode", "extra"); WriteResult(sql, bAll, "naam", "alg_locatie_key", "code", "postcode", "extra");

21
APPL/Shared/Suggest/plaatsFilter.inc
View File

@@ -107,23 +107,25 @@ function getFiltClauseLocatie(pfiltcode, params)
+ "(SELECT ''" + "(SELECT ''"
+ " FROM alg_srtgebouw sg, alg_v_aanweziggebouw gg" + " FROM alg_srtgebouw sg, alg_v_aanweziggebouw gg"
+ " WHERE sg.alg_srtgebouw_passief IS NULL" + " WHERE sg.alg_srtgebouw_passief IS NULL"
+ " AND (gg.alg_gebouw_vervaldatum IS NULL OR gg.alg_gebouw_vervaldatum > TRUNC(SYSDATE))" + " AND (gg.alg_gebouw_vervaldatum IS NULL OR gg.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " AND sg.alg_srtgebouw_key(+) = gg.alg_srtgebouw_key" + " AND sg.alg_srtgebouw_key(+) = gg.alg_srtgebouw_key"
+ " AND gg.alg_locatie_key = l.alg_locatie_key" + " AND gg.alg_locatie_key = DECODE(l.alg_locatie_key, NULL, gg.alg_locatie_key, l.alg_locatie_key)"
+ " UNION ALL" + " UNION ALL"
+ " SELECT ''" + " SELECT ''"
+ " FROM alg_v_aanwezigterreinsector t" + " FROM alg_v_aanwezigterreinsector t"
+ " WHERE t.alg_locatie_key = l.alg_locatie_key)"; + " WHERE t.alg_locatie_key = DECODE(l.alg_locatie_key, NULL, t.alg_locatie_key, l.alg_locatie_key)"
+ ")";
var lfiltClauseEXP = " AND EXISTS" var lfiltClauseEXP = " AND EXISTS"
+ " (SELECT ''" + " (SELECT ''"
+ " FROM alg_v_aanweziggebouw gg" + " FROM alg_v_aanweziggebouw gg"
+ " WHERE gg.alg_locatie_key = l.alg_locatie_key" + " WHERE gg.alg_locatie_key = DECODE(l.alg_locatie_key, NULL, gg.alg_locatie_key, l.alg_locatie_key)"
+ " AND (gg.alg_gebouw_vervaldatum IS NULL OR gg.alg_gebouw_vervaldatum > TRUNC(SYSDATE))" + " AND (gg.alg_gebouw_vervaldatum IS NULL OR gg.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " UNION ALL" + " UNION ALL"
+ " SELECT ''" + " SELECT ''"
+ " FROM alg_v_aanwezigterreinsector t" + " FROM alg_v_aanwezigterreinsector t"
+ " WHERE t.alg_locatie_key = l.alg_locatie_key)"; + " WHERE t.alg_locatie_key = DECODE(l.alg_locatie_key, NULL, t.alg_locatie_key, l.alg_locatie_key)"
+ " )";
if (pfiltcode && pfiltcode != "") if (pfiltcode && pfiltcode != "")
{ {
@@ -216,7 +218,7 @@ function getFiltClauseLocatie(pfiltcode, params)
break; break;
case "INCVR": // include virtual rooms, default these are NOT included case "INCVR": // include virtual rooms, default these are NOT included
lfiltClause.where = lfiltClauseFAC; lfiltClause.where = lfiltClauseEXP;
break; break;
case "EXP": // vervallen gebouwen niet tonen case "EXP": // vervallen gebouwen niet tonen
@@ -233,6 +235,9 @@ function getFiltClauseGebouw(pfiltcode, params)
// Facilitair relevant hebben we vaker nodig // Facilitair relevant hebben we vaker nodig
var lfiltClauseFAC = " AND sg.alg_srtgebouw_passief IS NULL" var lfiltClauseFAC = " AND sg.alg_srtgebouw_passief IS NULL"
+ " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"; + " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE))";
var lfiltClauseEXP = " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE))";
if (pfiltcode && pfiltcode != "") if (pfiltcode && pfiltcode != "")
{ {
switch(pfiltcode) switch(pfiltcode)
@@ -244,9 +249,9 @@ function getFiltClauseGebouw(pfiltcode, params)
case "FAC": lfiltClause.where = lfiltClauseFAC; case "FAC": lfiltClause.where = lfiltClauseFAC;
break; break;
case "INCVR": // include virtual rooms, default these are NOT included case "INCVR": // include virtual rooms, default these are NOT included
lfiltClause.where = lfiltClauseFAC; lfiltClause.where = lfiltClauseEXP;
break; break;
case "EXP": lfiltClause.where = " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"; case "EXP": lfiltClause.where = lfiltClauseEXP;
break; break;
case "RESB": // Bezorgplaats voor voorzieningen, d.i. gebouwen met ruimten excl. reserveerbare ruimten case "RESB": // Bezorgplaats voor voorzieningen, d.i. gebouwen met ruimten excl. reserveerbare ruimten
var loc_scope_act_filter = get_loc_scope_act_filter(params, 3) var loc_scope_act_filter = get_loc_scope_act_filter(params, 3)

2
CUST/AADS/xsl/cust_settings.xsl
View File

@@ -8,7 +8,7 @@
<xsl:template name="customer_code">DSM</xsl:template> <xsl:template name="customer_code">DSM</xsl:template>
<xsl:template name="customer_email">servicedeskdsm@aa-fm.com</xsl:template> <xsl:template name="customer_email">servicedeskdsm@aa-fm.com</xsl:template>
<xsl:template name="invoice_email">invoices.dsm@aa-fm.com</xsl:template> <xsl:template name="invoice_email">invoices.dsm@aa-fm.com</xsl:template>
<xsl:template name="servicedesk_telefoon">60000</xsl:template> <xsl:template name="servicedesk_telefoon">040-2332820</xsl:template>
<xsl:template name="opdracht_qr_bookmark"></xsl:template> <xsl:template name="opdracht_qr_bookmark"></xsl:template>

2497
CUST/DJIN/xsl/cust.xsl
View File

File diff suppressed because it is too large Load Diff

8
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_4PS_soap.xsl
View File

@@ -170,7 +170,13 @@
<xsl:call-template name="construct_instructionlines"> <xsl:call-template name="construct_instructionlines">
<xsl:with-param name="p_LineNumber" select="position()"/> <xsl:with-param name="p_LineNumber" select="position()"/>
<xsl:with-param name="p_Quantity" select="aantal"/> <xsl:with-param name="p_Quantity" select="aantal"/>
<xsl:with-param name="p_MeasurementUnitQuantity" select="eenheidcode"/> <!-- MARX#38434: default met PCE doorsturen, indien AX leeg wordt aangeleverd. -->
<xsl:with-param name="p_MeasurementUnitQuantity">
<xsl:choose>
<xsl:when test="eenheidcode != ''"><xsl:value-of select="eenheidcode"/></xsl:when>
<xsl:otherwise>PCE</xsl:otherwise>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_NormPriceCode" select="''"/> <xsl:with-param name="p_NormPriceCode" select="''"/>
<xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/> <xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/> <xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>

8
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_INSBOU001_2016.2_soap.xsl
View File

@@ -174,7 +174,13 @@
<xsl:call-template name="construct_instructionlines"> <xsl:call-template name="construct_instructionlines">
<xsl:with-param name="p_LineNumber" select="position()"/> <xsl:with-param name="p_LineNumber" select="position()"/>
<xsl:with-param name="p_Quantity" select="aantal"/> <xsl:with-param name="p_Quantity" select="aantal"/>
<xsl:with-param name="p_MeasurementUnitQuantity" select="eenheidcode"/> <!-- MARX#38434: default met PCE doorsturen, indien AX leeg wordt aangeleverd. -->
<xsl:with-param name="p_MeasurementUnitQuantity">
<xsl:choose>
<xsl:when test="eenheidcode != ''"><xsl:value-of select="eenheidcode"/></xsl:when>
<xsl:otherwise>PCE</xsl:otherwise>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_NormPriceCode" select="''"/> <xsl:with-param name="p_NormPriceCode" select="''"/>
<xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/> <xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/> <xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>

10
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_INSBOU001_nov2015.xsl
View File

@@ -164,7 +164,13 @@
<xsl:call-template name="construct_instructionlines"> <xsl:call-template name="construct_instructionlines">
<xsl:with-param name="p_LineNumber" select="position()"/> <xsl:with-param name="p_LineNumber" select="position()"/>
<xsl:with-param name="p_Quantity" select="aantal"/> <xsl:with-param name="p_Quantity" select="aantal"/>
<xsl:with-param name="p_MeasurementUnitQuantity" select="eenheidcode"/> <!-- MARX#38434: default met PCE doorsturen, indien AX leeg wordt aangeleverd. -->
<xsl:with-param name="p_MeasurementUnitQuantity">
<xsl:choose>
<xsl:when test="eenheidcode != ''"><xsl:value-of select="eenheidcode"/></xsl:when>
<xsl:otherwise>PCE</xsl:otherwise>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_NormPriceCode" select="''"/> <xsl:with-param name="p_NormPriceCode" select="''"/>
<xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/> <xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/> <xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>
@@ -228,7 +234,7 @@
<LineNumber><xsl:value-of select="$p_LineNumber"/></LineNumber> <LineNumber><xsl:value-of select="$p_LineNumber"/></LineNumber>
<!-- SIDB - Het aantal eenheden van werk geidentificeerd door de normprijscode. Mandatory, N(15) --> <!-- SIDB - Het aantal eenheden van werk geidentificeerd door de normprijscode. Mandatory, N(15) -->
<Quantity><xsl:value-of select="$p_Quantity"/></Quantity> <Quantity><xsl:value-of select="$p_Quantity"/></Quantity>
<!-- SIDB - Code van de meeteenheid waarin het aantal is uitgedrukt. Mandatory, C(3) --> <!-- SIDB - Code van de meeteenheid waarin het aantal is uitgedrukt. Mandatory, C(3) -->
<MeasurementUnitQuantity><xsl:value-of select="$p_MeasurementUnitQuantity"/></MeasurementUnitQuantity> <MeasurementUnitQuantity><xsl:value-of select="$p_MeasurementUnitQuantity"/></MeasurementUnitQuantity>
<!-- SIDB - Code waarmee het uit te voeren werk wordt aangegeven. Mandatory, C(17) --> <!-- SIDB - Code waarmee het uit te voeren werk wordt aangegeven. Mandatory, C(17) -->
<!-- Zie call FSN#34901 voor de (on)zin van dit veld --> <!-- Zie call FSN#34901 voor de (on)zin van dit veld -->

8
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_INSBOU001_nov2015_soap.xsl
View File

@@ -167,7 +167,13 @@
<xsl:call-template name="construct_instructionlines"> <xsl:call-template name="construct_instructionlines">
<xsl:with-param name="p_LineNumber" select="position()"/> <xsl:with-param name="p_LineNumber" select="position()"/>
<xsl:with-param name="p_Quantity" select="aantal"/> <xsl:with-param name="p_Quantity" select="aantal"/>
<xsl:with-param name="p_MeasurementUnitQuantity" select="eenheidcode"/> <!-- MARX#38434: default met PCE doorsturen, indien AX leeg wordt aangeleverd. -->
<xsl:with-param name="p_MeasurementUnitQuantity">
<xsl:choose>
<xsl:when test="eenheidcode != ''"><xsl:value-of select="eenheidcode"/></xsl:when>
<xsl:otherwise>PCE</xsl:otherwise>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_NormPriceCode" select="''"/> <xsl:with-param name="p_NormPriceCode" select="''"/>
<xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/> <xsl:with-param name="p_Area" select="melding/kenmerk[@key='6']"/>
<xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/> <xsl:with-param name="p_ShortDescription" select="substring(normalize-space(omschrijving),1,35)"/>

6
CUST/NMPC/cust.css
View File

@@ -3,10 +3,10 @@
* $Id$ * $Id$
*/ */
#headerblok
.nomicon
{ {
background: url(fac_head.gif) no-repeat; background-color: #c2092e;
background-color: #FFFFFF;
} }
#headerdate #headerdate

BIN
CUST/NMPC/fac_head.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

3020
CUST/NYBU/xsl/cust.xsl
View File

File diff suppressed because it is too large Load Diff