From fbd27c02c2296b22b1a7aa736f65c2349b22b77a Mon Sep 17 00:00:00 2001
From: Sergei Ogorelkov <sergei.ogorelkov@icloud.com>
Date: Tue, 16 May 2023 10:01:25 +0400
Subject: [PATCH] [UBER-73] Remove project default time report day (#3184)
Signed-off-by: Sergei Ogorelkov <sergei.ogorelkov@icloud.com>
---
plugins/tracker-assets/lang/en.json | 1 -
plugins/tracker-assets/lang/ru.json | 1 -
.../src/components/projects/CreateProject.svelte | 14 ++------------
plugins/tracker-resources/src/plugin.ts | 1 -
4 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/plugins/tracker-assets/lang/en.json b/plugins/tracker-assets/lang/en.json
index 751fbe9a89..d9519a0731 100644
--- a/plugins/tracker-assets/lang/en.json
+++ b/plugins/tracker-assets/lang/en.json
@@ -279,7 +279,6 @@
"CurrentWorkDay": "Current Working Day",
"PreviousWorkDay": "Previous Working Day",
"TimeReportDayTypeLabel": "Select time report day type",
- "DefaultTimeReportDay": "Select default day for time report",
"DefaultAssignee": "Select default assignee for issues",
"SevenHoursLength": "Seven Hours",
diff --git a/plugins/tracker-assets/lang/ru.json b/plugins/tracker-assets/lang/ru.json
index dfa7bfe97f..7c218b7131 100644
--- a/plugins/tracker-assets/lang/ru.json
+++ b/plugins/tracker-assets/lang/ru.json
@@ -279,7 +279,6 @@
"CurrentWorkDay": "Текущий Рабочий День",
"PreviousWorkDay": "Предыдущий Рабочий День",
"TimeReportDayTypeLabel": "Выберите тип дня для временного отчета",
- "DefaultTimeReportDay": "Выберите день для временного отчета по умолчанию",
"DefaultAssignee": "Выберите исполнителя по умолчанию",
"SevenHoursLength": "Семь Часов",
diff --git a/plugins/tracker-resources/src/components/projects/CreateProject.svelte b/plugins/tracker-resources/src/components/projects/CreateProject.svelte
index 72abe6e190..2ada663bfd 100644
--- a/plugins/tracker-resources/src/components/projects/CreateProject.svelte
+++ b/plugins/tracker-resources/src/components/projects/CreateProject.svelte
@@ -35,7 +35,6 @@
} from '@hcengineering/ui'
import { createEventDispatcher } from 'svelte'
import tracker from '../../plugin'
- import TimeReportDayDropdown from '../issues/timereport/TimeReportDayDropdown.svelte'
import ChangeIdentity from './ChangeIdentity.svelte'
import ProjectIconChooser from './ProjectIconChooser.svelte'
@@ -49,8 +48,6 @@
let isPrivate: boolean = project?.private ?? false
let icon: Asset | undefined = project?.icon ?? undefined
let color: number | undefined = project?.color ?? undefined
- let selectedWorkDayType: TimeReportDayType | undefined =
- project?.defaultTimeReportDay ?? TimeReportDayType.PreviousWorkDay
let defaultAssignee: Ref<Employee> | null | undefined = project?.defaultAssignee ?? null
let members: Ref<Account>[] =
project?.members !== undefined ? hierarchy.clone(project.members) : [getCurrentAccount()._id]
@@ -81,7 +78,7 @@
defaultAssignee: defaultAssignee ?? undefined,
icon,
color,
- defaultTimeReportDay: selectedWorkDayType ?? TimeReportDayType.PreviousWorkDay
+ defaultTimeReportDay: project?.defaultTimeReportDay ?? TimeReportDayType.PreviousWorkDay
}
}
@@ -185,7 +182,7 @@
label={isNew ? tracker.string.NewProject : tracker.string.EditProject}
okLabel={isNew ? presentation.string.Create : presentation.string.Save}
okAction={handleSave}
- canSave={name.length > 0 && !!selectedWorkDayType && !(members.length === 0 && isPrivate)}
+ canSave={name.length > 0 && !(members.length === 0 && isPrivate)}
on:close={() => {
dispatch('close')
}}
@@ -242,13 +239,6 @@
/>
</div>
- <div class="flex-between">
- <div class="caption">
- <Label label={tracker.string.DefaultTimeReportDay} />
- </div>
- <TimeReportDayDropdown bind:selected={selectedWorkDayType} label={tracker.string.DefaultTimeReportDay} />
- </div>
-
<div class="flex-between">
<div class="caption">
<Label label={tracker.string.Members} />
diff --git a/plugins/tracker-resources/src/plugin.ts b/plugins/tracker-resources/src/plugin.ts
index bf1155617e..3f3f2390fc 100644
--- a/plugins/tracker-resources/src/plugin.ts
+++ b/plugins/tracker-resources/src/plugin.ts
@@ -301,7 +301,6 @@ export default mergeIds(trackerId, tracker, {
CurrentWorkDay: '' as IntlString,
PreviousWorkDay: '' as IntlString,
TimeReportDayTypeLabel: '' as IntlString,
- DefaultTimeReportDay: '' as IntlString,
DefaultAssignee: '' as IntlString,
SevenHoursLength: '' as IntlString,