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

FSN#34307 suppressEmpty, valutasign, requierd velden eerst

Browse Source 
svn path=/Website/trunk/; revision=27068
This commit is contained in:
Peter Feij
2015-11-20 16:26:47 +00:00
parent e168604857
commit d4b6ebe116
3 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
APPL/PRS/kpn_edit_kpn.asp
View File

@@ -141,13 +141,6 @@ user.auth_required_or_abort(canChange);
onSubmit="kpn_submit();">
<input type="hidden" name="kpg_limperiode" value="<%=kpg_limperiode%>">
<% BLOCK_START("kpnMan", "");
RWFIELDTR("kpn_oms", "fld", L("lcl_prs_descr"), kpn_oms, {maxlength: 60, readonly: !canChangeAlg});
FCLTpersoonselector("prs_key", // requestor
"sgPerson",
{ perslidKey: kpn_prs_key,
label: L("lcl_prs_budgethouder"),
whenEmpty: L("lcl_search_generic"), // want filter
readonly: !canChangeAlg });
RWFIELDTR("kpn_nr", "fld", L("lcl_prs_dept_name"), kpn_nr, {required: true, maxlength: 30, readonly: !canChangeAlg});
sql = "SELECT 'ALG' modulekey, "
@@ -168,6 +161,13 @@ user.auth_required_or_abort(canChange);
emptyOption: "",
readonly: !canChangeAlg,
required: true });
RWFIELDTR("kpn_oms", "fld", L("lcl_prs_descr"), kpn_oms, {maxlength: 60, readonly: !canChangeAlg});
FCLTpersoonselector("prs_key", // requestor
"sgPerson",
{ perslidKey: kpn_prs_key,
label: L("lcl_prs_budgethouder"),
whenEmpty: L("lcl_search_generic"), // want filter
readonly: !canChangeAlg });
sql = "SELECT prs_kostenplaatsgrp_key"
+ " , prs_kostenplaatsgrp_oms"
@@ -195,7 +195,7 @@ user.auth_required_or_abort(canChange);
initEmpty: !kpn_eind || kpn_key <= 0
});
RWFIELDTR("kpn_limiet", "fldkpnlimiet", L("lcl_prs_budget") + "&nbsp;" + S("currency_pref"), kpn_limiet, {datatype: "number", maxlength: 8, html: "onChange='checkLimit(event)'"});
RWFIELDTR("kpn_limiet", "fldkpnlimiet", L("lcl_prs_budget") + "&nbsp;(" + L("lcl_valutasign")+")", kpn_limiet, {datatype: "number", maxlength: 8, html: "onChange='checkLimit(event)'"});
sql = "SELECT 0, " + safe.quoted_sql(L("lcl_prs_none")) + " FROM DUAL"
+ " UNION SELECT 1, " + safe.quoted_sql(L("lcl_prs_per_month")) + " FROM DUAL"

54
APPL/PRS/kpn_show_kpn.asp
View File

@@ -126,22 +126,6 @@ user.auth_required_or_abort(canShow);
<form name=u2 onSubmit="return false;">
<% // if (alg.canWriteRuimte(room_key, authparams.mALGwritelevel)) TODO
BLOCK_START("kpnMan", L("lcl_prs_general_info"));
ROFIELDTR("fld",
L("lcl_prs_descr"),
kpn_oms,
{translate: { fld: "prs_kostenplaats_omschrijving", key : kpn_key }}
);
FCLTpersoonselector("prs_key", // requestor
"prs_key",
{ perslidKey: kpn_prs_key,
label: L("lcl_prs_budgethouder"),
moreinfo: true,
readonly: true });
var params = { infoPointer: { Url: "appl/shared/status_info.asp?kpn_key=" + kpn_key,
Title: L("lcl_status_details") + " " + kpn_key
}
}
ROFIELDTR("fld", L("lcl_prs_dept_name"), kpn_nr, params);
sql = "SELECT 'ALG' modulekey, "
@@ -161,6 +145,24 @@ user.auth_required_or_abort(canShow);
initKey: kpn_module,
emptyOption: "",
readonly: true });
ROFIELDTR("fld",
L("lcl_prs_descr"),
kpn_oms,
{translate: { fld: "prs_kostenplaats_omschrijving", key : kpn_key}, suppressEmpty: true}
);
FCLTpersoonselector("prs_key", // requestor
"prs_key",
{ perslidKey: kpn_prs_key,
label: L("lcl_prs_budgethouder"),
moreinfo: true,
readonly: true,
suppressEmpty: true });
var params = { infoPointer: { Url: "appl/shared/status_info.asp?kpn_key=" + kpn_key,
Title: L("lcl_status_details") + " " + kpn_key
}
}
sql = "SELECT prs_kostenplaatsgrp_key, "
+ " prs_kostenplaatsgrp_oms "
+ " FROM prs_kostenplaatsgrp kpg "
@@ -170,25 +172,29 @@ user.auth_required_or_abort(canShow);
{ label: L("lcl_prs_kostenpl_group"),
initKey: kpn_grpkey,
emptyOption: "",
suppressEmpty: true,
readonly: true });
ROCHECKBOXTR("fldcheck", L("lcl_prs_kpnextern"), kpn_extern);
ROCHECKBOXTR("fldcheck", L("lcl_prs_kpnfiat"), kpn_fiat);
ROFIELDTR("flddate", L("lcl_end_date"), toDateString(kpn_eind));
ROFIELDTR("fldkpnlimiet", L("lcl_prs_budget") + "&nbsp;" + S("currency_pref"), safe.curr(kpn_limiet));
sql = "SELECT 0, " + safe.quoted_sql(L("lcl_prs_none")) + " FROM DUAL"
ROFIELDTR("flddate", L("lcl_end_date"), toDateString(kpn_eind), {suppressEmpty: true});
ROFIELDTR("fldkpnlimiet", L("lcl_prs_budget") + "&nbsp;" + L("lcl_valutasign"), safe.curr(kpn_limiet), {suppressEmpty: true});
sql = "SELECT 0, '' FROM DUAL"
+ " UNION SELECT 1, " + safe.quoted_sql(L("lcl_prs_per_month")) + " FROM DUAL"
+ " UNION SELECT 2, " + safe.quoted_sql(L("lcl_prs_annual")) + " FROM DUAL";
FCLTselector("kpn_limietperiode", sql,
{ label: L("lcl_prs_budgetperiode"),
initKey: kpn_limietperiode,
readonly: true });
readonly: true,
suppressEmpty: true });
BLOCK_END();
BLOCK_START("kpnGrp", L("lcl_prs_budgettering"), true);
ROFIELDTR("fld", L("lcl_prs_budget") + "&nbsp;" + L("lcl_prs_kostenpl_group") + "&nbsp;" + S("currency_pref"), safe.curr(kpngrp_limiet), {maxlength: 60, suppressEmpty: true});
ROFIELDTR("fldfreebudget" + (gebruikt_budget > kpngrp_limiet? " hot" : ""), L("lcl_prs_afwijking_budget") + "&nbsp;" + S("currency_pref"), safe.curr(kpngrp_limiet - gebruikt_budget), {maxlength: 60, suppressEmpty: true});
BLOCK_END();
if ( kpngrp_limiet || kpngrp_limiet || gebruikt_budget) {
BLOCK_START("kpnGrp", L("lcl_prs_budgettering"), true);
ROFIELDTR("fld", L("lcl_prs_budget") + "&nbsp;" + L("lcl_prs_kostenpl_group") + "&nbsp;" + L("lcl_valutasign"), safe.curr(kpngrp_limiet), {suppressEmpty: true});
ROFIELDTR("fldfreebudget" + (gebruikt_budget > kpngrp_limiet? " hot" : ""), L("lcl_prs_afwijking_budget") + "&nbsp;" + L("lcl_valutasign"), safe.curr(kpngrp_limiet - gebruikt_budget), {suppressEmpty: true});
BLOCK_END();
}
IFACE.FORM_END();
%>
</form>

14
APPL/PRS/kpn_show_kpngroep.asp
View File

@@ -88,22 +88,23 @@ user.auth_required_or_abort(canShow);
%>
<div id="show">
<form name="u2" onSubmit="return false;">
<% // if (alg.canWriteRuimte(room_key, authparams.mALGwritelevel)) TODO
<%
BLOCK_START("kpnMan", L("lcl_prs_general_info"));
ROFIELDTR("fld",
L("lcl_prs_descr"),
kpngrp_oms,
{translate: { fld: "prs_kostenplaatsgrp_oms", key : kpngroep_key }}
);
ROFIELDTR("fld", L("lcl_prs_number"), kpngrp_nr);
ROFIELDTR("fld", L("lcl_prs_number"), kpngrp_nr, {suppressEmpty: true});
FCLTpersoonselector("prs_key", // requestor
"prs_key",
{ perslidKey: prs_key,
label: L("lcl_prs_budgethouder"),
moreinfo: true,
suppressEmpty: true,
readonly: true });
ROFIELDTR("fld", L("lcl_prs_budget") + "&nbsp;" + S("currency_pref"), safe.curr(kpngrp_limiet));
sql = "SELECT 0, " + safe.quoted_sql(L("lcl_prs_none")) + ", 0 FROM DUAL"
ROFIELDTR("fld", L("lcl_prs_budget") + "&nbsp;" + L("lcl_valutasign"), safe.curr(kpngrp_limiet), {suppressEmpty: true});
sql = "SELECT 0, '', 0 FROM DUAL"
+ " UNION SELECT 1, " + safe.quoted_sql(L("lcl_prs_month")) + ", 1 FROM DUAL"
+ " UNION SELECT 2, " + safe.quoted_sql(L("lcl_prs_year")) + ", 2 FROM DUAL"
+ " ORDER BY 3";
@@ -111,7 +112,8 @@ user.auth_required_or_abort(canShow);
sql,
{ initKey: kpngrp_limperiode,
label: L("lcl_prs_limietperiode"),
readonly: true
readonly: true,
suppressEmpty: true
});
BLOCK_END();
@@ -126,7 +128,7 @@ user.auth_required_or_abort(canShow);
if (kpngrp_limiet - gebruikt_budget > 0)
{
BLOCK_START("kpnGrp", L("lcl_prs_budgettering"), true);
ROFIELDTR("fldfreebudget" + (gebruikt_budget > kpngrp_limiet? " hot" : ""), L("lcl_prs_afwijking_budget") + "&nbsp;" + S("currency_pref"), safe.curr(kpngrp_limiet - gebruikt_budget), {maxlength: 60, suppressEmpty: true});
ROFIELDTR("fldfreebudget" + (gebruikt_budget > kpngrp_limiet? " hot" : ""), L("lcl_prs_afwijking_budget") + "&nbsp;" + L("lcl_valutasign"), safe.curr(kpngrp_limiet - gebruikt_budget), {suppressEmpty: true});
BLOCK_END();
}
%>