From a7cff851f50abc8fb088bd4bab3a7dc972bcbdd4 Mon Sep 17 00:00:00 2001
From: Alexander Trost <galexrt@googlemail.com>
Date: Fri, 27 Sep 2024 15:34:46 +0200
Subject: [PATCH] feat: tweak citizen job props display by adding a wildcard to
 custom

Signed-off-by: Alexander Trost <galexrt@googlemail.com>
---
 app/components/citizens/CitizensList.vue                | 1 +
 app/components/citizens/info/CitizenInfo.vue            | 2 +-
 app/components/jobs/timeclock/TimeclockInactiveList.vue | 5 ++---
 app/components/partials/WebSocketStatusOverlay.vue      | 8 +++++++-
 gen/go/proto/services/citizenstore/citizenstore.go      | 7 +++++++
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/components/citizens/CitizensList.vue b/app/components/citizens/CitizensList.vue
index b38e93321..dea0ed498 100644
--- a/app/components/citizens/CitizensList.vue
+++ b/app/components/citizens/CitizensList.vue
@@ -305,6 +305,7 @@ defineShortcuts({
         </template>
         <template #jobLabel-data="{ row: citizen }">
             {{ citizen.jobLabel.value }}
+            {{ citizen.props?.jobName || citizen.props?.jobGradeNumber ? '*' : '' }}
         </template>
         <template #sex-data="{ row: citizen }">
             {{ citizen.sex?.value.toUpperCase() ?? $t('common.na') }}
diff --git a/app/components/citizens/info/CitizenInfo.vue b/app/components/citizens/info/CitizenInfo.vue
index 6a1b630ef..60dc9ada7 100644
--- a/app/components/citizens/info/CitizenInfo.vue
+++ b/app/components/citizens/info/CitizenInfo.vue
@@ -174,7 +174,7 @@ const isOpen = ref(false);
                                     <template v-if="user.jobGrade > 0 && user.job !== game.unemployedJobName">
                                         ({{ $t('common.rank') }}: {{ user.jobGradeLabel }})
                                     </template>
-                                    {{ user.props?.jobGrade ? '*' : '' }}
+                                    {{ user.props?.jobName || user.props?.jobGradeNumber ? '*' : '' }}
                                 </UBadge>
 
                                 <UBadge v-if="user?.props?.wanted" color="red">
diff --git a/app/components/jobs/timeclock/TimeclockInactiveList.vue b/app/components/jobs/timeclock/TimeclockInactiveList.vue
index c5e654bdb..5777d2156 100644
--- a/app/components/jobs/timeclock/TimeclockInactiveList.vue
+++ b/app/components/jobs/timeclock/TimeclockInactiveList.vue
@@ -132,16 +132,15 @@ const columns = [
         class="flex-1"
     >
         <template #name-data="{ row: colleague }">
-            <div class="inline-flex items-center">
+            <div class="inline-flex items-center gap-1 text-gray-900 dark:text-white">
                 <ProfilePictureImg
                     :src="colleague.avatar?.url"
                     :name="`${colleague.firstname} ${colleague.lastname}`"
                     size="sm"
                     :enable-popup="true"
-                    class="mr-2"
                 />
 
-                {{ colleague.firstname }} {{ colleague.lastname }}
+                <span> {{ colleague.firstname }} {{ colleague.lastname }} </span>
             </div>
             <dl class="font-normal lg:hidden">
                 <dt class="sr-only">{{ $t('common.job_grade') }}</dt>
diff --git a/app/components/partials/WebSocketStatusOverlay.vue b/app/components/partials/WebSocketStatusOverlay.vue
index a19fe6e49..8849d0a1b 100644
--- a/app/components/partials/WebSocketStatusOverlay.vue
+++ b/app/components/partials/WebSocketStatusOverlay.vue
@@ -15,6 +15,8 @@ const status = useDebounce(webSocket.status, 150);
 
 const notificationId = ref<string | undefined>();
 
+const overlay = ref<HTMLDivElement | null>(null);
+
 async function checkWebSocketStatus(previousStatus: WebSocketStatus, status: WebSocketStatus): Promise<void> {
     if (notificationId.value !== undefined && status === 'OPEN') {
         toast.remove(notificationId.value);
@@ -28,6 +30,8 @@ async function checkWebSocketStatus(previousStatus: WebSocketStatus, status: Web
             description: t('notifications.grpc_errors.available.content'),
             timeout: timeouts.notification,
         });
+
+        overlay.value?.blur();
     } else if (previousStatus === 'CONNECTING' && status === 'CLOSED') {
         if (notificationId.value !== undefined) {
             return;
@@ -61,6 +65,8 @@ async function checkWebSocketStatus(previousStatus: WebSocketStatus, status: Web
                 },
             ],
         });
+
+        overlay.value?.focus();
     }
 }
 
@@ -84,7 +90,7 @@ useTimeoutFn(() => {
 </script>
 
 <template>
-    <div v-if="notificationId" class="relative z-150">
+    <div v-if="notificationId" ref="overlay" class="relative z-150">
         <div class="fixed inset-0 bg-gray-200/75 transition-opacity dark:bg-gray-800/75" />
 
         <div class="fixed inset-0 overflow-y-auto">
diff --git a/gen/go/proto/services/citizenstore/citizenstore.go b/gen/go/proto/services/citizenstore/citizenstore.go
index 0dc546b91..59eac168b 100644
--- a/gen/go/proto/services/citizenstore/citizenstore.go
+++ b/gen/go/proto/services/citizenstore/citizenstore.go
@@ -129,28 +129,34 @@ func (s *Server) ListCitizens(ctx context.Context, req *ListCitizensRequest) (*L
 				phoneNumber := strings.ReplaceAll(strings.ReplaceAll(*req.PhoneNumber, "%", ""), " ", "") + "%"
 				condition = condition.AND(tUser.PhoneNumber.LIKE(jet.String(phoneNumber)))
 			}
+
 		case "UserProps.Wanted":
 			selectors = append(selectors, tUserProps.Wanted)
 
 			if req.Wanted != nil && *req.Wanted {
 				condition = condition.AND(tUserProps.Wanted.IS_TRUE())
 			}
+
 		case "UserProps.Job":
 			selectors = append(selectors, tUserProps.Job, tUserProps.JobGrade)
+
 		case "UserProps.TrafficInfractionPoints":
 			selectors = append(selectors, tUserProps.TrafficInfractionPoints)
 
 			if req.TrafficInfractionPoints != nil && *req.TrafficInfractionPoints > 0 {
 				condition = condition.AND(tUserProps.TrafficInfractionPoints.GT_EQ(jet.Uint32(*req.TrafficInfractionPoints)))
 			}
+
 		case "UserProps.OpenFines":
 			selectors = append(selectors, tUserProps.OpenFines)
 
 			if req.OpenFines != nil && *req.OpenFines > 0 {
 				condition = condition.AND(tUserProps.OpenFines.GT_EQ(jet.Uint64(*req.OpenFines)))
 			}
+
 		case "UserProps.BloodType":
 			selectors = append(selectors, tUserProps.BloodType)
+
 		case "UserProps.MugShot":
 			selectors = append(selectors, tUserProps.MugShot)
 		}
@@ -159,6 +165,7 @@ func (s *Server) ListCitizens(ctx context.Context, req *ListCitizensRequest) (*L
 	req.Search = strings.TrimSpace(req.Search)
 	req.Search = strings.ReplaceAll(req.Search, "%", "")
 	req.Search = strings.ReplaceAll(req.Search, " ", "%")
+	req.Search = strings.ReplaceAll(req.Search, "\t", " ")
 	if req.Search != "" {
 		req.Search = "%" + req.Search + "%"
 		condition = condition.AND(