finished basic AddressDB view

Layout/default/AddressDB/Index.php

@@ -137,8 +137,8 @@
               <h4 class="header-title">Liste aller GWR-Adressen</h4>
             </div>
             <div class="float-right">
-              <a class="btn btn-primary mb-2" href="<?=self::getUrl("AddressDB", "add")?>"><i class="fas fa-plus"></i> Neue Adresse anlegen</a>
-              <a class="btn btn-outline-violett mb-2" href="<?=self::getUrl("AddressDB", "add")?>"><i class="fas fa-marker"></i> Bulk update</a>
+              <!--<a class="btn btn-primary mb-2" href="<?=self::getUrl("AddressDB", "add")?>"><i class="fas fa-plus"></i> Neue Adresse anlegen</a>-->
+              <a class="btn btn-outline-violett mb-2" href="#" onclick="return false;"><i class="fas fa-marker"></i> Bulk update</a>
               
             </div>
             

Layout/default/Preorder/Index.php

@@ -155,8 +155,8 @@
                   <?=$preorder->adb_hausnummer->hausnummer?><br />
                   <?=($preorder->adb_wohneinheit_id) ? ((string)$preorder->adb_wohneinheit ? $preorder->adb_wohneinheit."<br />" : "") : "<i class='text-pink'>&lt;keine Wohneinheit&gt;</i><br />"?>
                   <?=$preorder->adb_hausnummer->plz->plz?>
+                  <?=$preorder->adb_hausnummer->ortschaft->name?><br />
                   <?=$preorder->adb_hausnummer->strasse->gemeinde->name?>
-                  <?=($preorder->address_district) ? "<br />(".$preorder->address_district.")" : ""?>
                 </td>
                 <?php else: ?>
                 <td></td>

Layout/default/Preordercampaign/Index.php

@@ -71,15 +71,15 @@
         </div>
         
         
-        
-        
         <div class="card">
           <div class="card-body mb-3">
             <div class="float-left">
               <h4 class="header-title">Liste aller Vorbestellkampagnen</h4>
             </div>
             <div class="float-right">
-              <a class="btn btn-primary mb-2" href="<?=self::getUrl("Preordercampaign", "add")?>"><i class="fas fa-plus"></i> Neue Vorbestellkampagne anlegen</a>
+              <?php if($me->is("Admin")): ?>
+                <a class="btn btn-primary mb-2" href="<?=self::getUrl("Preordercampaign", "add")?>"><i class="fas fa-plus"></i> Neue Vorbestellkampagne anlegen</a>
+              <?php endif; ?>
             </div>
             
             <table class="table table-striped table-hover">

Layout/default/menu.php

@@ -18,12 +18,15 @@
             <li><a href="<?=self::getUrl("News")?>"><i class="far fa-th-list text-info"></i> News</a></li>
           </ul>
         </li>
+        <?php endif; ?>
         
+        <?php if($me->is(["Admin", "netowner"])): ?>
         <li class="has-submenu">
           <a href="#">
             <i class="far fa-database"></i>Stammdaten <div class="arrow-down"></div>
           </a>
           <ul class="submenu">
+            <?php if($me->is(["Admin"])): ?>
             <li class="has-sub-submenu font-weight-bold"><a>Betriebsstammdaten</a></li>
             <li><a href="<?=self::getUrl("Address")?>"><i class="fad fa-user text-info"></i> Personen & Firmen</a></li>
             <li><a href="<?=self::getUrl("Product")?>"><i class="far fa-rectangle-list text-info"></i> Produkte</a></li>
@@ -33,10 +36,14 @@
             <li class="has-sub-submenu"><a href="<?=self::getUrl("User")?>"><i class="fad fa-users text-info"></i> Benutzer</a></li>
             
             <li class="has-sub-submenu font-weight-bold mt-1"><a>Grundstammdaten</a></li>
+            <?php endif; ?>
+            <?php if($me->is(["Admin", "netowner"])): ?>
             <li><a href="<?=self::getUrl("AddressDB")?>"><i class="fas fa-city text-info"></i> GWR / AddressDB</a></li>
+            <?php endif; ?>
+            <?php if($me->is(["Admin"])): ?>
             <li><a href="<?=self::getUrl("Producttech")?>"><i class="fad fa-microchip text-info"></i> Technologien</a></li>
             <!--<li><a href="<?=self::getUrl("Contractconfig")?>"><i class="fad fa-gear text-info"></i> ContractConfig</a></li>-->
-
+            <?php endif; ?>
             
           </ul>
         </li>

application/AddressDB/AddressDBController.php

@@ -56,7 +56,7 @@ class AddressDBController extends mfBaseController {
         $my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id);
       }
     }
-    //var_dump($filter, $my_adb_networks);
+    //var_dump($my_networks, $my_adb_networks);
     if(!$this->me->is("Admin") && array_key_exists("network_id", $filter)) {
       if(array_key_exists($filter['network_id'], $my_adb_networks)) {
         $filter['netzgebiet_id'] = $filter['network_id'];
@@ -70,7 +70,7 @@ class AddressDBController extends mfBaseController {
     if(!array_key_exists("netzgebiet_id", $addressdb_filter)) {
       $addressdb_filter['netzgebiet_id'] = $netzgebiet_ids;
     }
-    
+    //var_dump($my_adb_networks);exit;
     $this->layout()->set("my_networks", ADBNetzgebietModel::getAll());
     $this->layout()->set("my_adb_networks", $my_adb_networks);
     //var_dump($addressdb_filter);exit;

application/Network/NetworkModel.php

@@ -1,15 +1,16 @@
 <?php
 
 class NetworkModel {
-  public $name = null;
-  public $owner_id = null;
-  public $sytemowner_action_status = null;
-  public $note = null;
+  public $name;
+  public $owner_id ;
+  public $adb_netzgebiet_id;
+  public $sytemowner_action_status;
+  public $note;
   
-  public $create_by = null;
-  public $edit_by = null;
-  public $create = null;
-  public $edit = null;
+  public $create_by;
+  public $edit_by;
+  public $create;
+  public $edit;
   
 
   public static function create(Array $data) {

scripts/addressdb/liezen/02-create_thetool_netzgebiete.php

@@ -25,6 +25,7 @@ foreach(ADBNetzgebietModel::search(['name%' => 'liezen%']) as $adb_netzgebiet) {
   
   $network = NetworkModel::create([
     'owner_id' => $owner_id,
+    'adb_netzgebiet_id' => $adb_netzgebiet->id,
     'name' => $name,
     'note' => $note,
     'sytemowner_action_status' => "term_connected",