diff --git a/src/app/app.component.html b/src/app/app.component.html index 8f9d440..83b6c32 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,7 +1,5 @@ - - diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 7410a4d..5434387 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -52,7 +52,6 @@ import { ChartTopBrokersComponent } from './chart-top-brokers/chart-top-brokers. import { ListAllLoansComponent } from './list-all-loans/list-all-loans.component'; import { TopBarComponent } from './top-bar/top-bar.component'; import {LoanSummaryService} from './service/loan_summary.service'; -import { LoanAddNewComponent } from './loan-add-new/loan-add-new.component'; import { EditorModule } from '@progress/kendo-angular-editor'; import { BasicinfoComponent } from './loan-edit/basicinfo/basicinfo.component'; import { PeopleRewardComponent } from './loan-edit/people-reward/people-reward.component'; @@ -123,7 +122,6 @@ import { PopupIncomeFilterComponent } from './popup-income-filter/popup-income-f ChartTopBrokersComponent, ListAllLoansComponent, TopBarComponent, - LoanAddNewComponent, BasicinfoComponent, PeopleRewardComponent, TrailIncomeComponent, diff --git a/src/app/list-all-people/list-all-people.component.ts b/src/app/list-all-people/list-all-people.component.ts index 895acf8..e1b469b 100644 --- a/src/app/list-all-people/list-all-people.component.ts +++ b/src/app/list-all-people/list-all-people.component.ts @@ -15,13 +15,12 @@ export class ListAllPeopleComponent implements OnInit { private AllPeople: PeopleModel[] = []; public filteredPeople: PeopleModel[] = []; public displayedPeople: PeopleModel[] = []; - public personSelected: PeopleModel; public skip = 0; public pageSize = 12; public total = 0; - constructor(private ps: PeopleService, private auth: AuthService, private dcs: ClonerService) { } + constructor(private ps: PeopleService, private auth: AuthService) { } ngOnInit(): void { this.ps.getPeopleList('').subscribe( diff --git a/src/app/loan-add-new/loan-add-new.component.html b/src/app/loan-add-new/loan-add-new.component.html deleted file mode 100644 index 09e303e..0000000 --- a/src/app/loan-add-new/loan-add-new.component.html +++ /dev/null @@ -1,143 +0,0 @@ - -
- -
-
-
-
-
-
- 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 - - - -
-
-
-
-
-
- - - - - - - - -

Additional info

- -
- - - - - - diff --git a/src/app/loan-add-new/loan-add-new.component.scss b/src/app/loan-add-new/loan-add-new.component.scss deleted file mode 100644 index e742af8..0000000 --- a/src/app/loan-add-new/loan-add-new.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -.pane-content { padding: 0 10px; } - diff --git a/src/app/loan-add-new/loan-add-new.component.spec.ts b/src/app/loan-add-new/loan-add-new.component.spec.ts deleted file mode 100644 index a594711..0000000 --- a/src/app/loan-add-new/loan-add-new.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LoanAddNewComponent } from './loan-add-new.component'; - -describe('LoanAddNewComponent', () => { - let component: LoanAddNewComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ LoanAddNewComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(LoanAddNewComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/loan-add-new/loan-add-new.component.ts b/src/app/loan-add-new/loan-add-new.component.ts deleted file mode 100644 index b1ae59f..0000000 --- a/src/app/loan-add-new/loan-add-new.component.ts +++ /dev/null @@ -1,79 +0,0 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; - - -@Component({ - selector: 'app-loan-add-new', - templateUrl: './loan-add-new.component.html', - styleUrls: ['./loan-add-new.component.scss'] -}) -export class LoanAddNewComponent implements OnInit { - //popup - public dialogOpened = false; - public windowOpened = false; - - //test - public somedata : string = "opened"; - - - //form access - - //@ViewChild('birthDate', {static: true}) birthDate: LoanEditComponent; - - constructor() { } - - ngOnInit(): void { - } - - public close(component) { - this.somedata = "" + Math.random(); - this[component + 'Opened'] = false; - } - - public open(component) { - //this.somedata = "" + Math.random(); - this[component + 'Opened'] = true; - } - - public action(status) { - console.log(`Dialog result: ${status}`); - this.dialogOpened = false; - } - - - - 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(); - //this.action('yes'); - } - - public clearForm(): void { - this.registerForm.reset(); - //this.action('no'); - } - - 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 }; - - -} diff --git a/src/app/pay-in/pay-in.component.html b/src/app/pay-in/pay-in.component.html index a24c505..64b977a 100644 --- a/src/app/pay-in/pay-in.component.html +++ b/src/app/pay-in/pay-in.component.html @@ -24,7 +24,7 @@
- +
diff --git a/src/app/people-card/people-card.component.html b/src/app/people-card/people-card.component.html index 39663a4..300069e 100644 --- a/src/app/people-card/people-card.component.html +++ b/src/app/people-card/people-card.component.html @@ -2,8 +2,7 @@
-
-
+

{{contact.Display}}

{{UserExtra.Role}} diff --git a/src/app/people-card/people-card.component.scss b/src/app/people-card/people-card.component.scss index 9138c5a..53aa4c1 100644 --- a/src/app/people-card/people-card.component.scss +++ b/src/app/people-card/people-card.component.scss @@ -33,9 +33,7 @@ $card-width: 330px; height: 100vh; width: 100vw; - background: url("https://images.unsplash.com/photo-1447433589675-4aaa569f3e05?ixlib=rb-0.3.5&s=4222852e25e0f57d9485f7889957e99a&auto=format&fit=crop&w=2000&q=80"); background-size: cover; - background: #ccc; background-position: 0 50%; background: #DEB493; diff --git a/src/app/people-card/people-card.component.ts b/src/app/people-card/people-card.component.ts index 35d6766..539005a 100644 --- a/src/app/people-card/people-card.component.ts +++ b/src/app/people-card/people-card.component.ts @@ -40,12 +40,13 @@ export class PeopleCardComponent implements OnInit { } photoURL(): string { - if (this.contact === undefined ) { return ''; } + if (this.contact === undefined ) { return 'unknown'; } const url = this.auth.getUrl('avatar/') + this.contact.Id ; return url; } public bgPhoto(): string { + if ( !this.contact.Enabled ){ return '../../assets/img/bg/bg-disabled-card.jpg'; } @@ -59,7 +60,8 @@ export class PeopleCardComponent implements OnInit { case 'admin': return '../../assets/img/bg/bg-admin-card.jpg'; } - + // default photo + return '../../assets/img/bg/bg-disabled-card.jpg'; } public onButtonClick(): void {