@@ -195,6 +196,13 @@
+
+
diff --git a/src/app/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.scss b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.scss
similarity index 100%
rename from src/app/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.scss
rename to src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.scss
diff --git a/src/app/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.spec.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.spec.ts
similarity index 100%
rename from src/app/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.spec.ts
rename to src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.spec.ts
diff --git a/src/app/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts
similarity index 100%
rename from src/app/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts
rename to src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts
diff --git a/src/app/recurring-deposits/recurring-deposits-account-view/recurring-deposits-buttons.config.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-buttons.config.ts
similarity index 100%
rename from src/app/recurring-deposits/recurring-deposits-account-view/recurring-deposits-buttons.config.ts
rename to src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-buttons.config.ts
diff --git a/src/app/recurring-deposits/recurring-deposits-routing.module.ts b/src/app/deposits/recurring-deposits/recurring-deposits-routing.module.ts
similarity index 58%
rename from src/app/recurring-deposits/recurring-deposits-routing.module.ts
rename to src/app/deposits/recurring-deposits/recurring-deposits-routing.module.ts
index c4b657beb..c651a7571 100644
--- a/src/app/recurring-deposits/recurring-deposits-routing.module.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-routing.module.ts
@@ -3,13 +3,15 @@ import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
/** Translation Imports */
-import { extract } from '../core/i18n/i18n.service';
+import { extract } from '../../core/i18n/i18n.service';
/** Custom Components */
import { RecurringDepositsAccountViewComponent } from './recurring-deposits-account-view/recurring-deposits-account-view.component';
+import { InterestRateChartTabComponent } from './recurring-deposits-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component';
/** Custom Resolvers */
import { RecurringDepositsAccountViewResolver } from './common-resolvers/recurring-deposits-account-view.resolver';
+import { RecurringDepositsAccountDataResolver } from './common-resolvers/recurring-deposits-account-data.resolver';
const routes: Routes = [
{
@@ -19,10 +21,20 @@ const routes: Routes = [
{
path: ':recurringDepositAccountId',
data: { title: extract('RecurringDeposit Account View'), routeParamBreadcrumb: 'recurringDepositAccountId' },
+ component: RecurringDepositsAccountViewComponent,
resolve: {
recurringDepositsAccountData: RecurringDepositsAccountViewResolver
},
- component: RecurringDepositsAccountViewComponent
+ children: [
+ {
+ path: 'interest-rate-chart',
+ component: InterestRateChartTabComponent,
+ data: { title: extract('Interest Rate Chart'), breadcrumb: 'Interest Rate Chart', routeParamBreadcrumb: false },
+ resolve: {
+ recurringDepositsAccountData: RecurringDepositsAccountDataResolver
+ }
+ }
+ ]
}
]
}
@@ -33,6 +45,7 @@ const routes: Routes = [
declarations: [],
providers: [
RecurringDepositsAccountViewResolver,
+ RecurringDepositsAccountDataResolver
]
})
export class RecurringDepositsRoutingModule {}
diff --git a/src/app/recurring-deposits/recurring-deposits.module.spec.ts b/src/app/deposits/recurring-deposits/recurring-deposits.module.spec.ts
similarity index 100%
rename from src/app/recurring-deposits/recurring-deposits.module.spec.ts
rename to src/app/deposits/recurring-deposits/recurring-deposits.module.spec.ts
diff --git a/src/app/recurring-deposits/recurring-deposits.module.ts b/src/app/deposits/recurring-deposits/recurring-deposits.module.ts
similarity index 69%
rename from src/app/recurring-deposits/recurring-deposits.module.ts
rename to src/app/deposits/recurring-deposits/recurring-deposits.module.ts
index d572beadf..eb1fb34d1 100644
--- a/src/app/recurring-deposits/recurring-deposits.module.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits.module.ts
@@ -5,11 +5,12 @@ import { DatePipe } from '@angular/common';
/** Custom Modules */
import { RecurringDepositsRoutingModule } from './recurring-deposits-routing.module';
import { SharedModule } from 'app/shared/shared.module';
-import { PipesModule } from '../pipes/pipes.module';
-import { DirectivesModule } from '../directives/directives.module';
+import { PipesModule } from '../../pipes/pipes.module';
+import { DirectivesModule } from '../../directives/directives.module';
/** Custom Components */
import { RecurringDepositsAccountViewComponent } from './recurring-deposits-account-view/recurring-deposits-account-view.component';
+import { InterestRateChartTabComponent } from './recurring-deposits-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component';
/**
* RecurringDeposits Module
@@ -24,7 +25,8 @@ import { RecurringDepositsAccountViewComponent } from './recurring-deposits-acco
RecurringDepositsRoutingModule
],
declarations: [
- RecurringDepositsAccountViewComponent
+ RecurringDepositsAccountViewComponent,
+ InterestRateChartTabComponent
],
providers: [DatePipe]
})
diff --git a/src/app/recurring-deposits/recurring-deposits.service.spec.ts b/src/app/deposits/recurring-deposits/recurring-deposits.service.spec.ts
similarity index 100%
rename from src/app/recurring-deposits/recurring-deposits.service.spec.ts
rename to src/app/deposits/recurring-deposits/recurring-deposits.service.spec.ts
diff --git a/src/app/recurring-deposits/recurring-deposits.service.ts b/src/app/deposits/recurring-deposits/recurring-deposits.service.ts
similarity index 100%
rename from src/app/recurring-deposits/recurring-deposits.service.ts
rename to src/app/deposits/recurring-deposits/recurring-deposits.service.ts
diff --git a/src/app/products/products.module.ts b/src/app/products/products.module.ts
index a01ef1c95..0ea17a150 100644
--- a/src/app/products/products.module.ts
+++ b/src/app/products/products.module.ts
@@ -146,16 +146,17 @@ import { ShareProductsDividendsComponent } from './share-products/dividends-shar
FixedDepositProductChargesStepComponent,
FixedDepositProductAccountingStepComponent,
FixedDepositProductPreviewStepComponent,
- DepositProductIncentiveFormDialogComponent,
ManageTaxGroupsComponent,
ViewTaxComponentComponent,
CreateTaxComponentComponent,
EditTaxComponentComponent,
EditChargeComponent,
ViewTaxGroupComponent,
- ShareProductsDividendsComponent
+ ShareProductsDividendsComponent,
+ DepositProductIncentiveFormDialogComponent
],
entryComponents: [
+ DepositProductIncentiveFormDialogComponent,
FloatingRatePeriodDialogComponent
],
providers: [DatePipe]
diff --git a/src/theme/custom/denim-yellowgreen.scss b/src/theme/custom/denim-yellowgreen.scss
index d969d3fd3..069850dad 100644
--- a/src/theme/custom/denim-yellowgreen.scss
+++ b/src/theme/custom/denim-yellowgreen.scss
@@ -8,7 +8,7 @@
@import '../../app/savings/savings-account-view/savings-account-view.component-theme.scss';
@import '../../app/shares/shares-account-view/shares-account-view.component-theme.scss';
@import '../../app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component-theme.scss';
-@import '../../app/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component-theme.scss';
+@import '../../app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component-theme.scss';
// Custom material palette
$mat-denim: (
diff --git a/src/theme/custom/pictonblue-yellowgreen.scss b/src/theme/custom/pictonblue-yellowgreen.scss
index 478e08001..bc6f9f84a 100644
--- a/src/theme/custom/pictonblue-yellowgreen.scss
+++ b/src/theme/custom/pictonblue-yellowgreen.scss
@@ -8,7 +8,7 @@
@import '../../app/savings/savings-account-view/savings-account-view.component-theme.scss';
@import '../../app/shares/shares-account-view/shares-account-view.component-theme.scss';
@import '../../app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component-theme.scss';
-@import '../../app/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component-theme.scss';
+@import '../../app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component-theme.scss';
// Custom material palette
$mat-picton-blue: (