Feature/extracompanyname

galette/includes/fields_defs/members_fields.php

@@ -67,6 +67,14 @@
         'position' => 5,
         'category' => FieldsCategories::ADH_CATEGORY_IDENTITY
     ),
+    'id_legal_status' => array(   // POURQUOI _adh +/- partout ?
+        'label'    => _T("Legal status:"),
+        'propname' => 'id_legal_status',
+        'required' => false,
+        'visible'  => FieldsConfig::NOBODY,//USER_WRITE,
+        'position' => 5000000, //TODO
+        'category' => FieldsCategories::ADH_CATEGORY_IDENTITY
+    ),
     'pseudo_adh' => array(
         'label'    => _T("Nickname:"),
         'propname' => 'nickname',

galette/includes/routes/management.routes.php

@@ -29,6 +29,7 @@
 use Galette\Controllers\AdminToolsController;
 use Galette\Controllers\TextController;
 use Galette\DynamicFields\DynamicField;
+use Galette\Controllers\Crud\CrudHelper;
 
 //galette's dashboard
 $app->get(
@@ -207,35 +208,9 @@ function ($request, $response) use ($routeparser) {
     [PdfController::class, 'storeModels']
 )->setName('pdfModels')->add($authenticate);
 
-$app->get(
-    '/titles',
-    [Crud\TitlesController::class, 'list']
-)->setName('titles')->add($authenticate);
-
-$app->post(
-    '/titles',
-    [Crud\TitlesController::class, 'doAdd']
-)->setName('titles')->add($authenticate);
-
-$app->get(
-    '/titles/remove/{id:\d+}',
-    [Crud\TitlesController::class, 'confirmDelete']
-)->setName('removeTitle')->add($authenticate);
-
-$app->post(
-    '/titles/remove/{id:\d+}',
-    [Crud\TitlesController::class, 'delete']
-)->setName('doRemoveTitle')->add($authenticate);
-
-$app->get(
-    '/titles/edit/{id:\d+}',
-    [Crud\TitlesController::class, 'edit']
-)->setname('editTitle')->add($authenticate);
-
-$app->post(
-    '/titles/edit/{id:\d+}',
-    [Crud\TitlesController::class, 'doEdit']
-)->setname('editTitle')->add($authenticate);
+CrudHelper::addRoutesBasicEntityCRUD($app, Crud\TitlesController::class, $authenticate);
+CrudHelper::addRoutesBasicEntityCRUD($app, Crud\LegalStatussController::class, $authenticate);
+CrudHelper::addRoutesBasicEntityCRUD($app, Crud\PaymentTypesController::class, $authenticate);
 
 $app->get(
     '/texts[/{lang}/{ref}]',
@@ -403,36 +378,6 @@ function ($request, $response) use ($routeparser) {
     [AdminToolsController::class, 'process']
 )->setName('doAdminTools')->add($authenticate);
 
-$app->get(
-    '/payment-types',
-    [Crud\PaymentTypeController::class, 'list']
-)->setName('paymentTypes')->add($authenticate);
-
-$app->post(
-    '/payment-types',
-    [Crud\PaymentTypeController::class, 'doAdd']
-)->setName('paymentTypes')->add($authenticate);
-
-$app->get(
-    '/payment-type/remove/{id:\d+}',
-    [Crud\PaymentTypeController::class, 'confirmDelete']
-)->setName('removePaymentType')->add($authenticate);
-
-$app->post(
-    '/payment-type/remove/{id:\d+}',
-    [Crud\PaymentTypeController::class, 'delete']
-)->setName('doRemovePaymentType')->add($authenticate);
-
-$app->get(
-    '/payment-type/edit/{id:\d+}',
-    [Crud\PaymentTypeController::class, 'edit']
-)->setname('editPaymentType')->add($authenticate);
-
-$app->post(
-    '/payment-type/edit/{id:\d+}',
-    [Crud\PaymentTypeController::class, 'doEdit']
-)->setname('editPaymentType')->add($authenticate);
-
 $app->get(
     '/{form_name:adh|contrib|trans}/{id:\d+}/file/{fid:\d+}/{pos:\d+}/{name}',
     [Crud\DynamicFieldsController::class, 'getDynamicFile']

galette/install/scripts/mysql.sql

@@ -11,6 +11,7 @@ CREATE TABLE galette_adherents (
   prenom_adh varchar(255) NOT NULL default '',
   pseudo_adh varchar(255) NOT NULL default '',
   societe_adh varchar(200) default NULL,
+  id_legal_status int(10) unsigned DEFAULT NULL,  
   titre_adh int(10) unsigned default NULL,
   ddn_adh date default '1901-01-01',
   sexe_adh tinyint(1) NOT NULL default '0',
@@ -44,6 +45,7 @@ CREATE TABLE galette_adherents (
   UNIQUE (login_adh),
   FOREIGN KEY (id_statut) REFERENCES galette_statuts (id_statut) ON DELETE RESTRICT ON UPDATE CASCADE,
   FOREIGN KEY (titre_adh) REFERENCES galette_titles (id_title) ON DELETE RESTRICT ON UPDATE CASCADE,
+  FOREIGN KEY (id_legal_status) REFERENCES galette_legalstatus (id_legal_status) ON DELETE RESTRICT ON UPDATE CASCADE,
   FOREIGN KEY (parent_id) REFERENCES galette_adherents (id_adh) ON DELETE RESTRICT ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
 
@@ -95,6 +97,14 @@ CREATE TABLE galette_titles (
   PRIMARY KEY (id_title)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_520_ci;
 
+DROP TABLE IF EXISTS galette_legalstatus;
+CREATE TABLE galette_legalstatus (
+  id_legal_status int(10) unsigned NOT NULL auto_increment,
+  short_label varchar(10) NOT NULL default '',
+  long_label varchar(100) default '',
+  PRIMARY KEY (id_legal_status)
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_520_ci;
+
 DROP TABLE IF EXISTS galette_types_cotisation;
 CREATE TABLE galette_types_cotisation (
   id_type_cotis int(10) unsigned NOT NULL auto_increment,

galette/lib/Galette/Controllers/AdminToolsController.php

@@ -108,7 +108,7 @@ public function process(Request $request, Response $response): Response
 
         if (isset($post['initpdfmodels'])) {
             //proceed emails texts reinitialization
-            $models = new PdfModels($this->zdb, $this->preferences, $this->login);
+            $models = new PdfModels();//$this->zdb, $this->preferences, $this->login);
             $res = $models->installInit(false);
             if ($res === true) {
                 $success_detected[] = _T("PDF models has been successfully reinitialized.");

galette/lib/Galette/Controllers/Crud/CrudHelper.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace Galette\Controllers\Crud;
+
+use Slim\App;
+use Galette\Middleware\Authenticate;
+
+/**
+ * CrudHelper
+ *
+ * @author Manuel <manuelh78dev@ik.me>
+ */
+class CrudHelper
+{
+    /**
+     * Ajouter des routes automatiquement pour un object Entity via le nom de son controller
+     *
+     * @param Slim\App     $app                 Slim application
+     * @param string       $controllerClassName controller class name AController::class
+     * @param Authenticate $authenticate        Middleware for user authentification
+     *
+     * @return void
+     */
+    public static function addRoutesBasicEntityCRUD(App $app, string $controllerClassName, Authenticate $authenticate): void
+    {
+        //Galette\Controllers\Crud\TitlesController -> Title
+        $entity = str_replace(['Controller', '\\'], ['', '/'], $controllerClassName);
+        $entity = basename($entity);
+        $entity = substr($entity, 0, -1);
+
+        $baseName = lcfirst($entity);
+        $basePath = strtolower($entity);
+
+        $app->get(
+            "/{$basePath}s",
+            [$controllerClassName, 'list']
+        )->setName("{$baseName}s")->add($authenticate);
+
+        $app->post(
+            "/{$basePath}",
+            [$controllerClassName, 'doAdd']
+        )->setName("add{$entity}"/*"{$basePath}"*/)->add($authenticate);
+
+        $app->get(
+            "/{$basePath}/remove/{id:\d+}",
+            [$controllerClassName, 'confirmDelete']
+        )->setName("remove{$entity}")->add($authenticate);
+
+        $app->post(
+            "/{$basePath}/remove/{id:\d+}",
+            [$controllerClassName, 'delete']
+        )->setName("doRemove{$entity}")->add($authenticate);
+
+        $app->get(
+            "/{$basePath}/edit/{id:\d+}",
+            [$controllerClassName, 'edit']
+        )->setname("edit{$entity}")->add($authenticate);
+
+        $app->post(
+            "/{$basePath}/edit/{id:\d+}",
+            [$controllerClassName, 'doEdit']
+        )->setname("edit{$entity}")->add($authenticate);
+    }
+}
+
+
+/*$app->get(
+    '/titles',
+    [Crud\TitlesController::class, 'list']
+)->setName('titles')->add($authenticate);
+
+$app->post(
+    '/title',
+    [Crud\TitlesController::class, 'doAdd']
+)->setName('titles')->add($authenticate);
+
+$app->get(
+    '/titles/remove/{id:\d+}',
+    [Crud\TitlesController::class, 'confirmDelete']
+)->setName('removeTitle')->add($authenticate);
+
+$app->post(
+    '/titles/remove/{id:\d+}',
+    [Crud\TitlesController::class, 'delete']
+)->setName('doRemoveTitle')->add($authenticate);
+
+$app->get(
+    '/titles/edit/{id:\d+}',
+    [Crud\TitlesController::class, 'edit']
+)->setname('editTitle')->add($authenticate);
+
+$app->post(
+    '/titles/edit/{id:\d+}',
+    [Crud\TitlesController::class, 'doEdit']
+)->setname('editTitle')->add($authenticate);
+*/