This repository has been archived by the owner on Feb 5, 2023. It is now read-only.
Rework add hours component #181
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
tsinevik
commented
Aug 18, 2021
tsinevik
commented
- Updated add hours layout to new design
- Connected component with backend
# Conflicts: # src/app/modules/user/components/add-hours/add-hours.component.ts # src/app/modules/user/components/attendance/attendance.component.ts
# Conflicts: # src/app/core/services/user/user.service.ts # src/app/modules/user/components/attendance/attendance.component.ts
# Conflicts: # src/app/modules/user/components/add-hours/add-hours.component.ts # src/app/shared/shared.module.ts
…dd-hours-layout # Conflicts: # src/app/modules/user/components/add-hours/add-hours.component.html # src/app/modules/user/components/add-hours/add-hours.component.ts # src/app/modules/user/components/attendance/attendance.component.html
# Conflicts: # src/app/modules/user/components/add-hours/add-hours.component.html # src/app/modules/user/components/add-hours/add-hours.component.ts # src/app/modules/user/components/attendance/attendance.component.ts
# Conflicts: # src/app/data/api/time-service/models/leave-time-info.ts
AnastassiaVarabei
previously approved these changes
Aug 20, 2021
Dimokku
reviewed
Aug 20, 2021
| [timePeriodSelected]='timePeriodSelected' | ||
| [projects]='projects$ | async' | ||
| ></do-user-tasks> | ||
| <do-user-tasks class="tasks" [timePeriodSelected]="timePeriodSelected" [projects]="projects$ | async"></do-user-tasks> |
There was a problem hiding this comment.
timePeriodSelected и projects можно не передавать, в компоненте дата сама инициализируется и проекты с отсутствиями сами подтягиваются с сервера. И класс тоже вроде ни на что не влияет
| task: ['', Validators.required], | ||
| description: [''], | ||
| }); | ||
| this.workTimes$ = this._getWorkTimes(3); |
There was a problem hiding this comment.
Тут должен быть номер текущего месяца или всё же константный третий?
Dimokku
approved these changes
Aug 22, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.