Add educational institution status#363/zubkov #635
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
…Frontend into addEducationalInstitutionStatus#363/Zubkov
dmitryy90
requested changes
Nov 13, 2021
| @@ -43,6 +44,7 @@ export class Provider { | |||
| this.actualAddress = actualAddress; | |||
| this.description = photo.description; | |||
| this.userId = user.id; | |||
| this.institutionStatusId = photo.institutionStatusId? photo.institutionStatusId : null | |||
There was a problem hiding this comment.
this.institutionStatusId = photo.institutionStatusId || null;
There was a problem hiding this comment.
I believe it is not photo anymore, lets rename photo parameter
| * This method get all institution statuses | ||
| */ | ||
| getInstitutionStatus(): Observable<InstitutionStatus[]> { | ||
| return this.http.get<InstitutionStatus[]>('/api/v1/InstitutionStatus/Get'); |
| @@ -36,4 +61,7 @@ export class ProviderOrgInfoComponent implements OnInit { | |||
| this.editLink = createProviderSteps[tabChangeEvent.index]; | |||
| } | |||
|
|
|||
|
|
|||
dmitryy90
requested changes
Nov 15, 2021
| @@ -26,7 +26,7 @@ export class CreateProviderGuard implements CanDeactivate<unknown>, CanLoad { | |||
| segments: UrlSegment[]): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree { | |||
| const isEditMode = this.store.selectSnapshot<boolean>(AppState.isEditMode); | |||
|
|
|||
| return isEditMode ? true : this.user$.pipe(map((user: User) => user.role === Role.provider && user.isRegistered === false)); | |||
| return isEditMode ? true : this.user$.pipe(map((user: User) => user?.role === Role.provider && user.isRegistered === false)); | |||
There was a problem hiding this comment.
in which cases user can be undefined?
There was a problem hiding this comment.
thanks for catching that, I think it was for testing purposes, deleted '?'
dmitryy90
approved these changes
Nov 15, 2021
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.
No description provided.