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

svn path=/Website/trunk/; revision=23788

Browse Source
This commit is contained in:
Erik Groener
2015-01-06 12:02:06 +00:00
parent 9de55b2281
commit acd9d456f2
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
APPL/API2/model_issues.inc
View File

@@ -172,6 +172,10 @@ model_issues =
_pre_analyze_fields: function (params, jsondata) /* analyseer inkomende jsondata voor POST */
{
params.data = {};
var issuetype = api2.get_jdata_refkey(jsondata.issue.issuetype);
var account = api2.get_jdata_refkey(jsondata.issue.account);
var mld_key = jsondata.issue.id;
if (params.isNew)
{ // analyseer inkomende jsondata voor POST
var msgError = "";
@@ -190,8 +194,9 @@ model_issues =
+ " , mld_discipline md"
+ " , mld_disc_params dp"
+ " WHERE sm.mld_ins_discipline_key = md.ins_discipline_key"
+ " AND sm.mld_ins_discipline_key = dp.mld_ins_discipline_key";
+ " AND sm.mld_stdmelding_key = " + jsondata.issue.issuetype;
+ " AND sm.mld_ins_discipline_key = dp.mld_ins_discipline_key"
+ " AND sm.mld_stdmelding_key = " + issuetype;
var oRs_stdm = Oracle.Execute(sql_stdm);
if (!oRs_stdm.eof)
{
@@ -206,8 +211,8 @@ model_issues =
//
// Bepaal de kostenplaats, indien verplicht.
var stdm_info = mld.mld_stdmeldinginfo(jsondata.issue.issuetype);
var kpkey = (jsondata.issue.account ? jsondata.issue.account : -1);
var stdm_info = mld.mld_stdmeldinginfo(issuetype);
var kpkey = (account ? account : -1);
if (stdm_info.kpnverplicht && kpkey < 0)
{ // Kostenplaats is verplicht, maar is niet meegegeven. Bepaal default kostenplaats.
kpkey = (user.afdeling().prs_kostenplaats_key() || -1); // User kostenplaats key
@@ -234,7 +239,7 @@ model_issues =
// Bestaande melding: Haal de gegevens op.
var sql = "SELECT mld_stdmelding_key"
+ " FROM mld_melding"
+ " WHERE mld_melding_key = " + jsondata.issue.id;
+ " WHERE mld_melding_key = " + mld_key;
var oRs = Oracle.Execute(sql);
jsondata.issue.issuetype = oRs("mld_stdmelding_key").Value;
oRs.Close();
@@ -242,7 +247,7 @@ model_issues =
}
//
//
var stdm_info = mld.mld_stdmeldinginfo(jsondata.issue.issuetype);
var stdm_info = mld.mld_stdmeldinginfo(issuetype);
// Startdatum: indien niet meegegeven, neem dan sysdate
var startdate = (jsondata.issue.issuedate ? jsondata.issue.issuedate : new Date);
var startwerkdag = parseFloat(S("fac_t_startofworkday"));
@@ -265,7 +270,6 @@ model_issues =
}
else
{ // Bestaande melding
var mld_key = jsondata.issue.id;
sql = "SELECT mld_melding_datum"
+ " FROM mld_melding"
+ " WHERE mld_melding_key = " + mld_key;