break form scripts in parts; first pdf example

2 files changed, 16 insertions, 12 deletions

diff --git a/public/app/controllers/Auth.php b/public/app/controllers/Auth.php
index d52b6c9..e2fe989 100644
--- a/public/app/controllers/Auth.php
+++ b/public/app/controllers/Auth.php
@@ -50,6 +50,7 @@ class Auth {
             ->set('first_name', $record['first_name'])
             ->set('last_name', $record['last_name'])
             ->set('father_name', $record['father_name'])
+            ->set('phone', $record['phone'])
             ->set('email', $record['email'])
             ->set('sector', $record['sector'])
             ->set('position', $record['position'])
@@ -172,7 +173,7 @@ class Auth {
         $form_setup->form[$key]->options = $gendered_position;
 
         // attach default values 
-        $form_setup->defaults->values = $user;
+        $form_setup->defaults = $user;
 
         // get Form's HTML and Jsvascript
         $form = JsonToForm::json_form($form_setup, [
@@ -180,7 +181,7 @@ class Auth {
             ['name' => 'id', 'value' => $user->id],
             ['name' => 'invitation', 'value' => $user->invitation]
         
-        ]);
+        ]); // print_r($form_setup); die();
 
         Render::view('user/invitation', [
             'form' => $form,
@@ -231,6 +232,7 @@ class Auth {
                 'first_name' => $user->get('first_name'),
                 'last_name' => $user->get('last_name'),
                 'father_name' => $user->get('father_name'),
+                'phone' => $user->get('phone'),
                 'email' => $user->get('email'),
                 'sector' => $user->get('sector'),
                 'position' => $user->get('position'),
diff --git a/public/app/controllers/Office.php b/public/app/controllers/Office.php
index 5038200..d4b0217 100644
--- a/public/app/controllers/Office.php
+++ b/public/app/controllers/Office.php
@@ -118,12 +118,12 @@ class Office {
 
 
 
-    /** (any) petition
+    /** request any (empty/new) petition form
      * 
-     * check if user is authorized to view the content;
-     * if so, prepare and render the petition view
+     * The method acts as an authorization checker and internal router
+     * to actual petition form-templates
      * 
-     * @param $petition_type (string): [common|penalty]
+     * @param $petition_tag (string): petition type ex. [common|penalty]
      */
     public static function request_petition($petition_tag)
     {
@@ -135,8 +135,9 @@ class Office {
                 'moto' => 'Forbidden',
                 'message' => 'Για να έχετε πρόσβαση, θα πρέπει πρώτα να συνδεθείτε'
             ]);
-            die();      // then end;
-        }
+            die();      // then die();
+
+        } // else continue...
 
         $token = $manager->getUserToken();      // from token
         $user = $token->getUser();          // create user
@@ -160,8 +161,9 @@ class Office {
     }
 
 
-    /** render application form
+    /** render an (empty/new) application form
      * 
+     * @param array $opts : user identity ([user_id => id])
      */
     private static function render_application_form($opts)
     {
@@ -192,8 +194,6 @@ class Office {
             ? GENDERED_POSITIONS['she']
             : GENDERED_POSITIONS['he'];
 
-        
-
         // #4: get Form's HTML and Javascript ----------------------------------
         $form = JsonToForm::json_form($form_setup, [
             ['name' => 'user_id', 'value' => $user_id]      // pass user identity
@@ -204,8 +204,10 @@ class Office {
     }
 
 
-    /** render penalty form
+    /**
+     * render an (empty/new) penalty form
      * 
+     * @param array $opts : user identity ([user_id => id])
      */
     private static function render_penalty_form($opts)
     {