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

Merge 5.4.4 Gold A patches

Browse Source 
svn path=/Website/trunk/; revision=23852
This commit is contained in:
Jos Groot Lipman
2015-01-12 13:22:59 +00:00
parent 10f0cc0e6b
commit a97e4066a7
20 changed files with 82 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API/api_hmail.asp
View File

@@ -37,7 +37,7 @@ function abortRejectMail(tekst)
function stripHtml(html)
{
// verwijder html-tags
html = html.replace(/(<([^>]+)>)/ig,"");
html = (html||"").replace(/(<([^>]+)>)/ig,"");
//verwijder leading spaces and tabs
html = html.replace(/^[ \t]+/gm,"");
// verwijder lege regels

5
APPL/API2/model_issues.inc
View File

@@ -33,7 +33,7 @@ model_issues =
{ name: "name", dbs: "mld_melding_id", typ: "varchar", sql: "ins_srtdiscipline.ins_srtdiscipline_prefix||mld_melding.mld_melding_key", filter: "exact" },
{ name: "contact", dbs: "prs_perslid_key", typ: "key", foreign: "prs_perslid", track: L("lcl_mld_name"), filter: "exact" },
{ name: "requestor", dbs: "prs_perslid_key_voor", typ: "key", foreign: "prs_perslid", track: L("lcl_mld_call_for"), filter: "exact" },
{ name: "issuedate", dbs: "mld_melding_datum", typ: "datetime", track: L("lcl_mld_date_time")},
{ name: "issuedate", dbs: "mld_melding_datum", typ: "datetime", track: L("lcl_mld_date_time"), filter: "range" },
{ name: "enddate", dbs: "mld_melding_einddatum", typ: "datetime", track: L("lcl_mld_enddate")},
{ name: "issuetype", dbs: "mld_stdmelding_key", typ: "key", foreign: "mld_stdmelding", track: L("lcl_complain"), filter: "exact" },
{ name: "description", dbs: "mld_melding_omschrijving", typ: "varchar", track: L("lcl_descr"), filter: "like" },
@@ -97,7 +97,8 @@ model_issues =
if (!params.filter.id)
{
/* You can't go any further back in time than the GUI could (ongeveer)*/
if (S("mld_max_history") > 0)
/* Als er wel een start_issuedate is dan wordt deze toegevoegd in api2.sqlfilter() verderop. */
if (!params.filter.start_issuedate && S("mld_max_history") > 0)
{
query.wheres.push("mld_melding_datum > SYSDATE - "+ S("mld_max_history"));
}

2
APPL/BES/bes_search.asp
View File

@@ -478,7 +478,7 @@ oRs.Close();
if (!frontend)
buttons.push ({title: L("lcl_shared_more"), action:"iface_toggleSecondarySearchblock()", id : "btnMoreLess"});
if (backo)
buttons.push ({title: L("lcl_obj_advanced")+'&gt;', action:"myModal()", id : "bAdvanced"}); // met actuele waarden van catalogus en vorig filter
buttons.push ({title: L("lcl_obj_advanced"), action:"myModal()", id : "bAdvanced"}); // met actuele waarden van catalogus en vorig filter
CreateButtons(buttons, { entersubmit: true} );
%>

12
APPL/BES/bes_voorraad_list.inc
View File

@@ -57,6 +57,7 @@ function bes_voorraad_list (pautfunction, params)
<%
// Bestelde artikelen intern (gekoppeld via bes_disc_params.bes_ins_discipline_key_inkoop)
var sql_from_intern = " SELECT sd.bes_srtdeel_nr"
+ ", sd.bes_srtdeel_key"
+ ", "+ lcl.xsqla('sd.bes_srtdeel_omschrijving','sd.bes_srtdeel_key')
+ ", sd.bes_srtdeel_notitie"
+ ", dp.bes_ins_discipline_key_inkoop inkoop_disc"
@@ -109,6 +110,7 @@ function bes_voorraad_list (pautfunction, params)
+ " WHERE sd2.bes_srtdeel_key = " + params.item_key + ")"
: "")
+ " GROUP BY sd.bes_srtdeel_nr"
+ ", sd.bes_srtdeel_key"
+ ", "+ lcl.xsql('sd.bes_srtdeel_omschrijving','sd.bes_srtdeel_key')
+ ", sd.bes_srtdeel_notitie"
+ ", dp.bes_ins_discipline_key_inkoop"
@@ -120,6 +122,7 @@ function bes_voorraad_list (pautfunction, params)
// Bestelde artikelen bij de leverancier (extern)
// Besteld (status = 5) en Geleverd (status = 6,7)
var sql_from_extern = " SELECT sd.bes_srtdeel_nr"
+ ", sd.bes_srtdeel_key"
+ ", "+ lcl.xsqla('sd.bes_srtdeel_omschrijving','sd.bes_srtdeel_key')
+ ", sd.bes_srtdeel_notitie"
+ ", bd.ins_discipline_key inkoop_disc"
@@ -156,6 +159,7 @@ function bes_voorraad_list (pautfunction, params)
? " AND sd.bes_srtdeel_key = " + item_key
: "")
+ " GROUP BY bes_srtdeel_nr"
+ ", sd.bes_srtdeel_key"
+ ", "+ lcl.xsql('sd.bes_srtdeel_omschrijving','sd.bes_srtdeel_key')
+ ", sd.bes_srtdeel_notitie"
+ ", bd.ins_discipline_key"
@@ -165,6 +169,7 @@ function bes_voorraad_list (pautfunction, params)
+ ", bes_srtdeel_voorraadmin"
+ " UNION ALL"
+ " SELECT sd.bes_srtdeel_nr"
+ ", sd.bes_srtdeel_key"
+ ", "+ lcl.xsqla('sd.bes_srtdeel_omschrijving','sd.bes_srtdeel_key')
+ ", sd.bes_srtdeel_notitie"
+ ", bd.ins_discipline_key inkoop_disc"
@@ -202,6 +207,7 @@ function bes_voorraad_list (pautfunction, params)
? " AND sd.bes_srtdeel_key = " + item_key
: "")
+ " GROUP BY bes_srtdeel_nr"
+ ", sd.bes_srtdeel_key"
+ ", "+ lcl.xsql('sd.bes_srtdeel_omschrijving','sd.bes_srtdeel_key')
+ ", sd.bes_srtdeel_notitie"
+ ", bd.ins_discipline_key"
@@ -216,7 +222,7 @@ function bes_voorraad_list (pautfunction, params)
var sql = "SELECT bes_srtdeel_nr"
+ ", "+ lcl.xsqla('bes_srtdeel_omschrijving','sd.bes_srtdeel_key')
+ ", "+ lcl.xsqla('bes_srtdeel_omschrijving','bes_srtdeel_key')
+ ", bes_srtdeel_notitie"
+ ", inkoop_disc"
+ ", disc_oms"
@@ -238,10 +244,10 @@ function bes_voorraad_list (pautfunction, params)
: "")
+ (params.searchtekst
? (params.catalogus_key? " AND" : " WHERE") + " (UPPER(bes_srtdeel_nr) LIKE " + safe.quoted_sql_wild("%" + params.searchtekst + "%")
+ " OR UPPER("+ lcl.xsql('bes_srtdeel_omschrijving','sd.bes_srtdeel_key') +") LIKE " + safe.quoted_sql_wild("%" + params.searchtekst + "%") + ")"
+ " OR UPPER("+ lcl.xsql('bes_srtdeel_omschrijving','bes_srtdeel_key') +") LIKE " + safe.quoted_sql_wild("%" + params.searchtekst + "%") + ")"
: "")
+ " GROUP BY bes_srtdeel_nr"
+ ", "+ lcl.xsql('bes_srtdeel_omschrijving','sd.bes_srtdeel_key')
+ ", "+ lcl.xsql('bes_srtdeel_omschrijving','bes_srtdeel_key')
+ ", bes_srtdeel_notitie"
+ ", inkoop_disc"
+ ", disc_oms"

9
APPL/CAD/cad_selectbylegend.asp
View File

@@ -46,10 +46,15 @@ sql = "SELECT ts.CAD_LEGENDA_KEY,"
+ " tt.CAD_THEMA_VIEW"
+ " FROM CAD_LEGENDA ts, CAD_THEMA tt"
+ " WHERE tt.CAD_THEMA_KEY = " + pThema
+ " AND tt.CAD_LEGENDA_KEY = ts.CAD_LEGENDA_KEY";
+ " AND tt.CAD_LEGENDA_KEY = ts.CAD_LEGENDA_KEY"
+ " AND CAD_LEGENDA_DISCREET <> 0";
oRs = Oracle.Execute(sql)
if (oRs.EOF) Response.end; // Is wel heel vreemd, een lege legenda
if (oRs.EOF) // Waarschijnlijk CAD_LEGENDA_DISCREET=0
{
Response.Write(JSON.stringify({}));
Response.end;
}
var legenda_key=oRs("CAD_LEGENDA_KEY").value;
var viewName = oRs("CAD_THEMA_VIEW").value;

2
APPL/CNT/cnt_show_scope.asp
View File

@@ -51,7 +51,7 @@ var outputmode = getQParamInt("outputmode", 0);
case 'V' : url = "appl/alg/alg_verdieping.asp?key="+rowKey ; break;
case 'R' : url = "appl/alg/alg_ruimte.asp?key="+rowKey ; break;
case 'L' : url = "appl/alg/alg_locatie.asp?key="+rowKey ; break;
case 'D' : url= "appl/ins/ins_deel.asp?ins_key="+rowKey; break;
case 'D' : url= "appl/ins/ins_deel.asp?urole=bo&ins_key="+rowKey; break;
case 'S' : url = "appl/ins/ins_srtdeel.asp?urole=bo&srtdeel_key="+rowKey ; break;
}
FcltMgr.openDetail(url, "");

12
APPL/FAC/fac_list_worker.asp
View File

@@ -49,7 +49,7 @@ DOCTYPE_Disable = 1;
? " " + lcl.xsql('id.ins_discipline_omschrijving', 'id.ins_discipline_key') + " detail, "
: " " + lcl.xsql('sm.mld_stdmelding_omschrijving', 'sm.mld_stdmelding_key') + " detail, ")
+ " m.mld_melding_status status_key, "
+ "(SELECT fac_bookmark_path||'?'||fac_bookmark_query FROM fac_bookmark WHERE fac_bookmark_xmlnode = 'melding') bookmark"
+ "(SELECT fac_bookmark_path||'?'||fac_bookmark_query FROM fac_bookmark WHERE fac_bookmark_xmlnode = 'melding' AND fac_bookmark_naam = 'melding') bookmark"
+ " FROM mld_melding m"
+ " , ins_srtdiscipline isd"
+ " , ins_tab_discipline id"
@@ -79,7 +79,7 @@ DOCTYPE_Disable = 1;
+ " AND bi.bes_bestelling_key = b.bes_bestelling_key)) "
+ " oms, "
+ " b.bes_bestelling_status,"
+ "(SELECT fac_bookmark_path||'?'||fac_bookmark_query FROM fac_bookmark WHERE fac_bookmark_xmlnode = 'bestelling') bookmark"
+ "(SELECT fac_bookmark_path||'?'||fac_bookmark_query FROM fac_bookmark WHERE fac_bookmark_xmlnode = 'bestelling' AND fac_bookmark_naam = 'bestelling') bookmark"
+ " FROM bes_bestelling b "
+ " WHERE b.bes_bestelling_status IN (5, 4, 3, 2) AND b.fac_activiteit_key IS NULL "
+ " AND (b.prs_perslid_key_voor = " + user_key
@@ -94,7 +94,7 @@ DOCTYPE_Disable = 1;
+ " FROM res_activiteit ra "
+ " WHERE res_activiteit_key = rr.res_activiteit_key)), "
+ " DECODE (res_rsv_ruimte_dirtlevel, 0, rr.res_status_fo_key, -1), "
+ "(SELECT fac_bookmark_path||'?'||fac_bookmark_query FROM fac_bookmark WHERE fac_bookmark_xmlnode = 'reservering') bookmark"
+ "(SELECT fac_bookmark_path||'?'||fac_bookmark_query FROM fac_bookmark WHERE fac_bookmark_xmlnode = 'reservering' AND fac_bookmark_naam = 'reservering') bookmark"
+ " FROM res_v_aanwezigrsv_ruimte rr "
+ " WHERE rr.res_status_bo_key IN (4, 3, 2, 7) "
+ " AND rr.res_rsv_ruimte_van >= " + date_from.toSQL(true)
@@ -111,7 +111,7 @@ DOCTYPE_Disable = 1;
+ " FROM res_activiteit ra "
+ " WHERE res_activiteit_key = rr.res_activiteit_key)), "
+ " DECODE (res_rsv_ruimte_dirtlevel + res_rsv_deel_dirtlevel, 0, rr.res_status_fo_key, -1), "
+ "(SELECT fac_bookmark_path||'?'||fac_bookmark_query FROM fac_bookmark WHERE fac_bookmark_xmlnode = 'reservering') bookmark"
+ "(SELECT fac_bookmark_path||'?'||fac_bookmark_query FROM fac_bookmark WHERE fac_bookmark_xmlnode = 'reservering' AND fac_bookmark_naam = 'reservering') bookmark"
+ " FROM res_v_aanwezigrsv_ruimte rr, res_v_aanwezigrsv_deel dd "
+ " WHERE rr.res_status_bo_key IS NULL AND dd.res_rsv_ruimte_key = rr.res_rsv_ruimte_key "
+ " AND rr.res_rsv_ruimte_van >= " + date_from.toSQL(true)
@@ -128,7 +128,7 @@ DOCTYPE_Disable = 1;
+ " FROM res_activiteit ra "
+ " WHERE res_activiteit_key = rr.res_activiteit_key)), "
+ " DECODE (res_rsv_ruimte_dirtlevel + res_rsv_artikel_dirtlevel, 0, rr.res_status_fo_key, -1), "
+ "(SELECT fac_bookmark_path||'?'||fac_bookmark_query FROM fac_bookmark WHERE fac_bookmark_xmlnode = 'reservering') bookmark"
+ "(SELECT fac_bookmark_path||'?'||fac_bookmark_query FROM fac_bookmark WHERE fac_bookmark_xmlnode = 'reservering' AND fac_bookmark_naam = 'reservering') bookmark"
+ " FROM res_v_aanwezigrsv_ruimte rr, res_v_aanwezigrsv_artikel dd "
+ " WHERE rr.res_status_bo_key IS NULL AND dd.res_rsv_ruimte_key = rr.res_rsv_ruimte_key "
+ " AND rr.res_rsv_ruimte_van >= " + date_from.toSQL(true)
@@ -144,7 +144,7 @@ DOCTYPE_Disable = 1;
+ " b.bez_afspraak_naam "
+ " || (CASE WHEN bez_afspraak_bedrijf IS NOT NULL THEN ' (' || bez_afspraak_bedrijf || ')' END), "
+ " (CASE WHEN bez_bezoekers_done IS NOT NULL THEN 2 ELSE 1 END), "
+ "(SELECT fac_bookmark_path||'?'||fac_bookmark_query FROM fac_bookmark WHERE fac_bookmark_xmlnode = 'afspraak') bookmark"
+ "(SELECT fac_bookmark_path||'?'||fac_bookmark_query FROM fac_bookmark WHERE fac_bookmark_xmlnode = 'afspraak' AND fac_bookmark_naam = 'afspraak') bookmark"
+ " FROM bez_bezoekers b, bez_afspraak a "
+ " WHERE b.bez_afspraak_key = a.bez_afspraak_key AND bez_bezoekers_out IS NULL "
+ " AND a.bez_afspraak_datum >= " + date_from.toSQL(true)

13
APPL/FAC/fac_verify_data.asp
View File

@@ -313,6 +313,19 @@ checker("Controle: queries die geen records mogen opleveren",
+ " AND res_srtactiviteit_verwijder IS NOT NULL"
+ " AND a.res_srtactiviteit_key = sa.res_srtactiviteit_key"
},
{ msg: "Reserveringen met zowel res_ruimte_opstel_key als alg_ruimte_key (FSN#31382)",
sql: "SELECT *"
+ " FROM res_rsv_ruimte"
+ " WHERE res_ruimte_opstel_key IS NOT NULL"
+ " AND alg_ruimte_key IS NOT NULL"
},
{ msg: "Reserveringen zonder res_ruimte_opstel_key of alg_ruimte_key, afgelopen jaar",
sql: "SELECT *"
+ " FROM res_rsv_ruimte"
+ " WHERE res_ruimte_opstel_key IS NULL"
+ " AND alg_ruimte_key IS NULL"
+ " AND res_rsv_ruimte_tot > sysdate - 365"
},
{ msg: "Fysieke objecten die door meerdere reserveerbare objecten gebruikt worden. Dat mag, het zullen verschillende catalogi zijn maar misschien toch even naar kijken.",
sql: " SELECT ins_deel_key, ins_deel_omschrijving, COUNT ( * ) " +
" FROM (SELECT * " +

2
APPL/Localscripts/modal_kenmerken.js
View File

@@ -166,7 +166,7 @@ function showKenmerkModal(purl, ptitle)
resizable: false,
bgiframe: true, /* IE6 */
title: ptitle,
width: 625
width: 725
};
/*
FcltMgr.openModalDetail("../shared/flex_search.asp?load_url=" + escape(purl), ptitle,

2
APPL/MLD/mld_flexkenmerk.inc
View File

@@ -186,7 +186,7 @@ function generateFlexKenmerkBlock(params)
+ " AND vk.mld_srtkenmerk_key = vt.mld_srtkenmerk_key"
+ " AND vk.mld_srtkenmerk_key = k.mld_srtkenmerk_key"
+ " AND vk.mld_kenmerk_groep = k.mld_kenmerk_groep"
+ " AND vk.mld_kenmerk_niveau = k.mld_kenmerk_niveau"
// NIET! + " AND vk.mld_kenmerk_niveau = k.mld_kenmerk_niveau"
+ " AND v.mld_kenmerk_key = vk.mld_kenmerk_key"
+ " AND v.mld_kenmerkmelding_verwijder IS NULL), " + lcl.xsql('k.mld_kenmerk_default','k.mld_kenmerk_key') + ")";

2
APPL/PDA/melding.asp
View File

@@ -419,7 +419,7 @@ if (addSubheader)
BLOCK_END();
}
if (mld_info.show_ins)
if (mld_info.show_ins && stdm_info.alg_onrgoed_obj_niveau)
{
if (ins_key > 0 && mld_key < 0)
{ // Nieuwe melding waarbij het object bekend is: via qrc-code

8
APPL/PDA/resultset_table.inc
View File

@@ -74,10 +74,10 @@ function __rsProcessResultset(processParams)
if (this.dividerColumn)
{
var nextDivider = __fnContent(this.dividerColumn)(oRs);
if (nextDivider != lastDivider)
lines.push("<li data-role='list-divider'>" + safe.html(nextDivider) + "</li>");
var lastDivider = nextDivider;
var safenextDivider = __fnContent(this.dividerColumn)(oRs);
if (safenextDivider != lastDivider)
lines.push("<li data-role='list-divider'>" + safenextDivider + "</li>");
var lastDivider = safenextDivider;
}
lines.push(this.makeTableRow(oRs, cnt, false));

4
APPL/PRS/prs.inc
View File

@@ -316,8 +316,8 @@ prs =
uurloon: oRs("prs_bedrijf_uurloon").Value,
prs_leverancier_nr: oRs("prs_leverancier_nr").Value,
prs_overeenkomst_nr: oRs("prs_overeenkomst_nr").Value,
prs_overeenkomst_datum: oRs("prs_overeenkomst_datum").Value,
aanmaak: oRs("prs_bedrijf_aanmaak").Value,
prs_overeenkomst_datum: oRs("prs_overeenkomst_datum").Value!=null?new Date(oRs("prs_overeenkomst_datum").Value):null,
aanmaak: oRs("prs_bedrijf_aanmaak").Value!=null?new Date(oRs("prs_bedrijf_aanmaak").Value):null,
verwijderd: oRs("prs_bedrijf_verwijder").Value != null,
leverancier: oRs("prs_bedrijf_leverancier").Value,
uitvoerende: oRs("prs_bedrijf_uitvoerende").Value,

3
APPL/PRS/prs_edit_bedrijf.asp
View File

@@ -133,7 +133,8 @@ if (intern)
FCLTcalendar( "bdr_ovkdat",
{ label : L("lcl_prs_companies_overeenkomst_datum"),
datum : bedrijf_info.prs_overeenkomst_datum,
readonly: false
readonly: false,
initEmpty: !bedrijf_info.prs_overeenkomst_datum
});
RWFIELDTR("bdr_uurln", "fldshort", L("lcl_prs_companies_uurloon"), bedrijf_info.uurloon, {maxlength: 7});

41
APPL/RES/res.inc
View File

@@ -486,7 +486,8 @@ res = {
+ " r.res_status_fo_key,"
+ " r.res_status_bo_key,"
+ " r.res_reservering_key,"
+ " r.res_rsv_ruimte_verwijder"
+ " r.res_rsv_ruimte_verwijder,"
+ " r.res_activiteit_key"
+ " FROM res_rsv_ruimte r "
+ " WHERE res_rsv_ruimte_key = " + rsv_ruimte_key;
var roRs = Oracle.Execute(sql);
@@ -500,6 +501,7 @@ res = {
var rsv_ruimte_tot = new Date(roRs("res_rsv_ruimte_tot").Value);
var rsv_ruimte_contact_key = roRs("res_rsv_ruimte_contact_key").Value;
var rsv_ruimte_host_key = roRs("res_rsv_ruimte_host_key").Value;
var res_activiteit_key = roRs("res_activiteit_key").Value;
// Bepaal discipline parkeerplaatsen voor reserveringen. Deze moet uitgesloten worden voor de autorisatie controle.
// Als de reservering *voor* earliest_expire ligt gaan we moeilijk doen
@@ -554,18 +556,11 @@ res = {
else
{ // Als er nog geen artikelen bij de reservering bestaan, dan kijken welke disciplines er mogelijk zijn.
oRs.Close();
var discs = "SELECT DISTINCT rdp.res_ins_discipline_key res_discipline_key"
var discs = "SELECT rdp.res_ins_discipline_key res_discipline_key"
+ " , rdp.res_disc_params_kosten"
+ " , (SELECT count(*)"
+ " FROM res_rsv_artikel rra"
+ " , res_artikel ra"
+ " WHERE rra.res_artikel_key = ra.res_artikel_key"
+ " AND ra.res_discipline_key = rdp.res_ins_discipline_key"
+ " AND rra.res_rsv_ruimte_key = " + rsv_ruimte_key
+ ") has_cv"
+ " , 0 has_cv" // we weten in deze tak al dat er geen CV is
+ " FROM res_disc_params rdp"
+ " , (SELECT d.ins_discipline_key"
+ " , 0 res_disc_params_kosten"
+ " FROM res_v_aanwezigDISCIPLINE d"
+ " WHERE ins_discipline_min_level = 2"
+ " AND d.ins_discipline_key IN"
@@ -577,25 +572,21 @@ res = {
+ " AND g.prs_perslid_key = " + user_key
+ " AND fac_gebruiker_prs_level_write < 9"
+ " AND fac_gebruiker_alg_level_write < 9"
+ " AND d.ins_discipline_key IN"
+ " (SELECT res_discipline_key"
+ " FROM res_v_srtartikel_onrgoed"
+ " WHERE alg_ruimte_key IN"
+ " (SELECT alg_ruimte_key"
+ " FROM res_v_rsv_ruimte_2_alg_ruimte "
+ " WHERE res_alg_ruimte_verwijder IS NULL"
+ " AND res_rsv_ruimte_key = " + rsv_ruimte_key
+ ")"
+ ")"
+ ")"
+ " AND d.ins_discipline_key IN"
+ " (SELECT res_discipline_key"
+ " FROM res_v_srtartikel_onrgoed"
+ " WHERE alg_ruimte_key IN"
+ " (SELECT alg_ruimte_key"
+ " FROM res_v_rsv_ruimte_2_alg_ruimte "
+ " WHERE res_alg_ruimte_verwijder IS NULL"
+ " AND res_rsv_ruimte_key = " + rsv_ruimte_key
+ ")"
+ ")"
+ " AND EXISTS (SELECT res_activiteit_key"
+ " FROM res_activiteitdiscipline rad"
+ " WHERE rad.res_discipline_key = d.ins_discipline_key"
+ " AND rad.res_activiteit_key ="
+ " (SELECT res_activiteit_key"
+ " FROM res_rsv_ruimte"
+ " WHERE res_rsv_ruimte_key = " + rsv_ruimte_key
+ ")"
+ " AND rad.res_activiteit_key = " + res_activiteit_key
+ ")"
+ ") ra"
+ " WHERE ra.ins_discipline_key = rdp.res_ins_discipline_key";

6
APPL/RES/res_cat.inc
View File

@@ -298,12 +298,8 @@ function make_cat(discipline_key, rsv_ruimte_key, existing_only, res_artikel_key
<input type='button' id='btnmore_<%=art_key%>' name='btnmore_<%=art_key%>' value='<%=L("lcl_res_add_catering")%>'
class="addcatering"
onclick="res_addcat(this)"
OnMouseOver="showOpmerking('#add_remark<%=art_key%>', event);"
OnMouseOut="$('#add_remark<%=art_key%>').hide();"
title="<%=safe.html(L("lcl_res_add_catering_remark"))%>"
>
<div class="res_remark" id="add_remark<%=art_key%>">
<%=safe.html(L("lcl_res_add_catering_remark"))%>
</div>
</td>
<%
}

4
APPL/RES/res_edit_rsv_ruimte_save.asp
View File

@@ -283,7 +283,6 @@ function getRuimteOpstelling(opstel_key)
// Deze velden altijd opslaan
var fields = [ { dbs: "res_rsv_ruimte_omschrijving", typ: "varchar", frm: "descript", track: L("lcl_descr") },
{ dbs: "res_rsv_ruimte_opmerking", typ: "varchar", frm: "opmerk", track: L("lcl_remark"), len: 2000 },
{ dbs: "alg_ruimte_key", typ: "key", frm: "ruimtekey", track: L("lcl_room"), foreign: "alg_v_plaatsaanduiding" },
{ dbs: "res_ruimte_opstel_key", typ: "key", val: opstel_key, track: true /* afzonderlijke tracking, wel oldjsval */ },
{ dbs: "res_rsv_ruimte_van", typ: "datetime", frm: "date_from", track: (restype=="CV"? L("lcl_res_starttime_CV") : L("lcl_res_starttime")) },
{ dbs: "res_rsv_ruimte_tot", typ: "datetime", val: date_to, track: (restype=="CV"? L("lcl_res_endtime_CV") : L("lcl_res_endtime")) },
@@ -300,6 +299,9 @@ var fields = [ { dbs: "res_rsv_ruimte_omschrijving", typ: "varchar", frm: "des
{ dbs: "res_rsv_ruimte_telefoon", typ: "varchar", frm: "phone" } // MGE: Wordt volgens mij niet gebruikt!!
];
if (opstel_key < 0) // Voorkomen dat beide gezet raken
fields.push({ dbs: "alg_ruimte_key", typ: "key", frm: "ruimtekey", track: L("lcl_room"), foreign: "alg_v_plaatsaanduiding" });
if (res_undelete)
{
fields.push( {dbs: "res_rsv_ruimte_verwijder", typ: "datetime", val: null, track: L("lcl_res_track_room_undeleted") });

3
APPL/Shared/500_error.asp
View File

@@ -194,7 +194,8 @@ if (Application("otap_environment") == "O" || Session("logging") > 0)
var y = String(Request.ServerVariables("APPL_PHYSICAL_PATH")); // Zoveel gaan we er af strippen
pad = pad.substring(y.length);
var method = Request.ServerVariables("REQUEST_METHOD");
var extra = "<tr><td>Url:</td><td>" + Server.HTMLEncode(method + " " + pad) + "</td></tr>";
var extra = "<tr><td>Customer:</td><td>" + Session("customerId") + (rooturl.length>1?'@'+rooturl.substr(1):"") + "</td></tr>";
extra += "<tr><td>Url:</td><td>" + Server.HTMLEncode(method + " " + pad) + "</td></tr>";
Response.Write(ASPErrorText(extra));
Response.Write("\n<br>" + ShowSourcecode(-8, +4));

13
APPL/Shared/Shared.inc
View File

@@ -98,12 +98,12 @@ var shared = {
// Als 0 dagen/uren dan beide velden leeg maken. Als eenheidsveld aanwezig is, moet ook het tijdsduurveld aangwezig zijn.
add_time_field: function add_time_field(fields, dbsname, frm_tijd, frm_eenheid, track)
{
var dayshours = Request.Form(frm_eenheid).count > 0 && Request.Form(frm_tijd) > 0;
var dayshours = Request.Form(frm_eenheid).count > 0 && getFParamFloat(frm_tijd, -1) > 0;
if (dayshours)
fields.push({ dbs: dbsname + ".tijdsduur", obj: "MLD_T_UITVOERTIJD", typ: "number", frm: frm_tijd, track: (track? track.tracktijdsduur : null) },
fields.push({ dbs: dbsname + ".tijdsduur", obj: "MLD_T_UITVOERTIJD", typ: "float", frm: frm_tijd, track: (track? track.tracktijdsduur : null) },
{ dbs: dbsname + ".eenheid", obj: "MLD_T_UITVOERTIJD", typ: "varchar", frm: frm_eenheid, track: (track? track.trackeenheid : null) });
else // Leegmaken
fields.push({ dbs: dbsname + ".tijdsduur", obj: "MLD_T_UITVOERTIJD", typ: "number", val: null, track: (track? track.tracktijdsduur : null) },
fields.push({ dbs: dbsname + ".tijdsduur", obj: "MLD_T_UITVOERTIJD", typ: "float", val: null, track: (track? track.tracktijdsduur : null) },
{ dbs: dbsname + ".eenheid", obj: "MLD_T_UITVOERTIJD", typ: "varchar", val: null, track: (track? track.trackeenheid : null) });
return fields;
}
@@ -142,16 +142,17 @@ function _get_Param(pColl, pName, defVal, force)
return defVal;
else // Error message will get to client and/or IIS logfiles
{
__DoLogForm("#FF0000");
if (String(Request.ServerVariables("REQUEST_METHOD")) == "HEAD")
{
__DoLog("Parameter '" + pName + "' is missing, probably because of unexpected HEAD request", "#FF0000");
__DoLogForm();
__DoLog("Parameter '" + pName + "' is missing, probably because of unexpected HEAD request", "#FFFF00");
__DoLog("Useragent: " + Request.ServerVariables("HTTP_USER_AGENT"));
__DoLog("Referer: " + Request.ServerVariables("HTTP_REFERER"));
Response.End;
}
else
{
__DoLogForm("#FF0000");
eval("INTERNAL_ERROR_PARAMETER_" + pName + "_IS_MISSING"); // A required parameter was not supplied
}
}
@@ -272,7 +273,7 @@ function _get_ParamDate(pColl, pName, defVal)
// Error message will get to client and/or IIS logfiles
if (String(Request.ServerVariables("REQUEST_METHOD")) == "HEAD")
{
__DoLog("Parameter '" + pName + "' is not date, probably because of unexpected HEAD request", "#FF0000");
__DoLog("Parameter '" + pName + "' is not date, probably because of unexpected HEAD request", "##FFFF00");
__DoLog("Useragent: " + Request.ServerVariables("HTTP_USER_AGENT"));
__DoLog("Referer: " + Request.ServerVariables("HTTP_REFERER"));
Response.End;

2
APPL/Shared/default.inc
View File

@@ -9,7 +9,7 @@
Note: Sinds 5.2.2 zitten de settings in de database
*/
var FCLTVersion="5.4.4"; // software versie
var FCLTVersion="5.4.4a"; // software versie
var FCLTMinDatabaseSchema="24";
var custpath = rooturl + "/cust/" + customerId; // path to customer files