diff --git a/src/app/account-transfers/make-account-transfers/make-account-transfers.component.html b/src/app/account-transfers/make-account-transfers/make-account-transfers.component.html index 74083e5c6..fa6e26a67 100644 --- a/src/app/account-transfers/make-account-transfers/make-account-transfers.component.html +++ b/src/app/account-transfers/make-account-transfers/make-account-transfers.component.html @@ -117,7 +117,7 @@ Description - + Transfer Description is required diff --git a/src/app/accounting/accounting-rules/create-rule/create-rule.component.html b/src/app/accounting/accounting-rules/create-rule/create-rule.component.html index bf06b03c8..3f736e3cb 100644 --- a/src/app/accounting/accounting-rules/create-rule/create-rule.component.html +++ b/src/app/accounting/accounting-rules/create-rule/create-rule.component.html @@ -98,7 +98,7 @@ Description - + diff --git a/src/app/accounting/accounting-rules/edit-rule/edit-rule.component.html b/src/app/accounting/accounting-rules/edit-rule/edit-rule.component.html index 99d578ff0..30e5f691b 100644 --- a/src/app/accounting/accounting-rules/edit-rule/edit-rule.component.html +++ b/src/app/accounting/accounting-rules/edit-rule/edit-rule.component.html @@ -98,7 +98,7 @@ Description - + diff --git a/src/app/accounting/chart-of-accounts/create-gl-account/create-gl-account.component.html b/src/app/accounting/chart-of-accounts/create-gl-account/create-gl-account.component.html index 5b447d81b..28599f007 100644 --- a/src/app/accounting/chart-of-accounts/create-gl-account/create-gl-account.component.html +++ b/src/app/accounting/chart-of-accounts/create-gl-account/create-gl-account.component.html @@ -74,7 +74,7 @@ Description - + diff --git a/src/app/accounting/chart-of-accounts/edit-gl-account/edit-gl-account.component.html b/src/app/accounting/chart-of-accounts/edit-gl-account/edit-gl-account.component.html index cda77e59b..163acd10f 100644 --- a/src/app/accounting/chart-of-accounts/edit-gl-account/edit-gl-account.component.html +++ b/src/app/accounting/chart-of-accounts/edit-gl-account/edit-gl-account.component.html @@ -74,7 +74,7 @@ Description - + diff --git a/src/app/accounting/closing-entries/create-closure/create-closure.component.html b/src/app/accounting/closing-entries/create-closure/create-closure.component.html index 4bfd3c51d..012c36d10 100644 --- a/src/app/accounting/closing-entries/create-closure/create-closure.component.html +++ b/src/app/accounting/closing-entries/create-closure/create-closure.component.html @@ -32,7 +32,7 @@ Comments - + diff --git a/src/app/accounting/closing-entries/edit-closure/edit-closure.component.html b/src/app/accounting/closing-entries/edit-closure/edit-closure.component.html index 77fe38ea3..1ea4236b1 100644 --- a/src/app/accounting/closing-entries/edit-closure/edit-closure.component.html +++ b/src/app/accounting/closing-entries/edit-closure/edit-closure.component.html @@ -26,7 +26,7 @@ Comments - + diff --git a/src/app/accounting/create-journal-entry/create-journal-entry.component.html b/src/app/accounting/create-journal-entry/create-journal-entry.component.html index 476b7d836..24dc9438f 100644 --- a/src/app/accounting/create-journal-entry/create-journal-entry.component.html +++ b/src/app/accounting/create-journal-entry/create-journal-entry.component.html @@ -159,7 +159,7 @@ Comments - + diff --git a/src/app/accounting/frequent-postings/frequent-postings.component.html b/src/app/accounting/frequent-postings/frequent-postings.component.html index 86d4efa36..2c4f3faaa 100644 --- a/src/app/accounting/frequent-postings/frequent-postings.component.html +++ b/src/app/accounting/frequent-postings/frequent-postings.component.html @@ -173,7 +173,7 @@ Comments - + diff --git a/src/app/clients/client-stepper/client-address-step/client-address-step.component.html b/src/app/clients/client-stepper/client-address-step/client-address-step.component.html index b1d26e92b..d6dfc4f0b 100644 --- a/src/app/clients/client-stepper/client-address-step/client-address-step.component.html +++ b/src/app/clients/client-stepper/client-address-step/client-address-step.component.html @@ -4,18 +4,18 @@
- + - {{ getSelectedValue('addressTypeIdOptions',address.addressTypeId)?.name }} + {{ getSelectedValue('addressTypeIdOptions', address.addressTypeId)?.name }} @@ -57,12 +57,12 @@
diff --git a/src/app/clients/client-stepper/client-address-step/client-address-step.component.ts b/src/app/clients/client-stepper/client-address-step/client-address-step.component.ts index 7a251943e..d1ae230f9 100644 --- a/src/app/clients/client-stepper/client-address-step/client-address-step.component.ts +++ b/src/app/clients/client-stepper/client-address-step/client-address-step.component.ts @@ -32,7 +32,9 @@ export class ClientAddressStepComponent { /** * @param {MatDialog} dialog Mat Dialog */ - constructor(private dialog: MatDialog) { } + constructor(private dialog: MatDialog) { + this.clientAddressData = []; + } /** * Adds a client address @@ -42,7 +44,7 @@ export class ClientAddressStepComponent { title: 'Add Client Address', formfields: this.getAddressFormFields() }; - const addAddressDialogRef = this.dialog.open(FormDialogComponent, { data }); + const addAddressDialogRef = this.dialog.open(FormDialogComponent, { data, width: '50rem' }); addAddressDialogRef.afterClosed().subscribe((response: any) => { if (response.data) { const addressData = response.data.value; @@ -68,7 +70,7 @@ export class ClientAddressStepComponent { formfields: this.getAddressFormFields(address), layout: { addButtonText: 'Edit' } }; - const editAddressDialogRef = this.dialog.open(FormDialogComponent, { data }); + const editAddressDialogRef = this.dialog.open(FormDialogComponent, { data, width: '50rem' }); editAddressDialogRef.afterClosed().subscribe((response: any) => { if (response.data) { const addressData = response.data.value; @@ -216,7 +218,7 @@ export class ClientAddressStepComponent { * Returns the array of client addresses */ get address() { - return { address: this.clientAddressData }; + return { address: this.clientAddressData ? this.clientAddressData : [] }; } } diff --git a/src/app/clients/client-stepper/client-family-members-step/client-family-members-step.component.ts b/src/app/clients/client-stepper/client-family-members-step/client-family-members-step.component.ts index 947d29f84..e35ca3592 100644 --- a/src/app/clients/client-stepper/client-family-members-step/client-family-members-step.component.ts +++ b/src/app/clients/client-stepper/client-family-members-step/client-family-members-step.component.ts @@ -1,6 +1,5 @@ /** Angular Imports */ -import { Component, OnInit, Input } from '@angular/core'; -import { Router, ActivatedRoute } from '@angular/router'; +import { Component, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; /** Custom Components */ diff --git a/src/app/clients/client-stepper/client-general-step/client-general-step.component.html b/src/app/clients/client-stepper/client-general-step/client-general-step.component.html index a06f19229..c174206bf 100644 --- a/src/app/clients/client-stepper/client-general-step/client-general-step.component.html +++ b/src/app/clients/client-stepper/client-general-step/client-general-step.component.html @@ -120,7 +120,7 @@ Remarks - + diff --git a/src/app/clients/client-stepper/client-preview-step/client-preview-step.component.html b/src/app/clients/client-stepper/client-preview-step/client-preview-step.component.html index c01dbe3b3..bfa6df462 100644 --- a/src/app/clients/client-stepper/client-preview-step/client-preview-step.component.html +++ b/src/app/clients/client-stepper/client-preview-step/client-preview-step.component.html @@ -162,7 +162,7 @@ -
+

Address

@@ -175,7 +175,7 @@ - {{ getSelectedValue('addressTypeIdOptions',address.addressTypeId)?.name }} + {{ getSelectedValue('addressTypeIdOptions', address.addressTypeId)?.name }} @@ -211,7 +211,7 @@
diff --git a/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.html b/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.html index 5691073e7..7c5b7fe77 100644 --- a/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.html +++ b/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.html @@ -15,7 +15,7 @@ Note - + diff --git a/src/app/clients/clients-view/client-actions/view-survey/view-survey.component.html b/src/app/clients/clients-view/client-actions/view-survey/view-survey.component.html index d29c40c33..ed1db27c8 100644 --- a/src/app/clients/clients-view/client-actions/view-survey/view-survey.component.html +++ b/src/app/clients/clients-view/client-actions/view-survey/view-survey.component.html @@ -20,23 +20,23 @@ - + - + - - + + - + diff --git a/src/app/clients/clients-view/clients-view.component.html b/src/app/clients/clients-view/clients-view.component.html index 459130d22..2efc5bd9a 100644 --- a/src/app/clients/clients-view/clients-view.component.html +++ b/src/app/clients/clients-view/clients-view.component.html @@ -10,13 +10,16 @@ [src]="(clientImage)?clientImage:'assets/images/user_placeholder.png'">
- - -
@@ -26,11 +29,19 @@
- -

- + +

+ Client Name : {{clientViewData.displayName}}

+
+ +
@@ -38,81 +49,123 @@ Office : {{clientViewData.officeName}}
Client : {{clientViewData.accountNo}}
External Id: {{clientViewData.externalId}}
- Staff : {{clientViewData.staffName || 'Unassigned'}}
 - Activation Date : {{clientViewData.activationDate | dateFormat}}
 + Staff : {{clientViewData.staffName || + 'Unassigned'}}
 + Activation Date : {{clientViewData.activationDate | + dateFormat}}
 Member Of : {{group.name}}  -
+

- + + - + - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + - - - + + + - + - + - + @@ -138,13 +191,14 @@ [active]="documents.isActive" *mifosxHasPermission="'READ_DOCUMENT'"> Documents - + Notes - + {{clientDatatable.registeredTableName}} diff --git a/src/app/clients/clients-view/clients-view.component.scss b/src/app/clients/clients-view/clients-view.component.scss index adf227ce9..859eb5de2 100644 --- a/src/app/clients/clients-view/clients-view.component.scss +++ b/src/app/clients/clients-view/clients-view.component.scss @@ -7,7 +7,6 @@ padding: 1%; .header-title-group { .client-card-title { - margin-top: 1.4rem; color: white; width: 90%; p { @@ -16,7 +15,7 @@ } } .profile-image-container { - margin: 1%; + margin: 4px; .profile-image { object-fit: cover; border-radius: 20px; diff --git a/src/app/clients/create-client/create-client.component.html b/src/app/clients/create-client/create-client.component.html index 91ae2024f..64efe5358 100644 --- a/src/app/clients/create-client/create-client.component.html +++ b/src/app/clients/create-client/create-client.component.html @@ -34,7 +34,7 @@ FAMILY MEMBERS - + @@ -42,10 +42,8 @@ ADDRESS - + diff --git a/src/app/clients/create-client/create-client.component.ts b/src/app/clients/create-client/create-client.component.ts index 25fadd7e2..528064dd6 100644 --- a/src/app/clients/create-client/create-client.component.ts +++ b/src/app/clients/create-client/create-client.component.ts @@ -27,9 +27,9 @@ export class CreateClientComponent { /** Client General Step */ @ViewChild(ClientGeneralStepComponent, { static: true }) clientGeneralStep: ClientGeneralStepComponent; /** Client Family Members Step */ - @ViewChild(ClientFamilyMembersStepComponent, { static: true }) clientFamilyMembersStep: ClientFamilyMembersStepComponent; + @ViewChild('clientFamily') clientFamilyMembersStep: ClientFamilyMembersStepComponent; /** Client Address Step */ - @ViewChild(ClientAddressStepComponent, { static: true }) clientAddressStep: ClientAddressStepComponent; + @ViewChild('clientAddress') clientAddressStep: ClientAddressStepComponent; /** Get handle on dtclient tags in the template */ @ViewChildren('dtclient') clientDatatables: QueryList; @@ -124,7 +124,6 @@ export class CreateClientComponent { submit() { const locale = this.settingsService.language.code; const dateFormat = this.settingsService.dateFormat; - // TODO: Update once language and date settings are setup const clientData = { ...this.client, dateFormat, diff --git a/src/app/clients/edit-client/edit-client.component.html b/src/app/clients/edit-client/edit-client.component.html index 504551aa1..f5ca34e87 100644 --- a/src/app/clients/edit-client/edit-client.component.html +++ b/src/app/clients/edit-client/edit-client.component.html @@ -114,7 +114,7 @@ Remarks - +
diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/approve-fixed-deposits-account/approve-fixed-deposits-account.component.html b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/approve-fixed-deposits-account/approve-fixed-deposits-account.component.html index b8b6a5ac9..95fb5c699 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/approve-fixed-deposits-account/approve-fixed-deposits-account.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/approve-fixed-deposits-account/approve-fixed-deposits-account.component.html @@ -20,7 +20,7 @@ Note - + diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/close-fixed-deposits-account/close-fixed-deposits-account.component.html b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/close-fixed-deposits-account/close-fixed-deposits-account.component.html index 7e58c19fc..cfa0e6e60 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/close-fixed-deposits-account/close-fixed-deposits-account.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/close-fixed-deposits-account/close-fixed-deposits-account.component.html @@ -54,7 +54,7 @@ Note - + diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/premature-close-fixed-deposits-account/premature-close-fixed-deposits-account.component.html b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/premature-close-fixed-deposits-account/premature-close-fixed-deposits-account.component.html index 8ed37e718..86211a8bb 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/premature-close-fixed-deposits-account/premature-close-fixed-deposits-account.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/premature-close-fixed-deposits-account/premature-close-fixed-deposits-account.component.html @@ -54,7 +54,7 @@ Note - + diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/reject-fixed-deposits-account/reject-fixed-deposits-account.component.html b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/reject-fixed-deposits-account/reject-fixed-deposits-account.component.html index 602cc7536..cdff6c3de 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/reject-fixed-deposits-account/reject-fixed-deposits-account.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/reject-fixed-deposits-account/reject-fixed-deposits-account.component.html @@ -20,7 +20,7 @@ Note - + diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/undo-approval-fixed-deposits-account/undo-approval-fixed-deposits-account.component.html b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/undo-approval-fixed-deposits-account/undo-approval-fixed-deposits-account.component.html index ea2eb275e..1ab04f8c4 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/undo-approval-fixed-deposits-account/undo-approval-fixed-deposits-account.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/undo-approval-fixed-deposits-account/undo-approval-fixed-deposits-account.component.html @@ -8,7 +8,7 @@ Note - + diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/withdraw-by-client-fixed-deposits-account/withdraw-by-client-fixed-deposits-account.component.html b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/withdraw-by-client-fixed-deposits-account/withdraw-by-client-fixed-deposits-account.component.html index 48eb8c95f..0d78c2bfa 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/withdraw-by-client-fixed-deposits-account/withdraw-by-client-fixed-deposits-account.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/withdraw-by-client-fixed-deposits-account/withdraw-by-client-fixed-deposits-account.component.html @@ -20,7 +20,7 @@ Note - + diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.html index 363575b56..7ac5b32cc 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.html +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.html @@ -21,7 +21,7 @@ Note - + diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.html index 4c23af4f2..7b6ee428f 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.html +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.html @@ -95,7 +95,7 @@ Note - + diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.html index 5cba2ddff..42bbdf2c6 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.html +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.html @@ -80,7 +80,7 @@ Note - + diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.html index d773c3ad5..babca7282 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.html +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.html @@ -21,7 +21,7 @@ Note - + @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/undo-approval-recurring-deposits-account/undo-approval-recurring-deposits-account.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/undo-approval-recurring-deposits-account/undo-approval-recurring-deposits-account.component.html index e362b1d2c..588a8385b 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/undo-approval-recurring-deposits-account/undo-approval-recurring-deposits-account.component.html +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/undo-approval-recurring-deposits-account/undo-approval-recurring-deposits-account.component.html @@ -8,7 +8,7 @@ Note - + diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/withdraw-by-client-recurring-deposits-account/withdraw-by-client-recurring-deposits-account.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/withdraw-by-client-recurring-deposits-account/withdraw-by-client-recurring-deposits-account.component.html index 57e2b1fdc..2245037f9 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/withdraw-by-client-recurring-deposits-account/withdraw-by-client-recurring-deposits-account.component.html +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/withdraw-by-client-recurring-deposits-account/withdraw-by-client-recurring-deposits-account.component.html @@ -21,7 +21,7 @@ Note - + diff --git a/src/app/loans/loans-view/loan-account-actions/add-collateral/add-collateral.component.html b/src/app/loans/loans-view/loan-account-actions/add-collateral/add-collateral.component.html index d13167998..9a2d3c4a3 100644 --- a/src/app/loans/loans-view/loan-account-actions/add-collateral/add-collateral.component.html +++ b/src/app/loans/loans-view/loan-account-actions/add-collateral/add-collateral.component.html @@ -29,19 +29,19 @@ Description - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/add-loan-charge/add-loan-charge.component.html b/src/app/loans/loans-view/loan-account-actions/add-loan-charge/add-loan-charge.component.html index e050c713d..83312a1aa 100644 --- a/src/app/loans/loans-view/loan-account-actions/add-loan-charge/add-loan-charge.component.html +++ b/src/app/loans/loans-view/loan-account-actions/add-loan-charge/add-loan-charge.component.html @@ -50,13 +50,13 @@ - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/approve-loan/approve-loan.component.html b/src/app/loans/loans-view/loan-account-actions/approve-loan/approve-loan.component.html index dc18a5c09..1e84d4999 100644 --- a/src/app/loans/loans-view/loan-account-actions/approve-loan/approve-loan.component.html +++ b/src/app/loans/loans-view/loan-account-actions/approve-loan/approve-loan.component.html @@ -42,18 +42,18 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/assign-loan-officer/assign-loan-officer.component.html b/src/app/loans/loans-view/loan-account-actions/assign-loan-officer/assign-loan-officer.component.html index 52a2c52e6..a438d7925 100644 --- a/src/app/loans/loans-view/loan-account-actions/assign-loan-officer/assign-loan-officer.component.html +++ b/src/app/loans/loans-view/loan-account-actions/assign-loan-officer/assign-loan-officer.component.html @@ -33,13 +33,13 @@ - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/close-as-rescheduled/close-as-rescheduled.component.html b/src/app/loans/loans-view/loan-account-actions/close-as-rescheduled/close-as-rescheduled.component.html index e18395a05..434e6b795 100644 --- a/src/app/loans/loans-view/loan-account-actions/close-as-rescheduled/close-as-rescheduled.component.html +++ b/src/app/loans/loans-view/loan-account-actions/close-as-rescheduled/close-as-rescheduled.component.html @@ -21,18 +21,18 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/create-guarantor/create-guarantor.component.html b/src/app/loans/loans-view/loan-account-actions/create-guarantor/create-guarantor.component.html index 492f951bd..8258131d0 100644 --- a/src/app/loans/loans-view/loan-account-actions/create-guarantor/create-guarantor.component.html +++ b/src/app/loans/loans-view/loan-account-actions/create-guarantor/create-guarantor.component.html @@ -126,13 +126,13 @@ - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/disburse-loan-account/disburse-loan-account.component.html b/src/app/loans/loans-view/loan-account-actions/disburse-loan-account/disburse-loan-account.component.html index c6d6a0aa6..b8e0917d9 100644 --- a/src/app/loans/loans-view/loan-account-actions/disburse-loan-account/disburse-loan-account.component.html +++ b/src/app/loans/loans-view/loan-account-actions/disburse-loan-account/disburse-loan-account.component.html @@ -37,18 +37,18 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/disburse/disburse.component.html b/src/app/loans/loans-view/loan-account-actions/disburse/disburse.component.html index e4df1ac7d..dba8beab3 100644 --- a/src/app/loans/loans-view/loan-account-actions/disburse/disburse.component.html +++ b/src/app/loans/loans-view/loan-account-actions/disburse/disburse.component.html @@ -42,14 +42,12 @@
- Show Payment Details - - - + + +
+ Show Payment Details +
+
@@ -82,18 +80,18 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/edit-repayment-schedule/edit-repayment-schedule.component.html b/src/app/loans/loans-view/loan-account-actions/edit-repayment-schedule/edit-repayment-schedule.component.html new file mode 100644 index 000000000..455acf523 --- /dev/null +++ b/src/app/loans/loans-view/loan-account-actions/edit-repayment-schedule/edit-repayment-schedule.component.html @@ -0,0 +1,14 @@ +
+ + + + + + + + + + + + +
diff --git a/src/app/loans/loans-view/loan-account-actions/edit-repayment-schedule/edit-repayment-schedule.component.scss b/src/app/loans/loans-view/loan-account-actions/edit-repayment-schedule/edit-repayment-schedule.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/loans/loans-view/loan-account-actions/edit-repayment-schedule/edit-repayment-schedule.component.spec.ts b/src/app/loans/loans-view/loan-account-actions/edit-repayment-schedule/edit-repayment-schedule.component.spec.ts new file mode 100644 index 000000000..20dba6e7d --- /dev/null +++ b/src/app/loans/loans-view/loan-account-actions/edit-repayment-schedule/edit-repayment-schedule.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EditRepaymentScheduleComponent } from './edit-repayment-schedule.component'; + +describe('EditRepaymentScheduleComponent', () => { + let component: EditRepaymentScheduleComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ EditRepaymentScheduleComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(EditRepaymentScheduleComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/loans/loans-view/loan-account-actions/edit-repayment-schedule/edit-repayment-schedule.component.ts b/src/app/loans/loans-view/loan-account-actions/edit-repayment-schedule/edit-repayment-schedule.component.ts new file mode 100644 index 000000000..132d130e0 --- /dev/null +++ b/src/app/loans/loans-view/loan-account-actions/edit-repayment-schedule/edit-repayment-schedule.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'mifosx-edit-repayment-schedule', + templateUrl: './edit-repayment-schedule.component.html', + styleUrls: ['./edit-repayment-schedule.component.scss'] +}) +export class EditRepaymentScheduleComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/loans/loans-view/loan-account-actions/foreclosure/foreclosure.component.html b/src/app/loans/loans-view/loan-account-actions/foreclosure/foreclosure.component.html index 10c1ceaa7..2b77881e5 100644 --- a/src/app/loans/loans-view/loan-account-actions/foreclosure/foreclosure.component.html +++ b/src/app/loans/loans-view/loan-account-actions/foreclosure/foreclosure.component.html @@ -46,18 +46,18 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.html b/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.html index 8dba79e65..a045633ca 100644 --- a/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.html +++ b/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.html @@ -20,7 +20,8 @@ - + + diff --git a/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.ts b/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.ts index ae14af85e..5bcb7d48a 100644 --- a/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.ts +++ b/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.ts @@ -32,6 +32,7 @@ export class LoanAccountActionsComponent { 'Disburse': boolean, 'Withdrawn by Client': boolean, 'Undo Disbursal': boolean, + 'Undo Last Disbursal': boolean, 'Loan Screen Reports': boolean, 'Approve': boolean, 'Add Loan Charge': boolean, @@ -59,6 +60,7 @@ export class LoanAccountActionsComponent { 'Disburse': false, 'Withdrawn by Client': false, 'Undo Disbursal': false, + 'Undo Last Disbursal': false, 'Loan Screen Reports': false, 'Approve': false, 'Add Loan Charge': false, diff --git a/src/app/loans/loans-view/loan-account-actions/loan-credit-balance-refund/loan-credit-balance-refund.component.html b/src/app/loans/loans-view/loan-account-actions/loan-credit-balance-refund/loan-credit-balance-refund.component.html index fd1d75a82..e19d92dab 100644 --- a/src/app/loans/loans-view/loan-account-actions/loan-credit-balance-refund/loan-credit-balance-refund.component.html +++ b/src/app/loans/loans-view/loan-account-actions/loan-credit-balance-refund/loan-credit-balance-refund.component.html @@ -34,18 +34,18 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/loan-reschedule/loan-reschedule.component.html b/src/app/loans/loans-view/loan-account-actions/loan-reschedule/loan-reschedule.component.html index f76a8bd1a..117ee7fec 100644 --- a/src/app/loans/loans-view/loan-account-actions/loan-reschedule/loan-reschedule.component.html +++ b/src/app/loans/loans-view/loan-account-actions/loan-reschedule/loan-reschedule.component.html @@ -92,13 +92,13 @@ - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/loan-screen-reports/loan-screen-reports.component.html b/src/app/loans/loans-view/loan-account-actions/loan-screen-reports/loan-screen-reports.component.html index 28a74ae57..5327595ed 100644 --- a/src/app/loans/loans-view/loan-account-actions/loan-screen-reports/loan-screen-reports.component.html +++ b/src/app/loans/loans-view/loan-account-actions/loan-screen-reports/loan-screen-reports.component.html @@ -22,14 +22,14 @@ - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/loans-account-close/loans-account-close.component.html b/src/app/loans/loans-view/loan-account-actions/loans-account-close/loans-account-close.component.html index 7a17660a8..3106a0df1 100644 --- a/src/app/loans/loans-view/loan-account-actions/loans-account-close/loans-account-close.component.html +++ b/src/app/loans/loans-view/loan-account-actions/loans-account-close/loans-account-close.component.html @@ -21,18 +21,18 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html index 237589f47..cabb08043 100644 --- a/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html +++ b/src/app/loans/loans-view/loan-account-actions/make-repayment/make-repayment.component.html @@ -42,14 +42,12 @@
- Show Payment Details - - - + + +
+ Show Payment Details +
+
@@ -82,18 +80,18 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/prepay-loan/prepay-loan.component.html b/src/app/loans/loans-view/loan-account-actions/prepay-loan/prepay-loan.component.html index 7e0e89ceb..80ba623ec 100644 --- a/src/app/loans/loans-view/loan-account-actions/prepay-loan/prepay-loan.component.html +++ b/src/app/loans/loans-view/loan-account-actions/prepay-loan/prepay-loan.component.html @@ -55,14 +55,12 @@
- Show Payment Details - - - + + +
+ Show Payment Details +
+
@@ -95,18 +93,18 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/recovery-repayment/recovery-repayment.component.html b/src/app/loans/loans-view/loan-account-actions/recovery-repayment/recovery-repayment.component.html index 0be360d3d..ed629774d 100644 --- a/src/app/loans/loans-view/loan-account-actions/recovery-repayment/recovery-repayment.component.html +++ b/src/app/loans/loans-view/loan-account-actions/recovery-repayment/recovery-repayment.component.html @@ -37,14 +37,12 @@
- Show Payment Details - - - + + +
+ Show Payment Details +
+
@@ -77,18 +75,18 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/reject-loan/reject-loan.component.html b/src/app/loans/loans-view/loan-account-actions/reject-loan/reject-loan.component.html index 0f38f3bf5..a1ccb4858 100644 --- a/src/app/loans/loans-view/loan-account-actions/reject-loan/reject-loan.component.html +++ b/src/app/loans/loans-view/loan-account-actions/reject-loan/reject-loan.component.html @@ -21,18 +21,18 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/undo-approval/undo-approval.component.html b/src/app/loans/loans-view/loan-account-actions/undo-approval/undo-approval.component.html index e16132e5f..1fbdbc5bb 100644 --- a/src/app/loans/loans-view/loan-account-actions/undo-approval/undo-approval.component.html +++ b/src/app/loans/loans-view/loan-account-actions/undo-approval/undo-approval.component.html @@ -9,13 +9,13 @@ - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/undo-disbursal/undo-disbursal.component.html b/src/app/loans/loans-view/loan-account-actions/undo-disbursal/undo-disbursal.component.html index ac0c9f03e..3ab1693c7 100644 --- a/src/app/loans/loans-view/loan-account-actions/undo-disbursal/undo-disbursal.component.html +++ b/src/app/loans/loans-view/loan-account-actions/undo-disbursal/undo-disbursal.component.html @@ -6,16 +6,16 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/undo-disbursal/undo-disbursal.component.ts b/src/app/loans/loans-view/loan-account-actions/undo-disbursal/undo-disbursal.component.ts index 8a179d3cf..2b71f3324 100644 --- a/src/app/loans/loans-view/loan-account-actions/undo-disbursal/undo-disbursal.component.ts +++ b/src/app/loans/loans-view/loan-account-actions/undo-disbursal/undo-disbursal.component.ts @@ -1,5 +1,5 @@ /** Angular Imports */ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormBuilder } from '@angular/forms'; import { Router, ActivatedRoute } from '@angular/router'; @@ -16,6 +16,8 @@ import { LoansService } from '../../../loans.service'; }) export class UndoDisbursalComponent implements OnInit { + @Input() actionName: string; + /** Loan ID. */ loanId: any; /** Undo disbursal form. */ @@ -45,7 +47,11 @@ export class UndoDisbursalComponent implements OnInit { * Submits the undo disbursal form. */ submit() { - this.loansService.loanActionButtons(this.loanId, 'undodisbursal', {'note': this.note.value}).subscribe((response: any) => { + let command = 'undodisbursal'; + if (this.actionName === 'Undo Last Disbursal') { + command = 'undolastdisbursal'; + } + this.loansService.loanActionButtons(this.loanId, command, {'note': this.note.value}).subscribe((response: any) => { this.router.navigate(['../../general'], { relativeTo: this.route }); }); } diff --git a/src/app/loans/loans-view/loan-account-actions/waive-interest/waive-interest.component.html b/src/app/loans/loans-view/loan-account-actions/waive-interest/waive-interest.component.html index d74c54b84..7b091bcb6 100644 --- a/src/app/loans/loans-view/loan-account-actions/waive-interest/waive-interest.component.html +++ b/src/app/loans/loans-view/loan-account-actions/waive-interest/waive-interest.component.html @@ -29,18 +29,18 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/withdrawn-by-client/withdrawn-by-client.component.html b/src/app/loans/loans-view/loan-account-actions/withdrawn-by-client/withdrawn-by-client.component.html index 179d9892c..e0dcbea3b 100644 --- a/src/app/loans/loans-view/loan-account-actions/withdrawn-by-client/withdrawn-by-client.component.html +++ b/src/app/loans/loans-view/loan-account-actions/withdrawn-by-client/withdrawn-by-client.component.html @@ -21,18 +21,18 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-account-actions/write-off-page/write-off-page.component.html b/src/app/loans/loans-view/loan-account-actions/write-off-page/write-off-page.component.html index b4c22a998..08c92f837 100644 --- a/src/app/loans/loans-view/loan-account-actions/write-off-page/write-off-page.component.html +++ b/src/app/loans/loans-view/loan-account-actions/write-off-page/write-off-page.component.html @@ -26,20 +26,20 @@ Note - + - + + + + - - - - + diff --git a/src/app/loans/loans-view/loan-accounts-button-config.ts b/src/app/loans/loans-view/loan-accounts-button-config.ts index 81e7aa075..2758b77da 100644 --- a/src/app/loans/loans-view/loan-accounts-button-config.ts +++ b/src/app/loans/loans-view/loan-accounts-button-config.ts @@ -40,22 +40,22 @@ export class LoansAccountButtonConfiguration { this.buttonsArray = [ { name: 'Add Loan Charge', - icon: 'fa fa-plus', + icon: 'plus', taskPermissionName: 'CREATE_LOANCHARGE', }, { name: 'Foreclosure', - icon: 'icon-dollar', + icon: 'heart-broken', taskPermissionName: 'FORECLOSURE_LOAN', }, { name: 'Make Repayment', - icon: 'fa fa-dollar', + icon: 'coins', taskPermissionName: 'REPAYMENT_LOAN', }, { name: 'Undo Disbursal', - icon: 'fa fa-undo', + icon: 'undo', taskPermissionName: 'DISBURSALUNDO_LOAN', } ]; @@ -64,22 +64,22 @@ export class LoansAccountButtonConfiguration { this.buttonsArray = [ { name: 'Add Loan Charge', - icon: 'fa fa-plus', + icon: 'plus', taskPermissionName: 'CREATE_LOANCHARGE', }, { name: 'Approve', - icon: 'fa fa-check', + icon: 'check', taskPermissionName: 'APPROVE_LOAN', }, { name: 'Modify Application', - icon: 'fa fa-pincel-square-o', + icon: 'edit', taskPermissionName: 'UPDATE_LOAN', }, { name: 'Reject', - icon: 'fa fa-times', + icon: 'times', taskPermissionName: 'REJECT_LOAN', }, ]; @@ -88,17 +88,17 @@ export class LoansAccountButtonConfiguration { this.buttonsArray = [ { name: 'Disburse', - icon: 'fa fa-flag', + icon: 'hand-holding-usd', taskPermissionName: 'DISBURSE_LOAN', }, { name: 'Disburse to Savings', - icon: 'fa fa-flag', + icon: 'piggy-bank', taskPermissionName: 'DISBURSETOSAVINGS_LOAN', }, { name: 'Undo Approval', - icon: 'fa fa-undo', + icon: 'undo', taskPermissionName: 'APPROVALUNDO_LOAN', }, ]; @@ -107,12 +107,12 @@ export class LoansAccountButtonConfiguration { this.buttonsArray = [ { name: 'Transfer Funds', - icon: 'fa fa-exchange', + icon: 'exchange', taskPermissionName: 'CREATE_ACCOUNTTRANSFER', }, { name: 'Credit Balance Refund', - icon: 'fa fa-dollar', + icon: 'coins', taskPermissionName: 'CREATE_CREDIT_BALANCE_REFUND', } ]; @@ -121,7 +121,7 @@ export class LoansAccountButtonConfiguration { this.buttonsArray = [ { name: 'Recovery Payment', - icon: 'fa fa-briefcase', + icon: 'briefcase', taskPermissionName: 'RECOVERYPAYMENT_LOAN', }, ]; @@ -130,17 +130,17 @@ export class LoansAccountButtonConfiguration { this.buttonsArray = [ { name: 'Goodwill Credit', - icon: 'fa fa-dollar', + icon: 'coins', taskPermissionName: 'CREATE_GOODWILL_TRANSACTION', }, { name: 'Payout Refund', - icon: 'fa fa-dollar', + icon: 'coins', taskPermissionName: 'CREATE_PAYOUT_REFUND', }, { name: 'Merchant Issued Refund', - icon: 'fa fa-dollar', + icon: 'coins', taskPermissionName: 'CREATE_MERCHANT_ISSUED_REFUND', } ]; diff --git a/src/app/loans/loans-view/loans-view.component.html b/src/app/loans/loans-view/loans-view.component.html index 3aa702eb5..d0e8693ac 100644 --- a/src/app/loans/loans-view/loans-view.component.html +++ b/src/app/loans/loans-view/loans-view.component.html @@ -15,72 +15,87 @@
-
+

- Loan Product: {{loanDetailsData.loanProductName}}(#{{loanDetailsData.accountNo}}) -
- Client Name: {{loanDetailsData.clientName}}
- Group Name: {{loanDetailsData.group.name}} - - Loan Account Classification : {{loanDetailsData?.delinquencyRange.classification}} -
- - Past Due Days : {{loanDetailsData?.delinquent.pastDueDays | number}} -
- - Delinquent Days : {{loanDetailsData?.delinquent.delinquentDays | number}} - + Loan Product: {{loanDetailsData.loanProductName}}({{loanDetailsData.accountNo}})

+ + {{entityType}} Name: {{loanDetailsData.clientName || + loanDetailsData.groupName}}({{loanDetailsData.clientAccountNo}})
+ + + Loan Account Classification : {{loanDetailsData?.delinquencyRange.classification}}
+ + + Past Due Days : {{loanDetailsData?.delinquent.pastDueDays | number}}
+ + + Delinquent Days : {{loanDetailsData?.delinquent.delinquentDays | number}} +
-
+

Loan Account OverView

Current Balance: {{loanDetailsData.currency.displaySymbol}} {{loanDetailsData.summary.totalOutstanding | number}}
Arrears By: {{loanDetailsData.summary.totalOverdue | number}} Not Provided
- Arrears Since: {{loanDetailsData.summary.overdueSinceDate | dateFormat}} -
+ Arrears Since: {{loanDetailsData.summary.overdueSinceDate | + dateFormat}} + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/app/loans/loans-view/loans-view.component.ts b/src/app/loans/loans-view/loans-view.component.ts index 09c6fabdf..2b80c77cd 100644 --- a/src/app/loans/loans-view/loans-view.component.ts +++ b/src/app/loans/loans-view/loans-view.component.ts @@ -28,12 +28,15 @@ export class LoansViewComponent implements OnInit { recalculateInterest: any; /** Status */ status: string; + entityType: string; /** Loan Id */ loanId: number; /** Client Id */ - clientId: any; + clientId: number; /** Button Configuration */ buttonConfig: LoansAccountButtonConfiguration; + /** Disburse Transaction number */ + disburseTransactionNo = 0; constructor(private route: ActivatedRoute, private router: Router, @@ -51,6 +54,21 @@ export class LoansViewComponent implements OnInit { this.recalculateInterest = this.loanDetailsData.recalculateInterest || true; this.status = this.loanDetailsData.status.value; this.setConditionalButtons(); + + if (this.loanDetailsData.multiDisburseLoan) { + this.loanDetailsData.transactions.forEach((tranaction: any) => { + if (tranaction.type.disbursement) { + this.disburseTransactionNo++; + } + }); + } + if (this.router.url.includes('clients')) { + this.entityType = 'Client'; + } else if (this.router.url.includes('groups')) { + this.entityType = 'Group'; + } else if (this.router.url.includes('centers')) { + this.entityType = 'Center'; + } } // Defines the buttons based on the status of the loan account @@ -61,12 +79,14 @@ export class LoansViewComponent implements OnInit { this.buttonConfig.addOption({ name: (this.loanDetailsData.loanOfficerName ? 'Change Loan Officer' : 'Assign Loan Officer'), + icon: 'user-tie', taskPermissionName: 'DISBURSE_LOAN' }); if (this.loanDetailsData.isVariableInstallmentsAllowed) { this.buttonConfig.addOption({ name: 'Edit Repayment Schedule', + icon: 'edit', taskPermissionName: 'ADJUST_REPAYMENT_SCHEDULE' }); } @@ -75,7 +95,7 @@ export class LoansViewComponent implements OnInit { this.buttonConfig.addButton({ name: (this.loanDetailsData.loanOfficerName ? 'Change Loan Officer' : 'Assign Loan Officer'), - icon: 'fa fa-user', + icon: 'user-tie', taskPermissionName: 'DISBURSE_LOAN' }); @@ -83,24 +103,30 @@ export class LoansViewComponent implements OnInit { if (this.loanDetailsData.canDisburse || this.loanDetailsData.multiDisburseLoan) { this.buttonConfig.addButton({ name: 'Disburse', - icon: 'fa fa-flag', + icon: 'hand-holding-usd', taskPermissionName: 'DISBURSE_LOAN' }); } if (this.loanDetailsData.canDisburse) { this.buttonConfig.addButton({ name: 'Disburse To Savings', - icon: 'fa fa-flag', + icon: 'piggy-bank', taskPermissionName: 'DISBURSETOSAVINGS_LOAN' }); } - + if (this.loanDetailsData.multiDisburseLoan && this.disburseTransactionNo > 1) { + this.buttonConfig.addButton({ + name: 'Undo Last Disbursal', + icon: 'undo', + taskPermissionName: 'DISBURSALLASTUNDO_LOAN' + }); + } // loan officer not assigned to loan, below logic // helps to display otherwise not if (!this.loanDetailsData.loanOfficerName) { this.buttonConfig.addButton({ name: 'Assign Loan Officer', - icon: 'fa fa-user', + icon: 'user-tie', taskPermissionName: 'UPDATELOANOFFICER_LOAN' }); } @@ -108,7 +134,7 @@ export class LoansViewComponent implements OnInit { if (this.recalculateInterest) { this.buttonConfig.addButton({ name: 'Prepay Loan', - icon: 'fa fa-money', + icon: 'coins', taskPermissionName: 'REPAYMENT_LOAN' }); } diff --git a/src/app/loans/loans.module.ts b/src/app/loans/loans.module.ts index c41cd7419..5b3ae2d95 100644 --- a/src/app/loans/loans.module.ts +++ b/src/app/loans/loans.module.ts @@ -73,6 +73,7 @@ import { LoanAccountLoadDocumentsDialogComponent } from './custom-dialog/loan-ac import { LoanCreditBalanceRefundComponent } from './loans-view/loan-account-actions/loan-credit-balance-refund/loan-credit-balance-refund.component'; import { LoanDelinquencyTagsTabComponent } from './loans-view/loan-delinquency-tags-tab/loan-delinquency-tags-tab.component'; import { LoansAccountScheduleStepComponent } from './loans-account-stepper/loans-account-schedule-step/loans-account-schedule-step.component'; +import { EditRepaymentScheduleComponent } from './loans-view/loan-account-actions/edit-repayment-schedule/edit-repayment-schedule.component'; /** * Loans Module @@ -144,7 +145,8 @@ import { LoansAccountScheduleStepComponent } from './loans-account-stepper/loans GlimTermsStepComponent, GlimPreviewStepComponent, LoanDelinquencyTagsTabComponent, - LoansAccountScheduleStepComponent + LoansAccountScheduleStepComponent, + EditRepaymentScheduleComponent ], providers: [ ], }) diff --git a/src/app/organization/payment-types/create-payment-type/create-payment-type.component.html b/src/app/organization/payment-types/create-payment-type/create-payment-type.component.html index acd3e128e..879f4db7c 100644 --- a/src/app/organization/payment-types/create-payment-type/create-payment-type.component.html +++ b/src/app/organization/payment-types/create-payment-type/create-payment-type.component.html @@ -18,9 +18,9 @@ Description - + - + Is Cash Payment? @@ -32,9 +32,9 @@ Position is required - +
- + diff --git a/src/app/organization/payment-types/edit-payment-type/edit-payment-type.component.html b/src/app/organization/payment-types/edit-payment-type/edit-payment-type.component.html index 4fd34ae08..b8af63d82 100644 --- a/src/app/organization/payment-types/edit-payment-type/edit-payment-type.component.html +++ b/src/app/organization/payment-types/edit-payment-type/edit-payment-type.component.html @@ -18,9 +18,9 @@ Description - + - + Is Cash Payment? @@ -32,9 +32,9 @@ Position is required - + - + diff --git a/src/app/organization/tellers/create-teller/create-teller.component.html b/src/app/organization/tellers/create-teller/create-teller.component.html index 2bfec45da..e27b7fab0 100644 --- a/src/app/organization/tellers/create-teller/create-teller.component.html +++ b/src/app/organization/tellers/create-teller/create-teller.component.html @@ -33,7 +33,7 @@ Description - + diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.html index 221c3338d..f56d488f7 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.html +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.html @@ -47,7 +47,7 @@ Description - + diff --git a/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-details-step/recurring-deposit-product-details-step.component.html b/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-details-step/recurring-deposit-product-details-step.component.html index 4dda46860..e912fad46 100644 --- a/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-details-step/recurring-deposit-product-details-step.component.html +++ b/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-details-step/recurring-deposit-product-details-step.component.html @@ -20,7 +20,7 @@ Description - + Description is required diff --git a/src/app/products/saving-products/saving-product-stepper/saving-product-details-step/saving-product-details-step.component.html b/src/app/products/saving-products/saving-product-stepper/saving-product-details-step/saving-product-details-step.component.html index 8ccccef64..5841f693f 100644 --- a/src/app/products/saving-products/saving-product-stepper/saving-product-details-step/saving-product-details-step.component.html +++ b/src/app/products/saving-products/saving-product-stepper/saving-product-details-step/saving-product-details-step.component.html @@ -20,7 +20,7 @@ Description - + diff --git a/src/app/savings/saving-account-actions/activate-savings-account/activate-savings-account.component.html b/src/app/savings/saving-account-actions/activate-savings-account/activate-savings-account.component.html index 8b50a0ea8..500b2ccb8 100644 --- a/src/app/savings/saving-account-actions/activate-savings-account/activate-savings-account.component.html +++ b/src/app/savings/saving-account-actions/activate-savings-account/activate-savings-account.component.html @@ -19,8 +19,8 @@ - - + + diff --git a/src/app/savings/saving-account-actions/activate-savings-account/activate-savings-account.component.ts b/src/app/savings/saving-account-actions/activate-savings-account/activate-savings-account.component.ts index 84ad3c8e1..9ed9aa171 100644 --- a/src/app/savings/saving-account-actions/activate-savings-account/activate-savings-account.component.ts +++ b/src/app/savings/saving-account-actions/activate-savings-account/activate-savings-account.component.ts @@ -79,7 +79,7 @@ export class ActivateSavingsAccountComponent implements OnInit { locale }; this.savingsService.executeSavingsAccountCommand(this.accountId, 'activate', data).subscribe(() => { - this.router.navigate(['../../'], { relativeTo: this.route }); + this.router.navigate(['../../transactions'], { relativeTo: this.route }); }); } diff --git a/src/app/savings/saving-account-actions/add-charge-savings-account/add-charge-savings-account.component.html b/src/app/savings/saving-account-actions/add-charge-savings-account/add-charge-savings-account.component.html index fcbf0a3f8..0001f1916 100644 --- a/src/app/savings/saving-account-actions/add-charge-savings-account/add-charge-savings-account.component.html +++ b/src/app/savings/saving-account-actions/add-charge-savings-account/add-charge-savings-account.component.html @@ -80,7 +80,7 @@ - + diff --git a/src/app/savings/saving-account-actions/add-charge-savings-account/add-charge-savings-account.component.ts b/src/app/savings/saving-account-actions/add-charge-savings-account/add-charge-savings-account.component.ts index 6de9805cc..937132491 100644 --- a/src/app/savings/saving-account-actions/add-charge-savings-account/add-charge-savings-account.component.ts +++ b/src/app/savings/saving-account-actions/add-charge-savings-account/add-charge-savings-account.component.ts @@ -135,7 +135,7 @@ export class AddChargeSavingsAccountComponent implements OnInit { } } this.savingsService.createSavingsCharge(this.savingAccountId, 'charges', savingsCharge).subscribe( () => { - this.router.navigate(['../../'], { relativeTo: this.route }); + this.router.navigate(['../../transactions'], { relativeTo: this.route }); }); } diff --git a/src/app/savings/saving-account-actions/approve-savings-account/approve-savings-account.component.html b/src/app/savings/saving-account-actions/approve-savings-account/approve-savings-account.component.html index 5c9df9630..203596ffa 100644 --- a/src/app/savings/saving-account-actions/approve-savings-account/approve-savings-account.component.html +++ b/src/app/savings/saving-account-actions/approve-savings-account/approve-savings-account.component.html @@ -20,7 +20,7 @@ Note - + @@ -29,7 +29,7 @@ - + diff --git a/src/app/savings/saving-account-actions/approve-savings-account/approve-savings-account.component.ts b/src/app/savings/saving-account-actions/approve-savings-account/approve-savings-account.component.ts index ddc3c5771..bba6ca8af 100644 --- a/src/app/savings/saving-account-actions/approve-savings-account/approve-savings-account.component.ts +++ b/src/app/savings/saving-account-actions/approve-savings-account/approve-savings-account.component.ts @@ -80,7 +80,7 @@ export class ApproveSavingsAccountComponent implements OnInit { locale }; this.savingsService.executeSavingsAccountCommand(this.accountId, 'approve', data).subscribe(() => { - this.router.navigate(['../../'], { relativeTo: this.route }); + this.router.navigate(['../../transactions'], { relativeTo: this.route }); }); } diff --git a/src/app/savings/saving-account-actions/close-savings-account/close-savings-account.component.html b/src/app/savings/saving-account-actions/close-savings-account/close-savings-account.component.html index aa6e7e8c7..95575c55c 100644 --- a/src/app/savings/saving-account-actions/close-savings-account/close-savings-account.component.html +++ b/src/app/savings/saving-account-actions/close-savings-account/close-savings-account.component.html @@ -43,11 +43,14 @@ -
- Show Payment Details - +
+ + +
+ Show Payment Details +
+ +
@@ -79,7 +82,7 @@ Note - +
diff --git a/src/app/savings/saving-account-actions/post-interest-as-on-savings-account/post-interest-as-on-savings-account.component.ts b/src/app/savings/saving-account-actions/post-interest-as-on-savings-account/post-interest-as-on-savings-account.component.ts index d9b977555..e20e67953 100644 --- a/src/app/savings/saving-account-actions/post-interest-as-on-savings-account/post-interest-as-on-savings-account.component.ts +++ b/src/app/savings/saving-account-actions/post-interest-as-on-savings-account/post-interest-as-on-savings-account.component.ts @@ -80,7 +80,7 @@ export class PostInterestAsOnSavingsAccountComponent implements OnInit { locale }; this.savingsService.executeSavingsAccountTransactionsCommand(this.accountId, 'postInterestAsOn', data).subscribe(() => { - this.router.navigate(['../../'], { relativeTo: this.route }); + this.router.navigate(['../../transactions'], { relativeTo: this.route }); }); } diff --git a/src/app/savings/saving-account-actions/reject-savings-account/reject-savings-account.component.html b/src/app/savings/saving-account-actions/reject-savings-account/reject-savings-account.component.html index 9a8e9243d..97cb6615d 100644 --- a/src/app/savings/saving-account-actions/reject-savings-account/reject-savings-account.component.html +++ b/src/app/savings/saving-account-actions/reject-savings-account/reject-savings-account.component.html @@ -20,7 +20,7 @@ Note - + diff --git a/src/app/savings/saving-account-actions/savings-account-assign-staff/savings-account-assign-staff.component.ts b/src/app/savings/saving-account-actions/savings-account-assign-staff/savings-account-assign-staff.component.ts index ceb0fb4e4..1878da1a5 100644 --- a/src/app/savings/saving-account-actions/savings-account-assign-staff/savings-account-assign-staff.component.ts +++ b/src/app/savings/saving-account-actions/savings-account-assign-staff/savings-account-assign-staff.component.ts @@ -89,7 +89,7 @@ export class SavingsAccountAssignStaffComponent implements OnInit { locale }; this.savingsService.executeSavingsAccountCommand(this.accountId, 'assignSavingsOfficer', data).subscribe(() => { - this.router.navigate(['../../'], { relativeTo: this.route }); + this.router.navigate(['../../transactions'], { relativeTo: this.route }); }); } diff --git a/src/app/savings/saving-account-actions/savings-account-transactions/savings-account-transactions.component.html b/src/app/savings/saving-account-actions/savings-account-transactions/savings-account-transactions.component.html index 1c0598b4a..eba041ffc 100644 --- a/src/app/savings/saving-account-actions/savings-account-transactions/savings-account-transactions.component.html +++ b/src/app/savings/saving-account-actions/savings-account-transactions/savings-account-transactions.component.html @@ -37,11 +37,14 @@ -
- Show Payment Details - +
+ + +
+ Show Payment Details +
+ +
@@ -75,7 +78,7 @@ - + diff --git a/src/app/savings/saving-account-actions/savings-account-transactions/savings-account-transactions.component.ts b/src/app/savings/saving-account-actions/savings-account-transactions/savings-account-transactions.component.ts index d05ea14aa..42e434882 100644 --- a/src/app/savings/saving-account-actions/savings-account-transactions/savings-account-transactions.component.ts +++ b/src/app/savings/saving-account-actions/savings-account-transactions/savings-account-transactions.component.ts @@ -121,7 +121,7 @@ export class SavingsAccountTransactionsComponent implements OnInit { locale }; this.savingsService.executeSavingsAccountTransactionsCommand(this.savingAccountId, this.transactionCommand, data).subscribe(res => { - this.router.navigate(['../../'], { relativeTo: this.route }); + this.router.navigate(['../../transactions'], { relativeTo: this.route }); }); } } diff --git a/src/app/savings/saving-account-actions/savings-account-unassign-staff/savings-account-unassign-staff.component.ts b/src/app/savings/saving-account-actions/savings-account-unassign-staff/savings-account-unassign-staff.component.ts index 2fa243496..cf6a309a2 100644 --- a/src/app/savings/saving-account-actions/savings-account-unassign-staff/savings-account-unassign-staff.component.ts +++ b/src/app/savings/saving-account-actions/savings-account-unassign-staff/savings-account-unassign-staff.component.ts @@ -79,7 +79,7 @@ export class SavingsAccountUnassignStaffComponent implements OnInit { locale }; this.savingsService.executeSavingsAccountCommand(this.accountId, 'unassignSavingsOfficer', data).subscribe(() => { - this.router.navigate(['../../'], { relativeTo: this.route }); + this.router.navigate(['../../transactions'], { relativeTo: this.route }); }); } diff --git a/src/app/savings/saving-account-actions/undo-approval-savings-account/undo-approval-savings-account.component.html b/src/app/savings/saving-account-actions/undo-approval-savings-account/undo-approval-savings-account.component.html index efd7bf7e9..8c8879e19 100644 --- a/src/app/savings/saving-account-actions/undo-approval-savings-account/undo-approval-savings-account.component.html +++ b/src/app/savings/saving-account-actions/undo-approval-savings-account/undo-approval-savings-account.component.html @@ -8,7 +8,7 @@ Note - + diff --git a/src/app/savings/saving-account-actions/undo-approval-savings-account/undo-approval-savings-account.component.ts b/src/app/savings/saving-account-actions/undo-approval-savings-account/undo-approval-savings-account.component.ts index f7b9e7bd7..d3a999171 100644 --- a/src/app/savings/saving-account-actions/undo-approval-savings-account/undo-approval-savings-account.component.ts +++ b/src/app/savings/saving-account-actions/undo-approval-savings-account/undo-approval-savings-account.component.ts @@ -59,7 +59,7 @@ export class UndoApprovalSavingsAccountComponent implements OnInit { ...this.undoApprovalSavingsAccountForm.value, }; this.savingsService.executeSavingsAccountCommand(this.accountId, 'undoapproval', data).subscribe(() => { - this.router.navigate(['../../'], { relativeTo: this.route }); + this.router.navigate(['../../transactions'], { relativeTo: this.route }); }); } diff --git a/src/app/savings/saving-account-actions/withdraw-by-client-savings-account/withdraw-by-client-savings-account.component.html b/src/app/savings/saving-account-actions/withdraw-by-client-savings-account/withdraw-by-client-savings-account.component.html index e14457532..abfbe4f84 100644 --- a/src/app/savings/saving-account-actions/withdraw-by-client-savings-account/withdraw-by-client-savings-account.component.html +++ b/src/app/savings/saving-account-actions/withdraw-by-client-savings-account/withdraw-by-client-savings-account.component.html @@ -20,7 +20,7 @@ Note - +
diff --git a/src/app/savings/savings-account-view/savings-account-view.component.html b/src/app/savings/savings-account-view/savings-account-view.component.html index 04aef3a1e..620a315fb 100644 --- a/src/app/savings/savings-account-view/savings-account-view.component.html +++ b/src/app/savings/savings-account-view/savings-account-view.component.html @@ -6,91 +6,117 @@
-
+ + + + + + + + + + + + + + + - -
Survey Survey {{ survey.surveyName }} Created By Created By {{ survey.createdBy }} Date {{ survey.date | dateFormat }} DateTime {{ survey.date | datetimeFormat }} Score {{ survey.score }} {{ survey.score | number }}
- + - + - + - + - + - + - + - + @@ -114,11 +140,12 @@ - + - + @@ -138,7 +165,8 @@ - + @@ -162,7 +190,7 @@ - + @@ -177,13 +205,14 @@ -
+

Account Summary

Total Withdrawls{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalWithdrawals | number}}{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalWithdrawals | + number}}
Withdrawals Fees{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalWithdrawalFees | number}}{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalWithdrawalFees | + number}}
Annual Fees{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalAnnualFees | number}}{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalAnnualFees | + number}}
Interest Earned{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalInterestEarned | number}}{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalInterestEarned | + number}}
Interest Posted{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalInterestPosted | number}}{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalInterestPosted | + number}}
Interest Earned Not Posted{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.interestNotPosted | number}}{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.interestNotPosted | + number}}
Interest On Overdraft{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalOverdraftInterestDerived | number}} + {{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalOverdraftInterestDerived + | number}}
Overdraft Interest Not Posted{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.interestNotPosted | number}}{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.interestNotPosted | + number}}
Nominal Interest Rate
Withdrawal Fee{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.withdrawalFee.amount | number}}{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.withdrawalFee.amount | + number}}
Last Active Transaction Date{{savingsAccountData.lastActiveTransactionDate | dateFormat}}{{savingsAccountData.lastActiveTransactionDate | dateFormat}}
Substatus
Annual Fee{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.annualFee.amount | number}}{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.annualFee.amount | number}} +
Over Draft Limit
Interest Recalculation Date{{savingsAccountData.summary.lastInterestCalculationDate | dateFormat}}{{savingsAccountData.summary.lastInterestCalculationDate | dateFormat}}
On Hold Funds
- + @@ -200,13 +229,15 @@
-
+

Savings Details

Activated On{{savingsAccountData.timeline.activatedOnDate ? (savingsAccountData.timeline.activatedOnDate | dateFormat) : 'Not Activated'}}{{savingsAccountData.timeline.activatedOnDate ? (savingsAccountData.timeline.activatedOnDate | + dateFormat) : 'Not Activated'}}
Currency
- + @@ -252,11 +283,13 @@ - + - +
Activated On{{savingsAccountData.timeline.activatedOnDate ? (savingsAccountData.timeline.activatedOnDate | dateFormat) : 'Not Activated'}}{{savingsAccountData.timeline.activatedOnDate ? (savingsAccountData.timeline.activatedOnDate | + dateFormat) : 'Not Activated'}}
Field Officer
Total Deposits{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalDeposits | number}}{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalDeposits | + number}}
Total Interest Earned{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalInterestEarned | number}}{{savingsAccountData.currency.displaySymbol}} {{savingsAccountData.summary.totalInterestEarned + | number}}
@@ -268,23 +301,24 @@
diff --git a/src/app/shares/shares-account-actions/close-shares-account/close-shares-account.component.html b/src/app/shares/shares-account-actions/close-shares-account/close-shares-account.component.html index c2c676c65..ba030bbaf 100644 --- a/src/app/shares/shares-account-actions/close-shares-account/close-shares-account.component.html +++ b/src/app/shares/shares-account-actions/close-shares-account/close-shares-account.component.html @@ -20,7 +20,7 @@ Note - +
diff --git a/src/app/shares/shares-account-actions/reject-shares-account/reject-shares-account.component.html b/src/app/shares/shares-account-actions/reject-shares-account/reject-shares-account.component.html index 7e5d30b44..cb22e8aa9 100644 --- a/src/app/shares/shares-account-actions/reject-shares-account/reject-shares-account.component.html +++ b/src/app/shares/shares-account-actions/reject-shares-account/reject-shares-account.component.html @@ -20,7 +20,7 @@ Note - + diff --git a/src/app/system/manage-data-tables/column-dialog/column-dialog.component.html b/src/app/system/manage-data-tables/column-dialog/column-dialog.component.html index 5f7dc6057..cfa5096c3 100644 --- a/src/app/system/manage-data-tables/column-dialog/column-dialog.component.html +++ b/src/app/system/manage-data-tables/column-dialog/column-dialog.component.html @@ -23,16 +23,12 @@ -
- Mandatory -
- - + Column Length - + Column Code @@ -41,6 +37,18 @@ +
+ Mandatory +
+ +
+ Unique +
+ +
+ Indexed +
+ diff --git a/src/app/system/manage-data-tables/column-dialog/column-dialog.component.ts b/src/app/system/manage-data-tables/column-dialog/column-dialog.component.ts index 760465b40..21a20a509 100644 --- a/src/app/system/manage-data-tables/column-dialog/column-dialog.component.ts +++ b/src/app/system/manage-data-tables/column-dialog/column-dialog.component.ts @@ -37,9 +37,11 @@ export class ColumnDialogComponent implements OnInit { this.columnForm = this.formBuilder.group({ 'name': [this.data ? this.data.columnName : '', Validators.required], 'type': [{ value: this.data ? (this.data.columnDisplayType === '' ? '' : this.getColumnType(this.data.columnDisplayType)) : '', disabled: this.data.type === 'existing' }, Validators.required], + 'length': [{ value: this.data ? + this.data.columnLength : '', disabled: this.getColumnType(this.data.columnDisplayType) !== 'String' || this.data.type === 'existing' }, Validators.required], 'mandatory': [{ value: this.data.isColumnNullable, disabled: this.data.type === 'existing' }], - 'length': [{ value: this.data ? +this.data.columnLength : '', disabled: this.getColumnType(this.data.columnDisplayType) !== 'String' || this.data.type === 'existing' }, Validators.required], - 'code': [{ value: this.data ? this.data.columnCode : '', disabled: this.getColumnType(this.data.columnDisplayType) !== 'Dropdown' || this.data.type === 'existing' }, Validators.required] + 'unique': [{ value: this.data.isColumnUnique, disabled: this.data.isColumnNullable || this.data.type === 'existing' }], + 'indexed': [{ value: this.data.isColumnIndexed, disabled: this.data.type === 'existing' }], + 'code': [{ value: this.data ? this.data.columnCode : '', disabled: this.getColumnType(this.data.columnDisplayType) !== 'Dropdown' || this.data.type === 'existing' }, Validators.required], }); this.onColumnTypeChanges(); } diff --git a/src/app/system/manage-data-tables/create-data-table/create-data-table.component.ts b/src/app/system/manage-data-tables/create-data-table/create-data-table.component.ts index 74c70c718..e5484c971 100644 --- a/src/app/system/manage-data-tables/create-data-table/create-data-table.component.ts +++ b/src/app/system/manage-data-tables/create-data-table/create-data-table.component.ts @@ -49,7 +49,9 @@ export class CreateDataTableComponent implements OnInit, AfterViewInit { columnLength: undefined, columnCode: undefined, columnCodes: undefined, - type: undefined + type: undefined, + isColumnUnique: undefined, + isColumnIndexed: undefined }; /** Columns to be displayed in columns table. */ displayedColumns: string[] = ['name', 'type', 'mandatory', 'length', 'code', 'actions']; @@ -127,9 +129,13 @@ export class CreateDataTableComponent implements OnInit, AfterViewInit { this.dataForDialog.columnDisplayType = undefined; this.dataForDialog.columnLength = undefined; this.dataForDialog.columnCode = undefined; + this.dataForDialog.isColumnUnique = undefined; + this.dataForDialog.isColumnIndexed = undefined; this.dataForDialog.type = 'new'; const addColumnDialogRef = this.dialog.open(ColumnDialogComponent, { - data: this.dataForDialog + data: this.dataForDialog, + height: '450px', + width: '400px' }); addColumnDialogRef.afterClosed().subscribe((response: any) => { if (response !== '') { @@ -137,6 +143,8 @@ export class CreateDataTableComponent implements OnInit, AfterViewInit { columnName: response.name, columnDisplayType: response.type, isColumnNullable: !response.mandatory, + isColumnUnique: response.unique, + isColumnIndexed: response.indexed, columnLength: response.length, columnCode: response.code, type: 'new' @@ -155,9 +163,13 @@ export class CreateDataTableComponent implements OnInit, AfterViewInit { this.dataForDialog.columnDisplayType = column.type; this.dataForDialog.columnLength = column.length; this.dataForDialog.columnCode = column.code; + this.dataForDialog.isColumnUnique = column.unique; + this.dataForDialog.isColumnIndexed = column.indexed; this.dataForDialog.type = 'new'; const editColumnDialogRef = this.dialog.open(ColumnDialogComponent, { - data: this.dataForDialog + data: this.dataForDialog, + height: '450px', + width: '400px' }); editColumnDialogRef.afterClosed().subscribe((response: any) => { if (response !== '') { @@ -165,6 +177,8 @@ export class CreateDataTableComponent implements OnInit, AfterViewInit { columnName: response.name, columnDisplayType: response.type, isColumnNullable: !response.mandatory, + isColumnUnique: response.unique, + isColumnIndexed: response.indexed, columnLength: response.length, columnCode: response.code, type: 'existing' @@ -203,6 +217,8 @@ export class CreateDataTableComponent implements OnInit, AfterViewInit { code: column.columnCode, length: column.columnLength, mandatory: !column.isColumnNullable, + unique: column.isColumnUnique, + indexed: column.isColumnIndexed }); }); this.dataTableForm.value.columns = columns; diff --git a/src/app/system/manage-data-tables/datatable-column.model.ts b/src/app/system/manage-data-tables/datatable-column.model.ts index 5ae5351b2..115c3e6dd 100644 --- a/src/app/system/manage-data-tables/datatable-column.model.ts +++ b/src/app/system/manage-data-tables/datatable-column.model.ts @@ -8,5 +8,7 @@ export interface DatatableColumn { columnCode: string; columnCodes?: any; type: string; + isColumnUnique: boolean; + isColumnIndexed: boolean; } diff --git a/src/app/system/manage-data-tables/edit-data-table/edit-data-table.component.html b/src/app/system/manage-data-tables/edit-data-table/edit-data-table.component.html index da728a1b9..881fbd1ca 100644 --- a/src/app/system/manage-data-tables/edit-data-table/edit-data-table.component.html +++ b/src/app/system/manage-data-tables/edit-data-table/edit-data-table.component.html @@ -53,38 +53,58 @@ - + - + - - - - - - + - + + + + + + + + + + + + + + + + - - + + + + + - +
Name Name {{ column.columnName }} Type Type {{ column.columnDisplayType }} Mandatory - - - Length Length {{ column.columnLength }} Code Code {{ column.columnCode }} Mandatory + + + Unique + + + Indexed + + + Actions + Actions diff --git a/src/app/system/manage-data-tables/edit-data-table/edit-data-table.component.ts b/src/app/system/manage-data-tables/edit-data-table/edit-data-table.component.ts index 668e53a66..7056579a4 100644 --- a/src/app/system/manage-data-tables/edit-data-table/edit-data-table.component.ts +++ b/src/app/system/manage-data-tables/edit-data-table/edit-data-table.component.ts @@ -45,8 +45,8 @@ export class EditDataTableComponent implements OnInit { apptableName: string, entitySubType: string, dropColumns?: { name: string }[], - changeColumns: { name: string, newName?: string, code?: string, newCode?: string, mandatory: boolean, length?: number }[], - addColumns?: { name?: string, type?: string, code?: string, mandatory?: boolean, length?: number }[] + changeColumns: { name: string, newName?: string, code?: string, newCode?: string, mandatory: boolean, length?: number, unique?: boolean, indexed?: boolean }[], + addColumns?: { name?: string, type?: string, code?: string, mandatory?: boolean, length?: number, unique?: boolean, indexed?: boolean }[] } = { apptableName: '', changeColumns: [], addColumns: [], dropColumns: [], entitySubType: '' @@ -59,10 +59,12 @@ export class EditDataTableComponent implements OnInit { columnLength: undefined, columnCode: undefined, columnCodes: undefined, - type: undefined + type: undefined, + isColumnUnique: undefined, + isColumnIndexed: undefined }; /** Columns to be displayed in columns table. */ - displayedColumns: string[] = ['name', 'type', 'mandatory', 'length', 'code', 'actions']; + displayedColumns: string[] = ['name', 'type', 'mandatory', 'length', 'code', 'unique', 'indexed', 'actions']; /** Data source for columns table. */ dataSource: MatTableDataSource; /** Paginator for columns table. */ @@ -146,11 +148,15 @@ export class EditDataTableComponent implements OnInit { this.dataForDialog.columnName = undefined; this.dataForDialog.columnDisplayType = undefined; this.dataForDialog.isColumnNullable = false; + this.dataForDialog.isColumnUnique = false; + this.dataForDialog.isColumnIndexed = false; this.dataForDialog.columnLength = undefined; this.dataForDialog.columnCode = undefined; this.dataForDialog.type = 'new'; const addColumnDialogRef = this.dialog.open(ColumnDialogComponent, { - data: this.dataForDialog + data: this.dataForDialog, + height: '450px', + width: '400px' }); addColumnDialogRef.afterClosed().subscribe((response: any) => { if (response !== '') { @@ -159,6 +165,8 @@ export class EditDataTableComponent implements OnInit { columnName: response.name, columnDisplayType: response.type, isColumnNullable: !response.mandatory, + isColumnUnique: response.unique, + isColumnIndexed: response.indexed, columnLength: response.length, columnCode: response.code, type: 'new' @@ -176,6 +184,8 @@ export class EditDataTableComponent implements OnInit { name: response.name, type: response.type, mandatory: response.mandatory, + unique: response.unique, + indexed: response.indexed, length: response.length, code: response.code }); @@ -194,11 +204,15 @@ export class EditDataTableComponent implements OnInit { this.dataForDialog.columnName = column.columnName; this.dataForDialog.columnDisplayType = column.columnDisplayType; this.dataForDialog.isColumnNullable = !column.isColumnNullable; + this.dataForDialog.isColumnUnique = !column.isColumnUnique; + this.dataForDialog.isColumnIndexed = !column.isColumnIndexed; this.dataForDialog.columnLength = column.columnLength; this.dataForDialog.columnCode = column.columnCode; this.dataForDialog.type = column.type; const editColumnDialogRef = this.dialog.open(ColumnDialogComponent, { - data: this.dataForDialog + data: this.dataForDialog, + height: '450px', + width: '400px' }); editColumnDialogRef.afterClosed().subscribe((response: any) => { if (response !== '') { @@ -218,6 +232,8 @@ export class EditDataTableComponent implements OnInit { columnName: response.name, columnDisplayType: response.type, isColumnNullable: !response.mandatory, + isColumnUnique: response.unique, + isColumnIndexed: response.indexed, columnLength: response.length, columnCode: response.code, type: 'new' @@ -227,6 +243,8 @@ export class EditDataTableComponent implements OnInit { columnName: response.name, columnDisplayType: column.columnDisplayType, isColumnNullable: column.isColumnNullable, + isColumnUnique: column.unique, + isColumnIndexed: column.indexed, columnLength: column.columnLength, columnCode: column.columnCode, type: 'existing' diff --git a/src/app/system/manage-data-tables/view-data-table/view-data-table.component.html b/src/app/system/manage-data-tables/view-data-table/view-data-table.component.html index 963284eba..d2b0d5cce 100644 --- a/src/app/system/manage-data-tables/view-data-table/view-data-table.component.html +++ b/src/app/system/manage-data-tables/view-data-table/view-data-table.component.html @@ -1,78 +1,97 @@
- + - +
- + - + -
-
- Associated With -
-
- {{ dataTableData.applicationTableName }} -
+
+
+ Associated With +
+
+ {{ dataTableData.applicationTableName }} +
-
+
- + - +
- +
- - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + + + -
Field Name {{ dataTableColumn.columnName }} Field Name {{ dataTableColumn.columnName }} Type {{ dataTable.columnDisplayType }} Type {{ dataTable.columnDisplayType }} Length {{ dataTable.columnLength }} Length {{ dataTable.columnLength }} Code {{ dataTable.columnCode }} Code {{ dataTable.columnCode }} Mandatory - - - Mandatory + + +
Unique + + +
+ +
Indexed + + +
+ + diff --git a/src/app/system/manage-data-tables/view-data-table/view-data-table.component.ts b/src/app/system/manage-data-tables/view-data-table/view-data-table.component.ts index 309faf5b8..c2634f8ce 100644 --- a/src/app/system/manage-data-tables/view-data-table/view-data-table.component.ts +++ b/src/app/system/manage-data-tables/view-data-table/view-data-table.component.ts @@ -27,7 +27,7 @@ export class ViewDataTableComponent implements OnInit { /** Column Data */ columnsData: any; /** Columns to be displayed in columns table. */ - displayedColumns: string[] = ['columnName', 'columnDisplayType', 'columnLength', 'columnCode', 'isColumnNullable']; + displayedColumns: string[] = ['columnName', 'columnDisplayType', 'columnLength', 'columnCode', 'isColumnNullable', 'isColumnUnique', 'isColumnIndexed']; /** Data source for columns table. */ dataSource: MatTableDataSource; diff --git a/src/app/system/manage-reports/create-report/create-report.component.html b/src/app/system/manage-reports/create-report/create-report.component.html index 9819c28d0..f52c08e41 100644 --- a/src/app/system/manage-reports/create-report/create-report.component.html +++ b/src/app/system/manage-reports/create-report/create-report.component.html @@ -60,7 +60,7 @@ Description - + diff --git a/src/app/system/manage-reports/edit-report/edit-report.component.html b/src/app/system/manage-reports/edit-report/edit-report.component.html index 30d967d20..b35ea3c82 100644 --- a/src/app/system/manage-reports/edit-report/edit-report.component.html +++ b/src/app/system/manage-reports/edit-report/edit-report.component.html @@ -59,7 +59,7 @@ Description - + diff --git a/src/app/system/manage-surveys/create-survey/create-survey.component.html b/src/app/system/manage-surveys/create-survey/create-survey.component.html index 031aa7a2a..c38cdc14a 100644 --- a/src/app/system/manage-surveys/create-survey/create-survey.component.html +++ b/src/app/system/manage-surveys/create-survey/create-survey.component.html @@ -17,7 +17,7 @@ Key is required - + Name @@ -39,7 +39,7 @@ Description - +
@@ -78,7 +78,7 @@ Key is required - + Text @@ -89,7 +89,7 @@ Description - + @@ -101,11 +101,11 @@ Add Option
- +
- +
@@ -131,10 +131,10 @@
+
- +
@@ -154,11 +154,11 @@ Add Question - + - + diff --git a/src/app/system/manage-surveys/edit-survey/edit-survey.component.html b/src/app/system/manage-surveys/edit-survey/edit-survey.component.html index 28b903bdb..93546b8b0 100644 --- a/src/app/system/manage-surveys/edit-survey/edit-survey.component.html +++ b/src/app/system/manage-surveys/edit-survey/edit-survey.component.html @@ -1,15 +1,15 @@
- +
- + - + - +
- + Key @@ -17,7 +17,7 @@ Key is required - + Name @@ -25,7 +25,7 @@ Name is required - + Country Code @@ -36,26 +36,26 @@ Country Code must consist of 2 alphabetic characters - + Description - + - +
- + - + - +
- + - + - +
- +

Question {{ questionIndex + 1 }}

- + Key @@ -71,7 +71,7 @@ Key is required - + Text @@ -79,14 +79,14 @@ Text is required - + Description - + - + - +

Options

- +
- +
- +
- + Text @@ -108,7 +108,7 @@ Text is required - + Value @@ -119,27 +119,27 @@ Value must be an integer between -9999 and 9999 - +
+
- +
- +
- +
- +
- + - +
- + - - + +
- - - + + +
- +
- +
- -
\ No newline at end of file + + diff --git a/src/assets/styles/_misc.scss b/src/assets/styles/_misc.scss index 84db36102..fe1da27fb 100644 --- a/src/assets/styles/_misc.scss +++ b/src/assets/styles/_misc.scss @@ -23,6 +23,9 @@ div { list-style: none; } +.actions-menu { + color: $white; +} .alert { background-color: #E8F4FD;