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

FSN#40482 Enkele patches, zie log voor details

Browse Source 
svn path=/Website/trunk/; revision=33895
This commit is contained in:
Koen Reefman
2017-05-17 10:08:36 +00:00
parent 5acb4ba5cc
commit 71614ecd1d
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/CNT/cnt_show_contract.asp
View File

@@ -209,7 +209,7 @@ var urlMail = "../shared/queuemail.asp?pcode=CNTMAI&defemail_key=" + defemail_ke
if (this_cnt.canChange) if (this_cnt.canChange)
buttons.push({title: L("lcl_change"), icon: "wijzigen.png", action:"cnt_change()" }); buttons.push({title: L("lcl_change"), icon: "wijzigen.png", action:"cnt_change()" });
if (this_cnt.canCopy) if (this_cnt.canCopy)
buttons.push({title: L("lcl_copy"), icon: "fa-copy", action: "cnt_copy()"}); buttons.push({title: L("lcl_cnt_copy"), icon: "fa-copy", action: "cnt_copy()"});
if (false && this_cnt.canOrder) if (false && this_cnt.canOrder)
{ // Aanzet tot CONN#17536, maar nog rudimentair { // Aanzet tot CONN#17536, maar nog rudimentair
// TODO: heb ik MLD_ORDBOF rechten voor deze cnt_discipline en // TODO: heb ik MLD_ORDBOF rechten voor deze cnt_discipline en

4
APPL/FAC/fac_faq_list.asp
View File

@@ -88,12 +88,12 @@ function make_faq_list (searchtext, ororand)
+ " ) vakgroep" + " ) vakgroep"
+ " , (SELECT MIN(NVL(o.alg_type, 'L'))" + " , (SELECT MIN(NVL(o.alg_type, 'L'))"
+ " FROM alg_v_allonroerendgoed o, alg_algfaq af" + " FROM alg_v_allonroerendgoed o, alg_algfaq af"
+ " WHERE af.alg_onroerendgoed_keys = o.alg_onroerendgoed_keys" + " WHERE af.alg_onroerendgoed_keys = o.alg_onroerendgoed_keys(+)"
+ " AND af.fac_faq_key = f.fac_faq_key) scope" + " AND af.fac_faq_key = f.fac_faq_key) scope"
+ " , (SELECT MIN(l.alg_locatie_code || " + " , (SELECT MIN(l.alg_locatie_code || "
+ " DECODE(o.alg_plaatsaanduiding, NULL, NULL, '-' || o.alg_plaatsaanduiding))" + " DECODE(o.alg_plaatsaanduiding, NULL, NULL, '-' || o.alg_plaatsaanduiding))"
+ " FROM alg_v_aanweziglocatie l, alg_v_onroerendgoed_gegevens o, alg_algfaq af" + " FROM alg_v_aanweziglocatie l, alg_v_onroerendgoed_gegevens o, alg_algfaq af"
+ " WHERE af.alg_onroerendgoed_keys = o.alg_onroerendgoed_keys" + " WHERE af.alg_onroerendgoed_keys = o.alg_onroerendgoed_keys(+)"
+ " AND af.alg_locatie_key = l.alg_locatie_key" + " AND af.alg_locatie_key = l.alg_locatie_key"
+ " AND af.fac_faq_key = f.fac_faq_key) plaats" + " AND af.fac_faq_key = f.fac_faq_key) plaats"
+ " , fac_faq_hint" + " , fac_faq_hint"

2
APPL/RES/res.css
View File

@@ -61,7 +61,7 @@ table.planbord td.capaciteit { width: 55px;
div.res_remark { display: none; div.res_remark { display: none;
float: right; float: right;
position:absolute; position:absolute;
z-index:1; z-index:15; /* floatingHeader = 10, hambDropDown = 11 */
width:200px; width:200px;
left:450px; left:450px;
padding: 5px; padding: 5px;

2
APPL/Shared/BijlagenForm.asp
View File

@@ -247,7 +247,7 @@ if (fso.FolderExists(params.AttachPath))
{ {
for (i=0; i<uploaded_files.length; i++) for (i=0; i<uploaded_files.length; i++)
{ {
FcltMgr.topmanager().window.$.toast({ text: L("lcl_appendix_added").format(uploaded_files[i]), icon: "success", position : 'top-center'}); FcltMgr.topmanager().window.$.toast({ loaderBg: "#fff", text: L("lcl_appendix_added").format(uploaded_files[i]), icon: "success", position : 'top-center'});
} }
window.location = "<%=protectQS.create("BijlagenForm.asp?x=x"+transitParam)%>"; window.location = "<%=protectQS.create("BijlagenForm.asp?x=x"+transitParam)%>";
} }

19
APPL/Shared/kenmerk_common.inc
View File

@@ -130,7 +130,7 @@ function BijlagenButton(pModule, pNiveau, pKey, tmpfolder, pKenmerk_key,
+ "&key=" + pKey + "&key=" + pKey
+ (pNiveau != ""? "&niveau=" + pNiveau : "") + (pNiveau != ""? "&niveau=" + pNiveau : "")
+ "&kenmerk_key=" + pKenmerk_key + "&kenmerk_key=" + pKenmerk_key
+ (params.kenmerk_module != ""? "&kenmerk_module=" + params.kenmerk_module : ""); + (!!params.kenmerk_module && params.kenmerk_module != "" ? "&kenmerk_module=" + params.kenmerk_module : "");
if (pKey < 0) if (pKey < 0)
{ {
url += "&tmpfolder=" + tmpfolder; url += "&tmpfolder=" + tmpfolder;
@@ -140,7 +140,8 @@ function BijlagenButton(pModule, pNiveau, pKey, tmpfolder, pKenmerk_key,
url += "&multi=1"; url += "&multi=1";
if (kdim) url += "&extFilter=" + escape(kdim); if (kdim) url += "&extFilter=" + escape(kdim);
if (pregexp) url += "&pregexp=" + escape(pregexp); // P800x600 voor foto van 800x600 if (pregexp) url += "&pregexp=" + escape(pregexp); // P800x600 voor foto van 800x600
if (params.kenmerk_module != "")
if (!!params.kenmerk_module && params.kenmerk_module != "")
url += "&kenmerk_module=" + params.kenmerk_module; url += "&kenmerk_module=" + params.kenmerk_module;
var blg = "onBijlagen('" + safe.jsstring(protectQS.create(url)) + "'" var blg = "onBijlagen('" + safe.jsstring(protectQS.create(url)) + "'"
+ ",''" // geen saveUrl + ",''" // geen saveUrl
@@ -544,7 +545,7 @@ function listKenmerk(sql, module, key, props)
if (ktype == 'C') if (ktype == 'C')
{ {
if (flexExprIncluded && !isExpression) if (flexExprIncluded && !isExpression)
onchangeExp = ";if (valid) calculateFlexExpressions(this" onchangeExp = ";if (fvalid) calculateFlexExpressions(this"
+ ", \"" + module + "\"" + ", \"" + module + "\""
+ ", " + key + ", " + key
+ ", \"" + (props.kenmerk_module || "") + "\"" + ", \"" + (props.kenmerk_module || "") + "\""
@@ -572,7 +573,7 @@ function listKenmerk(sql, module, key, props)
anyTextarea = true; // straks autogrow code anyTextarea = true; // straks autogrow code
kv = "<textarea " kv = "<textarea "
+ (kregexp ? " regexp='" + kregexp + "' " : "") + (kregexp ? " regexp='" + kregexp + "' " : "")
+ " onChange='checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")" + " onChange='fvalid=checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")"
+ onchangeExp + onchangeExp
+ "'" + "'"
+ " onBlur='checkKenmerk(this, true,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")'" + " onBlur='checkKenmerk(this, true,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")'"
@@ -609,7 +610,7 @@ function listKenmerk(sql, module, key, props)
{ {
kv = "<input type='text'" kv = "<input type='text'"
+ (kregexp ? " regexp='" + kregexp + "' " : "") + (kregexp ? " regexp='" + kregexp + "' " : "")
+ " onChange='checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")" + " onChange='fvalid=checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")"
+ onchangeExp + onchangeExp
+ "'" + "'"
+ " onBlur='checkKenmerk(this, true,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")'" + " onBlur='checkKenmerk(this, true,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")'"
@@ -927,7 +928,7 @@ function listKenmerk(sql, module, key, props)
+ (niveau != ""? "&niveau=" + niveau : "") + (niveau != ""? "&niveau=" + niveau : "")
+ "&kenmerk_key=" + kkey + "&kenmerk_key=" + kkey
+ "&mobile=" + (formobile ? 1 : 0) + "&mobile=" + (formobile ? 1 : 0)
+ (props.kenmerk_module != ""? "&kenmerk_module=" + props.kenmerk_module : ""); + (!!props.kenmerk_module && props.kenmerk_module != ""? "&kenmerk_module=" + props.kenmerk_module : "");
// nooit if (pReadonly) url += "&reado=1"; // nooit if (pReadonly) url += "&reado=1";
// nooit url += "&multi=1"; // nooit url += "&multi=1";
if (kdim) url += "&extFilter=" + escape(kdim); if (kdim) url += "&extFilter=" + escape(kdim);
@@ -950,7 +951,7 @@ function listKenmerk(sql, module, key, props)
saveUrl += "?module="+module; saveUrl += "?module="+module;
saveUrl += "&parentKey="+props.parentKey; saveUrl += "&parentKey="+props.parentKey;
saveUrl += "&kenmerkKey=" + kkey; saveUrl += "&kenmerkKey=" + kkey;
if (props.kenmerk_module!="") if (!!props.kenmerk_module && props.kenmerk_module != "")
saveUrl += "&kenmerk_module="+props.kenmerk_module; saveUrl += "&kenmerk_module="+props.kenmerk_module;
}; };
@@ -1077,7 +1078,7 @@ function listKenmerk(sql, module, key, props)
{ // Ook lege folders met bestanden en een enkele bestandsnaam krijgen we via de query mee. Maar deze niet tonen. { // Ook lege folders met bestanden en een enkele bestandsnaam krijgen we via de query mee. Maar deze niet tonen.
// Ooit meer HTML-types toepassen (number, float) // Ooit meer HTML-types toepassen (number, float)
if (flexExprIncluded && (ktype == "N" || ktype == "D" || ktype == "S") && !isExpression) if (flexExprIncluded && (ktype == "N" || ktype == "D" || ktype == "S") && !isExpression)
onchangeExp = ";if (valid) calculateFlexExpressions(this" onchangeExp = ";if (fvalid) calculateFlexExpressions(this"
+ ", \"" + module + "\"" + ", \"" + module + "\""
+ ", " + key + ", " + key
+ ", \"" + (props.kenmerk_module || "") + "\"" + ", \"" + (props.kenmerk_module || "") + "\""
@@ -1087,7 +1088,7 @@ function listKenmerk(sql, module, key, props)
kv = "<input type='text'" kv = "<input type='text'"
+ (!readonlyfield && kregexp ? " regexp='" + kregexp + "' " : "") + (!readonlyfield && kregexp ? " regexp='" + kregexp + "' " : "")
+ (!readonlyfield + (!readonlyfield
? " onChange='checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")" ? " onChange='fvalid=checkKenmerk(this, false,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")"
+ onchangeExp + onchangeExp
+ "' " + "' "
: "") : "")