Building::units are in-/decremented when adding/deleting Termination

application/Termination/TerminationController.php

@@ -64,6 +64,12 @@ class TerminationController extends mfBaseController {
       $term->save();
     }
     
+    // increment Building::units
+    if(is_numeric($building->units)) {
+      ++$building->units;
+      $building->save();
+    }
+    
     $this->layout()->setFlash("Anschluss gespeichert.", "success");
     $this->redirect("Building", "Index", [], "building=".$term->building_id);
     
@@ -90,12 +96,12 @@ class TerminationController extends mfBaseController {
     }
     
     $building_id = $term->building_id;
+    $building = $term->building;
     
     // if user is not admin, check if they have permission for this network
     if(!$this->me->is("Admin")) {
       $allowed = false;
       
-      $building = $term->building;
       $network = $building->network;
       foreach(["netowner", "pipeplanner"] as $type) {
         $perms = $network->getTypeAddresses($type);
@@ -122,6 +128,11 @@ class TerminationController extends mfBaseController {
 
     
     $term->delete();
+    if($building->units) {
+      --$building->units;
+      $building->save();
+    }
+    
     
     $this->layout()->setFlash("Anschluss gelöscht", "success");
     $this->redirect("Building", "Index", [], "building=".$building_id);

application/User/UserModel.php

@@ -51,7 +51,7 @@ class UserModel {
     
     $db = FronkDB::singleton();
     
-    $res = $db->select("Worker", "*");
+    $res = $db->select("Worker", "*", "1=1 ORDER BY address_id, username");
     if($db->num_rows($res)) {
       while($data = $db->fetch_object($res)) {
         $items[] = new User($data);
@@ -70,7 +70,7 @@ class UserModel {
             WHERE WorkerPermission.worker_id = Worker.id
             AND $where
             GROUP BY WorkerPermission.worker_id
-            ORDER BY Worker.id";
+            ORDER BY address_id, username, Worker.id";
     $res = $db->query($sql);
     if($db->num_rows($res)) {
       while($data = $db->fetch_object($res)) {

lib/mvcfronk/mfLogin/mfLoginController.php

@@ -143,4 +143,4 @@ class mfLoginController extends mfBaseController {
 		
 		return $salt.sha1($salt.$pass);
 	}
-}
+}