+35
@@ -0,0 +1,35 @@
|
|||||||
|
<form class="m-t-20" fxLayout="column" [formGroup]="transactionsReportForm" (ngSubmit)="generate()">
|
||||||
|
|
||||||
|
<div fxLayout="row" fxLayoutGap="3%" fxLayoutAlign="center">
|
||||||
|
|
||||||
|
<mat-form-field fxFlex="30%">
|
||||||
|
<mat-label>From Date</mat-label>
|
||||||
|
<input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="fromDatePicker" required formControlName="fromDate">
|
||||||
|
<mat-datepicker-toggle matSuffix [for]="fromDatePicker"></mat-datepicker-toggle>
|
||||||
|
<mat-datepicker #fromDatePicker></mat-datepicker>
|
||||||
|
<mat-error>
|
||||||
|
From date is <strong>required</strong>
|
||||||
|
</mat-error>
|
||||||
|
</mat-form-field>
|
||||||
|
|
||||||
|
<mat-form-field fxFlex="30%">
|
||||||
|
<mat-label>To Date</mat-label>
|
||||||
|
<input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="toDatePicker" required formControlName="toDate">
|
||||||
|
<mat-datepicker-toggle matSuffix [for]="toDatePicker"></mat-datepicker-toggle>
|
||||||
|
<mat-datepicker #toDatePicker></mat-datepicker>
|
||||||
|
<mat-error>
|
||||||
|
To date is <strong>required</strong>
|
||||||
|
</mat-error>
|
||||||
|
</mat-form-field>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="generate-button" fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5%">
|
||||||
|
<button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
|
||||||
|
<button mat-raised-button color="primary" [disabled]="!transactionsReportForm.valid">
|
||||||
|
<fa-icon icon="cogs"></fa-icon> Generate Report </button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<iframe *ngIf="!hideOutput" [src]="pentahoUrl" frameborder="0" width=100% height="750px;"></iframe>
|
||||||
+5
@@ -0,0 +1,5 @@
|
|||||||
|
.generate-button {
|
||||||
|
max-height: 2%;
|
||||||
|
padding: 1% 0 2% 6%;
|
||||||
|
align-self: center;
|
||||||
|
}
|
||||||
+25
@@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ExportTransactionsComponent } from './export-transactions.component';
|
||||||
|
|
||||||
|
describe('ExportTransactionsComponent', () => {
|
||||||
|
let component: ExportTransactionsComponent;
|
||||||
|
let fixture: ComponentFixture<ExportTransactionsComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ ExportTransactionsComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(ExportTransactionsComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
+87
@@ -0,0 +1,87 @@
|
|||||||
|
/** Angular Imports */
|
||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { DomSanitizer } from '@angular/platform-browser';
|
||||||
|
import { FormBuilder, Validators } from '@angular/forms';
|
||||||
|
import { DatePipe } from '@angular/common';
|
||||||
|
import { ActivatedRoute } from '@angular/router';
|
||||||
|
|
||||||
|
/** Custom Services */
|
||||||
|
import { ReportsService } from 'app/reports/reports.service';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Export Client Savings Transactions Component
|
||||||
|
*/
|
||||||
|
@Component({
|
||||||
|
selector: 'mifosx-export-transactions',
|
||||||
|
templateUrl: './export-transactions.component.html',
|
||||||
|
styleUrls: ['./export-transactions.component.scss']
|
||||||
|
})
|
||||||
|
export class ExportTransactionsComponent implements OnInit {
|
||||||
|
|
||||||
|
/** Minimum date allowed. */
|
||||||
|
minDate = new Date(2000, 0, 1);
|
||||||
|
/** Maximum date allowed. */
|
||||||
|
maxDate = new Date();
|
||||||
|
/** Transactions Report Form */
|
||||||
|
transactionsReportForm: any;
|
||||||
|
/** substitute for resolver */
|
||||||
|
hideOutput = true;
|
||||||
|
/** trusted resource url for pentaho output */
|
||||||
|
pentahoUrl: any;
|
||||||
|
/** Savings Account Id */
|
||||||
|
savingsAccountId: any;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetches savings account data from grandparent's `resolve`
|
||||||
|
* @param {DomSanitizer} sanitizer DOM Sanitizer
|
||||||
|
* @param {ReportsService} reportsService Reports Service
|
||||||
|
* @param {FormBuilder} formBuilder Form Builder
|
||||||
|
* @param {DatePipe} datePipe Date Pipe
|
||||||
|
* @param {ActivatedRoute} route Activated Route
|
||||||
|
*/
|
||||||
|
constructor(private sanitizer: DomSanitizer,
|
||||||
|
private reportsService: ReportsService,
|
||||||
|
private formBuilder: FormBuilder,
|
||||||
|
private datePipe: DatePipe,
|
||||||
|
private route: ActivatedRoute) {
|
||||||
|
this.route.parent.parent.data.subscribe((data: { savingsAccountData: any }) => {
|
||||||
|
this.savingsAccountId = data.savingsAccountData.accountNo;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.createTransactionsReportForm();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates the transactions report form.
|
||||||
|
*/
|
||||||
|
createTransactionsReportForm() {
|
||||||
|
this.transactionsReportForm = this.formBuilder.group({
|
||||||
|
'fromDate': ['', Validators.required],
|
||||||
|
'toDate': ['', Validators.required],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generates client savings transactions report.
|
||||||
|
*/
|
||||||
|
generate() {
|
||||||
|
const data = {
|
||||||
|
'output-type': 'PDF',
|
||||||
|
R_startDate: this.datePipe.transform(this.transactionsReportForm.value.fromDate, 'yyyy-MM-dd'),
|
||||||
|
R_endDate: this.datePipe.transform(this.transactionsReportForm.value.toDate, 'yyyy-MM-dd'),
|
||||||
|
R_savingsAccountId: this.savingsAccountId
|
||||||
|
};
|
||||||
|
this.reportsService.getPentahoRunReportData({name: 'Client Saving Transactions'}, data, 'default', 'en', 'dd MMMM yyyy')
|
||||||
|
.subscribe( (res: any) => {
|
||||||
|
const contentType = res.headers.get('Content-Type');
|
||||||
|
const file = new Blob([res.body], {type: contentType});
|
||||||
|
const filecontent = URL.createObjectURL(file);
|
||||||
|
this.pentahoUrl = this.sanitizer.bypassSecurityTrustResourceUrl(filecontent);
|
||||||
|
this.hideOutput = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+1
-1
@@ -6,7 +6,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="action-button m-b-20" fxLayout="row" fxLayoutGap="20px" *ngIf="checkStatus()">
|
<div class="action-button m-b-20" fxLayout="row" fxLayoutGap="20px" *ngIf="checkStatus()">
|
||||||
<button mat-raised-button color="primary">View Journal Entries</button>
|
<button mat-raised-button color="primary">View Journal Entries</button>
|
||||||
<button mat-raised-button color="primary">Export</button>
|
<button mat-raised-button color="primary" [routerLink]="['export']">Export</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ export class TransactionsTabComponent implements OnInit {
|
|||||||
* @param {ActivatedRoute} route Activated Route.
|
* @param {ActivatedRoute} route Activated Route.
|
||||||
*/
|
*/
|
||||||
constructor(private route: ActivatedRoute) {
|
constructor(private route: ActivatedRoute) {
|
||||||
this.route.parent.data.subscribe((data: { savingsAccountData: any }) => {
|
this.route.parent.parent.data.subscribe((data: { savingsAccountData: any }) => {
|
||||||
this.transactionsData = data.savingsAccountData.transactions.filter((transaction: any) => !transaction.reversed);
|
this.transactionsData = data.savingsAccountData.transactions.filter((transaction: any) => !transaction.reversed);
|
||||||
this.status = data.savingsAccountData.status.value;
|
this.status = data.savingsAccountData.status.value;
|
||||||
});
|
});
|
||||||
|
|||||||
-1
@@ -8,4 +8,3 @@
|
|||||||
<iframe [src]="pentahoUrl" frameborder="0" width=100% height="600px;"></iframe>
|
<iframe [src]="pentahoUrl" frameborder="0" width=100% height="600px;"></iframe>
|
||||||
|
|
||||||
</mat-card>
|
</mat-card>
|
||||||
|
|
||||||
|
|||||||
-1
@@ -5,4 +5,3 @@
|
|||||||
margin-bottom: 2%;
|
margin-bottom: 2%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import { EditSavingsAccountComponent } from './edit-savings-account/edit-savings
|
|||||||
import { ViewTransactionComponent } from './savings-account-view/transactions/view-transaction/view-transaction.component';
|
import { ViewTransactionComponent } from './savings-account-view/transactions/view-transaction/view-transaction.component';
|
||||||
import { ViewChargeComponent } from './savings-account-view/view-charge/view-charge.component';
|
import { ViewChargeComponent } from './savings-account-view/view-charge/view-charge.component';
|
||||||
import { ViewRecieptComponent } from './savings-account-view/transactions/view-reciept/view-reciept.component';
|
import { ViewRecieptComponent } from './savings-account-view/transactions/view-reciept/view-reciept.component';
|
||||||
|
import { ExportTransactionsComponent } from './savings-account-view/transactions-tab/export-transactions/export-transactions.component';
|
||||||
|
|
||||||
/** Custom Resolvers */
|
/** Custom Resolvers */
|
||||||
import { SavingsAccountViewResolver } from './common-resolvers/savings-account-view.resolver';
|
import { SavingsAccountViewResolver } from './common-resolvers/savings-account-view.resolver';
|
||||||
@@ -29,6 +30,7 @@ import { SavingsAccountChargeResolver } from './common-resolvers/savings-account
|
|||||||
import { SavingsAccountActionsResolver } from './common-resolvers/savings-account-actions.resolver';
|
import { SavingsAccountActionsResolver } from './common-resolvers/savings-account-actions.resolver';
|
||||||
import { SavingsTransactionRecieptResolver } from './common-resolvers/savings-transaction-reciept.resolver';
|
import { SavingsTransactionRecieptResolver } from './common-resolvers/savings-transaction-reciept.resolver';
|
||||||
|
|
||||||
|
|
||||||
const routes: Routes = [
|
const routes: Routes = [
|
||||||
{
|
{
|
||||||
path: '',
|
path: '',
|
||||||
@@ -58,8 +60,18 @@ const routes: Routes = [
|
|||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
path: 'transactions',
|
path: 'transactions',
|
||||||
component: TransactionsTabComponent,
|
data: { title: extract('Savings Account Transactions'), breadcrumb: 'Transactions', routeParamBreadcrumb: false },
|
||||||
data: { title: extract('Savings Account Transactions'), breadcrumb: 'Transactions', routeParamBreadcrumb: false }
|
children: [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: TransactionsTabComponent
|
||||||
|
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'export',
|
||||||
|
component: ExportTransactionsComponent
|
||||||
|
}
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'charges',
|
path: 'charges',
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ import { AddChargeSavingsAccountComponent } from './saving-account-actions/add-c
|
|||||||
import { CloseSavingsAccountComponent } from './saving-account-actions/close-savings-account/close-savings-account.component';
|
import { CloseSavingsAccountComponent } from './saving-account-actions/close-savings-account/close-savings-account.component';
|
||||||
import { ToggleWithholdTaxDialogComponent } from './savings-account-view/custom-dialogs/toggle-withhold-tax-dialog/toggle-withhold-tax-dialog.component';
|
import { ToggleWithholdTaxDialogComponent } from './savings-account-view/custom-dialogs/toggle-withhold-tax-dialog/toggle-withhold-tax-dialog.component';
|
||||||
import { ViewRecieptComponent } from './savings-account-view/transactions/view-reciept/view-reciept.component';
|
import { ViewRecieptComponent } from './savings-account-view/transactions/view-reciept/view-reciept.component';
|
||||||
|
import { ExportTransactionsComponent } from './savings-account-view/transactions-tab/export-transactions/export-transactions.component';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -91,7 +92,8 @@ import { ViewRecieptComponent } from './savings-account-view/transactions/view-r
|
|||||||
AddChargeSavingsAccountComponent,
|
AddChargeSavingsAccountComponent,
|
||||||
CloseSavingsAccountComponent,
|
CloseSavingsAccountComponent,
|
||||||
ToggleWithholdTaxDialogComponent,
|
ToggleWithholdTaxDialogComponent,
|
||||||
ViewRecieptComponent
|
ViewRecieptComponent,
|
||||||
|
ExportTransactionsComponent
|
||||||
],
|
],
|
||||||
entryComponents: [
|
entryComponents: [
|
||||||
CalculateInterestDialogComponent,
|
CalculateInterestDialogComponent,
|
||||||
|
|||||||
Reference in New Issue
Block a user