diff --git a/Layout/default/Address/Index.php b/Layout/default/Address/Index.php index c339b7f52..120fbc559 100644 --- a/Layout/default/Address/Index.php +++ b/Layout/default/Address/Index.php @@ -52,7 +52,7 @@ "> Neue Person/Firma anlegen - +
diff --git a/Layout/default/User/Form.php b/Layout/default/User/Form.php new file mode 100644 index 000000000..a0c841a07 --- /dev/null +++ b/Layout/default/User/Form.php @@ -0,0 +1,94 @@ + + + +
+
+ + +
+
+
+
+
    +
  1. ">the-tool
    2. +
  2. ">Benutzer
    3. +
    4. +
+
+

Benutzer

+
+
+
+ + + +
+
+
+
+

Benutzer bearbeiten

+ +
"> + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ +
+ +
+ +
+
+
+
+ +
+ + + + + + + +
+
+ + +
+
+
+
+
    +
  1. ">the-tool
    2. +
  2. Benutzer
    3. +
+
+

Benutzer

+
+
+
+ + + +
+
+ +
+
+
+

Benutzerliste

+
+
+ "> Neuen Benutzer anlegen +
+
Typ Firma
+ + + + + + + + + + + + + + + + + + +
UsernameNameFirma / PersonEmailAdmin
username?>name?>address->company) ? $user->address->company : $user->address->getFullName()?>email?>isAdmin()) ? "Ja" : "Nein"?> + $user->id])?>" title="User bearbeiten"> + id > 1): ?> + $user->id])?>" class="text-danger" title="User löschen" onclick="if(!confirm('Benutzer wirklich löschen?')) return false;"> + +
+ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Layout/default/footer.php b/Layout/default/footer.php index 26bd2235f..e9e847db0 100644 --- a/Layout/default/footer.php +++ b/Layout/default/footer.php @@ -3,7 +3,7 @@
- © 2021 Xinon GmbH - Made by fronk - Simulor Theme by Coderthemes + the tool © 2021 Xinon GmbH - Made by fronk - Simulor Theme by Coderthemes
diff --git a/Layout/default/header.php b/Layout/default/header.php index b08b0eeba..9eef36faa 100644 --- a/Layout/default/header.php +++ b/Layout/default/header.php @@ -2,7 +2,7 @@ - tool, the + the tool diff --git a/Layout/default/menu.php b/Layout/default/menu.php index b1a5f4dda..e4485affe 100644 --- a/Layout/default/menu.php +++ b/Layout/default/menu.php @@ -21,6 +21,9 @@
  • ["addresstype" => ["supplier"]]])?>">Lieferanten
    • +
  • + ">Benutzer +
    • diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php index 391c2b22c..3b06b4efb 100644 --- a/application/Address/AddressController.php +++ b/application/Address/AddressController.php @@ -41,9 +41,6 @@ class AddressController extends mfBaseController { protected function saveAction() { $r = $this->request; - - //var_dump($r->get());exit; - $id = $r->id; if(is_numeric($id) && $id > 0) { diff --git a/application/User/User.php b/application/User/User.php index 58ea4d7c1..dbac68580 100644 --- a/application/User/User.php +++ b/application/User/User.php @@ -8,6 +8,7 @@ class User extends mfBaseModel { public $permissions; public $flags; + public $address; public function init() { $this->table = "Worker"; @@ -41,6 +42,8 @@ class User extends mfBaseModel { $wp->loadByUserId($this->id); $this->permissions = $wp; $this->loadFlags(); + + $this->address = new Address($this->address_id); return true; } diff --git a/application/User/UserController.php b/application/User/UserController.php index af4997e48..b9080d5bf 100644 --- a/application/User/UserController.php +++ b/application/User/UserController.php @@ -29,12 +29,11 @@ class UserController extends mfBaseController { } $this->layout()->setTemplate('User/Index'); - $users=$this->getUsers(); + $users = UserModel::getAll(); $this->layout()->set('users',$users); - $pc = new ProviderController(); - $providers = $pc->getProvider(); - $this->layout()->set("providers", $providers); + $addresses = AddressModel::getAll(); + $this->layout()->set("addresses", $addresses); } protected function addAction($request) { @@ -43,9 +42,8 @@ class UserController extends mfBaseController { } $this->layout()->setTemplate('User/Form'); - $pc = new ProviderController(); - $providers = $pc->getProvider(); - $this->layout()->set("providers", $providers); + $addresses = AddressModel::getAll(); + $this->layout()->set("addresses", $addresses); } protected function editAction($request) { @@ -62,9 +60,8 @@ class UserController extends mfBaseController { $user=new User($id); $this->layout()->set('user',$user); - $pc = new ProviderController(); - $providers = $pc->getProvider(); - $this->layout()->set("providers", $providers); + $addresses = AddressModel::getAll(); + $this->layout()->set("addresses", $addresses); } protected function profileAction($request) { @@ -72,62 +69,61 @@ class UserController extends mfBaseController { } - protected function saveAction($request) { - //$this->log->debug("UserController::save"); - $id = $request['id']; + protected function saveAction() { + $r = $this->request; + $id = $r->id; if(!$this->isAdmin()) { $id = $this->me->id; $request['username'] = $this->me->username; - unset($request['provider_id']); + unset($r->address_id); } - if(!$id && !$request['username']) { + if(!$id && !$r->username) { self::redirect('User'); } $user = new User($id); - if($request['username']) { - $user->username = $request['username']; + if($r->username) { + $user->username = $r->username; } - if($request['name']) { - $user->name = $request['name']; + if($r->name) { + $user->name = $r->name; } - if($request['email']) { - $user->email = $request['email']; + if($r->email) { + $user->email = $r->email; } - if($request['provider_id']) { + if($r->address_id) { if($this->isAdmin()) { - $user->provider_id = intval($request['provider_id']); + $user->address_id = intval($r->address_id); //var_dump($user);exit; - $provider = new Provider($user->provider_id); - if(!$provider->id) { - throw new Exception("Unbekannter Provider"); + $address = new Address($user->address_id); + if(!$address->id) { + throw new Exception("Unbekannte Firma/Person"); } } } - if($request['password']) { - if($request['password'] === $request['password2']) { - $user->password=mfLoginController::generatePasswordHash($request['password']); + if($r->password) { + if($r->password === $r->password2) { + $user->password=mfLoginController::generatePasswordHash($r->password); } else { $this->layout()->setFlash("Passwörter stimmen nicht überein!", "error"); } } + $user->edit_by = $this->me->id; + if(!$id) { + $user->create_by = $this->me->id; + } + $id = $user->save(); if($this->isAdmin()) { - if($request['admin'] == "true" || $user->id == 1) { + if($r->admin == "true" || $user->id == 1) { $user->permissions->admin = "true"; } else { $user->permissions->admin = "false"; } - if($request['ticketadmin'] == "true") { - $user->permissions->ticketadmin = "true"; - } else { - $user->permissions->ticketadmin = "false"; - } - $user->permissions->save(); } diff --git a/application/User/UserModel.php b/application/User/UserModel.php new file mode 100644 index 000000000..d14d19dbf --- /dev/null +++ b/application/User/UserModel.php @@ -0,0 +1,99 @@ + $value) { + if(property_exists(get_called_class(), $field)) { + $model->$field = $value; + } + } + + return $model; + } + + public static function getOne($id) { + if(!is_numeric($id) || !$id) { + throw new Exception("Invalid number", 400); + } + $item = []; + $db = FronkDB::singleton(); + + $res = $db->select("Worker", "*", "id=$id LIMIT 1"); + if($db->num_rows($res)) { + $data = $db->fetch_object($res); + $item = new User($data); + } + return $item; + } + + public static function getAll() { + $items = []; + + $db = FronkDB::singleton(); + + $res = $db->select("Worker", "*"); + if($db->num_rows($res)) { + while($data = $db->fetch_object($res)) { + $items[] = new User($data); + } + } + return $items; + + } + + public static function search($filter) { + $items = []; + $db = FronkDB::singleton(); + + $where = self::getSqlFilter($filter); + $sql = "SELECT Worker.* FROM Worker, WorkerPermission + WHERE WorkerPermission.worker_id= Worker.id + AND $where + GROUP BY WorkerPermission.worker_id + ORDER BY Worker.id"; + $res = $db->query($sql); + if($db->num_rows($res)) { + while($data = $db->fetch_object($res)) { + $items[] = new User($data); + } + } + return $items; + } + + private function getSqlFilter($filter) { + $where = "1=1 "; + + //var_dump($filter);exit; + if(array_key_exists("address_id", $filter)) { + $addressid = $filter['address_id']; + if($addressid === null || $addressid == "null") { + $where .= " AND address_id IS NULL"; + } elseif(is_numeric($addressid)) { + $where .= " AND parent_id=$addressid"; + } + } + //var_dump($filter, $where);exit; + return $where; + } + +} \ No newline at end of file diff --git a/lib/Layout/Layout.php b/lib/Layout/Layout.php index 2bfa1a448..37273e420 100644 --- a/lib/Layout/Layout.php +++ b/lib/Layout/Layout.php @@ -19,8 +19,4 @@ class Layout extends mfLayout { public function dotToComma($num) { return str_replace(".", ",", $num); } - - public function arrayToUrl(Array $array) { - - } } \ No newline at end of file