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

FSN#35338 Bevindingen beheerschermen 2016.1

Browse Source 
svn path=/Website/trunk/; revision=29121
This commit is contained in:
Erik Groener
2016-04-21 14:29:48 +00:00
parent 21795fc8cf
commit fa07883248
14 changed files with 165 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
APPL/API2/model_cad_legendawaarde.inc
View File

@@ -43,19 +43,19 @@ function model_cad_legendawaarde()
"desc": "cad_legenda_omschrijving"
}
},
"value_name": {
"name": {
"dbs": "cad_legendawaarde_value",
"label": L("cad_legendawaarde_value"),
"typ": "varchar",
"translate": true
},
"value_desc": {
"description": {
"dbs": "cad_legendawaarde_omschr",
"label": L("cad_legendawaarde_omschr"),
"typ": "varchar",
"translate": true
},
"value_rgb": {
"rgb": {
"dbs": "cad_legendawaarde_rgb",
"label": L("cad_legendawaarde_rgb"),
"typ": "varchar",
@@ -69,9 +69,9 @@ function model_cad_legendawaarde()
"columns": [
"id",
"legenda",
"value_name",
"value_desc",
"value_rgb"
"name",
"description",
"rgb"
]
};
this.search = {
@@ -108,7 +108,7 @@ function model_cad_legendawaarde()
function fnshowcolor(oRs)
{ // Tonen van gekleurde blokjes bij de waarde in de lijst.
var kleur = (oRs.Fields("value_rgb").Value).replace(/ /g, "");
var kleur = (oRs.Fields("rgb").Value).replace(/ /g, "");
return "<div style='width:20px; background-color:#" + safe.html(kleur) + "'><span style='padding-left:25px'>" + safe.html(kleur) + "</span></div>";
}
@@ -134,7 +134,7 @@ function model_cad_legendawaarde()
"hidden": true
};
var rgb = (obj.value_rgb).replace(/ /g, "");
var rgb = (obj.rgb).replace(/ /g, "");
var kleur = '<span style="border:1px;width:16px;display: inline-block;background-color:#' + rgb + '">&nbsp;</span>'
+ '&nbsp;' + L("cad_legendawaarde_select");
fld._color.defaultvalue = kleur;

1
APPL/API2/model_cad_thema.inc
View File

@@ -55,6 +55,7 @@ function model_cad_thema()
"key": "cad_legenda_key",
"desc": "cad_legenda_omschrijving"
},
"defaultvalue": null,
"filter": "exact"
},
"authorization": {

9
APPL/API2/model_mld_dienstniveau.inc
View File

@@ -11,6 +11,7 @@
Notes:
*/
%>
<!-- #include file="../api2/model_mld_dienstpakket.inc" -->
<%
function model_mld_dienstniveau()
@@ -48,6 +49,14 @@ function model_mld_dienstniveau()
};
this.includes = {
"dienstpakket": {
"model": new model_mld_dienstpakket(),
"joinfield": "level"
}
};
this.REST_GET = generic_REST_GET(this);
this.REST_POST = generic_REST_POST(this);
this.REST_PUT = generic_REST_PUT(this);

78
APPL/API2/model_mld_dienstpakket.inc Normal file
View File

@@ -0,0 +1,78 @@
<% /*
$Revision$
$Id$
File: model_mld_dienstpakket.inc
Description: Vanuit CodeCharge gegenereerd model voor mld_dienstpakket
Context:
Notes:
*/
%>
<%
function model_mld_dienstpakket()
{
this.table = "mld_dienstpakket";
this.primary = "mld_dienstpakket_key";
this.records_name = "mld_dienstpakkets";
this.record_name = "mld_dienstpakket";
this.autfunction = "WEB_MLDMGT";
this.record_title = L("mld_dienstpakket");
this.records_title = L("mld_dienstpakket_m");
this.fields = {
"id": {
"dbs": "mld_dienstpakket_key",
"label": "Key",
"typ": "key",
"filter": "exact",
"seq": "mld_s_dienstniveau_key"
},
"level": {
"dbs": "mld_dienstniveau_key",
"label": L("mld_dienstniveau_omschr"),
"typ": "key"
},
"call": {
"dbs": "mld_stdmelding_key",
"label": L("lcl_mld_stdmelding"),
"typ": "key",
"foreign": {
"tbl": "(select mld_stdmelding_key"
+ " , sd.ins_srtdiscipline_prefix || '-' ||"
+ " td.ins_discipline_omschrijving || ' / ' ||"
+ " sm.mld_stdmelding_omschrijving full_description"
+ " from ins_srtdiscipline sd"
+ " , ins_tab_discipline td"
+ " , mld_stdmelding sm"
+ " where sd.ins_srtdiscipline_key = td.ins_srtdiscipline_key"
+ " and td.ins_discipline_key = sm.mld_ins_discipline_key"
+ " order by 2)",
"key": "mld_stdmelding_key",
"desc": "full_description"
}
}
};
this.list = {
"columns": [
"id",
"call"
]
};
this.edit = {
"modal": true
};
this.REST_GET = generic_REST_GET(this);
this.REST_POST = generic_REST_POST(this);
this.REST_DELETE = generic_REST_DELETE(this);
// Gegevens mogen niet gewijzigd worden.
}
%>

3
APPL/API2/model_mld_disc_params.inc
View File

@@ -172,7 +172,8 @@ model_mld_disc_params =
"tbl": "fac_activiteit",
"key": "fac_activiteit_key",
"desc": "fac_activiteit_omschrijving"
}
},
"emptyoption": null
},
"autooffer": {
"dbs": "mld_disc_params_offerteauto",

6
APPL/API2/model_mld_kenmerk.inc
View File

@@ -35,7 +35,7 @@ function model_mld_kenmerk()
"seq": "mld_s_mld_kenmerk_key",
"readonly": true
},
"mld_kenmerk_niveau": {
"level": {
"dbs": "mld_kenmerk_niveau",
"label": L("mgt_kenmerk_niveau"),
"typ": "varchar",
@@ -43,7 +43,7 @@ function model_mld_kenmerk()
"hidden_fld": true,
"defaultvalue": "O"
},
"property_key": {
"type": {
"dbs": "mld_srtkenmerk_key",
"label": L("mgt_srtkenmerk_key"),
"typ": "key",
@@ -81,7 +81,7 @@ function model_mld_kenmerk()
"typ": "number",
"required": true
},
"property_group": {
"group": {
"dbs": "mld_kenmerk_groep",
"label": L("mgt_kenmerk_groep"),
"typ": "key",

7
APPL/API2/model_mld_srtdiscipline.inc
View File

@@ -16,6 +16,7 @@
function model_mld_srtdiscipline()
{
this.terms = "mld_srtdiscipline";
this.table = "ins_srtdiscipline";
this.primary = "ins_srtdiscipline_key";
this.records_name = "ins_srtdisciplines";
@@ -57,7 +58,8 @@ function model_mld_srtdiscipline()
"dbs": "ins_srtdiscipline_alg",
"label": L("ins_srtdiscipline_alg"),
"typ": "key",
"LOV": L("ins_srtdiscipline_algLOV")
"LOV": L("ins_srtdiscipline_algLOV"),
"emptyoption": null
},
"objectdata": {
"dbs": "ins_srtdiscipline_ins",
@@ -75,7 +77,8 @@ function model_mld_srtdiscipline()
"typ": "key",
"translate": true,
"defaultvalue": "0",
"LOV": L("ins_srtdiscipline_kostenklantLOV")
"LOV": L("ins_srtdiscipline_kostenklantLOV"),
"emptyoption": null
},
"description": {
"dbs": "ins_srtdiscipline_opmerking",

18
APPL/API2/model_mld_typeopdr.inc
View File

@@ -51,13 +51,15 @@ function model_mld_typeopdr()
"dbs": "mld_typeopdr_decentraal",
"label": L("mld_typeopdr_decentraal"),
"typ": "key",
"LOV": L("mld_typeopdr_decentraalLOV")
"LOV": L("mld_typeopdr_decentraalLOV"),
"emptyoption": true
},
"external": {
"dbs": "mld_typeopdr_afmelden_extern",
"label": L("mld_typeopdr_afmelden_extern"),
"typ": "key",
"LOV": L("mld_typeopdr_afmelden_externLOV")
"LOV": L("mld_typeopdr_afmelden_externLOV"),
"emptyoption": true
},
"costs": {
"dbs": "mld_typeopdr_kosten",
@@ -69,14 +71,16 @@ function model_mld_typeopdr()
"label": L("mld_typeopdr_sluitmelding"),
"typ": "key",
"defaultvalue": "0",
"LOV": L("mld_typeopdr_sluitmeldingLOV")
"LOV": L("mld_typeopdr_sluitmeldingLOV"),
"emptyoption": true
},
"matchtype": {
"dbs": "mld_typeopdr_matchtype",
"label": L("mld_typeopdr_matchtype"),
"typ": "key",
"defaultvalue": "2",
"LOV": L("mld_typeopdr_matchtypeLOV")
"LOV": L("mld_typeopdr_matchtypeLOV"),
"emptyoption": true
},
"closemargin": {
"dbs": "mld_typeopdr_afmeldmarge",
@@ -120,7 +124,8 @@ function model_mld_typeopdr()
"label": L("mld_typeopdr_contract"),
"typ": "key",
"defaultvalue": "2",
"LOV": L("mld_typeopdr_contractLOV")
"LOV": L("mld_typeopdr_contractLOV"),
"emptyoption": true
},
"progress": {
"dbs": "mld_typeopdr_afhandeling",
@@ -131,7 +136,8 @@ function model_mld_typeopdr()
"dbs": "mld_typeopdr_kosten_verplicht",
"label": L("mld_typeopdr_kosten_verplicht"),
"typ": "key",
"LOV": L("mld_typeopdr_kosten_verplichtLOV")
"LOV": L("mld_typeopdr_kosten_verplichtLOV"),
"emptyoption": true
}
};

44
APPL/API2/model_res_kenmerk.inc
View File

@@ -18,6 +18,11 @@ function model_res_kenmerk()
this.primary = "res_kenmerk_key";
this.records_name = "res_kenmerks";
this.record_name = "res_kenmerk";
this.soft_delete = "res_kenmerk_verwijder";
this.autfunction = "WEB_RESMGT";
this.record_title = L("res_kenmerk");
this.records_title = L("res_kenmerk_m");
this.fields = {
"id": {
@@ -28,7 +33,7 @@ function model_res_kenmerk()
"filter": "exact",
"seq": "res_s_res_kenmerk_key"
},
"res_srtkenmerk_key": {
"type": {
"dbs": "res_srtkenmerk_key",
"label": L("res_srtkenmerk_key"),
"typ": "key",
@@ -44,7 +49,7 @@ function model_res_kenmerk()
"filter": "exact",
"LOVinit": ""
},
"res_kenmerk_niveau": {
"level": {
"dbs": "res_kenmerk_niveau",
"label": L("lcl_niveau"),
"typ": "varchar",
@@ -52,7 +57,7 @@ function model_res_kenmerk()
"hidden_fld": true,
"defaultvalue": "A"
},
"res_kenmerk_volgnummer": {
"sequence": {
"dbs": "res_kenmerk_volgnummer",
"label": L("res_kenmerk_volgnummer"),
"typ": "number",
@@ -74,14 +79,14 @@ function model_res_kenmerk()
"filter": "exact",
"LOVinit": ""
},
"res_kenmerk_verplicht": {
"required": {
"dbs": "res_kenmerk_verplicht",
"label": L("res_kenmerk_verplicht"),
"typ": "key",
"LOV": buildVerplichtingList(),
"emptyoption": null
},
"res_kenmerk_groep": {
"group": {
"dbs": "res_kenmerk_groep",
"label": L("res_kenmerk_groep"),
"typ": "key",
@@ -89,51 +94,30 @@ function model_res_kenmerk()
"LOV": buildGroepsverplichtingList(),
"emptyoption": null
},
"res_kenmerk_toonbaar": {
"readonly": {
"dbs": "res_kenmerk_toonbaar",
"label": L("res_kenmerk_toonbaar"),
"typ": "check"
},
"res_kenmerk_default": {
"default": {
"dbs": "res_kenmerk_default",
"label": L("res_kenmerk_default"),
"typ": "memo",
"translate": true
},
"res_kenmerk_hint": {
"hint": {
"dbs": "res_kenmerk_hint",
"label": L("res_kenmerk_hint"),
"typ": "memo",
"translate": true
},
"res_kenmerk_regexp": {
"regexp": {
"dbs": "res_kenmerk_regexp",
"label": L("res_kenmerk_regexp"),
"typ": "varchar"
}
};
this.list = {
"columns": [
"id",
"res_srtkenmerk_key",
"res_kenmerk_volgnummer",
"res_activiteit_key"
]
};
this.search = {
"autosearch": true,
"filters": [
"res_srtkenmerk_key",
"res_activiteit_key"
]
};
this.soft_delete = "res_kenmerk_verwijder";
this.autfunction = "WEB_RESMGT";
this.record_title = L("res_kenmerk");
this.records_title = L("res_kenmerk_m");
this.REST_GET = generic_REST_GET(this, this.gparams);
this.REST_POST = generic_REST_POST(this);

5
APPL/MGT/mgt_tools.inc
View File

@@ -133,6 +133,11 @@
+ " FROM fac_functie f"
+ " ORDER BY 2)";
break;
case "EXT1": tbl = "(SELECT f.fac_functie_key"
+ " , f.fac_functie_omschrijving ||' ('|| f.fac_functie_code ||')' fac_functie_omschrijving"
+ " FROM fac_functie f"
+ " ORDER BY 2)";
break;
default: tbl = "FAC_FUNCTIE";
}

4
APPL/MGT/mld_dienstniveau.asp
View File

@@ -13,7 +13,6 @@
*/
%>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../mgt/mgt_tools.inc" -->
<!-- #include file="../api2/model_mld_dienstniveau.inc" -->
<%
var this_model = new model_mld_dienstniveau();
@@ -29,9 +28,6 @@ scaffolding(this_model,
"name",
"description"
]
},
"edit":{
"modal": true
}
});
%>

3
APPL/MGT/mld_kenmerk.asp
View File

@@ -32,13 +32,14 @@ scaffolding(this_model,
"search": {
"autosearch": true,
"filters": [
"type",
"order_type"
]
},
"list": {
"columns": [
"id",
"property_key",
"type",
"order_type",
"sequence",
"property_group",

34
APPL/MGT/res_kenmerk.asp
View File

@@ -4,8 +4,30 @@
<!-- #include file="../api2/model_res_kenmerk.inc" -->
<%
var this_model = new model_res_kenmerk();
scaffolding(this_model,
{
"search": {
"autosearch": true,
"filters": [
"type",
"res_activiteit_key"
]
},
"list": {
"columns": [
"id",
"type",
"sequence",
"res_activiteit_key"
]
}
});
function buildVerplichtingList()
{ // LOV waarden voor res_kenmerk_verplicht.
{ // LOV waarden voor required.
var s = ";" + L("res_kenmerk_verplicht_0")
+ ";1;" + L("res_kenmerk_verplicht_1")
+ ";2;" + L("res_kenmerk_verplicht_2");
@@ -13,7 +35,7 @@
}
function buildGroepsverplichtingList()
{ // LOV waarden voor res_kenmerk_groep.
{ // LOV waarden voor group.
var s = "0;";
for (var i=1; i<=9; i++)
{
@@ -22,10 +44,4 @@
return s;
}
scaffolding(new model_res_kenmerk(),
{
"search": {
autosearch: true
}
});
%>
%>

2
APPL/SCF/scaffolding_show.inc
View File

@@ -74,7 +74,7 @@ function scaffolding_show(model, scf_params)
for (var i = 0; i < scf_params.show.buttons.length; i++)
{ // Als je een action opgeeft *zonder* haakjes voegen we automagisch de key en model toe
if (scf_params.show.buttons[i].action.indexOf("(") < 0)
scf_params.show.buttons[i].action += "(" + key + ", '" + model.table + "')"
scf_params.show.buttons[i].action += "(" + key + ", '" + (model.terms ? model.terms : model.table) + "')"
buttons.push(scf_params.show.buttons[i]);
}
}