From 55e5210e835d162193e15f9bf8a498d5c0d653e4 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 15 Feb 2018 20:06:04 +0100
Subject: [PATCH] Draft organization form implementations

---
 Controller.php                      | 51 ++++++++++++++++++++++-------
 Theme/Backend/groups-single.tpl.php |  3 +-
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/Controller.php b/Controller.php
index a3edab9..46a771c 100644
--- a/Controller.php
+++ b/Controller.php
@@ -428,7 +428,7 @@ class Controller extends ModuleAbstract implements WebInterface
             return;
         }
 
-        $response->set($request->__toString(), $this->app->appSettings->get((int) $request->getData('id')));
+        $response->set($request->__toString(), ['response' => $this->app->appSettings->get((int) $request->getData('id'))]);
     }
 
     /**
@@ -482,7 +482,12 @@ class Controller extends ModuleAbstract implements WebInterface
         }
 
         $group = GroupMapper::get((int) $request->getData('id'));
-        $response->set($request->__toString(), $group->jsonSerialize());
+        $response->set($request->__toString(), [
+            'status' => 'ok',
+            'title' => 'Group',
+            'message' => 'Group successfully returned.',
+            'response' => $group->jsonSerialize()
+        ]);
     }
 
     /**
@@ -518,7 +523,7 @@ class Controller extends ModuleAbstract implements WebInterface
             'status' => 'ok',
             'title' => 'Group',
             'message' => 'Group successfully updated.',
-            'request' => $group->jsonSerialize()
+            'response' => $group->jsonSerialize()
         ]);
     }
 
@@ -534,8 +539,7 @@ class Controller extends ModuleAbstract implements WebInterface
     private function validateGroupCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (
-            ($val['name'] = empty($request->getData('name')))
+        if (($val['name'] = empty($request->getData('name')))
             || ($val['status'] = (
                 $request->getData('status') === null
                 || !GroupStatus::isValidValue((int) $request->getData('status'))
@@ -581,7 +585,7 @@ class Controller extends ModuleAbstract implements WebInterface
             'status' => 'ok',
             'title' => 'Group',
             'message' => 'Group successfully created.',
-            'request' => $group->jsonSerialize()
+            'response' => $group->jsonSerialize()
         ]);
     }
 
@@ -630,7 +634,12 @@ class Controller extends ModuleAbstract implements WebInterface
         $group  = GroupMapper::get((int) $request->getData('id'));
         $status = GroupMapper::delete($group);
 
-        $response->set($request->__toString(), $status);
+        $response->set($request->__toString(), [
+            'status' => 'ok',
+            'title' => 'Group',
+            'message' => 'Group successfully deleted.',
+            'response' => $status
+        ]);
     }
 
     /**
@@ -655,7 +664,12 @@ class Controller extends ModuleAbstract implements WebInterface
         }
 
         $account = AccountMapper::get((int) $request->getData('id'));
-        $response->set($request->__toString(), $account->jsonSerialize());
+        $response->set($request->__toString(), [
+            'status' => 'ok',
+            'title' => 'Account',
+            'message' => 'Account successfully returned.',
+            'response' => $account->jsonSerialize()
+        ]);
     }
 
     /**
@@ -737,7 +751,12 @@ class Controller extends ModuleAbstract implements WebInterface
         $account = $this->createAccountFromRequest($request);
 
         AccountMapper::create($account);
-        $response->set($request->__toString(), $account->jsonSerialize());
+        $response->set($request->__toString(), [
+            'status' => 'ok',
+            'title' => 'Account',
+            'message' => 'Account successfully created.',
+            'response' => $account->jsonSerialize()
+        ]);
     }
 
     /**
@@ -788,7 +807,12 @@ class Controller extends ModuleAbstract implements WebInterface
         $account = AccountMapper::get((int) ($request->getData('id')));
         $status  = AccountMapper::delete($account);
 
-        $response->set($request->__toString(), $status);
+        $response->set($request->__toString(), [
+            'status' => 'ok',
+            'title' => 'Account',
+            'message' => 'Account successfully deleted.',
+            'response' => $status
+        ]);
     }
 
     /**
@@ -823,7 +847,12 @@ class Controller extends ModuleAbstract implements WebInterface
 
         $status = AccountMapper::update($account);
 
-        $response->set($request->__toString(), $account->jsonSerialize());
+        $response->set($request->__toString(), [
+            'status' => 'ok',
+            'title' => 'Account',
+            'message' => 'Account successfully updated.',
+            'response' => $account->jsonSerialize()
+        ]);
     }
 
     /**
diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php
index dd1723c..c22407e 100644
--- a/Theme/Backend/groups-single.tpl.php
+++ b/Theme/Backend/groups-single.tpl.php
@@ -39,7 +39,8 @@ echo $this->getData('nav')->render(); ?>
                         <?php endforeach; ?>
                             </select>
                         <tr><td><label for="iGroupDescription"><?= $this->getHtml('Description'); ?></label>
-                        <tr><td><textarea id="iGroupDescription" name="description" placeholder="&#xf040;"><?= $this->printHtml($group->getDescription()); ?></textarea>
+                        <tr><td>
+                            <textarea id="iGroupDescription" name="description" placeholder="&#xf040;"><?= $this->printHtml($group->getDescription()); ?></textarea>
                         <tr><td><input id="groupSubmit" name="groupsubmit" type="submit" value="<?= $this->getHtml('Save', 0, 0); ?>">
                     </table>
                 </form>