forming default values for auto fields

3 files changed, 97 insertions, 24 deletions

diff --git a/public/app/controllers/Auth.php b/public/app/controllers/Auth.php
index f1e9819..e191c53 100644
--- a/public/app/controllers/Auth.php
+++ b/public/app/controllers/Auth.php
@@ -45,7 +45,16 @@ class Auth {
             ->setName($record['first_name'] .' '. $record['last_name'])
             ->setPassword($record['password'])
             ->setRoles([ $record['role_id'] ])      // roles is an array
-            ->setEnabled($record['active']);
+            ->setEnabled( ($record['active'] == 0) ? false : true )
+            ->set('prefix', $record['prefix'])
+            ->set('first_name', $record['first_name'])
+            ->set('last_name', $record['last_name'])
+            ->set('father_name', $record['father_name'])
+            ->set('email', $record['email'])
+            ->set('sector', $record['sector'])
+            ->set('position', $record['position'])
+            ->set('registration_number', $record['registration_number'])
+            ->set('belonging_school', $record['belonging_school']);
 
 
         // let user manager to validate user credentials
@@ -79,7 +88,7 @@ class Auth {
             $userManager->createUserToken($user);
             return [
                 'success' => true,
-                'goto' => '/admin/panel'
+                'goto' => '/panel'
             ];
     
         } else {
@@ -106,13 +115,13 @@ class Auth {
         $check = Access_model::activate_set_password($req->POST, $password);
 
         if ($check != 0) {
-            Render::view('/error/general', [
+            Render::json([
                 'title' => ACCOUNT_ACTIVATED_TITLE,
                  'message' => ACCOUNT_ACTIVATED_MESSAGE . '<br>(msg code: '. $check .')'
             ]);
 
         } else  {
-            Render::view('/error/general', [
+            Render::json([
                 'title' => NOT_VALID_ACTIVATION_TITLE,
                  'message' => NOT_VALID_ACTIVATION_MESSAGE
             ]);
@@ -199,15 +208,50 @@ class Auth {
         $manager = new App_manager();
         if ($manager->hasUserToken()) {
 
+            return true;
+
+        } else {
+            // user is not connected;
+            return false;
+        }
+    }
+
+
+    /** user_data 
+     * returns user's public data
+     */
+    public static function user_data()
+    {
+        $manager = new App_manager();
+        if ($manager->hasUserToken()) {
+
             // user is connected;
             $token = $manager->getUserToken();
             $user = $token->getUser();
 
-            return $user;
+            return [
+                'id' => $user->getID(),
+                'name' => $user->getName(),
+                'roles' => $user->getRoles(),
+
+                'sex' => $user->getSex(),
+                'active' => $user->isEnabled(),
+                'prefix' => $user->get('prefix'),
+                'first_name' => $user->get('first_name'),
+                'last_name' => $user->get('last_name'),
+                'father_name' => $user->get('father_name'),
+                'email' => $user->get('email'),
+                'sector' => $user->get('sector'),
+                'position' => $user->get('position'),
+                'registration_number' => $user->get('registration_number'),
+                'belonging_school' => $user->get('belonging_school')
+
+                // 'token' => $token->serialize()
+            ];
 
         } else {
             // user is not connected;
-            return false;
+            return [ 'user' => 0 ];
         }
     }
 
diff --git a/public/app/controllers/JsonToForm.php b/public/app/controllers/JsonToForm.php
index f6e9746..1e0b99b 100644
--- a/public/app/controllers/JsonToForm.php
+++ b/public/app/controllers/JsonToForm.php
@@ -113,25 +113,28 @@ class JsonToForm
         return (mb_strlen($str) > $len) ? mb_substr($str, 0, $len-1) ."…" : $str;
     }
 
+
     /** json_form
-     * 
+     * -------------------------------------------------------------------------
      * construct a form (html, javasctipt)
      * from a json designer
      * 
-     * @param $formJson (Std Object): form descriptor
-     * @param $require_identity (array): array of properties and values;
+     * @param stdClass $formJson      : form descriptor
+     * 
+     * @param array $require_identity : array of properties and values;
      *    they identify the record; injected into form as hidden fields
-     * @param $source (array): array of [key => value] pairs, where ...
-     *    `key`: the name of field, `value`: the default value of this field
+     * 
+     * @return array [ html=>(string), init_js=>(string), values_js=>String ] 
+     * -------------------------------------------------------------------------
      */
-    public static function json_form($formJson, $require_identity = [], $source = [])
+    public static function json_form($formJson, $require_identity = [])
     {
         // $formJson = json_decode(json_encode($form));
 
         $default_outer  = $formJson->defaults->outer_class ?? '';
         $default_inner  = $formJson->defaults->inner_class ?? '';
         $default_type   = $formJson->defaults->type ?? 'text';
-        $default_values = $formJson->defaults->values ?? ((object) ['nothing' => true]);
+        $default_values = $formJson->defaults ?? ((object) ['nothing' => true]);
 
         // TODO handle $form->defaults->source;
 
@@ -186,9 +189,16 @@ class JsonToForm
             // handle value assignment
             if (isset($field->value)) {         // if value property is set
                 $set_value = true;              // (flag: value seted)
-                $value = (($field->value == 'auto') && isset($default_values->$name))
-                    ? $default_values->$name    // set auto value
-                    : $field->value;            // or other set-value
+                $value = $field->value;
+                // $value = (($field->value == 'auto') && isset($default_values->$name))
+                //     ? $default_values->$name    // set auto value
+                //     : $field->value;            // or other set-value
+            
+            } else if (in_array('auto', $attributes) && isset($default_values->$name)) {
+                $set_value = true;                  // (flag: value seted)
+                $value = $default_values->$name;    // set auto value
+                // echo "\n{$name}: $value";
+
             } else {
                 $set_value = false;
             }
diff --git a/public/app/controllers/Office.php b/public/app/controllers/Office.php
index d0c10b9..9eb2a4c 100644
--- a/public/app/controllers/Office.php
+++ b/public/app/controllers/Office.php
@@ -162,25 +162,44 @@ class Office {
 
     private static function render_application_form($opts)
     {
+        // #1: user-id ---------------------------------------------------------
         $user_id = $opts['user']->getID();
-
+        
+        // #2: form template ---------------------------------------------------
         $form_setup = json_decode(json_encode(APPLICATION_FORM, JSON_UNESCAPED_UNICODE));
 
-        // get Form's HTML and Jsvascript
+        // #3: inject default values -------------------------------------------
+
+            // #3.1: inject user data
+        $form_setup->defaults = json_decode( json_encode(
+            Auth::user_data(), JSON_UNESCAPED_UNICODE
+        ));
+            // #3.2 inject `sector` and `position` <option>s
+
+        // #4: get Form's HTML and Javascript ----------------------------------
         $form = JsonToForm::json_form($form_setup, [
             ['name' => 'user_id', 'value' => $user_id]       // pass user identity
         ]);
 
+        // #5: render the view -------------------------------------------------
         Render::view('templates/application', ['form' => $form]);
     }
 
+
+    /** render penalty form
+     * 
+     */
     private static function render_penalty_form($opts)
     {
-        $user_id = $opts['user']->getID();
+        // #1: user-id ---------------------------------------------------------
+        $user_id = $opts['user']->getID();  
 
+        // #2: form template ---------------------------------------------------
         $form_setup = json_decode(json_encode(PENALTY_FORM, JSON_UNESCAPED_UNICODE));
 
-        // get all teachers 
+        // #3: prepare values to inject; then inject ---------------------------
+
+            // #3.1: get all teachers
         $teachers_array = Registry::use('database')->runQuery(
             "SELECT concat(last_name, ' ', first_name) as TeacherName
             FROM user ORDER BY TeacherName", []
@@ -189,9 +208,8 @@ class Office {
         foreach($teachers_array as $key => $person) {
             $teachers[] = $person['TeacherName'];
         }
-        // print_r( $teachers); die();
 
-        // get $key of rapporteur, president and members inside the form_setup->form array
+            // #3.2: get $key of rapporteur, president and members <select>s
         for($i=0; $i < sizeof($form_setup->form) ; $i++) {
             if (isset($form_setup->form[$i]->name)) {
                 if ($form_setup->form[$i]->name == 'rapporteur') { $keyRapporteur = $i; }
@@ -200,16 +218,17 @@ class Office {
             }
         }
 
-        // set option sources for rapporteur, president and members
+            // #3.3: inject <option>s for `rapporteur`, `president` and `members`
         $form_setup->form[$keyRapporteur]->options = $teachers;
         $form_setup->form[$keyPresident]->options = $teachers;
         $form_setup->form[$keyMembers]->options = $teachers;
 
-        // get Form's HTML and Jsvascript
+        // #4: get Form's HTML and Javascript ----------------------------------
         $form = JsonToForm::json_form($form_setup, [
             ['name' => 'user_id', 'value' => $user_id]       // pass user identity
         ]);
 
+        // #5: render the view -------------------------------------------------
         Render::view('templates/penalty', ['form' => $form]);
 
     }