diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index ed81a3a..bb95947 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,13 +4,15 @@ import { AuthComponent } from './auth/auth.component'; import { CanvasComponent } from './canvas/canvas.component'; import { DashboardComponent } from './dashboard/dashboard.component'; import { AuthGuard } from './service/auth-guard.service'; +import { TransactionComponent } from './transaction/transaction.component'; const routes: Routes = [ {path : '', component: DashboardComponent, canActivate: [AuthGuard]}, {path : 'canvas', component: CanvasComponent}, {path : 'dashboard', component: DashboardComponent, canActivate: [AuthGuard],}, - {path : 'login', component: AuthComponent} + {path : 'login', component: AuthComponent}, + {path : 'transaction', component: TransactionComponent, canActivate: [AuthGuard],}, ]; @NgModule({ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0351d81..be3e67b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -36,6 +36,7 @@ import { BkpDividerShadowBottomComponent } from './bkp-divider-shadow-bottom/bkp import { BkpDividerTextComponent } from './bkp-divider-text/bkp-divider-text.component'; import { DateInputsModule } from '@progress/kendo-angular-dateinputs'; import { DropDownsModule } from '@progress/kendo-angular-dropdowns'; +import { TransactionComponent } from './transaction/transaction.component'; @@ -54,7 +55,8 @@ import { DropDownsModule } from '@progress/kendo-angular-dropdowns'; LoanEditComponent, BkpDividerComponent, BkpDividerShadowBottomComponent, - BkpDividerTextComponent + BkpDividerTextComponent, + TransactionComponent ], imports: [ BrowserModule, diff --git a/src/app/loan-edit/dist/loan-edit.component.js b/src/app/loan-edit/dist/loan-edit.component.js index f85bf75..61e4aee 100644 --- a/src/app/loan-edit/dist/loan-edit.component.js +++ b/src/app/loan-edit/dist/loan-edit.component.js @@ -9,6 +9,7 @@ exports.__esModule = true; exports.LoanEditComponent = void 0; var core_1 = require("@angular/core"); var forms_1 = require("@angular/forms"); +var sample_product_1 = require("../models/sample_product"); var LoanEditComponent = /** @class */ (function () { //form access //@ViewChild('birthDate', {static: true}) birthDate: LoanEditComponent; @@ -37,6 +38,7 @@ var LoanEditComponent = /** @class */ (function () { { text: 'William', value: 3 } ]; this.statis = { text: 'Female', value: 2 }; + this.gridData = sample_product_1.sampleProducts; } LoanEditComponent.prototype.ngOnInit = function () { }; diff --git a/src/app/loan-edit/loan-edit.component.html b/src/app/loan-edit/loan-edit.component.html index 74a93a0..e5e3539 100644 --- a/src/app/loan-edit/loan-edit.component.html +++ b/src/app/loan-edit/loan-edit.component.html @@ -1,151 +1,125 @@
+ [minHeight]="600">
- - - - - - -
-
-
- Bank Transaction Details - - - - - Unique transaction - ID from bank - Error: the ID is required - - - - - - - - Date in bank - - - - - - - - - - - - - - - - - - - - - - - - - Error: status is required - - - - - - - - E.g. NAB Bank - Error: Lender is required - - - - - - - - E.g. 8000 - Error: Limit is required - - - - - - - - Date Settled - - -
- - -
-
-
-
- - - -
-

Commission Splits

-

Resizable and collapsible.

-
- - - - - - -
-

Revelant Parties

-

a table for revelant parties editable grid

-
- - - +
+
+
+ Bank Transaction Details + + + + + Unique transaction + ID from bank + Error: the ID is required + + + + + + + + Date in bank + + + + + + + + + + + + + + + + + + + + + + + + + Error: status is required + + + + + + + + E.g. NAB Bank + Error: Lender is required + + + + + + + + E.g. 8000 + Error: Limit is required + + + + + + + + Date Settled + + +
+ + +
+
+
+
diff --git a/src/app/loan-edit/loan-edit.component.ts b/src/app/loan-edit/loan-edit.component.ts index bbdecb6..13238be 100644 --- a/src/app/loan-edit/loan-edit.component.ts +++ b/src/app/loan-edit/loan-edit.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { sampleProducts } from '../models/sample_product'; @Component({ selector: 'app-loan-edit', @@ -71,4 +72,7 @@ export class LoanEditComponent implements OnInit { ]; public statis: { text: string, value: number } = { text: 'Female', value: 2 }; + + + public gridData: any[] = sampleProducts; } diff --git a/src/app/main-menu-items.ts b/src/app/main-menu-items.ts index 118abf7..05d664a 100644 --- a/src/app/main-menu-items.ts +++ b/src/app/main-menu-items.ts @@ -18,7 +18,8 @@ export const mainMenuItems: any[] = [ text: 'Loans', icon: 'dollar', items: [ - { text: 'Add', icon: 'plus', popup: "loanEdit" }, + { text: 'Add+', icon: 'plus', popup: "loanEdit" }, + { text: 'Edit', icon: 'plus', url: "./#transaction" }, { text: 'List All', icon: 'table' ,url: '#' }, { text: '--', separator: "true" }, { text: 'Export All Loans' , icon: "excel"}, diff --git a/src/app/transaction/transaction.component.html b/src/app/transaction/transaction.component.html new file mode 100644 index 0000000..7b0dd47 --- /dev/null +++ b/src/app/transaction/transaction.component.html @@ -0,0 +1,182 @@ +
+
+
+
+ + + + + + +
+
+
+ Bank Transaction Details + + + + + Unique transaction + ID from bank + Error: the ID is required + + + + + + + + Date in bank + + + + + + + + + + + + + + + + + + + + + + + + + Error: status is required + + + + + + + + E.g. NAB Bank + Error: Lender is required + + + + + + + + E.g. 8000 + Error: Limit is required + + + + + + + + Date Settled + + +
+ + +
+
+
+
+ + + +
+

Commission Splits

+ + + + + + + + + + + + + + + + + +
+ + + + + + +
+

Revelant Parties

+ + + + + + + + + + + + + + + + + +
+ + + +
+
+
+
\ No newline at end of file diff --git a/src/app/transaction/transaction.component.scss b/src/app/transaction/transaction.component.scss new file mode 100644 index 0000000..954710d --- /dev/null +++ b/src/app/transaction/transaction.component.scss @@ -0,0 +1,20 @@ +.container.outer{ + width:100%; + background: url('../../assets/img/body_bg.jpg') no-repeat center center fixed; + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + background-size: cover; + opacity:0.98; +} +.container.inner { + width: 99%; + min-height: calc(100vh - 48px); + /* background-color:chartreuse; */ +} + +.pane-content { padding: 0 10px; } + +.transSplit{ + min-height: calc(100vh - 48px); +} \ No newline at end of file diff --git a/src/app/transaction/transaction.component.spec.ts b/src/app/transaction/transaction.component.spec.ts new file mode 100644 index 0000000..5423d88 --- /dev/null +++ b/src/app/transaction/transaction.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TransactionComponent } from './transaction.component'; + +describe('TransactionComponent', () => { + let component: TransactionComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ TransactionComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(TransactionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/transaction/transaction.component.ts b/src/app/transaction/transaction.component.ts new file mode 100644 index 0000000..6e77b14 --- /dev/null +++ b/src/app/transaction/transaction.component.ts @@ -0,0 +1,51 @@ +import { Component, OnInit } from '@angular/core'; +import { FormControl, FormGroup } from '@angular/forms'; +import { sampleProducts } from '../models/sample_product'; + +@Component({ + selector: 'app-transaction', + templateUrl: './transaction.component.html', + styleUrls: ['./transaction.component.scss'] +}) +export class TransactionComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + + + public min: Date = new Date(2015, 0, 1); + public max: Date = new Date(2030, 4, 31); + + public registerForm: FormGroup = new FormGroup({ + transID: new FormControl(), + submissionDate: new FormControl(new Date(2020, 0, 10)), + clientNames : new FormControl([1]), + brokers : new FormControl([2]), + referals : new FormControl([3]), + status: new FormControl(), + lender: new FormControl(), + limit: new FormControl(), + settlementDate: new FormControl(new Date(2020, 0, 9)), + }); + + public submitForm(): void { + this.registerForm.markAllAsTouched(); + } + + public clearForm(): void { + this.registerForm.reset(); + } + + public listClientNames: Array<{ text: string, value: number }> = [ + { text: 'John', value: 1 }, + { text: 'Steven', value: 2 }, + { text: 'William', value: 3 } + ]; + + public statis: { text: string, value: number } = { text: 'Female', value: 2 }; + + + public gridData: any[] = sampleProducts; +}