-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add institution type data #1290
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
acb54cd
Merge pull request #879 from ita-social-projects/develop
DmyMi a2f72a9
Merge pull request #1244 from ita-social-projects/develop
DmyMi 61b6afd
Merge pull request #1246 from ita-social-projects/develop
DmyMi e9104df
add insstitution type data
Pabloostr 1b4c9ba
bug fixed
Pabloostr 55f9656
fixed
Pabloostr 81fbb3d
corrected
Pabloostr 7985741
Merge branch 'develop' into bugfix
Pabloostr ca172c3
test
Pabloostr d090176
Merge remote-tracking branch 'origin' into bugfix
litvinets File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,23 @@ | ||
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; | ||
import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'; | ||
import { Constants } from 'src/app/shared/constants/constants'; | ||
import { MatTabChangeEvent } from '@angular/material/tabs'; | ||
import { | ||
CreateProviderSteps, | ||
InstitutionTypes, | ||
OwnershipType, | ||
OwnershipTypeUkr, | ||
ProviderType, | ||
ProviderTypeUkr, | ||
} from '../../enum/provider'; | ||
import { Provider } from '../../models/provider.model'; | ||
import { Select, Store } from '@ngxs/store'; | ||
import { GetInstitutionStatus } from '../../store/meta-data.actions'; | ||
import { MetaDataState } from '../../store/meta-data.state'; | ||
import { Observable, Subject } from 'rxjs'; | ||
import { InstitutionStatus } from '../../models/institutionStatus.model'; | ||
import { ActivateEditMode } from 'src/app/shared/store/app.actions'; | ||
import { GetInstitutionStatus } from '../../store/meta-data.actions'; | ||
import { filter, takeUntil } from 'rxjs/operators'; | ||
import { RegistrationState } from '../../store/registration.state'; | ||
import { ActivateEditMode } from 'src/app/shared/store/app.actions'; | ||
|
||
@Component({ | ||
selector: 'app-provider-info', | ||
|
@@ -29,6 +30,8 @@ export class ProviderInfoComponent implements OnInit { | |
readonly ownershipType: typeof OwnershipType = OwnershipType; | ||
readonly ownershipTypeUkr = OwnershipTypeUkr; | ||
readonly providerTypeUkr = ProviderTypeUkr; | ||
readonly institutionTypes = InstitutionTypes; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add empty row after readonly fields |
||
|
||
editLink: string = CreateProviderSteps[0]; | ||
|
||
@Input() provider: Provider; | ||
|
@@ -50,13 +53,13 @@ export class ProviderInfoComponent implements OnInit { | |
.pipe( | ||
filter((institutionStatuses) => !!institutionStatuses.length), | ||
takeUntil(this.destroy$) | ||
).subscribe((institutionStatuses) => { | ||
const provider = this.store.selectSnapshot(RegistrationState.provider); | ||
this.currentStatus = | ||
institutionStatuses | ||
.find((item) => +item.id === provider?.institutionStatusId) | ||
?.name.toString() ?? 'Відсутній'; | ||
}); | ||
).subscribe((institutionStatuses) => { | ||
const provider = this.store.selectSnapshot(RegistrationState.provider); | ||
this.currentStatus = | ||
institutionStatuses | ||
.find((item) => +item.id === provider?.institutionStatusId) | ||
?.name.toString() ?? 'Відсутній'; | ||
}); | ||
} | ||
|
||
onTabChanged(tabChangeEvent: MatTabChangeEvent): void { | ||
|
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
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove unused imports (output as I see)