diff --git a/models/recruit/src/review.ts b/models/recruit/src/review.ts index 65228dea52..934f4751bf 100644 --- a/models/recruit/src/review.ts +++ b/models/recruit/src/review.ts @@ -93,7 +93,16 @@ export function createReviewModel (builder: Builder): void { company: contact.class.Organization } } as FindOptions, - config: [] + config: [ + '', + 'title', + '$lookup.attachedTo', + 'verdict', + { key: '', presenter: recruit.component.OpinionsPresenter, label: recruit.string.Opinions, sortingKey: 'opinions' }, + { key: '$lookup.participants', presenter: calendar.component.PersonsPresenter, label: calendar.string.Participants, sortingKey: '$lookup.participants' }, + '$lookup.company', + 'modifiedOn' + ] }) } @@ -119,8 +128,6 @@ function createTableViewlet (builder: Builder): void { '$lookup.company', 'date', 'dueDate', - // { presenter: attachment.component.AttachmentsPresenter, label: attachment.string.Files, sortingKey: 'attachments' }, - // { presenter: chunter.component.CommentsPresenter, label: chunter.string.Comments, sortingKey: 'comments' }, 'modifiedOn' ] }) diff --git a/packages/ui/src/components/Tooltip.svelte b/packages/ui/src/components/Tooltip.svelte index 4f056d1dc5..0981db6365 100644 --- a/packages/ui/src/components/Tooltip.svelte +++ b/packages/ui/src/components/Tooltip.svelte @@ -22,6 +22,7 @@ export let component: AnySvelteComponent | AnyComponent | undefined = undefined export let props: any | undefined = undefined export let anchor: HTMLElement | undefined = undefined + export let fill = false let triggerHTML: HTMLElement let shown: boolean = false @@ -29,7 +30,7 @@
{ @@ -42,5 +43,9 @@ diff --git a/packages/ui/src/components/calendar/MonthCalendar.svelte b/packages/ui/src/components/calendar/MonthCalendar.svelte index de2a4452ed..06053f44fa 100644 --- a/packages/ui/src/components/calendar/MonthCalendar.svelte +++ b/packages/ui/src/components/calendar/MonthCalendar.svelte @@ -31,7 +31,7 @@ const todayDate = new Date() -
+
{#each [...Array(7).keys()] as dayOfWeek}
{getWeekDayName(day(firstDayOfCurrentMonth, dayOfWeek), weekFormat)}
@@ -52,7 +52,7 @@ currentDate.getMonth()} on:click={() => onSelect(weekday(firstDayOfCurrentMonth, weekIndex, dayOfWeek))} > - {#if !$$slots.cell || weekday(firstDayOfCurrentMonth, weekIndex, dayOfWeek).getMonth() !== currentDate.getMonth()} + {#if !$$slots.cell } {weekday(firstDayOfCurrentMonth, weekIndex, dayOfWeek).getDate()} {:else} @@ -89,8 +89,8 @@ color: var(--primary-button-color); } .cell { - height: 100%; - width: 100%; + height: calc(100% - 5px); + width: calc(100% - 5px); border-radius: 0.5rem; border: 1px solid transparent; } diff --git a/plugins/calendar-resources/src/components/CalendarView.svelte b/plugins/calendar-resources/src/components/CalendarView.svelte index 37acca770c..7ef1f1108d 100644 --- a/plugins/calendar-resources/src/components/CalendarView.svelte +++ b/plugins/calendar-resources/src/components/CalendarView.svelte @@ -211,18 +211,20 @@
+{#if mode === CalendarMode.Year} - {#if mode === CalendarMode.Year} - + + {:else if mode === CalendarMode.Month} - - - - - +
+ + + + + +
{/if} - diff --git a/plugins/calendar-resources/src/components/Day.svelte b/plugins/calendar-resources/src/components/Day.svelte index edff283079..9a83230a6d 100644 --- a/plugins/calendar-resources/src/components/Day.svelte +++ b/plugins/calendar-resources/src/components/Day.svelte @@ -14,6 +14,7 @@ --> {#if events.length > 0} - -
- {date.getDate()} -
-
+ + {#if size === 'huge'} +
+
+ {date.getDate()} +
+
+
+
+ {#each events.slice(0, 4) as e, ei} +
+ {e.title} +
+ {new Date(e.date).getHours()}:{new Date(e.date).getMinutes()} +
+
+ {/each} + {#if events.length > 4} + And {events.length - 4} more + {/if} +
+
+ {:else} +
+ {date.getDate()} +
+
+ {/if} +{:else if size === 'huge'} + +
+ {date.getDate()} +
+ {:else} - {date.getDate()} +
+ {date.getDate()} +
{/if} diff --git a/plugins/calendar-resources/src/components/EventsPopup.svelte b/plugins/calendar-resources/src/components/EventsPopup.svelte index 30a4e20bcd..c6b0f81af2 100644 --- a/plugins/calendar-resources/src/components/EventsPopup.svelte +++ b/plugins/calendar-resources/src/components/EventsPopup.svelte @@ -16,23 +16,23 @@ it._id) } } } + _class={_class} + config={config} + {baseMenuClass} + options={ options } + query={ { ...query, _id: { $in: value.map(it => it._id) } } } loadingProps={{ length: value.length ?? 0 }} />