diff --git a/app/Models/Person/Person.php b/app/Models/Person/Person.php index d65c435..ef3f74d 100644 --- a/app/Models/Person/Person.php +++ b/app/Models/Person/Person.php @@ -68,7 +68,7 @@ protected static function booted() protected function makeAllSearchableUsing(Builder $query): Builder { - return $query->with(['addresses', 'phones']); + return $query->with(['addresses', 'phones', 'emails']); } public function toSearchableArray(): array @@ -79,6 +79,7 @@ public function toSearchableArray(): array 'full_name' => '', 'person_addresses.address' => '', 'person_phones.nu' => '', + 'emails.value' => '', ]; } diff --git a/resources/js/Pages/Cases/Partials/ActivityTable.vue b/resources/js/Pages/Cases/Partials/ActivityTable.vue index 79bc8b4..b48badc 100644 --- a/resources/js/Pages/Cases/Partials/ActivityTable.vue +++ b/resources/js/Pages/Cases/Partials/ActivityTable.vue @@ -93,6 +93,7 @@ const confirmDeleteAction = () => { > + Pogodba Odločitev Opomba @@ -107,6 +108,15 @@ const confirmDeleteAction = () => { :key="row.id" class="border-b last:border-b-0" > + + + +
{ vertical-align: top; padding: 0.625rem 1rem; /* match header horizontal padding */ } +/* Center the decision dot in its column */ +.activity-basic-table td.decision-dot { + vertical-align: middle; +} /* Ensure first column lines up exactly (no extra offset) */ .activity-basic-table th:first-child, .activity-basic-table td:first-child { @@ -268,11 +283,11 @@ const confirmDeleteAction = () => { /* Column sizing hints (optional fine tuning) */ .activity-basic-table th:nth-child(1), .activity-basic-table td:nth-child(1) { - width: 14%; + width: 6%; } .activity-basic-table th:nth-child(2), .activity-basic-table td:nth-child(2) { - width: 16%; + width: 14%; } .activity-basic-table th:nth-child(3), .activity-basic-table td:nth-child(3) { diff --git a/resources/js/Pages/Notifications/Unread.vue b/resources/js/Pages/Notifications/Unread.vue index 1b4e201..2637a13 100644 --- a/resources/js/Pages/Notifications/Unread.vue +++ b/resources/js/Pages/Notifications/Unread.vue @@ -1,30 +1,39 @@ @@ -45,8 +54,14 @@ async function markRead(id) {
@@ -88,10 +119,18 @@ async function markRead(id) { {{ fmtDate(row.due_date) }} diff --git a/routes/web.php b/routes/web.php index c841024..b390987 100644 --- a/routes/web.php +++ b/routes/web.php @@ -119,6 +119,7 @@ $builder->join('clients', 'person.id', '=', 'clients.person_id') ->leftJoin('person_addresses', 'person.id', '=', 'person_addresses.person_id') ->leftJoin('person_phones', 'person.id', '=', 'person_phones.person_id') + ->leftJoin('emails', 'person.id', '=', 'emails.person_id') ->select('person.*', 'clients.uuid as client_uuid') ->limit($request->input('limit')); }) @@ -129,6 +130,7 @@ $builder->join('client_cases', 'person.id', '=', 'client_cases.person_id') ->leftJoin('person_addresses', 'person.id', '=', 'person_addresses.person_id') ->leftJoin('person_phones', 'person.id', '=', 'person_phones.person_id') + ->leftJoin('emails', 'person.id', '=', 'emails.person_id') ->select('person.*', 'client_cases.uuid as case_uuid', 'client_cases.id as case_id') ->limit($request->input('limit')); })