diff --git a/SPECIFICATION.md b/SPECIFICATION.md
index 55ca6ce7..68986641 100644
--- a/SPECIFICATION.md
+++ b/SPECIFICATION.md
@@ -609,9 +609,10 @@ employees — sick leave is the canonical example (`employee_requestable = false
edits or cancels it from the standard detail sidebar. There is **no delete**: a wrong
entry is cancelled (`CANCELLED`), so the row and its history stay intact for the audit
trail (§17). HR's cancel skips the withdrawal step and applies immediately (§5.5).
-- **No "Approved" label shown.** Since approval isn't a concept for HR-recorded leave,
- the UI hides the status chip and the approval **progress stepper** when such a request
- is `APPROVED` (a cancelled one still shows its status). The leave-type chip (e.g.
+- **"Recorded", not "Approved".** Since approval isn't a concept for HR-recorded leave,
+ the status chip reads **Recorded** and the approval **progress stepper** is hidden when
+ such a request is `APPROVED` (a cancelled one still shows its status). Every row of a
+ list carries a chip, so these rows look like the others. The leave-type chip (e.g.
"🤒 Sick leave") still identifies it.
---
@@ -1587,8 +1588,13 @@ NcContent(app-name="absence")
count adds the escalated requests, which HR decides on that page. HR sees
the *HR* section (grouped under an `NcAppNavigationCaption`). Every item uses an
`@mdi` icon. The **`NcAppNavigationNew` "New request"** button sits at the top as the
- single prominent primary action.
-- **Center `NcAppContent`** hosts the routed view.
+ single prominent primary action. A page header button that repeats a navigation action
+ (*New request* on My leave, *Record absence* on Absences) only shows while the
+ navigation is closed, so there is always exactly one.
+- **Center `NcAppContent`** hosts the routed view. Every view uses the one page wrapper
+ (`src/styles/page.scss`): title and content share the same left edge, clear of the
+ navigation toggle; tables and timelines take the full width, forms, lists and cards
+ stop at a reading width.
- **Right `NcAppSidebar`** opens when a request is selected, with tabbed detail
(Details / Coverage / Comments / History) — the standard Nextcloud master-detail
pattern, used instead of a modal for *viewing* a request. Each comment shows when it
@@ -1676,7 +1682,8 @@ NcContent(app-name="absence")
- **Absences** (`#/hr/absences`, HR only) — the counterpart to *Record absence*: the
full list of recorded absences with filters for employee (user autocomplete), leave
type, status and year, paged with a "Load more" button. Rows are the same
- `RequestListItem` as elsewhere and open the detail sidebar, whose **Edit** and
+ `RequestListItem` as elsewhere (with the person's days of that type still to book,
+ "N available", for a single year) and open the detail sidebar, whose **Edit** and
**Cancel** controls are what let HR correct a wrong vacation or sick day (§5.6).
People are named, never printed as user ids: requests are serialized with an
`employeeName` (display name, falling back to the uid for a deleted account),
diff --git a/src/App.vue b/src/App.vue
index 6ccfaeca..d4020b35 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -338,10 +338,4 @@ function onChanged(): void {
// The page shell and table styles every view builds on. Global on purpose —
// see the file header.
@use './styles/page.scss';
-
-// Keep the page titles clear of the floating app-navigation toggle button,
-// which overlays the top-left corner of the content area (applies to every view).
-.app-absence .page__header {
- padding-inline-start: calc(var(--default-clickable-area, 44px) + var(--app-navigation-padding, 4px) * 2);
-}
diff --git a/src/components/RequestListItem.vue b/src/components/RequestListItem.vue
index b3bfbae4..f7173144 100644
--- a/src/components/RequestListItem.vue
+++ b/src/components/RequestListItem.vue
@@ -23,7 +23,7 @@
⚠️
{{ othersOff.label }}
-
+
@@ -46,14 +46,14 @@ const props = withDefaults(defineProps<{
request: LeaveRequest
active?: boolean
showEmployee?: boolean
- // The employee's remaining days for this leave type and year, when the caller
- // has them to hand. Null for leave that counts against no allowance, and while
- // the figures are still loading.
- remaining?: number | null
+ // The days the employee can still book of this leave type and year (after
+ // pending requests), when the caller has them to hand. Null for leave that
+ // counts against no allowance, and while the figures are still loading.
+ available?: number | null
}>(), {
active: false,
showEmployee: false,
- remaining: null,
+ available: null,
})
const emit = defineEmits<{
@@ -65,9 +65,7 @@ const leaveTypesStore = useLeaveTypesStore()
const type = computed(() => leaveTypesStore.leaveType(props.request.typeId))
// On a decision queue every row waits, so the status only tells a withdrawal apart
-const showStatus = computed(() => props.request.decision
- ? props.request.status === 'WITHDRAWAL_PENDING'
- : leaveTypesStore.statusVisible(props.request))
+const showStatus = computed(() => !props.request.decision || props.request.status === 'WITHDRAWAL_PENDING')
const waiting = computed(() => {
const since = props.request.decision?.waitingSince
@@ -110,12 +108,12 @@ const subtitle = computed(() => {
if (after !== undefined && after !== null) {
return `${range} · ${days} · ${n('absence', '%n available after', '%n available after', Math.round(after * 10) / 10)}`
}
- if (props.remaining === null) {
+ if (props.available === null) {
return `${range} · ${days}`
}
// Days taken alone does not answer the question the list is scanned for.
- const left = n('absence', '%n day left', '%n days left', Math.round(props.remaining * 10) / 10)
- return `${range} · ${days} · ${left}`
+ const available = n('absence', '%n available', '%n available', Math.round(props.available * 10) / 10)
+ return `${range} · ${days} · ${available}`
})
/**
diff --git a/src/components/RequestSidebar.vue b/src/components/RequestSidebar.vue
index 9f900569..32e21e3a 100644
--- a/src/components/RequestSidebar.vue
+++ b/src/components/RequestSidebar.vue
@@ -8,8 +8,8 @@
:name="type.label"
:subname="subLabel"
@close="$emit('close')">
-
-
+
+
@@ -22,7 +22,7 @@
{{ shortNoticeLabel }}
-
+
- {{ t('absence', 'Employee') }}
-
@@ -430,7 +430,8 @@ const shortNoticeLabel = computed(() => {
/** A confidential absence seen by someone outside HR: no category, no thread. */
const withheld = computed(() => detail.value?.typeId === null)
-const showStatus = computed(() => detail.value ? leaveTypesStore.statusVisible(detail.value) : true)
+/** Leave HR booked without an approval: there are no steps to show */
+const recorded = computed(() => detail.value !== null && leaveTypesStore.displayStatus(detail.value) === 'RECORDED')
const isDecidable = computed(() => detail.value !== null && ['PENDING', 'ESCALATED', 'WITHDRAWAL_PENDING'].includes(detail.value.status))
diff --git a/src/components/StatusChip.vue b/src/components/StatusChip.vue
index 17c63bdf..bcc71712 100644
--- a/src/components/StatusChip.vue
+++ b/src/components/StatusChip.vue
@@ -10,13 +10,13 @@