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

FLEX#64726 ins_srtdeel_sensortype editable, en afhankelijk daarvan als tab beschikbaar

Browse Source 
svn path=/Website/trunk/; revision=50132
This commit is contained in:
Peter Feij
2021-03-02 13:46:28 +00:00
parent 6fca42ef8f
commit 27a8ed74e1
5 changed files with 141 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
APPL/INS/ins_deel.asp
View File

@@ -31,6 +31,7 @@ var transitParam = buildTransitParam(["parent_key", "disc", "Group", "sort", "de
var ins_name = "";
var ins_srtname = "";
var ins_srtimage = "fa-circle";
var ins_parentkey;
var gevuldLogboek;
var canInspect = false;
@@ -42,15 +43,23 @@ if (ins_key > 0)
+ " , ins_deel_parent_key"
+ " , ins_deel_verwijder"
+ " , " + lcl.xsqla("sd.ins_srtdeel_omschrijving", "sd.ins_srtdeel_key")
+ " , COALESCE (sd.ins_srtdeel_image, di.ins_discipline_image) image"
+ " , ins_srtdeel_sensortype"
+ " FROM ins_deel d"
+ " , ins_srtdeel sd"
+ " , ins_srtgroep sg"
+ " , ins_discipline di"
+ " WHERE sd.ins_srtdeel_key = d.ins_srtdeel_key"
+ " AND sd.ins_srtgroep_key = sg.ins_srtgroep_key"
+ " AND sg.ins_discipline_key = di.ins_discipline_key"
+ " AND ins_deel_key = " + ins_key;
var oRs = Oracle.Execute(sql);
ins_name = oRs("ins_deel_omschrijving").Value;
ins_srtname = oRs("ins_srtdeel_omschrijving").Value;
ins_parentkey = oRs("ins_deel_parent_key").Value;
ins_srtimage = oRs("image").Value||ins_srtimage;
var ins_deleted = oRs("ins_deel_verwijder").Value != null;
var ins_srtdeel_sensortype = oRs("ins_srtdeel_sensortype").Value;
oRs.Close();
var sql = "SELECT COUNT(*)"
@@ -155,7 +164,7 @@ if (ins_key > 0)
</head>
<body>
<% PAGE_START({ pageHeader: { icon: "fa-circle", extraclass: "ins", title: ins_srtname+" "+ins_name } }); %>
<% PAGE_START({ pageHeader: { icon: ins_srtimage, extraclass: "ins", title: ins_srtname+" "+ins_name } }); %>
<% if (ins_key == -1 || copy)
var page="ins_edit_deel.asp"; // Maak een nieuw
else
@@ -202,6 +211,32 @@ if (ins_key > 0)
IFRAMER("insCntFrame", page, { initHide: true, extraclass: "others" } );
}
var res_authparams = user.checkAutorisation("WEB_RESBOF", true);
var res_deel_key = -1;
if (res_authparams)
{
// Is dit deel al reserveerbaar?
var sql = "SELECT res_deel_key"
+ " FROM res_deel"
+ " WHERE res_deel_verwijder IS NULL"
+ " AND res_ins_deel_key = " + ins_key;
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
res_deel_key = oRs("res_deel_key").Value;
oRs.Close();
if (!ins_deleted && ins_key > 0 && !copy && res_deel_key > -1)
{
page = "../res/res_deel_history.asp?res_deel_key=" + res_deel_key + "&urole=" + curole;
IFRAMER("insResFrame", page, { initHide: true, extraclass: "others" } );
}
}
if (!ins_deleted && ins_key > 0 && !copy && ins_srtdeel_sensortype > 0)
{
page = "ins_state_history.asp?ins_key=" + ins_key;
IFRAMER("insStateFrame", page, { initHide: true, extraclass: "others" } );
}
var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE", true);
var hasReadCTRUSE = authparamsCTRUSE && authparamsCTRUSE.ALGreadlevel < 9 && authparamsCTRUSE.PRSreadlevel < 9;
if (!ins_deleted && canInspect && hasReadCTRUSE && !copy)

59
APPL/INS/ins_edit_srtdeel.asp
View File

@@ -35,7 +35,7 @@ user.auth_required_or_abort(authparams.ALGwritelevel < 9 && authparams.PRSwritel
var ins_score_enabled = S("ins_score_enabled") == 1;
var srtdeel_key = getQParamInt("srtdeel_key", -1);
if (srtdeel_key > 0) // bestaande ins_utel/cilinder
if (srtdeel_key > 0) // bestaande srtdeel
{
var sql = "SELECT *"
+ " FROM ins_srtdeel s"
@@ -60,6 +60,7 @@ if (srtdeel_key > 0) // bestaande ins_utel/cilinder
prs_bedrijf_key: oRs("prs_bedrijf_key").Value,
srtdeel_vervaldatum : (oRs('ins_srtdeel_vervaldatum').Value != null)? new Date(oRs('ins_srtdeel_vervaldatum').Value) : null,
srtdeel_image: oRs("ins_srtdeel_image").Value,
srtdeel_sensortype: oRs("ins_srtdeel_sensortype").Value,
srtdeel_mjb_grensscore1: oRs("ins_srtdeel_mjb_grensscore1").Value
}
oRs.close();
@@ -150,7 +151,7 @@ else
target="hidFrameSubmit"
onsubmit="return false">
<% BLOCK_START("insIns", L("lcl_inssrt_general_info"));
<% BLOCK_START("insIns", L("lcl_inssrt_general_info"), {icon: "fa-tag"});
FCLTdisciplineselector("disc",
"sgDisc",
@@ -174,7 +175,7 @@ else
required: true
});
RWFIELDTR("srtcode", "fldnum", L("lcl_obj_srtdeel_code"), srtdeel.srtdeel_code,
RWFIELDTR("srtcode", "fldshort", L("lcl_obj_srtdeel_code"), srtdeel.srtdeel_code,
{ required: true,
maxlength: 10
});
@@ -184,18 +185,31 @@ else
maxlength: 100
});
RWFIELDTR("srtdeel_volgnr", "fld", L("lcl_ins_volgnr"), srtdeel.srtdeel_volgnr );
RWFIELDTR("srtdeel_eenheid", "fld", L("lcl_obj_unit"), srtdeel.srtdeel_eenheid );
//RWFIELDTR("srtdeel_dimensie", "fld", L("lcl_ins_dimensie"), srtdeel.srtdeel_dimensie );
RWFIELDTR("srtdeel_acadsymbol", "fld", L("lcl_obj_symbol"), srtdeel.srtdeel_acadsymbol );
RWFIELDTR("srtdeel_image", "fld", L("lcl_ins_symbol_name"), srtdeel.srtdeel_image );
var params = { type: "button",
html: "title='" + L("lcl_obj_symbol_upload") + "' onclick='UploadAcadsymbol()'"
html: "title='" + L("lcl_obj_symbol_upload") + "' onclick='UploadImage()'"
}
ROFIELDTR("symbol_button", L("lcl_obj_symbol_upload"), L("lcl_fg_upload"), params);
ROFIELDTR("image_button", L("lcl_obj_symbol_upload"), L("lcl_fg_upload"), params);
RWFIELDTR("srtdeel_volgnr", "fld", L("lcl_ins_volgnr"), srtdeel.srtdeel_volgnr );
RWFIELDTR("srtdeel_eenheid", "fld", L("lcl_obj_unit"), srtdeel.srtdeel_eenheid );
FCLTcalendar("vervaldatum",
{ datum: srtdeel.srtdeel_vervaldatum,
initEmpty: srtdeel.srtdeel_vervaldatum==null,
label: L("lcl_ins_vervaldatum")
});
//RWFIELDTR("srtdeel_dimensie", "fld", L("lcl_ins_dimensie"), srtdeel.srtdeel_dimensie );
var sql = "SELECT 0, " + safe.quoted_sql(L("lcl_ins_sensortype0")) + " FROM DUAL"
+ " UNION SELECT 1, " + safe.quoted_sql(L("lcl_ins_sensortype1")) + " FROM DUAL"
+ " UNION SELECT 2, " + safe.quoted_sql(L("lcl_ins_sensortype2")) + " FROM DUAL"
+ " ORDER BY 1";
FCLTselector('srtdeel_sensortype', sql,
{ label: L("lcl_ins_sensortype"),
initKey: srtdeel.srtdeel_sensortype
}
);
RWCHECKBOXTR("srtdeel_uitleenbaar", "fldcheck", L("lcl_ins_uitleenbaar"), srtdeel.srtdeel_uitleenbaar );
RWFIELDTR("srtdeel_nr", "fld", L("lcl_ins_srtartikelnr"), srtdeel.srtdeel_nr );
FCLTbedrijfselector("prs_bedrijf_key", // supplier
"sg_lev",
@@ -204,17 +218,6 @@ else
filtercode: "L",
whenEmpty: L("lcl_search_generic")
});
FCLTcalendar("vervaldatum",
{ datum: srtdeel.srtdeel_vervaldatum,
initEmpty: srtdeel.srtdeel_vervaldatum==null,
label: L("lcl_ins_vervaldatum")
});
RWFIELDTR("srtdeel_image", "fld", L("lcl_ins_image"), srtdeel.srtdeel_image );
var params = { type: "button",
html: "title='" + L("lcl_obj_symbol_upload") + "' onclick='UploadImage()'"
}
ROFIELDTR("image_button", L("lcl_obj_image_upload"), L("lcl_fg_upload"), params);
if (ins_score_enabled)
RWFIELDTR("srtdeel_grensscore1", "fldnum", L("ins_srtdeel_mjb_grensscore1"), srtdeel.srtdeel_mjb_grensscore1,
{ datatype: "number",
@@ -222,13 +225,23 @@ else
});
BLOCK_END();
BLOCK_START("insBind", L("lcl_obj_bind"));
BLOCK_START("insBind", L("lcl_obj_bind"), {icon: "fa-link"});
RWCHECKBOXTR("bindR", "fldcheck", L("lcl_obj_bind_r"), srtdeel.srtdeel_binding & BIND_RUIMTE );
RWCHECKBOXTR("bindW", "fldcheck", L("lcl_obj_bind_w"), srtdeel.srtdeel_binding & BIND_WERKPL );
RWCHECKBOXTR("bindT", "fldcheck", L("lcl_obj_bind_t"), srtdeel.srtdeel_binding & BIND_TERREI );
RWCHECKBOXTR("bindA", "fldcheck", L("lcl_obj_bind_a"), srtdeel.srtdeel_binding & BIND_AFDELI );
RWCHECKBOXTR("bindP", "fldcheck", L("lcl_obj_bind_p"), srtdeel.srtdeel_binding & BIND_PERSOO );
RWCHECKBOXTR("bindI", "fldcheck", L("lcl_obj_bind_i"), srtdeel.srtdeel_binding & BIND_INSDEE );
RWCHECKBOXTR("srtdeel_uitleenbaar", "fldcheck", L("lcl_ins_uitleenbaar"), srtdeel.srtdeel_uitleenbaar );
BLOCK_END();
BLOCK_START("insGraph", L("lcl_graphics"), {icon: "fa-map"});
RWFIELDTR("srtdeel_acadsymbol", "fld", L("lcl_obj_symbol"), srtdeel.srtdeel_acadsymbol );
var params = { type: "button",
html: "title='" + L("lcl_obj_symbol_upload") + "' onclick='UploadAcadsymbol()'"
}
ROFIELDTR("symbol_button", L("lcl_obj_symbol_upload"), L("lcl_fg_upload"), params);
BLOCK_END();
if (srtdeel.srtgroep_key > 0) // Kan nog niet bestaan bij nieuwe omdat je ze (nog) niet

3
APPL/INS/ins_edit_srtdeel_save.asp
View File

@@ -5,6 +5,8 @@
File: ins_edit_srtdeel_save.asp
Description: SUBMIT-form
TODO: tracking van sensortype-wijziging in tekst
*/ %>
<!-- #include file="../Shared/common.inc" -->
@@ -42,6 +44,7 @@ var fields = [ { dbs: "ins_srtgroep_key", typ: "key", frm:
{ dbs: "prs_bedrijf_key", typ: "key", frm: "prs_bedrijf_key", track: L("lcl_ins_leverancier"), foreign: "prs_bedrijf" },
{ dbs: "ins_srtdeel_vervaldatum", typ: "date", frm: "vervaldatum", track: L("lcl_ins_vervaldatum") },
{ dbs: "ins_srtdeel_image", typ: "varchar", frm: "srtdeel_image", track: L("lcl_ins_image") },
{ dbs: "ins_srtdeel_sensortype", typ: "number", frm: "srtdeel_sensortype", track: L("lcl_ins_sensortype") },
{ dbs: "ins_srtdeel_module", typ: "varchar", val: "INS" },
{ dbs: "ins_srtdeel_binding", typ: "number", val: binding, track: L("lcl_obj_bind") }];

21
APPL/INS/ins_show_srtdeel.asp
View File

@@ -50,6 +50,7 @@ var srtdeel = { discipline_omschrijving: oRs("ins_discipline_omschrijving").Valu
prs_bedrijf_key: oRs("prs_bedrijf_key").Value,
srtdeel_vervaldatum : oRs('ins_srtdeel_vervaldatum').Value,
srtdeel_image: oRs("ins_srtdeel_image").Value,
srtdeel_sensortype: oRs("ins_srtdeel_sensortype").Value,
srtdeel_mjb_grensscore1: oRs("ins_srtdeel_mjb_grensscore1").Value
}
oRs.close();
@@ -104,7 +105,7 @@ oRs.close();
%>
<form name="u2">
<%
BLOCK_START("insIns", L("lcl_inssrt_general_info"));
BLOCK_START("insIns", L("lcl_inssrt_general_info"), {icon: "fa-tag"});
ROFIELDTR("fld", L("lcl_discipline"), srtdeel.discipline_omschrijving);
ROFIELDTR("fld", L("lcl_obj_group"), srtdeel.groep_omschrijving);
var params = { infoPointer: { Url: "appl/shared/status_info.asp?srtdeel_key=" + srtdeel_key + "&urole=" + urole,
@@ -115,15 +116,18 @@ oRs.close();
ROFIELDTR("fld", L("lcl_descr"), srtdeel.srtdeel_omschrijving,
{ translate: { fld: "ins_srtdeel_omschrijving", key : srtdeel_key }});
ROFIELDTR("fld", L("lcl_ins_symbol_name"), srtdeel.srtdeel_image, {suppressEmpty: true } );
ROFIELDTR("fld", L("lcl_ins_volgnr"), srtdeel.srtdeel_volgnr, {suppressEmpty: true } );
ROFIELDTR("fld", L("lcl_obj_unit"), srtdeel.srtdeel_eenheid,
{ suppressEmpty: true, translate: { fld: "ins_srtdeel_eenheid", key : srtdeel_key }});
//ROFIELDTR("fld", L("lcl_ins_dimensie"), srtdeel.srtdeel_dimensie, {suppressEmpty: true } );
ROFIELDTR("fld", L("lcl_obj_symbol"), srtdeel.srtdeel_acadsymbol, {suppressEmpty: true } );
ROCHECKBOXTR("fldcheck", L("lcl_ins_uitleenbaar"), srtdeel.srtdeel_uitleenbaar, {suppressEmpty: true } );
ROFIELDTR("fld", L("lcl_ins_srtartikelnr"), srtdeel.srtdeel_nr, {suppressEmpty: true } );
ROFIELDTR("fld", L("lcl_ins_volgnr"), srtdeel.prs_bedrijf_key, {suppressEmpty: true } );
ROFIELDTR("fld", L("lcl_ins_vervaldatum"), toDateString(srtdeel.srtdeel_vervaldatum), {suppressEmpty: true});
var srtdeel_sensortypetxt = ([L("lcl_ins_sensortype0"), L("lcl_ins_sensortype1"), L("lcl_ins_sensortype2")])[srtdeel.srtdeel_sensortype];
ROFIELDTR("fld", L("lcl_ins_sensortype"), srtdeel_sensortypetxt );
ROFIELDTR("fld", L("lcl_ins_srtartikelnr"), srtdeel.srtdeel_nr, {suppressEmpty: true } );
FCLTbedrijfselector("prs_bedrijf_key", // supplier
"sg_lev",
{ companyKey: srtdeel.prs_bedrijf_key,
@@ -132,21 +136,24 @@ oRs.close();
suppressEmpty: true,
moreinfo: true
});
ROFIELDTR("fld", L("lcl_ins_vervaldatum"), toDateString(srtdeel.srtdeel_vervaldatum), {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_ins_image"), srtdeel.srtdeel_image, {suppressEmpty: true } );
if (ins_score_enabled)
ROFIELDTR("fld", L("ins_srtdeel_mjb_grensscore1"), srtdeel.srtdeel_mjb_grensscore1, {suppressEmpty: true});
BLOCK_END();
BLOCK_START("insBind", L("lcl_obj_bind"));
BLOCK_START("insBind", L("lcl_obj_bind"), {icon: "fa-link"});
ROCHECKBOXTR("fldcheck", L("lcl_obj_bind_r"), srtdeel.srtdeel_binding & BIND_RUIMTE );
ROCHECKBOXTR("fldcheck", L("lcl_obj_bind_w"), srtdeel.srtdeel_binding & BIND_WERKPL );
ROCHECKBOXTR("fldcheck", L("lcl_obj_bind_t"), srtdeel.srtdeel_binding & BIND_TERREI );
ROCHECKBOXTR("fldcheck", L("lcl_obj_bind_a"), srtdeel.srtdeel_binding & BIND_AFDELI );
ROCHECKBOXTR("fldcheck", L("lcl_obj_bind_p"), srtdeel.srtdeel_binding & BIND_PERSOO );
ROCHECKBOXTR("fldcheck", L("lcl_obj_bind_i"), srtdeel.srtdeel_binding & BIND_INSDEE );
ROCHECKBOXTR("fldcheck", L("lcl_ins_uitleenbaar"), srtdeel.srtdeel_uitleenbaar, {suppressEmpty: true } );
BLOCK_END();
BLOCK_START("insGraph", L("lcl_graphics"), {icon: "fa-map"});
ROFIELDTR("fld", L("lcl_obj_symbol"), srtdeel.srtdeel_acadsymbol, {suppressEmpty: true } );
BLOCK_END();
var fso = new ActiveXObject("Scripting.FileSystemObject");

52
APPL/RES/res_deel_history.asp Normal file
View File

@@ -0,0 +1,52 @@
<%@language = "javascript" %>
<% /*
$Revision$
$Id$
Description: Gebruiks/maandoverzicht van een reserverbaar object. Is een demonstratievoorbeeld
van wat we allemaal weten. Biedt makkelijk inzicht in de noodzaak dit product aan te bieden
of wellicht te vervangen (qua draaiuren).
Parameters: res_deel_key
Note: moet dichtgespijkerd worden denk ik (ook al is de informatie niet erg gevoelig).
*/ %>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/resultset_table_v2.inc" -->
<%
var outputmode = getQParamInt("outputmode", 0);
var showall = getQParamInt("showall", 0) == 1;
var res_deel_key = getQParamInt("res_deel_key", -1);
var autfunction = "WEB_RESMSU"; // Dit vinden we vast niet goed genoeg, *dit* reserveerbaar object
var authparams = user.checkAutorisation(autfunction);
%>
<html>
<head>
<%
FCLTHeader.Generate({outputmode: outputmode});
%>
</head>
<body id="listbody">
<%
var sql = "SELECT TO_CHAR(rrd.res_rsv_deel_tot, 'YYYY-MM') maand"
+ " , ROUND(SUM(rrd.res_rsv_deel_tot - rrd.res_rsv_deel_van)*24) duur"
+ " FROM res_v_aanwezigrsv_deel rrd"
+ " WHERE rrd.res_deel_key = " + res_deel_key
+ " GROUP BY TO_CHAR(rrd.res_rsv_deel_tot, 'YYYY-MM')"
+ " ORDER BY 1 DESC";
var rst = new ResultsetTable({ sql: sql,
ID: "resdeelhisttable",
outputmode: outputmode,
showAll: showall
});
rst.addColumn(new Column({caption: L("lcl_month"), content: "maand", datatype: "string"}));
rst.addColumn(new Column({caption: L("lcl_hours"), content: "duur", datatype: "number", total: true }));
var count = rst.processResultset();
%>
</body>
</html>
<% ASPPAGE_END(); %>