Use badges for Status,ConfidenceMode Enums

COmanage · Nov 9, 2021 · c4335f2 · c4335f2
1 parent 1eed592
commit c4335f2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 43 deletions.
diff --git a/app/resources/locales/en_US/default.po b/app/resources/locales/en_US/default.po
@@ -164,87 +164,45 @@ msgstr "Danger"
 msgid "match.en.PermissionEnum.A"
 msgstr "Platform Administrator"
 
-msgid "match.en.PermissionEnum.A.warn.level"
-msgstr "Secondary"
-
 msgid "match.en.PermissionEnum.MA"
 msgstr "Matchgrid Administrator"
 
-msgid "match.en.PermissionEnum.MA.warn.level"
-msgstr "Light"
-
 msgid "match.en.PermissionEnum.RM"
 msgstr "Reconciliation Manager"
 
-msgid "match.en.PermissionEnum.RM.warn.level"
-msgstr "Light"
-
 msgid "match.en.PermissionEnum.RS"
 msgstr "Reconciliation Support"
 
-msgid "match.en.PermissionEnum.RS.warn.level"
-msgstr "Light"
-
 msgid "match.en.PermissionEnum.X"
 msgstr "None"
 
-msgid "match.en.PermissionEnum.X.warn.level"
-msgstr "Warning"
-
 msgid "match.en.ReferenceIdEnum.S"
 msgstr "Sequence"
 
-msgid "match.en.ReferenceIdEnum.S.warn.level"
-msgstr "Light"
-
 msgid "match.en.ReferenceIdEnum.U"
 msgstr "UUID (Type 4)"
 
-msgid "match.en.ReferenceIdEnum.U.warn.level"
-msgstr "Light"
-
 msgid "match.en.ResolutionModeEnum.E"
 msgstr "External"
 
-msgid "match.en.ResolutionModeEnum.E.warn.level"
-msgstr "Light"
-
 msgid "match.en.ResolutionModeEnum.I"
 msgstr "Interactive"
 
-msgid "match.en.ResolutionModeEnum.I.warn.level"
-msgstr "Light"
-
 msgid "match.en.SearchTypeEnum.D"
 msgstr "Distance"
 
-msgid "match.en.SearchTypeEnum.D.warn.level"
-msgstr "Light"
-
 msgid "match.en.SearchTypeEnum.E"
 msgstr "Exact"
 
-msgid "match.en.SearchTypeEnum.E.warn.level"
-msgstr "Light"
-
 msgid "match.en.SearchTypeEnum.M"
 msgstr "Mapping"
 
-msgid "match.en.SearchTypeEnum.M.warn.level"
-msgstr "Light"
-
 msgid "match.en.SearchTypeEnum.X"
 msgstr "Skip"
 
-msgid "match.en.SearchTypeEnum.X.warn.level"
-msgstr "Light"
-
 msgid "match.en.SearchTypeEnum.S"
 msgstr "Substring"
 
-msgid "match.en.SearchTypeEnum.S.warn.level"
-msgstr "Light"
-
 msgid "match.en.StatusEnum.A"
 msgstr "Active"
 

diff --git a/app/src/View/Helper/BadgeHelper.php b/app/src/View/Helper/BadgeHelper.php
@@ -117,6 +117,10 @@ public function getBadgeColor(string $color): ?string {
       'Dark'      => 'dark',
     ];
 
+    if(!isset($color_map[$color])) {
+      return null;
+    }
+
     return $color_map[$color];
   }
 

diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
@@ -190,7 +190,11 @@ function _column_key($modelsName, $c, $tz=null) {
                 $warning_level = __('match.en.'.$cfg['class'].'.'.$entity->$col . '.warn.level');
                 $title = __('match.en.'.$cfg['class'].'.'.$entity->$col);
 
-                print $this->Badge->badgeIt($title, $this->Badge->getBadgeColor($warning_level));
+                if(!empty($warning_level) && strpos($warning_level, '.warn.level') === false) {
+                  print $this->Badge->badgeIt($title, $this->Badge->getBadgeColor($warning_level));
+                } else {
+                  print $title;
+                }
               }
               break;
             case 'fk':