diff --git a/plugins/hr-resources/src/components/CreateRequest.svelte b/plugins/hr-resources/src/components/CreateRequest.svelte index 65655a434a..b6c1931887 100644 --- a/plugins/hr-resources/src/components/CreateRequest.svelte +++ b/plugins/hr-resources/src/components/CreateRequest.svelte @@ -92,7 +92,6 @@ items={types.map((p) => { return { id: p._id, label: p.label } })} - placeholder={hr.string.RequestType} label={hr.string.RequestType} on:selected={(e) => typeSelected(e.detail)} /> diff --git a/plugins/hr-resources/src/components/ScheduleView.svelte b/plugins/hr-resources/src/components/ScheduleView.svelte index aeb5d94755..4662604b6b 100644 --- a/plugins/hr-resources/src/components/ScheduleView.svelte +++ b/plugins/hr-resources/src/components/ScheduleView.svelte @@ -157,8 +157,7 @@ : new Date(date).setDate(date.getDate() + 1) } - function getTooltip (employee: Staff, date: Date): LabelAndProps | undefined { - const requests = getRequests(employee._id, date) + function getTooltip (requests: Request[], employee: Staff, date: Date): LabelAndProps | undefined { if (requests.length === 0) return const endDate = getEndDate(date) return { @@ -234,31 +233,37 @@ {#if mode === CalendarMode.Year} {@const month = getMonth(currentDate, value)} {@const requests = getRequests(employee._id, month)} - -
- {getTotal(requests)} -
- + {@const tooltipValue = getTooltip(requests, employee, month)} + {#key tooltipValue} + +
+ {getTotal(requests)} +
+ + {/key} {:else} {@const date = getDay(new Date(startDate), value)} {@const requests = getRequests(employee._id, date)} {@const editable = isEditable(employee)} - createRequest(e, date, employee)} - > - {#if requests.length} - - {/if} - + {@const tooltipValue = getTooltip(requests, employee, date)} + {#key [tooltipValue, editable]} + createRequest(e, date, employee)} + > + {#if requests.length} + + {/if} + + {/key} {/if} {/each}