wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-20 23:32:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[UBER-73] Remove project default time report day (#3184)

Browse Source 
Signed-off-by: Sergei Ogorelkov <sergei.ogorelkov@icloud.com>
This commit is contained in:
Sergei Ogorelkov 2023-05-16 10:01:25 +04:00 committed by GitHub
parent 927e838c46
commit fbd27c02c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/tracker-assets/lang/en.json
View File

@ -279,7 +279,6 @@
"CurrentWorkDay": "Current Working Day", "CurrentWorkDay": "Current Working Day",
"PreviousWorkDay": "Previous Working Day", "PreviousWorkDay": "Previous Working Day",
"TimeReportDayTypeLabel": "Select time report day type", "TimeReportDayTypeLabel": "Select time report day type",
"DefaultTimeReportDay": "Select default day for time report",
"DefaultAssignee": "Select default assignee for issues", "DefaultAssignee": "Select default assignee for issues",
"SevenHoursLength": "Seven Hours", "SevenHoursLength": "Seven Hours",

1
plugins/tracker-assets/lang/ru.json
View File

@ -279,7 +279,6 @@
"CurrentWorkDay": "Текущий Рабочий День", "CurrentWorkDay": "Текущий Рабочий День",
"PreviousWorkDay": "Предыдущий Рабочий День", "PreviousWorkDay": "Предыдущий Рабочий День",
"TimeReportDayTypeLabel": "Выберите тип дня для временного отчета", "TimeReportDayTypeLabel": "Выберите тип дня для временного отчета",
"DefaultTimeReportDay": "Выберите день для временного отчета по умолчанию",
"DefaultAssignee": "Выберите исполнителя по умолчанию", "DefaultAssignee": "Выберите исполнителя по умолчанию",
"SevenHoursLength": "Семь Часов", "SevenHoursLength": "Семь Часов",

14
plugins/tracker-resources/src/components/projects/CreateProject.svelte
View File

@ -35,7 +35,6 @@
} from '@hcengineering/ui' } from '@hcengineering/ui'
import { createEventDispatcher } from 'svelte' import { createEventDispatcher } from 'svelte'
import tracker from '../../plugin' import tracker from '../../plugin'
import TimeReportDayDropdown from '../issues/timereport/TimeReportDayDropdown.svelte'
import ChangeIdentity from './ChangeIdentity.svelte' import ChangeIdentity from './ChangeIdentity.svelte'
import ProjectIconChooser from './ProjectIconChooser.svelte' import ProjectIconChooser from './ProjectIconChooser.svelte'
@ -49,8 +48,6 @@
let isPrivate: boolean = project?.private ?? false let isPrivate: boolean = project?.private ?? false
let icon: Asset | undefined = project?.icon ?? undefined let icon: Asset | undefined = project?.icon ?? undefined
let color: number | undefined = project?.color ?? 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 defaultAssignee: Ref<Employee> | null | undefined = project?.defaultAssignee ?? null
let members: Ref<Account>[] = let members: Ref<Account>[] =
project?.members !== undefined ? hierarchy.clone(project.members) : [getCurrentAccount()._id] project?.members !== undefined ? hierarchy.clone(project.members) : [getCurrentAccount()._id]
@ -81,7 +78,7 @@
defaultAssignee: defaultAssignee ?? undefined, defaultAssignee: defaultAssignee ?? undefined,
icon, icon,
color, color,
defaultTimeReportDay: selectedWorkDayType ?? TimeReportDayType.PreviousWorkDay defaultTimeReportDay: project?.defaultTimeReportDay ?? TimeReportDayType.PreviousWorkDay
} }
} }
@ -185,7 +182,7 @@
label={isNew ? tracker.string.NewProject : tracker.string.EditProject} label={isNew ? tracker.string.NewProject : tracker.string.EditProject}
okLabel={isNew ? presentation.string.Create : presentation.string.Save} okLabel={isNew ? presentation.string.Create : presentation.string.Save}
okAction={handleSave} okAction={handleSave}
canSave={name.length > 0 && !!selectedWorkDayType && !(members.length === 0 && isPrivate)} canSave={name.length > 0 && !(members.length === 0 && isPrivate)}
on:close={() => { on:close={() => {
dispatch('close') dispatch('close')
}} }}
@ -242,13 +239,6 @@
/> />
</div> </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="flex-between">
<div class="caption"> <div class="caption">
<Label label={tracker.string.Members} /> <Label label={tracker.string.Members} />

1
plugins/tracker-resources/src/plugin.ts
View File

@ -301,7 +301,6 @@ export default mergeIds(trackerId, tracker, {
CurrentWorkDay: '' as IntlString, CurrentWorkDay: '' as IntlString,
PreviousWorkDay: '' as IntlString, PreviousWorkDay: '' as IntlString,
TimeReportDayTypeLabel: '' as IntlString, TimeReportDayTypeLabel: '' as IntlString,
DefaultTimeReportDay: '' as IntlString,
DefaultAssignee: '' as IntlString, DefaultAssignee: '' as IntlString,
SevenHoursLength: '' as IntlString, SevenHoursLength: '' as IntlString,