Iets duidelijker onderscheid field en dbfields

svn path=/Website/trunk/; revision=25702
This commit is contained in:
Jos Groot Lipman
2015-07-23 10:56:17 +00:00
parent 530dc713fb
commit 4cff703f4b
8 changed files with 74 additions and 78 deletions

View File

@@ -40,11 +40,11 @@ model_invoicelines =
delete jsondata.line; // factuurregelnummer niet door de gebruiker laten zetten.
},
_analyze_fields: function (fields, params, jsondata) /* analyseer inkomende data, common voor PUT en POST */
_analyze_fields: function (dbfields, params, jsondata) /* analyseer inkomende data, common voor PUT en POST */
{
},
_validate_fields: function (fields, params, jsondata) /* valideer fields, alle constraints die niet door de database worden afgevangen */
_validate_fields: function (dbfields, params, jsondata) /* valideer dbfields, alle constraints die niet door de database worden afgevangen */
{
//__Log(jsondata);
//var factuurregel_key = parseInt(jsondata.invoiceline.id);
@@ -117,9 +117,9 @@ model_invoicelines =
{
var finregel_key = the_key;
model_invoicelines._pre_analyze_fields(params, jsondata);
var fields = api2.update_fields(params, model_invoicelines, jsondata); // Build updater
model_invoicelines._analyze_fields(fields, params, jsondata);
model_invoicelines._validate_fields(fields, params, jsondata);
var dbfields = api2.update_fields(params, model_invoicelines, jsondata); // Build updater
model_invoicelines._analyze_fields(dbfields, params, jsondata);
model_invoicelines._validate_fields(dbfields, params, jsondata);
//
var sql = "SELECT fin_factuur_key"
+ " FROM fin_factuurregel"
@@ -132,7 +132,7 @@ model_invoicelines =
user.auth_required_or_abort(this_fin.canChange); // Geen wijzigingen toestaan bij onvoldoende rechten.
var wheres = [" fin_factuurregel_key = " + finregel_key];
var finUpd = buildTrackingUpdate("fin_factuurregel", wheres.join(" AND " ), fields, { noValidateToken: true });
var finUpd = buildTrackingUpdate("fin_factuurregel", wheres.join(" AND " ), dbfields, { noValidateToken: true });
var sql = "BEGIN "
+ finUpd.sql + ";"
@@ -153,9 +153,9 @@ model_invoicelines =
user.auth_required_or_abort(this_fin.canChange); // Geen nieuwe factuurregels bij een verwerkte factuur en onvoldoende rechten.
model_invoicelines._pre_analyze_fields(params, jsondata);
var fields = api2.update_fields(params, model_invoicelines, jsondata); // Build updater
model_invoicelines._analyze_fields(fields, params, jsondata);
model_invoicelines._validate_fields(fields, params, jsondata);
var dbfields = api2.update_fields(params, model_invoicelines, jsondata); // Build updater
model_invoicelines._analyze_fields(dbfields, params, jsondata);
model_invoicelines._validate_fields(dbfields, params, jsondata);
// Zet volgnummer van de nieuwe factuurregel.
var sql = "SELECT MAX(fin_factuurregel_nr) volgnr"
@@ -165,11 +165,11 @@ model_invoicelines =
var volgnr = oRs("volgnr").value + 1;
oRs.Close();
fields["invoice"] = { dbs: "fin_factuur_key", typ: "key", val: factuur_key };
fields["id"] = { dbs: "fin_factuurregel_key", typ: "key", seq: "fin_s_fin_factuurregel_key" };
fields["line"] = { dbs: "fin_factuurregel_nr", typ: "number", val: volgnr };
dbfields["invoice"] = { dbs: "fin_factuur_key", typ: "key", val: factuur_key };
dbfields["id"] = { dbs: "fin_factuurregel_key", typ: "key", seq: "fin_s_fin_factuurregel_key" };
dbfields["line"] = { dbs: "fin_factuurregel_nr", typ: "number", val: volgnr };
var finIns = buildInsert("fin_factuurregel", fields, { noValidateToken: true });
var finIns = buildInsert("fin_factuurregel", dbfields, { noValidateToken: true });
var factuurregel_key = finIns.sequences["fin_factuurregel_key"];
var sql = "BEGIN "

View File

@@ -24,7 +24,7 @@ model_issueobjects =
parent_key: "MLD_MELDING_KEY",
list: { columns: ["object"] },
_analyze_fields: function (fields, params, jsondata) /* analyseer inkomende data, common voor PUT en POST */
_analyze_fields: function (dbfields, params, jsondata) /* analyseer inkomende data, common voor PUT en POST */
{
if (jsondata.id)
{
@@ -38,7 +38,7 @@ model_issueobjects =
+ " FROM mld_melding_object"
+ " WHERE mld_melding_object_verwijder IS NULL"
+ " AND mld_melding_key = " + params.filter.id
+ " AND ins_deel_key = " + fields[0].val; // TODO: unsafe?
+ " AND ins_deel_key = " + dbfields[0].val; // TODO: unsafe?
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
@@ -49,7 +49,7 @@ model_issueobjects =
}
},
_validate_fields: function (fields, params, jsondata) /* valideer fields, alle constraints die niet door de database worden afgevangen */
_validate_fields: function (dbfields, params, jsondata) /* valideer dbfields, alle constraints die niet door de database worden afgevangen */
{
},
@@ -75,10 +75,10 @@ model_issueobjects =
REST_PUT: function (params, jsondata, the_key) /* update object */
{
// Kan alleen vanuit model_issue aangeroepen worden. De autorisatie is daar al geregeld.
var fields = api2.update_fields(params, model_issueobjects, jsondata); // Build updater
model_issueobjects._analyze_fields(fields, params, jsondata);
var dbfields = api2.update_fields(params, model_issueobjects, jsondata); // Build updater
model_issueobjects._analyze_fields(dbfields, params, jsondata);
var mldUpd = buildTrackingUpdate("mld_melding_object", " mld_melding_object_key = " + the_key, fields, { noValidateToken: true });
var mldUpd = buildTrackingUpdate("mld_melding_object", " mld_melding_object_key = " + the_key, dbfields, { noValidateToken: true });
Oracle.Execute(mldUpd.sql);
// Nu geen api2.process_includes() meer aanroepen, anders ga je de objecten zelf ook nog aanpassen.
@@ -90,16 +90,16 @@ model_issueobjects =
{
// Kan alleen vanuit model_issue aangeroepen worden. De autorisatie is daar al geregeld.
params.isNew = true; // negeer eventuele bestaande keys
var fields = api2.update_fields(params, model_issueobjects, jsondata); // Build updater
model_issueobjects._analyze_fields(fields, params, jsondata);
var dbfields = api2.update_fields(params, model_issueobjects, jsondata); // Build updater
model_issueobjects._analyze_fields(dbfields, params, jsondata);
var new_key = null;
if (params.isNew)
{
fields["issue"] = { dbs: "mld_melding_key", typ: "key", val: parent_key };
fields["id"] = { dbs: "mld_melding_object_key", typ: "key", seq: "mld_s_mld_object_key" };
dbfields["issue"] = { dbs: "mld_melding_key", typ: "key", val: parent_key };
dbfields["id"] = { dbs: "mld_melding_object_key", typ: "key", seq: "mld_s_mld_object_key" };
var mldIns = buildInsert("mld_melding_object", fields, { noValidateToken: true });
var mldIns = buildInsert("mld_melding_object", dbfields, { noValidateToken: true });
new_key = mldIns.sequences["mld_melding_object_key"];
Oracle.Execute(mldIns.sql);
}

View File

@@ -78,11 +78,11 @@ model_notes =
},
_analyze_fields: function (fields, params, jsondata) /* analyseer inkomende data, common voor PUT en POST */
_analyze_fields: function (dbfields, params, jsondata) /* analyseer inkomende data, common voor PUT en POST */
{
},
_validate_fields: function (fields, params, jsondata) /* valideer fields, alle constraints die niet door de database worden afgevangen */
_validate_fields: function (dbfields, params, jsondata) /* valideer dbfields, alle constraints die niet door de database worden afgevangen */
{
},
@@ -145,19 +145,19 @@ model_notes =
// Een note kan alleen worden aangepast door de persoon die hem geschreven heeft.
// Alleen van de meest recente note bij een (melding/opdrachte/...) kan de omschrijving worden aangepast.
//
var fields = api2.update_fields(params, model_notes, jsondata); // Build updater
var dbfields = api2.update_fields(params, model_notes, jsondata); // Build updater
var xxx_tabel = model_notes._getNoteTable(params.data.module); // De tabel met notes die aangepast moet worden.
// Wijzig de veldnamen overeenkomstig de te gebruiken tabel
for (i in fields)
for (i in dbfields)
{
if (fields[i].dbs == "writer_key")
fields[i].dbs = "prs_perslid_key";
if (dbfields[i].dbs == "writer_key")
dbfields[i].dbs = "prs_perslid_key";
else
fields[i].dbs = xxx_tabel.naam + "_" + fields[i].dbs;
dbfields[i].dbs = xxx_tabel.naam + "_" + dbfields[i].dbs;
}
var wheres = [ xxx_tabel.naam+"_key = " + the_key];
var xxxUpd = buildTrackingUpdate(xxx_tabel.naam, wheres.join(" AND " ), fields, { noValidateToken: true });
var xxxUpd = buildTrackingUpdate(xxx_tabel.naam, wheres.join(" AND " ), dbfields, { noValidateToken: true });
Oracle.Execute(xxxUpd.sql);
@@ -169,14 +169,14 @@ model_notes =
params.isNew = true;
//
var xxx_tabel = model_notes._getNoteTable(params.data.module); // De tabel met notes die aangepast moet worden.
var fields = [];
fields["writer"] = { dbs: "prs_perslid_key", typ: "key", val: user_key };
fields["parent"] = { dbs: xxx_tabel.parent+"_key", typ: "key", val: params.filter.id };
fields["created"] = { dbs: xxx_tabel.naam+"_aanmaak", typ: "datetime", val: new Date() };
fields["description"] = { dbs: xxx_tabel.naam+"_omschrijving", typ: "varchar", val: jsondata.description };
fields["id"] = { dbs: xxx_tabel.naam+"_key", typ: "key", seq: xxx_tabel.seq };
var dbfields = [];
dbfields["writer"] = { dbs: "prs_perslid_key", typ: "key", val: user_key };
dbfields["parent"] = { dbs: xxx_tabel.parent+"_key", typ: "key", val: params.filter.id };
dbfields["created"] = { dbs: xxx_tabel.naam+"_aanmaak", typ: "datetime", val: new Date() };
dbfields["description"] = { dbs: xxx_tabel.naam+"_omschrijving", typ: "varchar", val: jsondata.description };
dbfields["id"] = { dbs: xxx_tabel.naam+"_key", typ: "key", seq: xxx_tabel.seq };
var xxxIns = buildInsert(xxx_tabel.naam, fields, { noValidateToken: true });
var xxxIns = buildInsert(xxx_tabel.naam, dbfields, { noValidateToken: true });
var new_key = xxxIns.sequences[xxx_tabel.naam];
var sql = "BEGIN "

View File

@@ -76,13 +76,12 @@ model_objects =
},
REST_PUT: function (params, jsondata, the_key) /* update object */
{
var fields = api2.update_fields(params, model_objects, jsondata); // Build updater
//model_objects._validate_fields(fields, params, jsondata);
var dbfields = api2.update_fields(params, model_objects, jsondata); // Build updater
//model_objects._validate_fields(dbfields, params, jsondata);
// TODO: Autorization
var wheres = [" ins_deel_key = " + the_key];
var insUpd = buildTrackingUpdate("ins_deel", wheres.join(" AND " ), fields, { noValidateToken: true });
// __DoLog(insUpd.sql);
var insUpd = buildTrackingUpdate("ins_deel", wheres.join(" AND " ), dbfields, { noValidateToken: true });
Oracle.Execute(insUpd.sql);
//var beztrack = api2.process_includes(params, model_objects, jsondata, the_key);

View File

@@ -93,9 +93,9 @@ model_regions =
model_regions._check_authorization(params, "PUT");
if (!jsondata.region.id) jsondata.region.id = the_key;
var reg_key = the_key;
var fields = api2.update_fields(params, model_regions, jsondata); // Build updater
var dbfields = api2.update_fields(params, model_regions, jsondata); // Build updater
var wheres = [" alg_regio_key = " + reg_key];
var regUpd = buildTrackingUpdate("alg_regio", wheres.join(" AND " ), fields, { noValidateToken: true });
var regUpd = buildTrackingUpdate("alg_regio", wheres.join(" AND " ), dbfields, { noValidateToken: true });
var warning = "";
var err = Oracle.Execute(regUpd.sql, true);
@@ -109,9 +109,9 @@ model_regions =
params.isNew = true;
model_regions._check_authorization(params, "POST");
var fields = api2.update_fields(params, model_regions, jsondata); // Build updater
fields["id"] = {dbs: "alg_regio_key", typ: "key", seq: "alg_s_alg_regio_key" };
var regIns = buildInsert("alg_regio", fields, { noValidateToken: true });
var dbfields = api2.update_fields(params, model_regions, jsondata); // Build updater
dbfields["id"] = {dbs: "alg_regio_key", typ: "key", seq: "alg_s_alg_regio_key" };
var regIns = buildInsert("alg_regio", dbfields, { noValidateToken: true });
var reg_key = regIns.sequences["alg_regio_key"];
var warning = "";

View File

@@ -193,9 +193,9 @@ function model_reportcolumns(usrrap_key, params)
};
this.REST_PUT = function (params, jsondata, the_key) /* update columns */
{
var fields = api2.update_fields(params, this, jsondata); // Build updater
var dbfields = api2.update_fields(params, this, jsondata); // Build updater
var sql = buildUpdate("fac_usrrap_cols", fields) + " fac_usrrap_cols_key = " + the_key;
var sql = buildUpdate("fac_usrrap_cols", dbfields) + " fac_usrrap_cols_key = " + the_key;
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
abort_with_warning(err.friendlyMsg);
@@ -205,11 +205,11 @@ function model_reportcolumns(usrrap_key, params)
// Only internally used by report_clone
this._REST_POST = function (params, jsondata, parent_key) /* insert columns */
{
var fields = api2.update_fields(params, this, jsondata); // Build updater
var dbfields = api2.update_fields(params, this, jsondata); // Build updater
fields["id"] = this.fields["id"];
fields["xxx"] = { dbs: "fac_usrrap_key", typ: "key", val: parent_key };
var rapIns = buildInsert("fac_usrrap_cols", fields, { noValidateToken: true });
dbfields["id"] = this.fields["id"];
dbfields["xxx"] = { dbs: "fac_usrrap_key", typ: "key", val: parent_key };
var rapIns = buildInsert("fac_usrrap_cols", dbfields, { noValidateToken: true });
var col_key = rapIns.sequences["fac_usrrap_col_key"];
var err = Oracle.Execute(rapIns.sql, true);

View File

@@ -78,10 +78,10 @@ model_reservationequipment =
REST_PUT: function (params, jsondata, the_key) /* update reservable equipment */
{
var rsv_deel_key = the_key;
var fields = api2.update_fields(params, model_reservationequipment, jsondata); // Build updater
var dbfields = api2.update_fields(params, model_reservationequipment, jsondata); // Build updater
var res_deel_key = parseInt(jsondata.equipment);
model_reservationequipment._analyze_fields(fields, params, jsondata);
model_reservationequipment._validate_fields(fields, params, jsondata);
model_reservationequipment._analyze_fields(dbfields, params, jsondata);
model_reservationequipment._validate_fields(dbfields, params, jsondata);
// De voorziening kan niet buiten de reservering van de ruimte geclaimd worden
var sql = "SELECT r.res_rsv_ruimte_key"
@@ -98,7 +98,7 @@ model_reservationequipment =
oRs.Close();
var wheres = [" res_rsv_deel_key = " + rsv_deel_key];
var resUpd = buildTrackingUpdate("res_rsv_deel", wheres.join(" AND " ), fields, { noValidateToken: true });
var resUpd = buildTrackingUpdate("res_rsv_deel", wheres.join(" AND " ), dbfields, { noValidateToken: true });
var check_fail_sql = " if res.dirty_level_all(" + rsv_ruimte_key + ") <> 0 then"
+ " raise_application_error (-20000, 'res_m999 " + L("lcl_res_fe_no_dirty") + "');"
+ " end if;"
@@ -122,9 +122,9 @@ model_reservationequipment =
var rsv_ruimte_key = parent_key;
var this_res = res.func_enabled(rsv_ruimte_key); // Wat heb ik zoal aan rechten op deze specifieke reservering
var fields = api2.update_fields(params, model_reservationequipment, jsondata); // Build updater
model_reservationequipment._analyze_fields(fields, params, jsondata);
model_reservationequipment._validate_fields(fields, params, jsondata);
var dbfields = api2.update_fields(params, model_reservationequipment, jsondata); // Build updater
model_reservationequipment._analyze_fields(dbfields, params, jsondata);
model_reservationequipment._validate_fields(dbfields, params, jsondata);
var sql = "SELECT res_reservering_key"
+ " , res_rsv_ruimte_van"
@@ -139,13 +139,13 @@ model_reservationequipment =
var res_tot = new Date(oRs("res_rsv_ruimte_tot").value);
oRs.Close();
fields["id"] = { dbs: "res_rsv_deel_key", typ: "key", seq: "res_s_res_rsv_deel_key" };
fields["reservation"] = { dbs: "res_rsv_ruimte_key", typ: "key", val: rsv_ruimte_key };
fields["from"] = { dbs: "res_rsv_deel_van", typ: "datetime", val: res_van };
fields["to"] = { dbs: "res_rsv_deel_tot", typ: "datetime", val: res_tot };
fields["amount"] = { dbs: "res_rsv_deel_aantal", typ: "number", val: 1 };
dbfields["id"] = { dbs: "res_rsv_deel_key", typ: "key", seq: "res_s_res_rsv_deel_key" };
dbfields["reservation"] = { dbs: "res_rsv_ruimte_key", typ: "key", val: rsv_ruimte_key };
dbfields["from"] = { dbs: "res_rsv_deel_van", typ: "datetime", val: res_van };
dbfields["to"] = { dbs: "res_rsv_deel_tot", typ: "datetime", val: res_tot };
dbfields["amount"] = { dbs: "res_rsv_deel_aantal", typ: "number", val: 1 };
var resIns = buildInsert("res_rsv_deel", fields, { noValidateToken: true });
var resIns = buildInsert("res_rsv_deel", dbfields, { noValidateToken: true });
var rsv_deel_key = resIns.sequences["res_rsv_deel_key"];
// Tracking toevoegen.
@@ -244,10 +244,7 @@ model_reservationequipment =
},
_analyze_fields: function (fields, params, jsondata) /* analyseer inkomende data, common voor PUT en POST */
_analyze_fields: function (dbfields, params, jsondata) /* analyseer inkomende data, common voor PUT en POST */
/* res_ruimte+config wordt bijvoorbeeld omgezet in res_ruimte_opstel_key */
{
if ("equipment" in jsondata)
@@ -268,7 +265,7 @@ model_reservationequipment =
}
},
_validate_fields: function (fields, params, jsondata) /* valideer fields, alle constraints die niet door de database worden afgevangen */
_validate_fields: function (dbfields, params, jsondata) /* valideer dbfields, alle constraints die niet door de database worden afgevangen */
{
// testurl = http://uwva.5iwork/branch542/api2/reservations/3112748.json?pretty=1&logging=1&include=reservationequipment
}

View File

@@ -61,10 +61,10 @@ model_visitors =
},
REST_PUT: function (params, jsondata, the_key) /* update visitors */
{
var fields = api2.update_fields(params, model_visitors, jsondata); // Build updater
var dbfields = api2.update_fields(params, model_visitors, jsondata); // Build updater
// bezUpd heeft na afloop eventueel oldjsvals
var bezUpd = buildTrackingUpdate("bez_bezoekers", " bez_bezoekers_key = " + the_key, fields, { noValidateToken: true });
var bezUpd = buildTrackingUpdate("bez_bezoekers", " bez_bezoekers_key = " + the_key, dbfields, { noValidateToken: true });
Oracle.Execute(bezUpd.sql);
var beztrack = api2.process_includes(params, model_visitors, the_key, jsondata);
@@ -77,11 +77,11 @@ model_visitors =
},
REST_POST: function (params, jsondata, parent_key) /* new visitors */
{
var fields = api2.update_fields(params, model_visitors, jsondata); // Build updater
fields["id"] = { dbs: "bez_bezoekers_key", typ: "key", seq: "bez_s_bez_bezoekers_key" };
fields["afspraak"] = { dbs: "bez_afspraak_key", typ: "key", val: parent_key };
var dbfields = api2.update_fields(params, model_visitors, jsondata); // Build updater
dbfields["id"] = { dbs: "bez_bezoekers_key", typ: "key", seq: "bez_s_bez_bezoekers_key" };
dbfields["afspraak"] = { dbs: "bez_afspraak_key", typ: "key", val: parent_key };
var bezIns = buildInsert("bez_bezoekers", fields, { noValidateToken: true });
var bezIns = buildInsert("bez_bezoekers", dbfields, { noValidateToken: true });
var bez_key = bezIns.sequences["bez_bezoekers_key"];
Oracle.Execute(bezIns.sql);
//var bezUpd = {trackarray: [L("lcl_bez_is_bezadd") + ": " + beznaam + "/" + bed]};