From aae6708f4b14fe96bd286c501106ff01b1749e3d Mon Sep 17 00:00:00 2001 From: loannis Date: Mon, 8 Nov 2021 21:56:55 +0200 Subject: [PATCH] Use badges for Status,ConfidenceMode Enums --- app/resources/locales/en_US/default.po | 42 -------------------------- app/src/View/Helper/BadgeHelper.php | 4 +++ app/templates/Standard/index.php | 6 +++- 3 files changed, 9 insertions(+), 43 deletions(-) diff --git a/app/resources/locales/en_US/default.po b/app/resources/locales/en_US/default.po index 89fcabd65..f9047c138 100644 --- 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 index 649821f79..cd91ab296 100644 --- 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 index baf4aef7b..854b791f5 100644 --- 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':