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

FCLT#69825 Automatische samenstelling van gebouw-omschrijving als code+naam niet meer doen

Browse Source 
svn path=/Website/trunk/; revision=57824
This commit is contained in:
Peter Feij
2022-11-01 16:39:54 +00:00
parent 1dbca473e9
commit 7fa8f1588e
13 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
APPL/ALG/alg_edit_gebouw.asp
View File

@@ -156,6 +156,7 @@ else
emptyOption: "",
readonly: !this_alg.writeman
});
manRWFIELD("bld_descr", "fld", L("lcl_estate_gebouw_man_descr"), bld_descr, {maxlength: 60});
manRWFIELD("bld_opmerk", "fld", L("lcl_estate_gebouw_man_opmerk"), bld_opmerk, {maxlength: 50});
manRWFIELD("bld_groep", "fld", L("lcl_estate_gebouw_groepkenmerk"), bld_groep, {maxlength: 60});

2
APPL/ALG/alg_edit_gebouw_save.asp
View File

@@ -54,7 +54,7 @@ if (user.checkAutorisation("WEB_BEZMGT", true))
if (this_alg.writeman)
{
fields.push({ dbs: "alg_gebouw_omschrijving", typ: "varchar", frm: "bld_descr" }, // wordt samengesteld uit code en naam
fields.push({ dbs: "alg_gebouw_omschrijving", typ: "varchar", frm: "bld_descr", track: L("lcl_estate_gebouw_man_descr") },
{ dbs: "alg_gebouw_naam", typ: "varchar", frm: "bld_naam", track: L("lcl_estate_gebouw_man_name") },
{ dbs: "alg_gebouw_code", typ: "varchar", frm: "bld_code", track: L("lcl_estate_gebouw_man_code") },
{ dbs: "alg_srtgebouw_key", typ: "key", frm: "bld_srtkey", track: L("alg_srtgebouw"), foreign: {tbl: "alg_srtgebouw", key: "alg_srtgebouw_key", desc: "alg_srtgebouw_omschrijving"} },

3
APPL/ALG/alg_edit_terreinsector.asp
View File

@@ -148,8 +148,8 @@ BLOCK_START("algter1", L("lcl_alg_terreinsector_frame"), {icon : "fa-draw-polygo
readonly: false, //ter_key > 0,
required: true });
RWFIELDTR("ter_code", "fld", L("lcl_estate_terreinsector_man_code"), ter_code, {maxlength: 12, required: true});
RWFIELDTR("ter_naam", "fld", L("lcl_estate_terreinsector_man_name"), ter_naam, {maxlength: 30, required: true});
RWFIELDTR("ter_code", "fld", L("lcl_estate_terreinsector_man_code"), ter_code, {maxlength: 12, required: true});
sql = "SELECT alg_srtterreinsector_key, "
+ lcl.xsqla('alg_srtterreinsec_omschrijving', 'alg_srtterreinsector_key')
+ " FROM alg_v_aanwezigsrtterreinsector "
@@ -161,6 +161,7 @@ BLOCK_START("algter1", L("lcl_alg_terreinsector_frame"), {icon : "fa-draw-polygo
emptyOption: "",
readonly: false
});
RWFIELDTR("ter_oms", "fld", L("lcl_estate_terreinsector_man_descr"), ter_oms, {maxlength: 60});
BLOCK_END();
BLOCK_START("algLoc5", L("lcl_alg_gebouw_bezoek"), {icon: "fa-user-tag"});

2
APPL/ALG/alg_edit_terreinsector_save.asp
View File

@@ -24,7 +24,7 @@ var onrgoedlvl = "T";
var this_alg = alg.func_enabled(ter_key, onrgoedlvl);
user.auth_required_or_abort(this_alg.writeman || (ter_key > 0 && this_alg.writeuse));
var fields = [/* { dbs: "alg_terreinsector_omschrijving", typ: "varchar", frm: "ter_oms"}, Wordt nergens meegegeven? */
var fields = [{ dbs: "alg_terreinsector_omschrijving", typ: "varchar", frm: "ter_oms", track: L("lcl_estate_terreinsector_man_descr") },
{ dbs: "alg_terreinsector_code", typ: "varchar", frm: "ter_code", track: L("lcl_estate_terreinsector_man_code") },
{ dbs: "alg_terreinsector_naam", typ: "varchar", frm: "ter_naam", track: L("lcl_estate_terreinsector_man_name") },
{ dbs: "alg_srtterreinsector_key", typ: "key", frm: "ter_srkey", track: L("lcl_estate_terreinsector_man_sort"), foreign: "ALG_SRTTERREINSECTOR" },

2
APPL/ALG/alg_gebouw_list.inc
View File

@@ -221,6 +221,7 @@ function gebouw_list(pautfunction, params)
+ " , " + lcl.xsqla('s.alg_srtgebouw_omschrijving', 's.alg_srtgebouw_key')
+ " , g.alg_gebouw_code"
+ " , g.alg_gebouw_naam"
+ " , g.alg_gebouw_omschrijving"
+ " , g.alg_gebouw_opmerking"
+ " , g.alg_gebouw_bruto_vloeropp"
+ " , g.alg_gebouw_omtrek"
@@ -324,6 +325,7 @@ function gebouw_list(pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_code"), content: "alg_gebouw_code"}));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_name"), content: "alg_gebouw_naam" }));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_srtgebouw"), content: "alg_srtgebouw_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_descr"), content: "alg_gebouw_omschrijving" }));
if (anybldresp)
{
rst.addColumn(new Column({caption: L("lcl_alg_verantw"), content: "perslid_resp"}));

6
APPL/ALG/alg_ruimte_list.inc
View File

@@ -118,7 +118,8 @@ function ruimte_list(pautfunction, params)
+ ", v.alg_gebouw_key"
+ ", g.alg_locatie_key"
+ ", l.alg_locatie_omschrijving"
+ ", g.alg_gebouw_omschrijving"
+ ", g.alg_gebouw_code"
+ ", g.alg_gebouw_naam"
+ ", v.alg_verdieping_omschrijving"
+ ", r.alg_srtruimte_key"
+ ", "+lcl.xsqla("s.alg_srtruimte_omschrijving", "s.alg_srtruimte_key")
@@ -269,7 +270,8 @@ function ruimte_list(pautfunction, params)
});
rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_descr"), content: "alg_locatie_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_descr"), content: "alg_gebouw_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_code"), content: "alg_gebouw_code"}));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_name"), content: "alg_gebouw_naam"}));
rst.addColumn(new Column({caption: L("lcl_estate_verdieping_man_descr"), content: "alg_verdieping_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_estate_ruimte_man_nr"), content: "alg_ruimte_nr"}));

8
APPL/ALG/alg_ruimtefunctie_list.inc
View File

@@ -79,7 +79,8 @@ function ruimtefunctie_list(pautfunction, params)
+ " , l.alg_locatie_key"
+ " , g.alg_gebouw_key"
+ " , l.alg_locatie_omschrijving"
+ " , g.alg_gebouw_omschrijving"
+ " , g.alg_gebouw_code"
+ " , g.alg_gebouw_naam"
+ " FROM alg_srtruimte sr"
+ " , alg_srtruimte_locatiegebouw srlg"
+ " , alg_locatie l"
@@ -147,8 +148,9 @@ function ruimtefunctie_list(pautfunction, params)
});
rst.addColumn(new Column({caption: L("lcl_estate_ruimte_man_sort"), content: "alg_srtruimte_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_location"), content: "alg_locatie_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_building"), content: "alg_gebouw_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_descr"), content: "alg_locatie_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_code"), content: "alg_gebouw_code"}));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_name"), content: "alg_gebouw_naam" }));
rst.addColumn(new Column({caption: L("lcl_alg_alg_tarief"), content: "alg_srtruimte_prijs", datatype: "float", decimals: 5 }));
rst.addColumn(new Column({caption: L("lcl_alg_alg_tariefA"), content: "alg_srtruimte_prijs2", datatype: "float", decimals: 5 }));
rst.addColumn(new Column({caption: L("lcl_alg_alg_tariefB"), content: "alg_srtruimte_prijs3", datatype: "float", decimals: 5 }));

1
APPL/ALG/alg_show_gebouw.asp
View File

@@ -144,6 +144,7 @@ oRs.Close();
suppressEmpty: true,
readonly: true
});
ROFIELDTR("fld", L("lcl_estate_gebouw_man_descr"), bld_descr, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_estate_gebouw_man_opmerk"), bld_opmerk, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_estate_gebouw_groepkenmerk"), bld_groep, {suppressEmpty:true});

5
APPL/ALG/alg_show_terreinsector.asp
View File

@@ -153,9 +153,10 @@ oRs.Close();
readonly: true
});
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_sort"), ter_sroms, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_code"), ter_code);
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_name"), ter_naam);
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_code"), ter_code);
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_sort"), ter_sroms, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_descr"), ter_oms);
BLOCK_END();
BLOCK_START("algLoc5", L("lcl_alg_gebouw_bezoek"), {icon: "fa-user-tag"});

1
APPL/ALG/alg_terreinsector_list.inc
View File

@@ -231,6 +231,7 @@ function terrein_list(pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_code"), content: "alg_terreinsector_code"}));
rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_name"), content: "alg_terreinsector_naam"}));
rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_sort"), content: "alg_srtterreinsec_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_descr"), content: "alg_terreinsector_omschrijving"}));
if (anyterrainresp)
{
rst.addColumn(new Column({caption: L("lcl_alg_verantw"), content: "perslid_resp"}));

6
APPL/ALG/alg_verdieping_list.inc
View File

@@ -126,7 +126,8 @@ function verdiepingen_list(pautfunction, params)
+ " v.alg_gebouw_key, "
+ " g.alg_locatie_key, "
+ " l.alg_locatie_omschrijving, "
+ " g.alg_gebouw_omschrijving, "
+ " g.alg_gebouw_code, "
+ " g.alg_gebouw_naam, "
+ " v.alg_verdieping_omschrijving, "
+ " v.alg_verdieping_code "
+ " FROM alg_v_aanwezigverdieping v, "
@@ -196,7 +197,8 @@ function verdiepingen_list(pautfunction, params)
});
rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_descr"), content: "alg_locatie_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_descr"), content: "alg_gebouw_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_code"), content: "alg_gebouw_code"}));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_name"), content: "alg_gebouw_naam"}));
rst.addColumn(new Column({caption: L("lcl_estate_verdieping_man_code"), content: "alg_verdieping_code"}));
rst.addColumn(new Column({caption: L("lcl_estate_verdieping_man_descr"), content: "alg_verdieping_omschrijving" }));

7
APPL/ALG/alg_werkplek_list.inc
View File

@@ -148,7 +148,6 @@ function werkplek_list(pautfunction, params)
+ " || p.alg_verdieping_code "
+ " || '-' "
+ " || p.alg_ruimte_nr samengesteld, "
+ " p.alg_gebouw_omschrijving, "
+ " p.alg_verdieping_omschrijving, "
+ " p.alg_verdieping_code, "
+ " p.alg_ruimte_nr, "
@@ -184,17 +183,17 @@ function werkplek_list(pautfunction, params)
sqln += " AND p.alg_ruimte_key = " + room_key;
}
else if (lvl_key_arr.length)
else if (lvl_key_arr && lvl_key_arr.length > 0)
{
sqln += " AND p.alg_verdieping_key IN (" + lvl_key_arr.join(",") + ")";
}
else if (bld_key_arr.length)
else if (bld_key_arr && bld_key_arr.length > 0)
{
sqln += " AND p.alg_gebouw_key IN (" + bld_key_arr.join(",") + ")";
}
else if (loc_key_arr.length)
else if (loc_key_arr && loc_key_arr.length > 0)
{
sqln += " AND p.alg_locatie_key IN (" + loc_key_arr.join(",") + ")";
}

2
APPL/API2/model_buildings.inc
View File

@@ -25,7 +25,7 @@ function model_buildings()
this.fields = {"id" : { "dbs": "alg_gebouw_key", "typ": "key" },
"code" : { "dbs": "alg_gebouw_code", "typ": "varchar", "filter": "like", "label": L("lcl_estate_gebouw_man_code") },
"name" : { "dbs": "alg_gebouw_naam", "typ": "varchar", "track": true, "filter": "like", "label": L("lcl_estate_gebouw_man_name") },
// is afgeleid gegeven { name: "description", "dbs": "alg_gebouw_omschrijving", "typ": "varchar"},
"description" : { "dbs": "alg_gebouw_omschrijving", "typ": "varchar", "track": true, "label": L("lcl_estate_gebouw_man_descr") },
"visitable" : { "dbs": "alg_gebouw_bez", "typ": "check", "label": L("lcl_estate_gebouw_bez")},
"callregistration" : { "dbs": "alg_gebouw_mld", "typ": "check", "label": L("lcl_estate_gebouw_mld")},
"location" : { "dbs": "alg_locatie_key", "typ": "key", "foreign": "alg_locatie", "label": L("lcl_location")},