Implemented: support to add, remove and display parties associated to a facility in staff sement (#12) #19
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
ymaheshwari1
requested changes
Nov 20, 2023
ymaheshwari1
requested changes
Nov 21, 2023
ymaheshwari1
requested changes
Nov 22, 2023
ymaheshwari1
approved these changes
Nov 23, 2023
ymaheshwari1
requested changes
Nov 23, 2023
src/store/modules/util/index.ts
Outdated
| @@ -8,6 +8,7 @@ import RootState from '@/store/RootState' | |||
| const utilModule: Module<UtilState, RootState> = { | |||
| namespaced: true, | |||
| state: { | |||
| roles: [], | |||
There was a problem hiding this comment.
Suggested change
| roles: [], | |
| partyRoles: [], |
ymaheshwari1
requested changes
Nov 23, 2023
| </ion-label> | ||
| <ion-select interface="popover" :placeholder="translate('Select')" :value="getPartyRoleTypeId(party.partyId)" @ion-change="updateSelectedParties($event, party.partyId)" required> | ||
| <ion-select-option v-for="(description, roleTypeId) in partyRoles" :key='roleTypeId' :value="roleTypeId">{{ description }}</ion-select-option> | ||
| </ion-select> |
| </ion-content> | ||
|
|
||
| <ion-fab vertical="bottom" horizontal="end" slot="fixed"> | ||
| <ion-fab @click="saveParties" vertical="bottom" horizontal="end" slot="fixed"> |
There was a problem hiding this comment.
Move click event on fab-button
src/store/modules/util/actions.ts
Outdated
| return | ||
| } | ||
|
|
||
| const roles = {} as any |
There was a problem hiding this comment.
Suggested change
| const roles = {} as any | |
| const partyRoles = {} as any |
Comment on lines
210
to
211
| if(this.isPartySelected(selectedPartyId)) { | ||
| party = this.selectedPartyValues.find((party: any) => party.partyId === selectedPartyId) |
There was a problem hiding this comment.
Suggested change
| if(this.isPartySelected(selectedPartyId)) { | |
| party = this.selectedPartyValues.find((party: any) => party.partyId === selectedPartyId) | |
| party = this.isPartySelected(selectedPartyId) | |
| if(party?.partyId) { |
| this.selectedPartyValues.push({...party, roleTypeId: selectedRoleTypeId}) | ||
| } | ||
| }, | ||
| isPartySelected(partyId: string) { |
There was a problem hiding this comment.
If the name of method starts with is it means that the method will return a boolean, but here in this case it returns the complete object of the party, so improve the name to something like getParty
Comment on lines
213
to
218
| if(selectedRoleTypeId === '') { | ||
| this.selectedPartyValues = this.selectedPartyValues.filter((party: any) => party.partyId !== selectedPartyId) | ||
| } else if(selectedPartyId !== party.roleTypeId) { | ||
| this.selectedPartyValues = this.selectedPartyValues.filter((party: any) => party.partyId !== selectedPartyId) | ||
| this.selectedPartyValues.push({...party, roleTypeId: selectedRoleTypeId}) | ||
| } |
There was a problem hiding this comment.
Suggested change
| if(selectedRoleTypeId === '') { | |
| this.selectedPartyValues = this.selectedPartyValues.filter((party: any) => party.partyId !== selectedPartyId) | |
| } else if(selectedPartyId !== party.roleTypeId) { | |
| this.selectedPartyValues = this.selectedPartyValues.filter((party: any) => party.partyId !== selectedPartyId) | |
| this.selectedPartyValues.push({...party, roleTypeId: selectedRoleTypeId}) | |
| } | |
| this.selectedPartyValues = this.selectedPartyValues.filter((party: any) => party.partyId !== selectedPartyId) | |
| if(selectedRoleTypeId) { | |
| this.selectedPartyValues.push({...party, roleTypeId: selectedRoleTypeId}) | |
| } |
| return this.selectedPartyValues.find((party: any) => party.partyId === partyId) | ||
| }, | ||
| getPartyRoleTypeId(partyId: string) { | ||
| return this.selectedPartyValues.find((party: any) => party.partyId === partyId) ? this.selectedPartyValues.find((party: any) => party.partyId === partyId).roleTypeId : '' |
There was a problem hiding this comment.
Suggested change
| return this.selectedPartyValues.find((party: any) => party.partyId === partyId) ? this.selectedPartyValues.find((party: any) => party.partyId === partyId).roleTypeId : '' | |
| return this.isPartySelected(partyId) ? this.isPartySelected(partyId).roleTypeId : '' |
src/store/modules/util/actions.ts
Outdated
| try { | ||
| const resp = await UtilService.fetchPartyRoles(params) | ||
| if (!hasError(resp)) { | ||
| resp.data.docs.map((doc:any) => { |
There was a problem hiding this comment.
Suggested change
| resp.data.docs.map((doc:any) => { | |
| resp.data.docs.map((role:any) => { |
ymaheshwari1
approved these changes
Nov 23, 2023
amansinghbais
changed the title
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.
Related Issues
Closes #12
Short Description and Why It's Useful
Screenshots of Visual Changes before/after (If There Are Any)
Contribution and Currently Important Rules Acceptance