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

FSN#32688: XD status niet opgelost wordt weergegeven als in behandeling.

Browse Source 
svn path=/Website/trunk/; revision=25545
This commit is contained in:
Maykel Geerdink
2015-06-30 10:28:35 +00:00
parent 2617639099
commit 92d77af03c
4 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/API2/api2.inc
View File

@@ -602,6 +602,8 @@ api2 = {
dbs = lcl.xsql(dbs, model.table + "." + model.fields.id.dbs);
if (model.aliasprefix)
dbs += " AS " + api2.sqlfield_alias(model, fld);
if (field.as)
dbs += " AS " + field.as;
else
if (field.translate)
dbs += " AS " + field.dbs;
@@ -612,7 +614,7 @@ api2 = {
continue;
if (field.foreign) // de functions komen later
if (field.foreign && typeof field.foreign != 'function') // de functions komen later
{
if (typeof field.foreign == 'string')
{

48
APPL/API2/model_issues.inc
View File

@@ -28,24 +28,25 @@ model_issues =
primary: "mld_melding_key",
records_name: "issues",
record_name: "issue",
fields: {"id" : { dbs: "mld_melding_key", typ: "key", filter: "exact" },
"name" : { dbs: "mld_melding_id", typ: "varchar", sql: "ins_srtdiscipline.ins_srtdiscipline_prefix||mld_melding.mld_melding_key", filter: "exact" },
"contact" : { dbs: "prs_perslid_key", typ: "key", foreign: "prs_perslid", label: L("lcl_mld_name"), track: true, filter: "exact" },
"requestor" : { dbs: "prs_perslid_key_voor", typ: "key", foreign: "prs_perslid", label: L("lcl_mld_call_for"), track: true, filter: "exact" },
"issuedate" : { dbs: "mld_melding_datum", typ: "datetime", label: L("lcl_mld_date_time"), track: true, filter: "range" },
"enddate" : { dbs: "mld_melding_einddatum", typ: "datetime", label: L("lcl_mld_enddate"), track: true},
"issuetype" : { dbs: "mld_stdmelding_key", typ: "key", foreign: "mld_stdmelding", label: L("lcl_complain"), track: true, filter: "exact" },
"description": { dbs: "mld_melding_omschrijving", typ: "varchar", label: L("lcl_descr"), track: true, filter: "like" },
"remark" : { dbs: "mld_melding_opmerking", typ: "varchar", label: L("lcl_remark"), track: true},
"status" : { dbs: "mld_melding_status", typ: "key", foreign: mld.getmldstatustext, label: L("lcl_status"), track: true, filter: "exact" },
"flag" : { dbs: "mld_melding_flag", typ: "key", /* geen echte key, wel key-gedrag */ label: L("lcl_mld_flags"), track: true, filter: "exact" },
"account" : { dbs: "prs_kostenplaats_key", typ: "key", foreign: "prs_kostenplaats", label: L("lcl_account"), track: true, filter: "exact" },
"handler" : { dbs: "mld_melding_behandelaar_key", typ: "key", foreign: "prs_perslid", label: L("lcl_mld_behandelaar"),track: true, filter: "exact" },
"location" : { dbs: "mld_alg_locatie_key", typ: "key", foreign: "alg_locatie", label: L("lcl_location"), track: true, filter: "exact" },
"building" : { dbs: "alg_v_allonroerendgoed.alg_gebouw_key", typ: "key", foreign: "alg_gebouw", label: L("lcl_building"), track: true, filter: "exact" },
"floor" : { dbs: "alg_v_allonroerendgoed.alg_verdieping_key", typ: "key", foreign: "alg_verdieping", label: L("lcl_floor"), track: true, filter: "exact" },
"room" : { dbs: "alg_v_allonroerendgoed.alg_ruimte_key", typ: "key", foreign: "alg_ruimte", label: L("lcl_room"), track: true, filter: "exact" },
"terrain" : { dbs: "alg_v_allonroerendgoed.alg_terreinsector_key", typ: "key", foreign: "alg_terreinsector", label: L("lcl_room"), track: true, filter: "exact" }
fields: {"id" : { dbs: "mld_melding_key", typ: "key", filter: "exact" },
"name" : { dbs: "mld_melding_id", typ: "varchar", sql: "ins_srtdiscipline.ins_srtdiscipline_prefix||mld_melding.mld_melding_key", filter: "exact" },
"contact" : { dbs: "prs_perslid_key", typ: "key", foreign: "prs_perslid", label: L("lcl_mld_name"), track: true, filter: "exact" },
"requestor" : { dbs: "prs_perslid_key_voor", typ: "key", foreign: "prs_perslid", label: L("lcl_mld_call_for"), track: true, filter: "exact" },
"issuedate" : { dbs: "mld_melding_datum", typ: "datetime", label: L("lcl_mld_date_time"), track: true, filter: "range" },
"enddate" : { dbs: "mld_melding_einddatum", typ: "datetime", label: L("lcl_mld_enddate"), track: true},
"issuetype" : { dbs: "mld_stdmelding_key", typ: "key", foreign: "mld_stdmelding", label: L("lcl_complain"), track: true, filter: "exact" },
"description": { dbs: "mld_melding_omschrijving", typ: "varchar", label: L("lcl_descr"), track: true, filter: "like" },
"remark" : { dbs: "mld_melding_opmerking", typ: "varchar", label: L("lcl_remark"), track: true},
"status" : { dbs: "mld_melding_status", typ: "key", foreign: mld.getmldstatustext, label: L("lcl_status"), track: true, filter: "exact" },
"flag" : { dbs: "mld_melding_flag", typ: "key", /* geen echte key, wel key-gedrag */ label: L("lcl_mld_flags"), track: true, filter: "exact" },
"account" : { dbs: "prs_kostenplaats_key", typ: "key", foreign: "prs_kostenplaats", label: L("lcl_account"), track: true, filter: "exact" },
"handler" : { dbs: "mld_melding_behandelaar_key", typ: "key", foreign: "prs_perslid", label: L("lcl_mld_behandelaar"), track: true, filter: "exact" },
"location" : { dbs: "mld_alg_locatie_key", typ: "key", foreign: "alg_locatie", label: L("lcl_location"), track: true, filter: "exact" },
"building" : { dbs: "alg_v_allonroerendgoed.alg_gebouw_key", typ: "key", foreign: "alg_gebouw", label: L("lcl_building"), track: true, filter: "exact" },
"floor" : { dbs: "alg_v_allonroerendgoed.alg_verdieping_key", typ: "key", foreign: "alg_verdieping", label: L("lcl_floor"), track: true, filter: "exact" },
"room" : { dbs: "alg_v_allonroerendgoed.alg_ruimte_key", typ: "key", foreign: "alg_ruimte", label: L("lcl_room"), track: true, filter: "exact" },
"terrain" : { dbs: "alg_v_allonroerendgoed.alg_terreinsector_key", typ: "key", foreign: "alg_terreinsector", label: L("lcl_room"), track: true, filter: "exact" },
"xstatus" : { dbs: "mld_melding_key", as: "xstatus", typ: "key", foreign: mld.getextendedmldstatustext, label: L("lcl_extended_status"), track: true, filter: "exact" }
},
includes: {
"issueobjects": {
@@ -250,7 +251,7 @@ model_issues =
}
//
//
var stdm_info = mld.mld_stdmeldinginfo(issuetype);
var stdm_info = mld.mld_stdmeldinginfo(jsondata.issue.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"));
@@ -307,10 +308,10 @@ model_issues =
}
else
{
startdate = jsondata.issue.issuedate;
// startdate = jsondata.issue.issuedate;
}
}
jsondata.issue.issuedate = startdate;
// jsondata.issue.issuedate = startdate;
// De einddatum is de meegegeven einddatum, maar als die niet wordt meegegeven regelt de trigger dat wel, dus DAN MOET IK HEM NIET MEEGEVEN
//
@@ -453,6 +454,11 @@ model_issues =
L("lcl_mld_is_mldupdtrack").format(mld_key) + (mldUpd.trackarray.length > 0? "\n" : "") + mldUpd.trackarray.join("\n"));
};
status = jsondata["status"].id;
if (status > 0)
mld.setmeldingstatus(mld_key, status, "");
return { key: mld_key };
},

11
APPL/MLD/mld.inc
View File

@@ -327,6 +327,17 @@ mld = {setmeldingstatus:
return result;
},
getextendedmldstatustext:
function (pmld_key)
{
var sql = "SELECT mld_melding_status status FROM mld_melding WHERE mld_melding_key = " + pmld_key;
oRs = Oracle.Execute(sql);
var mldStatus = oRs("status").Value;
oRs.Close();
var xstatus = mld.getextendedmldstatus(mldStatus, pmld_key);
return mld.getmldstatustext(xstatus);
},
// bereken de SLA-einddatum gegeven onderstaande info
geteinddatum:
function (startdate, stdm_key, prio, geb_key, ruimte_key, obj_key)

4
APPL/MLD/mld_search_list_xd.asp
View File

@@ -21,6 +21,7 @@
<!-- #include file="../Shared/resultset_table_v2.inc" -->
<!-- #include file="../Shared/calendar.inc" -->
<!-- #include file="../Shared/xd.inc" -->
<!-- #include file="../mld/mld.inc" -->
<%
var outputmode = getQParamInt("outputmode", 0);
@@ -160,6 +161,7 @@ for(var cid in gottenitems){ // per omgeving
stdmelding: thisdata.issuetype.name,
description: thisdata.description,
status: thisdata.status.name,
xstatus: thisdata.xstatus.name,
flag: thisdata.flag,
handler: thisdata.handler ? thisdata.handler.name : null,
plaatsaanduiding: xd.fnPlaatsaanduiding(thisdata.location, thisdata.building, thisdata.floor, thisdata.room)
@@ -195,7 +197,7 @@ rst.addColumn(new Column({caption: L("lcl_time"), combine: true, content: "issue
rst.addColumn(new Column({caption: L("lcl_caller"), content: "requestor"}));
rst.addColumn(new Column({caption: L("lcl_place"), content: "plaatsaanduiding"}));
rst.addColumn(new Column({caption: L("lcl_txt"), content: "description"}));
rst.addColumn(new Column({caption: L("lcl_mld_status"), content: "status"}));
rst.addColumn(new Column({caption: L("lcl_mld_status"), content: "xstatus"}));
rst.addColumn(new Column({caption: L("lcl_mld_behandelaar"), content: "handler"}));
rst.addColumn(new Column({caption: L("lcl_end_date_plan"), content: "enddate", datatype: "datetime"}));