Skip to content

Commit

Permalink
fix: timeclock rank display
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Trost <[email protected]>
  • Loading branch information
galexrt committed Oct 14, 2024
1 parent 6045eb0 commit 018bfea
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
5 changes: 2 additions & 3 deletions app/components/jobs/timeclock/TimeclockList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,8 @@ const input = ref<{ input: HTMLInputElement }>();
</template>
<template #rank-data="{ row: entry }">
<div class="text-gray-900 dark:text-white">
{{ entry.jobGradeLabel }}<span v-if="entry.jobGrade > 0"> ({{ entry.jobGrade }})</span>
</div>
{{ entry.entry.user.jobGradeLabel
}}<span v-if="entry.entry.user.jobGrade > 0"> ({{ entry.entry.user.jobGrade }})</span>
</template>
<template #time-data="{ row: entry }">
Expand Down
7 changes: 4 additions & 3 deletions gen/go/proto/services/jobs/timeclock.go
Original file line number Diff line number Diff line change
Expand Up @@ -356,11 +356,12 @@ func (s *Server) ListInactiveEmployees(ctx context.Context, req *ListInactiveEmp
}
}

resp.Pagination.Update(len(resp.Colleagues))

jobInfoFn := s.enricher.EnrichJobInfoSafeFunc(userInfo)
for i := 0; i < len(resp.Colleagues); i++ {
s.enricher.EnrichJobInfo(resp.Colleagues[i])
jobInfoFn(resp.Colleagues[i])
}

resp.Pagination.Update(len(resp.Colleagues))

return resp, nil
}

0 comments on commit 018bfea

Please sign in to comment.