FSN#44507: (PDA) Bijlagen toevoegen herzien savepoint

Ook vooral: mgt/mgt_tools naar api2/api2_tools verplaatst

svn path=/Website/branches/v2017.2/; revision=35656
This commit is contained in:
Jos Groot Lipman
2017-10-12 08:59:35 +00:00
parent f1d3ad9fe8
commit 8280e20254
59 changed files with 122 additions and 80 deletions

View File

@@ -12,6 +12,7 @@
*/
%>
<!-- #include file="../Shared/save2db.inc" -->
<!-- #include file="api2_tools.inc" -->
<%
api2 = {
form2JSONdata: function _form2JSONdata(model, params, formfields) // Maak een jsondata-object voor gebruik vanuit model_xxx.inc
@@ -1646,22 +1647,29 @@ function generic_REST_PUT(model, gparams)
jsondata_dp[model.disc_params.joinfield] = the_key;
}
var dbfields = api2.update_fields(params, model, jsondata);
var wheres = [model.fields["id"].dbs + " = " + the_key];
var xxxUpd = buildTrackingUpdate(model.table, wheres.join(" AND " ), dbfields, { noValidateToken: true });
// TODO: Generieke tracking?
if (xxxUpd) // Misschien geen velden opgegeven.
if (params.custom_fields_only)
{
var err = Oracle.Execute(xxxUpd.sql, true);
if (err.friendlyMsg)
api2.error(400, err.friendlyMsg); // Veronderstel Bad Request
if (model.trackcode && xxxUpd.trackarray.length > 0)
shared.trackaction(model.trackcode, the_key, L("lcl_updated") + "\n" + xxxUpd.trackarray.join("\n"));
var xxxUpd = { trackarray: [] };
}
else
{
var dbfields = api2.update_fields(params, model, jsondata);
var wheres = [model.fields["id"].dbs + " = " + the_key];
var xxxUpd = buildTrackingUpdate(model.table, wheres.join(" AND " ), dbfields, { noValidateToken: true });
// TODO: Generieke tracking?
if (xxxUpd) // Misschien geen velden opgegeven.
{
var err = Oracle.Execute(xxxUpd.sql, true);
if (err.friendlyMsg)
api2.error(400, err.friendlyMsg); // Veronderstel Bad Request
if (model.trackcode && xxxUpd.trackarray.length > 0)
shared.trackaction(model.trackcode, the_key, L("lcl_updated") + "\n" + xxxUpd.trackarray.join("\n"));
}
}
var inctrack = api2.process_includes(params, model, jsondata, the_key);
if ("disc_params" in model)
if (!params.custom_fields_only && "disc_params" in model)
{
// Nu de one-on-one tabel
var dbfields = api2.update_fields(params, model.disc_params.model, jsondata_dp);

View File

@@ -144,6 +144,7 @@ var api2_mapper = {
"reports" : { "filename": "appl/api2/api_reports.asp", "module": "FAC", "nodoc": true },
"invoices" : { "filename": "appl/api2/api_invoices.asp", "module": "FIN" },
"objects" : { "filename": "appl/api2/api_objects.asp", "module": "INS" },
"inspections" : { "filename": "appl/api2/api_ins_deelsrtcontrole.asp", "module": "INS" },
"companies" : { "filename": "appl/api2/api_companies.asp", "module": "PRS" },
"departments" : { "filename": "appl/mgt/prs_afdeling.asp", "module": "PRS" },

View File

@@ -149,12 +149,7 @@ api2_rest = {
Response.Status = "405 Method not allowed";
Response.End;
}
if (!("REST_" + method in model) || !model["REST_" + method])
{
Response.Status = "501 Not Implemented";
// TODO The response MUST include an Allow header containing a list of valid methods for the requested resource.
Response.End;
}
var key = getQParamInt("id", -1); // Voor POST/PUT/DELETE
if (/PUT|DELETE/.test(method) && !(key > 0))
api2.error(400, "Missing id");
@@ -164,6 +159,19 @@ api2_rest = {
filter = api2_rest.plugin.transform_filter(filter);
var requestparams = { filter: filter, include: getQParamArray("include", []) };
if (filter.mode == "attachment" && "custom_fields" in model.includes)
{
if (key > 0 && method == "POST") // het bestand mag dan wel nieuw zijn (POST is van toepassing),
method = "PUT"; // intern is het een update van een bestaand record, dus PUT
}
if (!("REST_" + method in model) || !model["REST_" + method])
{
Response.Status = "501 Not Implemented";
// TODO The response MUST include an Allow header containing a list of valid methods for the requested resource.
Response.End;
}
if (/PUT|POST/.test(method)) // Dan is er in de body data meegestuurd
{
if (filter.mode == "attachment" && "custom_fields" in model.includes)
@@ -342,7 +350,6 @@ api2_rest = {
}
else
{
method = "PUT"; // het moet altijd een update van een issue zijn
requestparams.custom_fields_only = true; // Voorkom bij nieuwe bijlage onnodige update vam hele issue
model["REST_" + method](requestparams, jsondata, key); // via het hoofdmodel met authorisatie controle en alles
var record = { xflexparentkey: key, propertyid: jsondata.custom_fields[0].propertyid};

View File

@@ -2,13 +2,14 @@
$Revision$
$Id$
File: mgt_tools.inc
File: api2_tools.inc
Description:
Context:
Notes:
Notes: voorheen mgt/mgt_tools.inc maar de functies zijn essentieel
voor vele modellen dus moet het in api2_tools.inc
*/
%>
<%

View File

@@ -0,0 +1,25 @@
<%@ language = "JavaScript" %>
<% /*
$Revision$
$Id$
File: api_ins_deelsrtcontrole.asp
Description: Inspecties model
Parameters:
Context: Door een remote systeem (geen persoon) om info uit FACILITOR te halen aan te roepen
Notes:
*/
DOCTYPE_Disable = true;
ANONYMOUS_Allowed = 1; // Eigenlijk niet waar. We regelen echter alles zelf
THIS_FILE = "appl/api/api_ins_deelsrtcontrole.asp";
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="./api2_rest.inc" -->
<!-- #include file="../Shared/json2.js" -->
<!-- #include file="./model_ins_deelsrtcontrole.inc" -->
<%
api2_rest.process(model_ins_deelsrtcontrole);
%>

View File

@@ -14,7 +14,6 @@
%>
<!-- #include file="../Shared/discxalg3d.inc"-->
<!-- #include file="./model_custom_fields.inc"-->
<!-- #include file="../mgt/mgt_tools.inc"-->
<!-- #include file="./model_alg_kenmerk.inc"-->
<%
function model_buildings()

View File

@@ -11,7 +11,6 @@
Notes:
*/
%>
<!-- #include file="../mgt/mgt_tools.inc" -->
<%
function model_cad_label()

View File

@@ -11,7 +11,6 @@
Notes: TODO: JGL: Ik ben er nog niet helemaal uit hoe de bitjes netjes op te lossen
*/
%>
<!-- #include file="../mgt/mgt_tools.inc" -->
<%
function model_cad_thema()

View File

@@ -13,7 +13,6 @@
%>
<!-- #include file="../prs/prs.inc" -->
<!-- #include file="./model_custom_fields.inc"-->
<!-- #include file="../mgt/mgt_tools.inc"-->
<!-- #include file="./model_prs_kenmerk.inc"-->
<%

View File

@@ -169,6 +169,10 @@ function model_custom_fields(formodel, flexModel, flexParams)
{ // Let op: parameter the_key is de kenmerk_key, niet een een kenmerkwaarde_key
// Merk op dat flexProps ook wel het type oplevert. Ik wil echter migreren naar modellen
var kenmerkdata = api2.GET(flexModel, jsondata.propertyid);
if ("attributetype" in kenmerkdata)
{
var typ = kenmerkdata.attributetype.id;

View File

@@ -11,7 +11,6 @@
Notes:
*/
%>
<!-- #include file="../mgt/mgt_tools.inc" -->
<%
function model_ins_controlemode()

View File

@@ -0,0 +1,40 @@
<% /*
$Revision$
$Id$
File: model_ins_deelsrtcontrole.inc
Description: Inspectie model.
Parameters:
Context:
Notes: Extreem rudimentair, uitsluitend om flexkenmerken (bijlagen) te kunnen opslaan
*/
%>
<!-- #include file="./model_custom_fields.inc"-->
<!-- #include file="./model_ins_kenmerk.inc"-->
<%
function model_ins_deelsrtcontrole()
{
this.table = "ins_deelsrtcontrole";
this.primary = "ins_deelsrtcontrole_key";
this.records_name = "objects";
this.record_name = "object";
this.autfunction = false; // TODO?
this.fields = { "id" : { dbs: "ins_deelsrtcontrole_key", typ: "key" },
"object" : { dbs: "ins_deel_key", typ: "key", foreign: "ins_deel" }
};
this.includes = { "custom_fields" : {
"model": new model_custom_fields(this, new model_ins_kenmerk("C", { internal: true }), { readman: true, readuse: true }),
"joinfield": "flexparentkey",
"enable_update": true
}
},
this.REST_GET = generic_REST_GET(this);
this.REST_PUT = generic_REST_PUT(this);
}
%>

View File

@@ -12,7 +12,6 @@
*/
%>
<!-- #include file="./model_ins_kenmerk.inc"-->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="./model_ctr_discipline.inc" -->
<%
function model_ins_srtcontrole()

View File

@@ -25,7 +25,6 @@
<!-- #include file="./model_invoicelines.inc"-->
<!-- #include file="./model_custom_fields.inc"-->
<!-- #include file="./model_fac_tracking.inc"-->
<!-- #include file="../mgt/mgt_tools.inc"-->
<!-- #include file="./model_fin_kenmerk.inc"-->
<%

View File

@@ -22,7 +22,6 @@
<!-- #include file="./model_custom_fields.inc"-->
<!-- #include file="./model_fac_tracking.inc"-->
<!-- #include file="./model_mld_kenmerk.inc"-->
<!-- #include file="../mgt/mgt_tools.inc"-->
<%
function fnextendedStatus (oRs, field, model)

View File

@@ -14,7 +14,6 @@
%>
<!-- #include file="../Shared/discxalg3d.inc"-->
<!-- #include file="./model_custom_fields.inc"-->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="./model_alg_kenmerk.inc"-->
<%
function model_alg_locatie()

View File

@@ -11,7 +11,6 @@
Notes:
*/
%>
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fin_factuur.inc" -->
<%

View File

@@ -44,7 +44,7 @@ model_objects =
joinfield: "trackingrefkey"
},
"custom_fields" : {
"model": new model_custom_fields(this, new model_ins_kenmerk({ internal: true }), { readman: true, readuse: true }),
"model": new model_custom_fields(this, new model_ins_kenmerk("D", { internal: true }), { readman: true, readuse: true }),
"joinfield": "flexparentkey",
"enable_update": true
}
@@ -94,15 +94,22 @@ model_objects =
},
REST_PUT: function (params, jsondata, the_key) /* update object */
{
var dbfields = api2.update_fields(params, model_objects, jsondata); // Build updater
//model_objects._validate_fields(dbfields, params, jsondata);
if (params.custom_fields_only)
{
var insUpd = { trackarray: [] };
}
else
{
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 " ), dbfields, { noValidateToken: true });
Oracle.Execute(insUpd.sql);
// TODO: Autorization
var wheres = [" ins_deel_key = " + the_key];
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);
var instrack = api2.process_includes(params, model_objects, jsondata, the_key);
return { key: the_key };
},

View File

@@ -23,7 +23,6 @@
<!-- #include file="./model_notes.inc"-->
<!-- #include file="./model_custom_fields.inc"-->
<!-- #include file="./model_fac_tracking.inc"-->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="./model_mld_kenmerk.inc"-->
<%

View File

@@ -13,7 +13,6 @@
%>
<!-- #include file="../prs/prs.inc" -->
<!-- #include file="./model_custom_fields.inc"-->
<!-- #include file="../mgt/mgt_tools.inc"-->
<!-- #include file="./model_prs_kenmerk.inc"-->
<%

View File

@@ -20,7 +20,6 @@
<!-- #include file="../api2/model_fac_tracking.inc"-->
<!-- #include file="../api2/model_fac_gebruikersgroep.inc" -->
<!-- #include file="./model_prs_kenmerk.inc"-->
<!-- #include file="../mgt/mgt_tools.inc"-->
<%
function fnApiToken(oRs, field, model)

View File

@@ -15,7 +15,6 @@
<!-- #include file="./model_cadcontours.inc" -->
<!-- #include file="./model_custom_fields.inc"-->
<!-- #include file="./model_fac_tracking.inc"-->
<!-- #include file="../mgt/mgt_tools.inc"-->
<!-- #include file="./model_alg_kenmerk.inc"-->
<!-- #include file="./model_prs_ruimteafdeling.inc"-->
<%

View File

@@ -15,7 +15,6 @@
<!-- #include file="../Shared/discxalg3d.inc"-->
<!-- #include file="../bez/bez.inc" -->
<!-- #include file="./model_custom_fields.inc"-->
<!-- #include file="../mgt/mgt_tools.inc"-->
<!-- #include file="./model_bez_kenmerk.inc"-->
<%
function model_visitors()

View File

@@ -1,7 +1,6 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_alg_kenmerk.inc" -->
<%
var niveau = getQParam("level"); // [ D | L | T | G | V | R ]

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_aut_client.inc" -->
<%
var this_model = new model_aut_client();

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_aut_client_perslid.inc" -->
<%
var params = {};

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_aut_idp.inc" -->
<%
var this_model = new model_aut_idp();

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_aut_sp.inc" -->
<%
var this_model = new model_aut_sp();

View File

@@ -1,7 +1,6 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_bes_kenmerk.inc" -->
<%
var this_model = new model_bes_kenmerk();

View File

@@ -1,7 +1,6 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_bes_kenmerkbestel.inc" -->
<%
var this_model = new model_bes_kenmerkbestel();

View File

@@ -1,7 +1,6 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_bes_srtkenmerk.inc" -->
<%

View File

@@ -1,7 +1,6 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_bez_kenmerk.inc" -->
<%
var this_model = new model_bez_kenmerk();

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_cnt_kenmerk.inc" -->
<%
var this_model = new model_cnt_kenmerk();

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_cnt_srtkenmerk.inc" -->
<%
var this_model = new model_cnt_srtkenmerk();

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_ctr_discipline.inc" -->
<%
var this_model = new model_ctr_discipline();

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fac_audit.inc" -->
<%

View File

@@ -14,7 +14,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../Shared/iface.inc" -->
<!-- #include file="../api2/model_fac_groeprechten.inc" -->
<!-- #include file="../Shared/audithistory.inc" -->

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fac_export_app.inc" -->
<%
var this_model = new model_fac_export_app();

View File

@@ -15,7 +15,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fac_functie.inc" -->
<%
var editmode = getQParamInt("editmode", 0);

View File

@@ -14,7 +14,6 @@
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fac_groep.inc" -->
<%

View File

@@ -15,7 +15,6 @@
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fac_groeprechten.inc" -->
<%

View File

@@ -1,7 +1,6 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fac_import_app.inc" -->
<%

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fac_usrgraph.inc" -->
<%
var this_model = new model_fac_usrgraph();

View File

@@ -1,7 +1,6 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fac_usrtab.inc" -->
<%

View File

@@ -1,7 +1,6 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fac_widget.inc" -->
<%

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_faq_kenmerk.inc" -->
<%
var this_model = new model_faq_kenmerk();

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_fin_kenmerk.inc" -->
<%
var this_model = new model_fin_kenmerk();

View File

@@ -1,7 +1,6 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_ins_srtkenmerk.inc" -->
<%

View File

@@ -15,7 +15,6 @@
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_ins_tab_discipline.inc" -->
<%

View File

@@ -15,7 +15,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_mld_kenmerk.inc" -->
<%
var this_model = new model_mld_kenmerk('O');

View File

@@ -15,7 +15,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_mld_kenmerk.inc" -->
<%
var this_model = new model_mld_kenmerk('M');

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_mld_srtdiscipline.inc" -->
<%
var this_model = new model_mld_srtdiscipline();

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_mld_srtkenmerk.inc" -->
<%
var this_model = new model_mld_srtkenmerk();

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_mld_workflowstep.inc" -->
<%

View File

@@ -14,7 +14,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_mld_workflowstep.inc" -->
<%

View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_mrk_discipline.inc" -->
<%
var this_model = new model_mrk_discipline();

View File

@@ -1,7 +1,6 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_prs_kenmerk.inc" -->
<%

View File

@@ -1,7 +1,6 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_res_discipline.inc" -->
<%

View File

@@ -1,7 +1,6 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_res_srtkenmerk.inc" -->
<%