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

FMHN#81512 API2/objects & FG ondersteunen nu ook coordinaten (incl. z-coordinaat)

Browse Source 
svn path=/Website/trunk/; revision=63284
This commit is contained in:
Koen Reefman
2024-01-22 12:41:22 +00:00
parent a8fd407f2e
commit 9bbfc9a46b
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
APPL/API2/model_objects.inc
View File

@@ -47,12 +47,15 @@ function model_objects(ins_key, params)
"department": { dbs: "ins_v_deel_gegevens.prs_afdeling_key", typ: "key", foreign: "prs_afdeling", label: L("lcl_obj_bind_a")},
"state": { dbs: "ins_deel_state", typ: "varchar", label: L("lcl_deel_state")},
"statedate": { dbs: "ins_deel_statedate", typ: "datetime", label: L("lcl_deel_statedate")},
"expiration": { dbs: "ins_deel_vervaldatum", typ: "date", label: L("lcl_ins_vervaldatum"), track: true},
"expiration": { dbs: "ins_deel_vervaldatum", typ: "date", label: L("lcl_ins_vervaldatum"), track: true},
"active": { dbs: "ins_deel_actief", typ: "check0", label: L("lcl_ins_active"), track: true},
"manager": { dbs: "prs_perslid_key_beh", typ: "key", foreign: "prs_perslid", label: L("lcl_ins_manager"), track: true},
// TODO if MJB
"score1": { dbs: "ins_deel_mjb_score1", typ: "varchar", track: true, label: L("lcl_ins_deel_mjb_score1")},
"score2": { dbs: "ins_deel_mjb_score2", typ: "varchar", track: true, label: L("lcl_ins_deel_mjb_score2")},
"dwgx": { dbs: "ins_deel_dwgx", typ: "float", label: L("lcl_ins_deel_dwgx")},
"dwgy": { dbs: "ins_deel_dwgy", typ: "float", label: L("lcl_ins_deel_dwgy")},
"dwgz": { dbs: "ins_deel_dwgz", typ: "float", label: L("lcl_ins_deel_dwgz")},
"externnr": { dbs: "ins_deel_externnr", typ: "varchar", label: L("extern_nr"), readonly: !user.has("WEB_FACTAB")},
"externsyncdate": { dbs: "ins_deel_externsyncdate", typ: "datetime", label: L("extern_syncdate"), readonly: !user.has("WEB_FACTAB")},
"flag": { dbs: "ins_deel_flag", typ: "number", track: true, LOV:"", label: L("lcl_ins_flags")}

11
APPL/CAD/ins_change.asp
View File

@@ -114,6 +114,7 @@ if (getQParamInt("clearXY", 0) == 1)
sql = "UPDATE INS_DEEL"
+ " SET ins_deel_dwgx = NULL,"
+ " ins_deel_dwgy = NULL,"
+ " ins_deel_dwgz = NULL,"
+ " ins_deel_dwgrotatie = 0,"
+ " ins_deel_dwgschaal = 1.0"
+ " WHERE ins_deel_key = " + deel_key
@@ -192,10 +193,12 @@ else if (Request.QueryString("newX").Count > 0)
if (scenario_key == 0)
{
sql = "UPDATE INS_DEEL"
+ " SET ins_deel_dwgx = " + dwgX
+ " , ins_deel_dwgy = " + dwgY
+ " , ins_deel_dwgrotatie = coalesce(ins_deel_dwgrotatie, 0)"
+ " , ins_deel_dwgschaal = coalesce(ins_deel_dwgschaal, 1.0)"
+ " SET ins_deel_dwgx = " + dwgX
+ " , ins_deel_dwgy = " + dwgY
+ " , ins_deel_dwgz = "
+ " COALESCE(ins_deel_dwgz, (SELECT alg_verdieping_dwgz FROM alg_verdieping WHERE alg_verdieping_key = " + vKey + "))" // Vul de verdieping z-coordinaat in indien leeg
+ " , ins_deel_dwgrotatie = COALESCE(ins_deel_dwgrotatie, 0)"
+ " , ins_deel_dwgschaal = COALESCE(ins_deel_dwgschaal, 1.0)"
tracktekst = L("lcl_ins_cad_moved");
if (ruimte_key > 0 && !wpdeel)

9
APPL/CAD/ins_create.asp
View File

@@ -227,7 +227,7 @@ if (scenario_key == 0)
sql = "INSERT INTO INS_DEEL"
+ "( ins_srtdeel_key, ins_deel_omschrijving"
+ ", ins_alg_ruimte_type, ins_alg_ruimte_key"
+ ", ins_deel_dwgx, ins_deel_dwgy"
+ ", ins_deel_dwgx, ins_deel_dwgy, ins_deel_dwgz"
+ ", ins_deel_dwgrotatie, ins_deel_dwgschaal"
+ ")"
+ " VALUES"
@@ -237,6 +237,13 @@ if (scenario_key == 0)
+ "," + roomKey
+ "," + newX
+ "," + newY
+ "," + (ins_type === "R"
? "(SELECT alg_verdieping_dwgz"
+ " FROM alg_verdieping v"
+ " , alg_ruimte r"
+ " WHERE r.alg_verdieping_key = v.alg_verdieping_key"
+ " AND r.alg_ruimte_key = " + roomKey + ")"
: "NULL")
+ "," + rot
+ "," + scl
+ ")";