Enable Filtering in Groups.Improve column_key function.

COmanage · Sep 6, 2022 · 1e3aa64 · 1e3aa64
1 parent e1bf2a1
commit 1e3aa64
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/app/resources/locales/en_US/enumeration.po b/app/resources/locales/en_US/enumeration.po
@@ -60,6 +60,18 @@ msgstr "Staff"
 msgid "EduPersonAffiliationEnum.student"
 msgstr "Student"
 
+msgid "GroupTypeEnum.MA"
+msgstr "Active Members"
+
+msgid "GroupTypeEnum.A"
+msgstr "Admins"
+
+msgid "GroupTypeEnum.M"
+msgstr "All Members"
+
+msgid "GroupTypeEnum.S"
+msgstr "Standard"
+
 msgid "LanguageEnum.af"
 msgstr "Afrikaans"
 

diff --git a/app/src/Lib/Traits/SearchFilterTrait.php b/app/src/Lib/Traits/SearchFilterTrait.php
@@ -97,7 +97,7 @@ public function whereFilter(\Cake\ORM\Query $query, string $attribute, string|ar
         return $query->where(function (\Cake\Database\Expression\QueryExpression $exp, \Cake\ORM\Query $query) use ($attribute, $search) {
           return $exp->between($attribute, "'" . $search[0] . "'", "'" . $search[1] . "'");
         });
-        // The starts at is non empty. So the data should be greater than the starts_at date
+        // The starts at is non-empty. So the data should be greater than the starts_at date
       } elseif(!empty($search[0])
         && empty($search[1])) {
         return $query->where(function (\Cake\Database\Expression\QueryExpression $exp, \Cake\ORM\Query $query) use ($attribute, $search) {

diff --git a/app/src/Lib/Util/StringUtilities.php b/app/src/Lib/Util/StringUtilities.php
@@ -29,6 +29,8 @@
 
 namespace App\Lib\Util;
 
+use \Cake\Utility\Inflector;
+
 class StringUtilities {
   /**
    * Construct the Column human-readable key
@@ -70,7 +72,8 @@ public static function column_key($modelsName, $c, $tz=null, $useCustomClMdlLabe
     //     Humanize
 
     // Otherwise look for the general key
-    return __d('field', $c);
+    $cfield = __d('field', $c);
+    return ($cfield !== $c) ? $cfield : \Cake\Utility\Inflector::humanize($c);
   }
 
   // The following two utilities provide base64 encoding and decoding for

diff --git a/app/src/Model/Table/GroupsTable.php b/app/src/Model/Table/GroupsTable.php
@@ -50,6 +50,7 @@ class GroupsTable extends Table {
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
+  use \App\Lib\Traits\SearchFilterTrait;
 
   /**
    * Perform Cake Model initialization.
@@ -92,6 +93,10 @@ public function initialize(array $config): void {
       'statuses' => [
         'type' => 'enum',
         'class' => 'SuspendableStatusEnum'
+      ],
+      'group_types' => [
+        'type' => 'enum',
+        'class' => 'GroupTypeEnum'
       ]
     ]);