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

TWYN#53173 kopieeren contracten: toevoegen filters

Browse Source 
svn path=/Website/branches/v2018.1/; revision=39023
This commit is contained in:
Erik Groener
2018-09-03 08:39:05 +00:00
parent 6ba9585d0a
commit 36c02cb59d
4 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
APPL/API2/model_mld_opdr.inc
View File

@@ -137,12 +137,14 @@ function model_mld_opdr()
"dbs": "mld_uitvoerende_keys",
"label": L("lcl_ord_company"),
"typ": "key",
"foreign": bgt_company_foreign()
"foreign": bgt_company_foreign(),
"showtransit": true
},
"reference": {
"dbs": "mld_opdr_id",
"label": L("lcl_opdr_id"),
"typ": "varchar"
"typ": "varchar",
"showtransit": true
},
"ordernr_sort": {
"dbs": "mld_opdr_ordernr_int",
@@ -167,17 +169,26 @@ function model_mld_opdr()
"dbs": "prs_kostenplaats_key",
"label": L("bgt_budget_account"),
"typ": "key",
"foreign": bgt_account_foreign()
"foreign": bgt_account_foreign(),
"showtransit": true
},
"description": {
"dbs": "mld_opdr_omschrijving",
"label": L("lcl_descr"),
"typ": "varchar"
},
"startdate_range": {
"dbs": "mld_opdr_datumbegin_range",
"sql": "mld_opdr_datumbegin",
"label": L("bgt_contractdatum"),
"typ": "date"
},
"startdate": {
"dbs": "mld_opdr_datumbegin",
"label": L("bgt_contractdatum"),
"typ": "date"
"typ": "date",
"filter": "exact",
"showtransit": true
},
"amount": {
"dbs": "mld_opdr_kosten",
@@ -314,6 +325,11 @@ Bij een nieuwe subopdracht is het opdrachtnummer gelijk aan die van de opdracht
}
*/
}
else
{
__Log("Wat heb ik nu bij een insert?");
__Log(obj);
}
%>
<script type="text/javascript">
@@ -323,6 +339,10 @@ Bij een nieuwe subopdracht is het opdrachtnummer gelijk aan die van de opdracht
<% if (obj.budgetcostcategory) { %> var budgetcostcategory = "<%=obj.budgetcostcategory.id%>"; <% } %>
<% if (obj.costtypegroup) { %> var costtypegroup = "<%=obj.costtypegroup.id%>"; <% } %>
<% if (obj.costtype) { %> var costtype = "<%=obj.costtype.id%>"; <% } %>
<% if (obj.company) { %> var company = "<%=obj.company.id%>"; <% } %>
<% if (obj.reference) { %> var reference = "<%=obj.reference%>"; <% } %>
<% if (obj.account) { %> var account = "<%=obj.account.id%>"; <% } %>
<% if (obj.startdate) { %> var startdate = "<%=obj.startdate%>"; <% } %>
</script>
<%
}

2
APPL/BGT/bgt_budget.js
View File

@@ -325,10 +325,12 @@ function process_info(data)
select.append($new_lov);
}
select.prop("disabled", false);
select.removeClass("btn_disabled");
}
else
{
select.prop("disabled", true);
select.addClass("btn_disabled");
}
if (sel_key > -1)

8
APPL/BGT/mld_opdr.asp
View File

@@ -38,7 +38,6 @@ if (mode == "list")
scaffolding(this_model,
{
"search": {
"autosearch": true,
"filters": [
"budgetdiscipline",
"budgetproject",
@@ -54,7 +53,11 @@ scaffolding(this_model,
"budgetproject",
"budgetcostcategory",
"costtypegroup",
"costtype"
"costtype",
"company",
"reference",
"account",
"startdate"
],
"requires": {
"js": ["../bgt/bgt_budget.js"]
@@ -149,6 +152,7 @@ scaffolding(this_model,
"label": L("lcl_mld_hidden_fields"),
"hidden": true,
"fields": [
"startdate_range",
"estimate",
"contracted",
"owner",

7
APPL/SCF/scaffolding.inc
View File

@@ -223,6 +223,7 @@ function scf_ROFIELDTR(model, fld, val, key, params)
txt = txt["name"];
}
else
{
if (field.typ == "datetime")
txt = toDateTimeString(txt);
else if (field.typ == "time")
@@ -234,6 +235,7 @@ function scf_ROFIELDTR(model, fld, val, key, params)
txt = txt["duration"] + " " + (txt["unit"]=='U'?L("lcl_mld_hours"):L("lcl_mld_days"));
else
return;
}
}
else if ("infoPointer" in field)
{
@@ -286,6 +288,11 @@ function scf_ROFIELDTR(model, fld, val, key, params)
{
ROTEXTAREATR("fldtxt", field.label, txt, params);
}
else if (field.typ == "date" && typeof txt == "string" && !isNaN(txt))
{
txt = toDateString(new Date(parseInt(txt)));
ROTEXTAREATR("fldtxt", field.label, txt, params);
}
else
{
ROFIELDTR("fldtxt", field.label, txt, params);