+ {#each slots as slot, i}
+
+
+
change(e, slot)}
+ on:dueChange={(e) => dueChange(e, slot)}
+ />
+
- {/each}
-
-
-
-
-
+
+
dispatch('create')}
+ >
+ {#if shortcuts}
+
+ {/if}
+
+ {#if duration}
+
+ :
+
+ {duration}
+
+ {/if}
diff --git a/plugins/time-resources/src/plugin.ts b/plugins/time-resources/src/plugin.ts
index 3b8883b9a2..b333d54781 100644
--- a/plugins/time-resources/src/plugin.ts
+++ b/plugins/time-resources/src/plugin.ts
@@ -61,6 +61,7 @@ export default mergeIds(timeId, time, {
AddTo: '' as IntlString,
AddTitle: '' as IntlString,
MyWork: '' as IntlString,
- WorkSchedule: '' as IntlString
+ WorkSchedule: '' as IntlString,
+ SummaryDuration: '' as IntlString
}
})
diff --git a/plugins/time-resources/src/utils.ts b/plugins/time-resources/src/utils.ts
index dd703e8ede..499e80ae22 100644
--- a/plugins/time-resources/src/utils.ts
+++ b/plugins/time-resources/src/utils.ts
@@ -1,6 +1,9 @@
-import type { Client, Ref } from '@hcengineering/core'
-import type { DefSeparators } from '@hcengineering/ui'
import type { WorkSlot, ToDo } from '@hcengineering/time'
+import type { DefSeparators } from '@hcengineering/ui'
+import type { Client, Ref } from '@hcengineering/core'
+import { DAY, HOUR, MINUTE } from '@hcengineering/ui'
+import { translate } from '@hcengineering/platform'
+import timePlugin from './plugin'
import time from '@hcengineering/time'
export * from './types'
@@ -36,3 +39,46 @@ export async function ToDoTitleProvider (client: Client, ref: Ref
, doc?: T
return object.title
}
+
+export function calculateEventsDuration (events: WorkSlot[]): number {
+ const points = events.flatMap((event) => [
+ { time: event.date, type: 'start' },
+ { time: event.dueDate, type: 'end' }
+ ])
+
+ points.sort((a, b) => a.time - b.time)
+
+ let activeEvents = 0
+ let duration = 0
+ let lastTime = 0
+
+ points.forEach((point) => {
+ if (activeEvents > 0) {
+ duration += point.time - lastTime
+ }
+ activeEvents += point.type === 'start' ? 1 : -1
+ lastTime = point.time
+ })
+
+ return duration
+}
+
+export async function formatEventsDuration (duration: number, language: string): Promise {
+ let text = ''
+ const days = Math.floor(duration / DAY)
+ if (days > 0) {
+ text += await translate(timePlugin.string.Days, { days }, language)
+ }
+ const hours = Math.floor((duration % DAY) / HOUR)
+ if (hours > 0) {
+ text += ' '
+ text += await translate(timePlugin.string.Hours, { hours }, language)
+ }
+ const minutes = Math.floor((duration % HOUR) / MINUTE)
+ if (minutes > 0) {
+ text += ' '
+ text += await translate(timePlugin.string.Minutes, { minutes }, language)
+ }
+ text = text.trim()
+ return text
+}
diff --git a/plugins/time/src/index.ts b/plugins/time/src/index.ts
index b1bcf69018..734a768ea8 100644
--- a/plugins/time/src/index.ts
+++ b/plugins/time/src/index.ts
@@ -13,12 +13,12 @@
// limitations under the License.
//
-import { Event, Visibility } from '@hcengineering/calendar'
-import { Person } from '@hcengineering/contact'
-import { AttachedDoc, Class, Doc, Hierarchy, Markup, Mixin, Ref, Space, Timestamp, Type } from '@hcengineering/core'
import type { Asset, Plugin, Resource } from '@hcengineering/platform'
+import { AttachedDoc, Class, Doc, Hierarchy, Markup, Mixin, Ref, Space, Timestamp, Type } from '@hcengineering/core'
import { IntlString, plugin } from '@hcengineering/platform'
+import { Event, Visibility } from '@hcengineering/calendar'
import { AnyComponent } from '@hcengineering/ui'
+import { Person } from '@hcengineering/contact'
/**
* @public
@@ -120,7 +120,7 @@ export default plugin(timeId, {
Team: '' as Asset,
Hashtag: '' as Asset,
Inbox: '' as Asset,
- Target: '' as Asset,
+ Calendar: '' as Asset,
Flag: '' as Asset,
FilledFlag: '' as Asset,
Planned: '' as Asset,
diff --git a/tests/create-local.sh b/tests/create-local.sh
index f57a9dff0d..7befb98d94 100755
--- a/tests/create-local.sh
+++ b/tests/create-local.sh
@@ -1,5 +1,5 @@
# Create workspace record in accounts
-./tool-local.sh create-workspace sanity-ws -o SanityTest
+./tool-local.sh create-workspace sanity-ws -w SanityTest
# Create user record in accounts
./tool-local.sh create-account user1 -f John -l Appleseed -p 1234
./tool-local.sh confirm-email user1
diff --git a/tests/sanity/tests/model/planning/planning-page.ts b/tests/sanity/tests/model/planning/planning-page.ts
index 67860c6538..81318a8bd8 100644
--- a/tests/sanity/tests/model/planning/planning-page.ts
+++ b/tests/sanity/tests/model/planning/planning-page.ts
@@ -40,8 +40,12 @@ export class PlanningPage extends CalendarPage {
this.inputPopupCreateTitle = page.locator('div.popup input')
this.inputPopupCreateDescription = page.locator('div.popup div.tiptap')
this.inputPanelCreateDescription = page.locator('div.hulyModal-container div.tiptap')
- this.buttonPopupCreateDueDate = page.locator('div.popup button.antiButton', { hasText: 'Due date' })
- this.buttonPanelCreateDueDate = page.locator('div.hulyModal-container button.antiButton', { hasText: 'Due date' })
+ this.buttonPopupCreateDueDate = page.locator(
+ 'div.popup div.block:first-child div.flex-row-center button:nth-child(3)'
+ )
+ this.buttonPanelCreateDueDate = page.locator(
+ 'div.hulyModal-container div.slots-content div.flex-row-top.justify-between div.flex-row-center button:first-child'
+ )
this.buttonPopupCreatePriority = page.locator('div.popup button#priorityButton')
this.buttonPanelCreatePriority = page.locator('div.hulyModal-container button#priorityButton')
this.buttonPopupCreateVisible = page.locator('div.popup button.type-button.menu', { hasText: 'visible' })
@@ -50,8 +54,8 @@ export class PlanningPage extends CalendarPage {
})
this.buttonPopupCreateAddLabel = page.locator('div.popup button.antiButton', { hasText: 'Add label' })
this.buttonPanelCreateAddLabel = page.locator('.hulyHeader-titleGroup > button:nth-child(2)')
- this.buttonPopupCreateAddSlot = page.locator('div.popup button.antiButton', { hasText: 'Add Slot' })
- this.buttonPanelCreateAddSlot = page.locator('div.hulyModal-container button.antiButton', { hasText: 'Add Slot' })
+ this.buttonPopupCreateAddSlot = page.locator('div.popup button', { hasText: 'Add Slot' })
+ this.buttonPanelCreateAddSlot = page.locator('div.hulyModal-container button', { hasText: 'Add Slot' })
this.buttonCalendarToday = page.locator('div.popup div.calendar button.day.today')
this.buttonCreateToDo = page.locator('div.popup button.antiButton', { hasText: 'Add ToDo' })
this.inputCreateToDoTitle = page.locator('div.toDos-container input[placeholder="Add todo, press Enter to save"]')
@@ -63,7 +67,7 @@ export class PlanningPage extends CalendarPage {
)
this.textPanelToDoDescription = page.locator('div.hulyModal-container div.top-content div.tiptap > p')
this.textPanelDueDate = page.locator(
- 'div.hulyModal-container div.slots-content div.flex-row-top.justify-between div.flex-row-center button.antiButton:first-child div[slot="content"]'
+ 'div.hulyModal-container div.slots-content div.flex-row-top.justify-between div.flex-row-center button:first-child span'
)
this.textPanelPriority = page.locator('div.hulyModal-container button#priorityButton svg')
this.textPanelVisible = page.locator(
@@ -133,12 +137,12 @@ export class PlanningPage extends CalendarPage {
public async setTimeSlot (rowNumber: number, slot: Slot, popup: boolean = false): Promise {
const p = popup
- ? 'div.popup div.horizontalBox div.flex-row-center'
- : 'div.hulyModal-container div.slots-content div.horizontalBox div.flex-row-center'
+ ? 'div.popup div.horizontalBox div.end div.flex-col div.flex'
+ : 'div.hulyModal-container div.slots-content div.flex-col div.flex'
const row = this.page.locator(p).nth(rowNumber)
// dateStart
- await row.locator('div.dateEditor-container:nth-child(2) button:first-child').click()
+ await row.locator('div.dateEditor-container:nth-child(1) button:first-child').click()
if (slot.dateStart === 'today') {
await this.buttonCalendarToday.click()
} else {
@@ -154,34 +158,34 @@ export class PlanningPage extends CalendarPage {
const hours = slot.timeStart.substring(0, 2)
const minutes = slot.timeStart.substring(2, slot.timeStart.length)
await row
- .locator('div.dateEditor-container:nth-child(2) button:last-child span.digit:first-child')
+ .locator('div.dateEditor-container:nth-child(1) button:last-child span.digit:first-child')
.click({ delay: 200 })
await row
- .locator('div.dateEditor-container:nth-child(2) button:last-child span.digit:first-child')
+ .locator('div.dateEditor-container:nth-child(1) button:last-child span.digit:first-child')
.pressSequentially(hours, { delay: 100 })
await row
- .locator('div.dateEditor-container:nth-child(2) button:last-child span.digit:last-child')
+ .locator('div.dateEditor-container:nth-child(1) button:last-child span.digit:last-child')
.click({ delay: 200 })
await row
- .locator('div.dateEditor-container:nth-child(2) button:last-child span.digit:last-child')
+ .locator('div.dateEditor-container:nth-child(1) button:last-child span.digit:last-child')
.pressSequentially(minutes, { delay: 100 })
// dateEnd + timeEnd
- await row.locator('div.dateEditor-container:nth-child(4) button').click()
+ await row.locator('div.dateEditor-container.difference button').click()
await this.fillSelectDatePopup(slot.dateEnd.day, slot.dateEnd.month, slot.dateEnd.year, slot.timeEnd)
}
private async checkTimeSlot (rowNumber: number, slot: Slot, popup: boolean = false): Promise {
const p = popup
- ? 'div.popup div.horizontalBox div.flex-row-center'
- : 'div.hulyModal-container div.slots-content div.horizontalBox div.flex-row-center'
+ ? 'div.popup div.horizontalBox div.end div.flex-col div.flex'
+ : 'div.hulyModal-container div.slots-content div.flex-col div.flex'
const row = this.page.locator(p).nth(rowNumber)
// timeStart
- await expect(row.locator('div.dateEditor-container:nth-child(2) button:last-child div.datetime-input')).toHaveText(
+ await expect(row.locator('div.dateEditor-container:nth-child(1) button:last-child div.datetime-input')).toHaveText(
slot.timeStart
)
// timeEnd
- await expect(row.locator('div.dateEditor-container:nth-child(4) button > div:first-child')).toHaveText(slot.timeEnd)
+ await expect(row.locator('div.dateEditor-container.difference button > div:first-child')).toHaveText(slot.timeEnd)
}
async openToDoByName (toDoName: string): Promise {
@@ -255,18 +259,17 @@ export class PlanningPage extends CalendarPage {
}
public async deleteTimeSlot (rowNumber: number): Promise {
- const row = this.page.locator('div.hulyModal-container div.slots-content div.horizontalBox div.tool').nth(rowNumber)
+ const row = this.page
+ .locator('div.hulyModal-container div.slots-content div.flex-col div.flex div.tool')
+ .nth(rowNumber)
await row.locator('xpath=..').hover()
await row.locator('button').click()
- await expect(row.locator('button')).toBeHidden()
await this.pressYesDeletePopup(this.page)
}
public async checkTimeSlotEndDate (rowNumber: number, dateEnd: string): Promise {
- const row = this.page
- .locator('div.hulyModal-container div.slots-content div.horizontalBox div.flex-row-center')
- .nth(rowNumber)
+ const row = this.page.locator('div.hulyModal-container div.slots-content div.flex-col div.flex').nth(rowNumber)
// dateEnd
- await expect(row.locator('div.dateEditor-container:nth-child(2) button:first-child')).toContainText(dateEnd)
+ await expect(row.locator('div.dateEditor-container:nth-child(1) button:first-child')).toContainText(dateEnd)
}
}