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

MARX#66033 Planbord resource voorzieningen/ reserveringen onder mld_opdrachten savepoint

Browse Source 
svn path=/Website/trunk/; revision=51298
This commit is contained in:
Jos Groot Lipman
2021-05-06 15:25:27 +00:00
parent 62b36dcfd1
commit aa300a00a0
6 changed files with 112 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API2/model_reservations.inc
View File

@@ -526,6 +526,8 @@ function model_reservations(rsv_key, params)
+ " WHERE res_reservering_key=" + this_res.res_reservering_key + ")"
Oracle.Execute( sql );
return { key: the_key, warning: "" };
}
if (rsv_key > 0)

19
APPL/API2/model_swagger.inc
View File

@@ -33,7 +33,7 @@ model_apis =
user.checkAutorisation(autfunction); // pessimistisch
var result = {
"swagger": "2.0",
"openapi": "3.0.0",
"info":{
"description":"This is a description of the Facilitor API2."
+ "<br>You are logged in as {0} ({1})".format(user.naam(), user.oslogin())
@@ -45,12 +45,9 @@ model_apis =
"email":"info@facilitor.nl"
}
},
"host": String(Request.ServerVariables("SERVER_NAME")),
"basePath": rooturl + "/api2",
"schemes":[
"http",
"https"
],
"servers":
[ { "url": HTTP.urlzelf() + "/api2/",
"description": "This environment" } ],
"consumes":[
"application/json",
"application/xml"
@@ -89,20 +86,22 @@ model_apis =
if (!oktags[module].anyfound) // niets geen rechten
__DoLog("Not authorized for module " + module);
}
if (params.filter.module && module != params.filter.module)
continue;
if (!oktags[module].anyfound) // niets geen rechten
continue;
if (!api2_mapper[dispatch].nodoc)
{
var trans = "&module={1}&fac_lang={2}".format(dispatch, module, getQParamSafe("fac_lang", user_lang)) + (api2_mapper[dispatch].docparam||"");
var trans = "&swmodule={1}&fac_lang={2}".format(dispatch, module, getQParamSafe("fac_lang", user_lang)) + (api2_mapper[dispatch].docparam||"");
result.paths["/" + dispatch] =
{
"$ref": HTTP.urlzelf() + "/api2/{0}.api?swagger=1".format(dispatch) + trans
"$ref": rooturl + "/{0}.api?swagger=1".format(dispatch) + trans
}
result.paths["/" + dispatch + "/{id}"] =
{
"$ref": HTTP.urlzelf() + "/api2/{0}.api?swagger=1&single=1".format(dispatch) + trans
"$ref": rooturl + "/api2/{0}.api?swagger=1&single=1".format(dispatch) + trans
}
}

1
APPL/MLD/opdr_res_list.asp
View File

@@ -18,6 +18,7 @@ var opdr_key = getQParamInt("order", -1);
var res_model = new model_reservations()
delete res_model["REST_POST"]; // die gaan we zelf doen
delete res_model["REST_DELETE"]; // te tricky?
var rsv_params = {
"list": {

1
APPL/RES/res.inc
View File

@@ -2280,7 +2280,6 @@ function get_res_deel_sql (params)
params.alg_ruimte_key = params.alg_ruimte_key || -1;
params.mld_opdr_key = params.mld_opdr_key || -1;
params.res_ruimte_key = params.res_ruimte_key || -1;
params.mld_opdr_key = params.mld_opdr_key || -1;
if (params.res_tot)
var res_tot = new Date(params.res_tot);

69
APPL/RES/res_mld_opdr_save.asp Normal file
View File

@@ -0,0 +1,69 @@
<%@language = "javascript" %>
<% /*
$Revision$
$Id$
File: res_mld_opdr_save.asp
Description: Opslaan van een res_deel resource onder een mld_opdr record
Context:
Note:
*/
var JSON_Result = true;
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/save2db.inc" -->
<!-- #include file="res.inc" -->
<%
protectRequest.validateToken();
var mld_opdr_key = getFParamInt('mld_opdr_key');
var res_deel_key = getFParamInt('res_deel_key');
var res_van = getFParamDate("res_van");
var res_tot = getFParamDate("res_tot");
var sql = "SELECT MIN(res_activiteit_key) res_activiteit_key"
+ " FROM res_deel rd"
+ " , res_activiteitdiscipline rad"
+ " WHERE rd.res_discipline_key = rad.res_discipline_key"
+ " AND rd.res_deel_key = " + res_deel_key;
var oRs = Oracle.Execute(sql);
var act_key = oRs("res_activiteit_key").Value;
oRs.Close()
var resfields = [ { dbs: "res_reservering_key", typ: "key", seq: "res_s_res_reservering_key" } ];
var resIns = buildInsert("res_reservering", resfields);
var newres_key = resIns.sequences["res_reservering_key"];
Oracle.Execute(resIns.sql);
var fields = [ { dbs: "mld_opdr_key", typ: "key", val: mld_opdr_key },
{ dbs: "res_rsv_ruimte_omschrijving", typ: "varchar", val: ""},
{ dbs: "res_rsv_ruimte_opmerking", typ: "varchar", val: "" },
{ dbs: "res_rsv_ruimte_van", typ: "datetime", val: res_van },
{ dbs: "res_rsv_ruimte_tot", typ: "datetime", val: res_tot },
{ dbs: "res_rsv_ruimte_host_key", typ: "key", val: user_key },
{ dbs: "res_activiteit_key", typ: "key", val: act_key },
//{ dbs: "res_status_fo_key", typ: "number", frm: "status_fo" },
{ dbs: "res_rsv_ruimte_contact_key", typ: "key", val: user_key },
{ dbs: "res_rsv_ruimte_key", typ: "key", seq: "res_s_res_rsv_ruimte_key" },
{ dbs: "res_reservering_key", typ: "key", val: newres_key },
{ dbs: "res_rsv_ruimte_volgnr", typ: "number", val: 1 }
];
var resIns = buildInsert("res_rsv_ruimte", fields);
var rsv_ruimte_key = resIns.sequences["res_rsv_ruimte_key"];
var err = Oracle.Execute(resIns.sql, true);
if (err.friendlyMsg)
abort_with_warning(err.friendlyMsg);
// Het res_deel object opslaan doen we met een tweede ajax naar res_edit_objcat_save.asp
doneParams = { rsv_ruimte_key: rsv_ruimte_key,
res_deel_key: res_deel_key,
success: true
};
Response.Write(JSON.stringify(doneParams));
ASPPAGE_END();
%>

32
APPL/RES/res_search_plan_obj_v2.asp
View File

@@ -376,6 +376,17 @@ IFRAMER_HEADER(L("lcl_res_frame_voorziening"), buttons);
if (!params.forSelectRoom && authparams.PRSwritelevel < 9 && authparams.ALGwritelevel < 9)
{ %>
function deel_save_callback(json)
{
var data = {};
data["chk_" + json.res_deel_key] = 'on';
protectRequest.dataToken(data);
$.post("res_edit_objcat_save.asp?urole=fo&verynew=1&rsv_ruimte_key=" + json.rsv_ruimte_key,
data,
FcltCallbackClose,
"json");
}
function roomGridClick(evt, urole, activiteit)
{
var target_object = find_datetime_from_target(evt.target);
@@ -389,9 +400,28 @@ IFRAMER_HEADER(L("lcl_res_frame_voorziening"), buttons);
return;
}
var res_deel_key = $labelgrid.attr("id");
//alert("Must add res_deel " + res_deel_key);
var res_van = new Date(target_object.res_date);
res_van.setHours(target_object.h, target_object.m, 0, 0);
<% if (mld_opdr_key)
{
%>
var res_tot = new Date(res_van);
res_tot.setHours(res_tot.getHours() + 1); // even hardcoded 1 uur.
var data = {
mld_opdr_key: <%=mld_opdr_key%>,
res_deel_key: res_deel_key,
res_van: res_van.getTime(),
res_tot: res_tot.getTime()
}
protectRequest.dataToken(data);
$.post("res_mld_opdr_save.asp",
data,
FcltCallbackAndThen(deel_save_callback),
"json");
return;
<%
}
%>
// Gewoon intern
var cmd = "appl/res/res_reservering.asp"
+ "?restype=CV"