[Workshop Admin/ Deputy] - personal cabinet functionality #1173 #1233
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
Release Candidate 1.0.0
…ttps://github.com/ita-social-projects/OoS-Frontend into Workshop-Admin-Deputy-personalcabinet-functionality
remove path (#1245)
litvinets
requested changes
May 31, 2022
| this.displayedColumns = ['pib', 'email', 'phone', 'place', 'role', 'status', 'actions']; | ||
| this.dataSource = new MatTableDataSource(this.users); | ||
| ngOnInit(): void { | ||
| this.subrole$.subscribe((subrole) => (this.subrole = subrole)); |
| @@ -47,6 +47,8 @@ describe('ProviderAdminsComponent', () => { | |||
| fixture = TestBed.createComponent(ProviderAdminsComponent); | |||
| component = fixture.componentInstance; | |||
| fixture.detectChanges(); | |||
| component.subrole = '' as string; | |||
|
|
|||
| @@ -47,6 +47,8 @@ describe('ProviderAdminsComponent', () => { | |||
| fixture = TestBed.createComponent(ProviderAdminsComponent); | |||
| component = fixture.componentInstance; | |||
| fixture.detectChanges(); | |||
| component.subrole = '' as string; | |||
|
|
|||
| @@ -85,6 +106,8 @@ export class ProviderAdminsComponent implements OnInit, OnDestroy { | |||
| takeUntil(this.destroy$) | |||
| ) | |||
| .subscribe((provider: Provider) => (this.provider = provider)); | |||
|
|
|||
| this.subrole$.subscribe((subrole) => (this.subrole = subrole)); | |||
There was a problem hiding this comment.
either add takeUntil or use async in the template
| @@ -85,6 +106,8 @@ export class ProviderAdminsComponent implements OnInit, OnDestroy { | |||
| takeUntil(this.destroy$) | |||
| ) | |||
| .subscribe((provider: Provider) => (this.provider = provider)); | |||
|
|
|||
| this.subrole$.subscribe((subrole) => (this.subrole = subrole)); | |||
Comment on lines
146
to
147
| this.deviceToogle && | ||
| document.removeEventListener('click', this.onClick.bind(this)); |
There was a problem hiding this comment.
please revert changes linter changes
|
|
||
| ngOnInit(): void { | ||
| this.childAge = Util.getChildAge(this.application.child); | ||
| this.deviceToogle = this.detectedDevice.checkedDevice() | ||
| this.deviceToogle = this.detectedDevice.checkedDevice(); | ||
| this.subrole$.subscribe((subrole) => (this.subrole = subrole)); |
|
|
||
| ngOnInit(): void { | ||
| this.childAge = Util.getChildAge(this.application.child); | ||
| this.deviceToogle = this.detectedDevice.checkedDevice() | ||
| this.deviceToogle = this.detectedDevice.checkedDevice(); | ||
| this.subrole$.subscribe((subrole) => (this.subrole = subrole)); |
| @@ -25,32 +45,35 @@ export class UsersListComponent implements OnInit, AfterViewInit { | |||
| readonly providerAdminTitles = ProviderAdminTitles; | |||
| readonly providerAdminStatus = ProviderAdminStatus; | |||
| readonly providerAdminIcons = ProviderAdminIcons; | |||
| subrole: string; | |||
There was a problem hiding this comment.
add empty row between readonly and public values
| @@ -25,32 +45,35 @@ export class UsersListComponent implements OnInit, AfterViewInit { | |||
| readonly providerAdminTitles = ProviderAdminTitles; | |||
| readonly providerAdminStatus = ProviderAdminStatus; | |||
| readonly providerAdminIcons = ProviderAdminIcons; | |||
| subrole: string; | |||
There was a problem hiding this comment.
add empty row between readonly and public values
|
Заступник директора cannot block/delete other deputies, admins. The header of the table was deleted but actions still exist |
|
Deputy should not be able to create new deputy so this button should be hidden for deputy creation |
|
There should be filtration for the workshop. Admin can delete, and edit only workshops he/she is assigned to. ALso can manage application only to his/her workshops |
litvinets
requested changes
Jun 4, 2022
| this.displayedColumns = ['pib', 'email', 'phone', 'place', 'role', 'status', 'actions']; | ||
| this.dataSource = new MatTableDataSource(this.users); | ||
| ngOnInit(): void { | ||
| this.subrole$.subscribe((subrole) => (this.subrole = subrole)); |
…ttps://github.com/ita-social-projects/OoS-Frontend into Workshop-Admin-Deputy-personalcabinet-functionality
…-Admin-Deputy-personalcabinet-functionality
litvinets
approved these changes
Jun 19, 2022
litvinets
deleted the
Workshop-Admin-Deputy-personalcabinet-functionality
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
[Workshop Admin/ Deputy] - personal cabinet functionality #1173