refractor: accounting module (#300)
* Refractor components. * Add resolvers. * Add relative router links. * Replace mat-icons by font-awesome icons. * Add comments. Fixes: #298
This commit is contained in:
@@ -1,9 +1,14 @@
|
||||
/** Angular Imports */
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { FormGroup, FormBuilder, Validators, FormArray } from '@angular/forms';
|
||||
import { Router } from '@angular/router';
|
||||
import { Router, ActivatedRoute } from '@angular/router';
|
||||
|
||||
/** Custom Services */
|
||||
import { AccountingService } from '../accounting.service';
|
||||
|
||||
/**
|
||||
* Create Journal Entry component.
|
||||
*/
|
||||
@Component({
|
||||
selector: 'mifosx-create-journal-entry',
|
||||
templateUrl: './create-journal-entry.component.html',
|
||||
@@ -11,28 +16,55 @@ import { AccountingService } from '../accounting.service';
|
||||
})
|
||||
export class CreateJournalEntryComponent implements OnInit {
|
||||
|
||||
// TODO: Validations
|
||||
|
||||
/** Minimum transaction date allowed. */
|
||||
minDate = new Date(2000, 0, 1);
|
||||
/** Maximum transaction date allowed. */
|
||||
maxDate = new Date();
|
||||
/** Journal entry form. */
|
||||
journalEntryForm: FormGroup;
|
||||
/** Office data. */
|
||||
officeData: any;
|
||||
/** Currency data. */
|
||||
currencyData: any;
|
||||
/** Payment type data. */
|
||||
paymentTypeData: any;
|
||||
/** Gl Account data. */
|
||||
glAccountData: any;
|
||||
|
||||
/**
|
||||
* Retrieves the offices, currencies, payment types and gl accounts data from `resolve`.
|
||||
* @param {FormBuilder} formBuilder Form Builder.
|
||||
* @param {AccountingService} accountingService Accounting Service.
|
||||
* @param {ActivatedRoute} route Activated Route.
|
||||
* @param {Router} router Router for navigation.
|
||||
*/
|
||||
constructor(private formBuilder: FormBuilder,
|
||||
private accountingService: AccountingService,
|
||||
private router: Router) { }
|
||||
|
||||
ngOnInit() {
|
||||
this.createJournalEntryForm();
|
||||
this.getOffices();
|
||||
this.getCurrencies();
|
||||
this.getPaymentTypes();
|
||||
this.getGlAccounts();
|
||||
private route: ActivatedRoute,
|
||||
private router: Router) {
|
||||
this.route.data.subscribe((data: {
|
||||
offices: any,
|
||||
currencies: any,
|
||||
paymentTypes: any,
|
||||
glAccounts: any
|
||||
}) => {
|
||||
this.officeData = data.offices;
|
||||
this.currencyData = data.currencies.selectedCurrencyOptions;
|
||||
this.paymentTypeData = data.paymentTypes;
|
||||
this.glAccountData = data.glAccounts;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates the journal entry form.
|
||||
*/
|
||||
ngOnInit() {
|
||||
this.createJournalEntryForm();
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates the journal entry form.
|
||||
*/
|
||||
createJournalEntryForm() {
|
||||
this.journalEntryForm = this.formBuilder.group({
|
||||
'officeId': ['', Validators.required],
|
||||
@@ -51,6 +83,10 @@ export class CreateJournalEntryComponent implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates the affected gl entry form.
|
||||
* @returns {FormGroup} Affected gl entry form.
|
||||
*/
|
||||
createAffectedGLEntryForm(): FormGroup {
|
||||
return this.formBuilder.group({
|
||||
'glAccountId': ['', Validators.required],
|
||||
@@ -58,50 +94,62 @@ export class CreateJournalEntryComponent implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
getFormArrayData(type: string): FormArray {
|
||||
return <FormArray>this.journalEntryForm.get(type);
|
||||
/**
|
||||
* Gets the affected gl entry (debits) form array.
|
||||
* @returns {FormArray} Debits form array.
|
||||
*/
|
||||
get debits(): FormArray {
|
||||
return this.journalEntryForm.get('debits') as FormArray;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the affected gl entry (credits) form array.
|
||||
* @returns {FormArray} Credits form array.
|
||||
*/
|
||||
get credits(): FormArray {
|
||||
return this.journalEntryForm.get('credits') as FormArray;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds the affected gl entry form to given affected gl entry form array.
|
||||
* @param {FormArray} affectedGLEntryFormArray Given affected gl entry form array (debit/credit).
|
||||
*/
|
||||
addAffectedGLEntry(affectedGLEntryFormArray: FormArray) {
|
||||
affectedGLEntryFormArray.push(this.createAffectedGLEntryForm());
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes the affected gl entry form from given affected gl entry form array at given index.
|
||||
* @param {FormArray} affectedGLEntryFormArray Given affected gl entry form array (debit/credit).
|
||||
* @param {number} index Array index from where affected gl entry form needs to be removed.
|
||||
*/
|
||||
removeAffectedGLEntry(affectedGLEntryFormArray: FormArray, index: number) {
|
||||
affectedGLEntryFormArray.removeAt(index);
|
||||
}
|
||||
|
||||
getOffices() {
|
||||
this.accountingService.getOffices().subscribe(officeData => {
|
||||
this.officeData = officeData;
|
||||
});
|
||||
}
|
||||
|
||||
getCurrencies() {
|
||||
this.accountingService.getCurrencies().subscribe(currencyData => {
|
||||
this.currencyData = currencyData.selectedCurrencyOptions;
|
||||
});
|
||||
}
|
||||
|
||||
getPaymentTypes() {
|
||||
this.accountingService.getPaymentTypes().subscribe(paymentTypeData => {
|
||||
this.paymentTypeData = paymentTypeData;
|
||||
});
|
||||
}
|
||||
|
||||
getGlAccounts() {
|
||||
this.accountingService.getGlAccounts().subscribe(glAccountData => {
|
||||
this.glAccountData = glAccountData;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Submits the journal entries form and creates journal entry,
|
||||
* if successful redirects to view created transaction.
|
||||
*/
|
||||
submit() {
|
||||
const journalEntry = this.journalEntryForm.value;
|
||||
// TODO: Update once language and date settings are setup
|
||||
journalEntry.locale = 'en';
|
||||
journalEntry.dateFormat = 'dd MMMM yyyy';
|
||||
journalEntry.transactionDate = '20 July 2018';
|
||||
journalEntry.dateFormat = 'yyyy-MM-dd';
|
||||
if (journalEntry.transactionDate instanceof Date) {
|
||||
let day = journalEntry.transactionDate.getDate();
|
||||
let month = journalEntry.transactionDate.getMonth() + 1;
|
||||
const year = journalEntry.transactionDate.getFullYear();
|
||||
if (day < 10) {
|
||||
day = `0${day}`;
|
||||
}
|
||||
if (month < 10) {
|
||||
month = `0${month}`;
|
||||
}
|
||||
journalEntry.transactionDate = `${year}-${month}-${day}`;
|
||||
}
|
||||
this.accountingService.createJournalEntry(journalEntry).subscribe(response => {
|
||||
this.router.navigate(['/accounting/transactions/view', response.transactionId]);
|
||||
this.router.navigate(['../transactions/view', response.transactionId], { relativeTo: this.route });
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user