From 439951ac04e4255fdc5474b998faef5e0da07c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20Ioni=C8=9B=C4=83?= <hi@andrei.io>
Date: Fri, 11 Nov 2022 12:41:26 +0000
Subject: [PATCH] Fixes (#32)

* fix: update form registration type

* feat: implement registration delete

* feat: send welcome email

* wip
---
 plugins/genuineq/user/components/Register.php          |  6 ++++--
 .../user/controllers/users/_preview_scoreboard.htm     |  4 ++--
 plugins/genuineq/user/lang/en/lang.php                 |  6 +++++-
 plugins/genuineq/user/lang/ro/lang.php                 | 10 +++++++---
 plugins/genuineq/user/models/user/columns.yaml         |  6 ++++++
 plugins/genuineq/user/models/user/fields.yaml          |  5 +++++
 .../regrequeststable/partials/_widget.htm              |  7 +++++++
 themes/esense/pages/authentification/register-form.htm |  2 +-
 8 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/plugins/genuineq/user/components/Register.php b/plugins/genuineq/user/components/Register.php
index fc2fa3e1..31de1a05 100644
--- a/plugins/genuineq/user/components/Register.php
+++ b/plugins/genuineq/user/components/Register.php
@@ -121,9 +121,11 @@ public function onRegister()
             /** Set the user type field. */
             $data['type'] = post('type');
 
-
             /** Filter out the registration requests that have an already registered school. */
-            if (in_array($data['type'], ['specialist', 'parent', 'school'])) {
+            if (
+                in_array($data['type'], ['specialist', 'parent']) && (-1 == post('school')) ||
+                'school' == $data['type']
+            ) {
                 /** Attempt to register the user. */
                 $user = RegisterLogic::register($data);
 
diff --git a/plugins/genuineq/user/controllers/users/_preview_scoreboard.htm b/plugins/genuineq/user/controllers/users/_preview_scoreboard.htm
index b9d3e526..2ac28fe5 100644
--- a/plugins/genuineq/user/controllers/users/_preview_scoreboard.htm
+++ b/plugins/genuineq/user/controllers/users/_preview_scoreboard.htm
@@ -1,7 +1,7 @@
 <div class="scoreboard-item title-value">
     <h4><?= e(trans('genuineq.user::lang.backend.user.scoreboard.name')) ?></h4>
-    <?php if ($formModel->name): ?>
-        <p><?= e($formModel->name) ?></p>
+    <?php if ($formModel->name || $formModel->name): ?>
+        <p><?= e($formModel->name) ?> <?= e($formModel->surname) ?></p>
     <?php else: ?>
         <p><em><?= e(trans('genuineq.user::lang.backend.user.scoreboard.name_empty')) ?></em></p>
     <?php endif ?>
diff --git a/plugins/genuineq/user/lang/en/lang.php b/plugins/genuineq/user/lang/en/lang.php
index f66f01d1..9e8cb901 100644
--- a/plugins/genuineq/user/lang/en/lang.php
+++ b/plugins/genuineq/user/lang/en/lang.php
@@ -143,7 +143,10 @@
 
             'fields' => [
                 'name' => 'Name',
-                'name_comment' => 'The full name of the user',
+                'name_comment' => 'The name of the user',
+
+                'surname' => 'Surname',
+                'surname_comment' => 'The surname of the user',
 
                 'email' => 'Email',
                 'email_comment' => 'The email of the user',
@@ -192,6 +195,7 @@
             'columns' => [
                 'id' => '#',
                 'name' => 'Name',
+                'surname' => 'Surnume',
                 'email' => 'Email',
                 'identifier' => 'Identifier',
                 'type' => 'Type',
diff --git a/plugins/genuineq/user/lang/ro/lang.php b/plugins/genuineq/user/lang/ro/lang.php
index 89f5e9cd..cc84ee29 100644
--- a/plugins/genuineq/user/lang/ro/lang.php
+++ b/plugins/genuineq/user/lang/ro/lang.php
@@ -142,8 +142,11 @@
             'label' => 'Utilizator',
 
             'fields' => [
-                'name' => 'Nume',
-                'name_comment' => 'Numele complet al utilizatorului',
+                'name' => 'Prenume',
+                'name_comment' => 'Prenumele utilizatorului',
+
+                'surname' => 'Nume',
+                'surname_comment' => 'Numele utilizatorului',
 
                 'email' => 'Email',
                 'email_comment' => 'Adresa de e-mail a utilizatorului',
@@ -191,7 +194,8 @@
 
             'columns' => [
                 'id' => '#',
-                'name' => 'Nume',
+                'name' => 'Prenume',
+                'surname' => 'Nume',
                 'email' => 'Email',
                 'identifier' => 'Identificator',
                 'type' => 'Tip',
diff --git a/plugins/genuineq/user/models/user/columns.yaml b/plugins/genuineq/user/models/user/columns.yaml
index 911f602f..ecba8fdd 100644
--- a/plugins/genuineq/user/models/user/columns.yaml
+++ b/plugins/genuineq/user/models/user/columns.yaml
@@ -15,6 +15,12 @@ columns:
         searchable: true
         sortable: true
 
+    surname:
+        label: genuineq.user::lang.backend.user.columns.surname
+        type: text
+        searchable: true
+        sortable: true
+
     email:
         label: genuineq.user::lang.backend.user.columns.email
         type: text
diff --git a/plugins/genuineq/user/models/user/fields.yaml b/plugins/genuineq/user/models/user/fields.yaml
index ec68f461..26da16c4 100644
--- a/plugins/genuineq/user/models/user/fields.yaml
+++ b/plugins/genuineq/user/models/user/fields.yaml
@@ -9,6 +9,11 @@ fields:
         comment: genuineq.user::lang.backend.user.fields.name_comment
         span: auto
 
+    surname:
+        label: genuineq.user::lang.backend.user.fields.surname
+        comment: genuineq.user::lang.backend.user.fields.surname_comment
+        span: auto
+
     email:
         label: genuineq.user::lang.backend.user.fields.email
         comment: genuineq.user::lang.backend.user.fields.email_comment
diff --git a/plugins/genuineq/user/reportwidgets/regrequeststable/partials/_widget.htm b/plugins/genuineq/user/reportwidgets/regrequeststable/partials/_widget.htm
index b586dd4f..5e893fa7 100644
--- a/plugins/genuineq/user/reportwidgets/regrequeststable/partials/_widget.htm
+++ b/plugins/genuineq/user/reportwidgets/regrequeststable/partials/_widget.htm
@@ -62,6 +62,9 @@ <h3><?= e(trans('genuineq.user::lang.reportwidgets.reg_requests_table.label')) ?
                             <th class="list-cell-name-name list-cell-type-text">
                                 <a href="#"> <?= e(trans('genuineq.user::lang.reportwidgets.reg_requests_table.columns.name')) ?> </a>
                             </th>
+                            <th class="list-cell-name-name list-cell-type-text">
+                                <a href="#"> <?= e(trans('genuineq.user::lang.reportwidgets.reg_requests_table.columns.surname')) ?> </a>
+                            </th>
                             <th class="list-cell-name-email list-cell-type-text">
                                 <a href="#"> <?= e(trans('genuineq.user::lang.reportwidgets.reg_requests_table.columns.email')) ?> </a>
                             </th>
@@ -101,6 +104,10 @@ <h3><?= e(trans('genuineq.user::lang.reportwidgets.reg_requests_table.label')) ?
                                     <?= $userModel->name ?>
                                 </td>
 
+                                <td class="list-cell-index-2 list-cell-name-name list-cell-type-text">
+                                    <?= $userModel->surname ?>
+                                </td>
+
                                 <td class="list-cell-index-3 list-cell-name-email list-cell-type-text">
                                     <?= $userModel->email ?>
                                 </td>
diff --git a/themes/esense/pages/authentification/register-form.htm b/themes/esense/pages/authentification/register-form.htm
index 913322e4..039f68a1 100644
--- a/themes/esense/pages/authentification/register-form.htm
+++ b/themes/esense/pages/authentification/register-form.htm
@@ -52,7 +52,7 @@ <h3 class="text-primary-dark font-weight-light mb-3" style="line-height: 38px;">
                 <div class="col-12 col-lg-7">
                     <div class="form-group outline-none">
                         <select id="selectRegisterForm" class="form-control selectpicker border outline-none" data-style="btn-white">
-                            <option value="teacher" data-icon="fas fa-fw fa-user-cog mr-2">{{'page.register.type.specilist'|_}}</option>
+                            <option value="specialist" data-icon="fas fa-fw fa-user-cog mr-2">{{'page.register.type.specilist'|_}}</option>
                             <option value="school" data-icon="fas fa-fw fa-school mr-2">{{'page.register.type.school'|_}}</option>
                             <option value="parent" data-icon="fas fa-fw fa-user mr-2">{{'page.register.type.parent'|_}}</option>
                         </select>