Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

changed colors in preorder map and added more cache

Browse Source
This commit is contained in:
Frank Schubert
2023-03-14 16:35:23 +01:00
parent 387c4e8911
commit d7054a926f
4 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Layout/default/Preorder/Index.php
View File

@@ -373,8 +373,21 @@
var marker_popup_content = '<?php include(realpath(dirname(__FILE__))."/include/preorder_popup.php");?>';
[["street", preorder.adb_strasse], ["hausnummer", preorder.adb_hausnummer], ["zip", preorder.adb_plz], ["city", preorder.adb_ort], ["type", preorder.type_label], ["adrcd", preorder.adrcd], ["extref", preorder.extref], ["gps", preorder.gps_lat + ", " + preorder.gps_long],
["contact", (preorder.company ? preorder.company + " " : preorder.firstname + " " + preorder.lastname)], ["phone", preorder.phone], ["email", preorder.email], ["connectiontype", preorder.connection_type_label], ["count", preorder.connection_count]
// popup fields
[
["street", preorder.adb_strasse],
["hausnummer", preorder.adb_hausnummer],
["zip", preorder.adb_plz],
["city", preorder.adb_ort],
["type", preorder.type_label],
["adrcd", preorder.adrcd],
["extref", preorder.extref ? preorder.extref : ""],
["gps", (preorder.gps_lat && preorder.gps_long) ? preorder.gps_lat + ", " + preorder.gps_long : ""],
["contact", (preorder.company ? preorder.company + " " : preorder.firstname + " " + preorder.lastname)],
["phone", preorder.phone ? preorder.phone : ""],
["email", preorder.email ? preorder.email : ""],
["connectiontype", preorder.connection_type_label],
["count", preorder.connection_count]
].forEach(function(item) {
marker_popup_content = marker_popup_content.replaceAll("{{" + item[0].toUpperCase() + "}}", item[1]);
});

14
application/ADBHausnummer/ADBHausnummer.php
View File

@@ -85,28 +85,22 @@ class ADBHausnummer extends mfBaseModel {
}
if($name == "netzgebiet") {
$this->netzgebiet = new ADBNetzgebiet($this->netzgebiet_id);
$this->netzgebiet = mfValuecache::singleton()->getMfObject("ADBNetzgebiet", $this->netzgebiet_id);
return $this->netzgebiet;
}
if($name == "ortschaft") {
$this->ortschaft = new ADBOrtschaft($this->ortschaft_id);
$this->ortschaft = mfValuecache::singleton()->getMfObject("ADBOrtschaft", $this->ortschaft_id);
return $this->ortschaft;
}
if($name == "strasse") {
$this->strasse = new ADBStrasse($this->strasse_id);
$this->strasse = mfValuecache::singleton()->getMfObject("ADBStrasse", $this->strasse_id);
return $this->strasse;
}
if($name == "plz") {
$this->plz = mfValuecache::singleton()->get("adbplz-".$this->plz_id);
if($this->plz === null) {
$this->plz = new ADBPlz($this->plz_id);
if($this->plz->id) {
mfValuecache::singleton()->set("adplz-".$this->plz_id, $this->plz);
}
}
$this->plz = mfValuecache::singleton()->getMfObject("ADBPlz", $this->plz_id);
return $this->plz;
}

12
lib/mvcfronk/mfValuecache/mfValuecache.php
View File

@@ -28,4 +28,16 @@ class mfValuecache {
public function getCache() {
return $this->cache;
}
public function getMfObject($objectname, $id) {
$object = $this->get("mfObjectmodel-$objectname-".$id);
if(!$object) {
$object = new $objectname($id);
if($object->id) {
$this->set("mfObjectmodel-$objectname-".$id, $object);
}
}
return $object;
}
}

1
scripts/addressdb/premstaetten/import/.~lock.SDIBuilding__Locations__FTTx_premstaetten_2023-03-07.csv#
View File

@@ -1 +0,0 @@
,fronk,fronk-nb,14.03.2023 14:13,file:///home/fronk/.config/libreoffice/4;