From 6f54177cad2e126f1b1df8f29e2da53f74e27b5a Mon Sep 17 00:00:00 2001 From: Akash Shah Date: Tue, 16 Jul 2019 23:12:22 -0400 Subject: [PATCH] i cant even keep track anymore --- .../empty-error-editor.component.spec.ts | 25 + .../empty-error-editor.component.ts | 46 + .../numeric-editor.component.spec.ts | 25 + .../numeric-editor.component.ts | 51 + .../phone-editor/phone-editor.component.ts | 2 +- AstuteClient2/src/app/app.module.ts | 10 +- .../src/app/customer/customer.component.css | 8 + .../src/app/customer/customer.component.html | 499 ++++--- .../src/app/customer/customer.component.ts | 36 +- .../invoice-payment.component.html | 379 ++--- .../invoice-payment.component.ts | 11 +- .../src/app/invoice/invoice.component.html | 1293 +++++++++-------- .../src/app/invoice/invoice.component.ts | 175 ++- .../src/app/login/login.component.html | 20 +- .../src/app/login/login.component.ts | 2 +- .../src/app/nav-bar/nav-bar.component.html | 5 +- .../src/app/nav-bar/nav-bar.component.ts | 6 + .../sales-order/sales-order.component.html | 714 ++++----- .../app/sales-order/sales-order.component.ts | 90 +- 19 files changed, 1849 insertions(+), 1548 deletions(-) create mode 100644 AstuteClient2/src/app/ag-grid-components/empty-error-editor/empty-error-editor.component.spec.ts create mode 100644 AstuteClient2/src/app/ag-grid-components/empty-error-editor/empty-error-editor.component.ts create mode 100644 AstuteClient2/src/app/ag-grid-components/numeric-editor/numeric-editor.component.spec.ts create mode 100644 AstuteClient2/src/app/ag-grid-components/numeric-editor/numeric-editor.component.ts diff --git a/AstuteClient2/src/app/ag-grid-components/empty-error-editor/empty-error-editor.component.spec.ts b/AstuteClient2/src/app/ag-grid-components/empty-error-editor/empty-error-editor.component.spec.ts new file mode 100644 index 0000000..f557fcb --- /dev/null +++ b/AstuteClient2/src/app/ag-grid-components/empty-error-editor/empty-error-editor.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EmptyErrorEditorComponent } from './empty-error-editor.component'; + +describe('EmptyErrorEditorComponent', () => { + let component: EmptyErrorEditorComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EmptyErrorEditorComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EmptyErrorEditorComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/AstuteClient2/src/app/ag-grid-components/empty-error-editor/empty-error-editor.component.ts b/AstuteClient2/src/app/ag-grid-components/empty-error-editor/empty-error-editor.component.ts new file mode 100644 index 0000000..0d934b1 --- /dev/null +++ b/AstuteClient2/src/app/ag-grid-components/empty-error-editor/empty-error-editor.component.ts @@ -0,0 +1,46 @@ +import {AfterViewInit, Component, ViewChild} from '@angular/core'; +import {ToastManagerService} from '../../services/toast-manager/toast-service.service'; + +@Component({ + selector: 'app-empty-error-editor', + template: ` + + ` +}) +export class EmptyErrorEditorComponent implements AfterViewInit { + @ViewChild('i', {'static': false}) textInput; + params; + + constructor(protected toastService: ToastManagerService) { } + + ngAfterViewInit() { + setTimeout(() => { + this.textInput.nativeElement.focus(); + }); + } + + agInit(params: any): void { + this.params = params; + } + + getValue() { + return this.textInput.nativeElement.value; + } + + onKeyDown(event) { + if (event.keyCode === 9 || event.keyCode === 13) { + if (!this.textInput.nativeElement.value) { + event.stopPropagation(); + this.notif('Value should not be empty'); + setTimeout(() => { + this.textInput.nativeElement.focus(); + }); + } + } + } + + // ** toast notification method + notif(text: string) { + this.toastService.show(text, {classname: 'bg-warning'}); + } +} diff --git a/AstuteClient2/src/app/ag-grid-components/numeric-editor/numeric-editor.component.spec.ts b/AstuteClient2/src/app/ag-grid-components/numeric-editor/numeric-editor.component.spec.ts new file mode 100644 index 0000000..39f44a6 --- /dev/null +++ b/AstuteClient2/src/app/ag-grid-components/numeric-editor/numeric-editor.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NumericEditorComponent } from './numeric-editor.component'; + +describe('NumericEditorComponent', () => { + let component: NumericEditorComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ NumericEditorComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(NumericEditorComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/AstuteClient2/src/app/ag-grid-components/numeric-editor/numeric-editor.component.ts b/AstuteClient2/src/app/ag-grid-components/numeric-editor/numeric-editor.component.ts new file mode 100644 index 0000000..b9aa550 --- /dev/null +++ b/AstuteClient2/src/app/ag-grid-components/numeric-editor/numeric-editor.component.ts @@ -0,0 +1,51 @@ +import {AfterViewInit, Component, ViewChild} from '@angular/core'; +import {ToastManagerService} from '../../services/toast-manager/toast-service.service'; + +@Component({ + selector: 'app-numeric-editor', + template: ` + + ` +}) +export class NumericEditorComponent implements AfterViewInit { + @ViewChild('i', {'static': false}) numberInput; + params; + canBeEmpty: boolean; + + constructor(protected toastService: ToastManagerService) { } + + ngAfterViewInit() { + setTimeout(() => { + this.numberInput.nativeElement.focus(); + }); + } + + agInit(params: any): void { + this.params = params; + this.canBeEmpty = params.canBeEmpty; + } + + getValue() { + return this.numberInput.nativeElement.value; + } + + onKeyDown(event) { + if (this.canBeEmpty) { + if (event.keyCode === 9 || event.keyCode === 13) { + if (!this.numberInput.nativeElement.value) { + event.stopPropagation(); + this.notif('Value should not be empty'); + setTimeout(() => { + this.numberInput.nativeElement.focus(); + }); + } + } + } + } + + // ** toast notification method + notif(text: string) { + this.toastService.show(text, {classname: 'bg-warning'}); + } +} + diff --git a/AstuteClient2/src/app/ag-grid-components/phone-editor/phone-editor.component.ts b/AstuteClient2/src/app/ag-grid-components/phone-editor/phone-editor.component.ts index 1c213ab..e971fb3 100644 --- a/AstuteClient2/src/app/ag-grid-components/phone-editor/phone-editor.component.ts +++ b/AstuteClient2/src/app/ag-grid-components/phone-editor/phone-editor.component.ts @@ -4,7 +4,7 @@ import {ToastManagerService} from '../../services/toast-manager/toast-service.se @Component({ selector: 'app-phone-editor-cell', template: ` - + ` }) export class PhoneEditorComponent implements AfterViewInit { diff --git a/AstuteClient2/src/app/app.module.ts b/AstuteClient2/src/app/app.module.ts index e109b3c..2480b58 100644 --- a/AstuteClient2/src/app/app.module.ts +++ b/AstuteClient2/src/app/app.module.ts @@ -26,6 +26,8 @@ import { ToastsContainerComponent } from './services/toast-manager/toasts-contai import { NumberFormatterComponent } from './ag-grid-components/number-formatter/number-formatter.component'; import { PhoneFormatterComponent } from './ag-grid-components/phone-formatter/phone-formatter.component'; import { PhoneEditorComponent } from './ag-grid-components/phone-editor/phone-editor.component'; +import { EmptyErrorEditorComponent } from './ag-grid-components/empty-error-editor/empty-error-editor.component'; +import { NumericEditorComponent } from './ag-grid-components/numeric-editor/numeric-editor.component'; // import { ServiceTypeComponent } from './service-type/service-type.component'; @NgModule({ @@ -45,7 +47,9 @@ import { PhoneEditorComponent } from './ag-grid-components/phone-editor/phone-ed ToastsContainerComponent, NumberFormatterComponent, PhoneFormatterComponent, - PhoneEditorComponent// , + PhoneEditorComponent, + EmptyErrorEditorComponent, + NumericEditorComponent// , // ServiceTypeComponent ], imports: [ @@ -53,7 +57,9 @@ import { PhoneEditorComponent } from './ag-grid-components/phone-editor/phone-ed AgGridModule.withComponents([ NumberFormatterComponent, PhoneFormatterComponent, - PhoneEditorComponent + PhoneEditorComponent, + EmptyErrorEditorComponent, + NumericEditorComponent ]), NgbModule, HttpClientModule, diff --git a/AstuteClient2/src/app/customer/customer.component.css b/AstuteClient2/src/app/customer/customer.component.css index b3aaa87..8f1db15 100644 --- a/AstuteClient2/src/app/customer/customer.component.css +++ b/AstuteClient2/src/app/customer/customer.component.css @@ -8,4 +8,12 @@ ::-ms-input-placeholder { /* Microsoft Edge */ color: lightblue; +} + +.disabled { + position: absolute; + width: 100%; + height: 100%; + z-index: 10; + background-color: rgba(0,0,0,0.5) !important; } \ No newline at end of file diff --git a/AstuteClient2/src/app/customer/customer.component.html b/AstuteClient2/src/app/customer/customer.component.html index bcb2e17..a1e7cc1 100644 --- a/AstuteClient2/src/app/customer/customer.component.html +++ b/AstuteClient2/src/app/customer/customer.component.html @@ -1,180 +1,60 @@ -

Customers

+
+

Customers

-
-
-
- +
+
+
+ +
-
-
-
-
- - - - +
+
+
+ + + + +
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ID* - - -
- Name* - - -
- Bill To Dept* - - -
- Address 1* - - -
- Address 2 - - -
- City* - - - - State* - - - - ZIP*(+4) - -
- - -
-
- Email* - - -
- Phone* - - -
- Ext* - - -
- Fax - - -
-
- -
- - -
- - - - -
+ +
+ + + + + @@ -183,7 +63,7 @@ Bill To Dept* @@ -192,7 +72,7 @@ Address 1* @@ -201,7 +81,7 @@ Address 2 @@ -210,14 +90,14 @@ City* @@ -240,7 +120,7 @@ Email* @@ -248,14 +128,17 @@ - + + + - @@ -264,7 +147,7 @@ Fax @@ -272,80 +155,216 @@
- - +
- -
-
- Choose a Customer First! -
-
- - -
-
- + - - -
-
-
-
- -
+ + +
+
+
+ ID* + + +
Name* - +
- +
- +
- +
- + State* - @@ -229,8 +109,8 @@
- - + +
- +
Phone* - + +
Ext* - + +
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Name* + + +
+ Bill To Dept* + + +
+ Address 1* + + +
+ Address 2 + + +
+ City* + + + + State* + + + + ZIP*(+4) + +
+ + +
+
+ Email* + + +
+ Phone* + + + + Ext* + + +
+ Fax + + +
-
-
-
- -
- - + +
+ + +
+
+
+
+ Choose a Customer First! +
+
+ + +
+
+ + + + +
+
+
+
+ +
+
+
+
+
+ +
+ + +
-
- - - -
-
-
- Choose a Customer First! + + +
-
- +
+
+ Choose a Customer First! +
+
+ +
+
+ +
+ +
+
+
+
+
+

Please Log In First!

+

Once you do, you will be able to create new customers and edit existing ones to your hearts content!

+

+ Log In +

+
+
- \ No newline at end of file +
+ diff --git a/AstuteClient2/src/app/customer/customer.component.ts b/AstuteClient2/src/app/customer/customer.component.ts index c051f94..a0c0fd5 100644 --- a/AstuteClient2/src/app/customer/customer.component.ts +++ b/AstuteClient2/src/app/customer/customer.component.ts @@ -3,6 +3,8 @@ import {AstuteClientService} from '../services/astute-client-service'; import {ToastManagerService} from '../services/toast-manager/toast-service.service'; import {PhoneFormatterComponent} from '../ag-grid-components/phone-formatter/phone-formatter.component'; import {PhoneEditorComponent} from '../ag-grid-components/phone-editor/phone-editor.component'; +import {EmptyErrorEditorComponent} from '../ag-grid-components/empty-error-editor/empty-error-editor.component'; +import {NumericEditorComponent} from "../ag-grid-components/numeric-editor/numeric-editor.component"; @Component({ selector: 'app-customer', @@ -11,6 +13,7 @@ import {PhoneEditorComponent} from '../ag-grid-components/phone-editor/phone-edi }) export class CustomerComponent implements OnInit { // @ViewChild('agGrid') agGrid; + loggedIn: boolean; gridApi; gridColumnApi; contactGridApi; @@ -19,22 +22,24 @@ export class CustomerComponent implements OnInit { customers; columnDefs = [ {headerName: 'ID', field: 'customerId'}, - {headerName: 'Name ✎', field: 'customerName', editable: true}, - {headerName: 'Bill To ✎', field: 'billToDept', editable: true}, - {headerName: 'Address 1 ✎', field: 'add1', editable: true}, - {headerName: 'Address 2 ✎', field: 'add2', editable: true}, - {headerName: 'City ✎', field: 'city', editable: true}, - {headerName: 'Email ✎', field: 'email', editable: true}, + {headerName: 'Name ✎', field: 'customerName', editable: true, cellEditor: 'emptyErrorEditorComponent'}, + {headerName: 'Bill To ✎', field: 'billToDept', editable: true, cellEditor: 'emptyErrorEditorComponent'}, + {headerName: 'Email ✎', field: 'email', editable: true, cellEditor: 'emptyErrorEditorComponent'}, {headerName: 'Fax ✎', field: 'fax', editable: true, cellEditor: 'phoneEditorComponent'}, {headerName: 'Phone ✎', field: 'phone', editable: true, cellEditor: 'phoneEditorComponent'}, - {headerName: 'Ext. ✎', field: 'phExt', editable: true}, - {headerName: 'State ✎', field: 'state', editable: true}, - {headerName: 'ZIP ✎', field: 'zip', editable: true}, - {headerName: 'ZIP-4 ✎', field: 'ziplast4', editable: true} + {headerName: 'Ext. ✎', field: 'phExt', editable: true, cellEditor: 'numericEditorComponent'}, + {headerName: 'Address 1 ✎', field: 'add1', editable: true, cellEditor: 'emptyErrorEditorComponent'}, + {headerName: 'Address 2 ✎', field: 'add2', editable: true, cellEditor: 'emptyErrorEditorComponent'}, + {headerName: 'City ✎', field: 'city', editable: true, cellEditor: 'emptyErrorEditorComponent'}, + {headerName: 'State ✎', field: 'state', editable: true, cellEditor: 'emptyErrorEditorComponent'}, + {headerName: 'ZIP ✎', field: 'zip', editable: true, cellEditor: 'emptyErrorEditorComponent'}, + {headerName: 'ZIP-4 ✎', field: 'ziplast4', editable: true, cellEditor: 'numericEditorComponent'} ]; frameworkComponents = { phoneFormatterComponent: PhoneFormatterComponent, - phoneEditorComponent: PhoneEditorComponent + phoneEditorComponent: PhoneEditorComponent, + emptyErrorEditorComponent: EmptyErrorEditorComponent, + numericEditorComponent: NumericEditorComponent }; rowData: any; states = [ @@ -94,7 +99,7 @@ export class CustomerComponent implements OnInit { contactsData: any; contactsColDef = [ - {headerName: 'Name ✎', field: 'name', editable: true}, + {headerName: 'Name ✎', field: 'name', editable: true, cellEditor: 'emptyErrorEditorComponent'}, {headerName: 'Title ✎', field: 'title', editable: true}, {headerName: 'Email ✎', field: 'email', editable: true}, {headerName: 'Work ✎', field: 'workPhone', editable: true, cellEditor: 'phoneEditorComponent'}, @@ -119,7 +124,12 @@ export class CustomerComponent implements OnInit { } ngOnInit() { - this.refreshData(); + if (localStorage.getItem('SESSION_ID') && localStorage.getItem('SESSION_USER')) { + this.loggedIn = true; + this.refreshData(); + } else { + this.loggedIn = false; + } } // callback for grid selection diff --git a/AstuteClient2/src/app/invoice-payment/invoice-payment.component.html b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.html index 230c8e3..074ba19 100644 --- a/AstuteClient2/src/app/invoice-payment/invoice-payment.component.html +++ b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.html @@ -1,206 +1,225 @@ -

Invoice Payments

-
-
-
- +
+

Invoice Payments

+ +
+
+
+ +
+
+
+
+ +
+
+ +
-
-
- -
-
- -
-
-
- - -
-
- - - - - - + + + +
+
- Invoice Number* - - -
+ + + + + - - - - + + + + - - - + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - -
+ Invoice Number* + + +
- Payment Received* - - -
+ Payment Received* + + +
- Payment Type* - +
+ Payment Type* + -
- Payment Date* - - -
+ Payment Date* + + +
- Check# - - -
+ Check# + + +
- Transaction# - - -
+ Transaction# + + +
-
+ + +
-
- - - -
- - +
+ + + +
+ + - - -
-
- - - - - - + + +
+
+
- Invoice Number** - - -
+ + + + + - - - - + + + + - - - + + - - - - - + + + + + + + - - - - + + + + - - - - + + + + - -
+ Invoice Number** + + +
- Payment Received* - - -
+ Payment Received* + + +
- Payment Type* - - - - +
+ Payment Type* + + + + - + - -
- Date Received* - - -
+ Date Received* + + +
- Check# - - -
+ Check# + + +
- Transaction# - - -
+ Transaction# + + +
+ + +
+
+ + +
-
- - +
+
+ Choose an Invoice Payment First! +
+
+ + +
+
+ +
+ +
+
+
+
+
+

Please Log In First!

+

Once you do, you will be able to log payments to your hearts content!

+

+ Log In +

+
+
-
-
- Choose an Invoice Payment First! -
-
- - -
-
- +
\ No newline at end of file diff --git a/AstuteClient2/src/app/invoice-payment/invoice-payment.component.ts b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.ts index 13f322a..05b5534 100644 --- a/AstuteClient2/src/app/invoice-payment/invoice-payment.component.ts +++ b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.ts @@ -10,6 +10,8 @@ import {ToastManagerService} from "../services/toast-manager/toast-service.servi }) export class InvoicePaymentComponent implements OnInit { @ViewChild('agGrid', {'static': false}) agGrid; + + loggedIn: boolean; selected = null; chosenInv: any = 0; chosenPaymentType: any = 0; @@ -25,14 +27,17 @@ export class InvoicePaymentComponent implements OnInit { {headerName: 'Payment Type', field: 'paymentType'}, {headerName: 'Check / ACH #', field: 'checkNo'}, {headerName: 'Transaction #', field: 'transactionNo'} - - ]; constructor(protected astuteClientService: AstuteClientService, protected toastService: ToastManagerService) { } ngOnInit() { - this.refreshData(); + if (localStorage.getItem('SESSION_ID') && localStorage.getItem('SESSION_USER')) { + this.loggedIn = true; + this.refreshData(); + } else { + this.loggedIn = false; + } } invoiceDropdownChange(index) { diff --git a/AstuteClient2/src/app/invoice/invoice.component.html b/AstuteClient2/src/app/invoice/invoice.component.html index 520bb1f..ef76648 100644 --- a/AstuteClient2/src/app/invoice/invoice.component.html +++ b/AstuteClient2/src/app/invoice/invoice.component.html @@ -1,6 +1,8 @@ -

Invoices

-
+
+

Invoices

+ +
@@ -59,667 +61,684 @@
- - - -
-

General

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Customer - - - - - - - - - - - SO Number* - - - - - - - -
-

- -

- 		- Invoice Number* - - -
-

- -

- 		- Change Order Num - - -
-

- -

- 		- Payment Status* - - - - - - -
- - - - - - - - - - - - - - + + + +
+

General

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Customer + + + + + + + + + + + SO Number* + + + + + + + +
+

+ +

+ 		+ Invoice Number* + + +
+

+ +

+ 		+ Change Order Num + + +
+

+ +

+ 		+ Payment Status* + + + + + + +
+ + + + + + + + + + + + + + - - - - - - - - - -
+ + + + + + + + + +
- - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
-
-
-
- Special Notes* + +
+
+
+
+ Special Notes* +
+ +
+ +
+
+ Certification* +
+
-
-
-
- Certification* -
- + +
+

Choose an Invoice First!

-
- -
-

Choose an Invoice First!

-
+ +
+

+ +

+

+ +

+
+ - -
-

+ + + + +

+

General

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Customer + + + + SO Number* + + +
+

+ {{customers[customerSelec.value].billToDept}} +

+ 		+ Invoice Number* + + +
+

+ {{customers[customerSelec.value].add1}} {{customers[customerSelec.value].add2}} +

+ 		+ Change Order Num + + +
+

+ {{customers[customerSelec.value].city}} {{customers[customerSelec.value].state}} {{customers[customerSelec.value].zip}}{{(customers[customerSelec.value].ziplast4 == 0) ? '':'-' + customers[customerSelec.value].ziplast4}} +

+ 		+ Payment Status* + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ Notes: +
+ +
+ +
+
+ Certification: +
+ +
+
+ + +
-

-

- -

-
- - - - - - -
-

General

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Customer - - - - SO Number* - - -
-

- {{customers[customerSelec.value].billToDept}} -

- 		- Invoice Number* - - -
-

- {{customers[customerSelec.value].add1}} {{customers[customerSelec.value].add2}} -

- 		- Change Order Num - - -
-

- {{customers[customerSelec.value].city}} {{customers[customerSelec.value].state}} {{customers[customerSelec.value].zip}}{{(customers[customerSelec.value].ziplast4 == 0) ? '':'-' + customers[customerSelec.value].ziplast4}} -

- 		- Payment Status* - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- Notes: -
- +
+ + -
-
- Certification: -
- -
-
+ + +
+
+
+
+ +
+ +
+ + +
- -
- - -
- - - - - -
-
-
-
- -
- -
- -
- +
+
+
+
+
+

Contract Amount: {{selectedBillAmt | currency}}

-
-
-
-

Contract Amount: {{selectedBillAmt | currency}}

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

Please Log In First!

+

Once you do, you will be able to create new invoices and edit existing ones to your hearts content!

+

+ Log In +

- - - - - \ No newline at end of file +
\ No newline at end of file diff --git a/AstuteClient2/src/app/invoice/invoice.component.ts b/AstuteClient2/src/app/invoice/invoice.component.ts index 68fdab1..7af3fde 100644 --- a/AstuteClient2/src/app/invoice/invoice.component.ts +++ b/AstuteClient2/src/app/invoice/invoice.component.ts @@ -13,6 +13,8 @@ declare var $: any; styleUrls: ['./invoice.component.css'] }) export class InvoiceComponent implements OnInit { + loggedIn: boolean; + gridApi; gridColumnApi; detailGridApi; @@ -49,7 +51,7 @@ export class InvoiceComponent implements OnInit { {headerName: 'Date', field: 'invoiceDate'}, {headerName: 'Sales Order Number', field: 'poNum'}, {headerName: 'Change Order Number', field: 'changeOrderNum'}, - {headerName: 'Outstanding Balance', field: 'outstandingBalanceString'}, + {headerName: 'Outstanding Balance', field: 'outstandingBalance', cellRenderer: 'numberFormatterComponent'}, {headerName: 'Bill Amount', field: 'billAmt', cellRenderer: 'numberFormatterComponent'}, {headerName: 'Notes ✎', field: 'specialNotes', editable: (node => node.data.invoiceStatus === 1), cellEditor: 'agLargeTextCellEditor'} @@ -67,15 +69,17 @@ export class InvoiceComponent implements OnInit { detailColumnDefs = [ {headerName: '#', field: 'lineItemNum'}, {headerName: 'PO Detail', field: 'poDetailName'}, - {headerName: 'Description ✎', field: 'desc', + {headerName: 'Description ✎*', field: 'desc', editable: (_ => (this.chosenInv && this.chosenInv.invoiceStatus === 1)), cellEditor: 'agLargeTextCellEditor'}, - {headerName: 'Fee Type', field: 'rateTypeName'}, + {headerName: 'Fee Type *', field: 'rateTypeName', + editable: (node => (node.data.poLineItemNum === -1 && this.chosenInv && this.chosenInv.invoiceStatus === 1)), + cellEditor: 'agSelectCellEditor', cellEditorParams: {values: this.rateNames}}, {headerName: 'Service Type', field: 'serviceTypeName'}, - {headerName: 'Qty or Hours ✎', field: 'qty', + {headerName: 'Qty or Hours ✎*', field: 'qty', editable: (_ => (this.chosenInv && this.chosenInv.invoiceStatus === 1))}, - {headerName: '(/Remaining)', field: 'remainingQty'}, - {headerName: 'Fee', field: 'fee', - cellRenderer: 'numberFormatterComponent'} + {headerName: 'Remaining Qty', field: 'remainingQty'}, + {headerName: 'Fee *', field: 'fee', + editable: (node => (node.data.poLineItemNum === -1 && this.chosenInv && this.chosenInv.invoiceStatus === 1)), cellRenderer: 'numberFormatterComponent'} ]; @@ -124,39 +128,49 @@ export class InvoiceComponent implements OnInit { } ngOnInit() { - this.astuteClientService.getServiceTypes().then((d) => { - if (d) { - this.serviceTypes = d; - this.serviceTypes.forEach((type) => { - this.serviceNames.push(type.serviceTypeDesc); - }); - } else { - this.notif ('Get service types failed'); - } - }, reason => { - this.notif('Get service type failed: ' + reason); - }); - this.astuteClientService.getRateTypes().then((d) => { - if (d) { - this.rateTypes = d; - this.rateTypes.forEach((type) => { - this.rateNames.push(type.feeTypeDesc); - }); - } else { - this.notif ('Get rate types failed'); - } - }, reason => { - this.notif('Get rate type failed: ' + reason); - }); - this.astuteClientService.getCustomers().then((customers) => { - if (customers) { - this.customers = customers; - } else { - this.notif('Get Customers Failed!'); - } - }, (reason) => { - this.notif('Get Customers Failed: ' + reason); - }); + if (localStorage.getItem('SESSION_ID') && localStorage.getItem('SESSION_USER')) { + this.loggedIn = true; + this.astuteClientService.getServiceTypes().then((d) => { + if (d) { + this.serviceTypes = d; + this.serviceTypes.forEach((type) => { + this.serviceNames.push(type.serviceTypeDesc); + }); + } else { + this.notif ('Get service types failed'); + } + }, reason => { + this.notif('Get service type failed: ' + reason); + }); + this.astuteClientService.getRateTypes().then((d) => { + if (d) { + this.rateTypes = d; + this.rateTypes.forEach((type) => { + this.rateNames.push(type.feeTypeDesc); + }); + } else { + this.notif ('Get rate types failed'); + } + }, reason => { + this.notif('Get rate type failed: ' + reason); + }); + this.astuteClientService.getCustomers().then((customers) => { + if (customers) { + this.customers = customers; + } else { + this.notif('Get Customers Failed!'); + } + }, (reason) => { + this.notif('Get Customers Failed: ' + reason); + }); + this.refreshPOs(); + this.refreshData(); + } else { + this.loggedIn = false; + } + } + + refreshPOs() { this.astuteClientService.getPOs().then((data) => { if (data) { this.pos = data; @@ -164,6 +178,7 @@ export class InvoiceComponent implements OnInit { this.astuteClientService.getPODetail(po.ponum).then((details) => { if (details) { details.forEach((detail) => { + detail.tempRemainingQty = detail.remainingQty; this.allPODetails.push(detail); }); // console.log(this.allPODetails); @@ -181,18 +196,12 @@ export class InvoiceComponent implements OnInit { }, (reason) => { this.notif('Get SOs Failed: ' + reason); }); - this.refreshData(); } refreshData() { this.astuteClientService.getInvoices().then((data) => { if (data) { this.source = data; - // console.log(data); - this.source.forEach((row) => { - row.billAmtString = formatCurrency(row.billAmt, 'en-US', '$', 'USD'); - row.outstandingBalanceString = formatCurrency(row.outstandingBalance, 'en-US', '$', 'USD'); - }); } else { this.notif('Get Invoices failed!'); } @@ -221,15 +230,16 @@ export class InvoiceComponent implements OnInit { // this.refreshData(); } updateDetailRow(event) { - const eventData = event.data; // console.log(eventData); + event.data.feeTypeId = this.getFeeIdFromName(event.data.rateTypeName); + const eventData = event.data; this.astuteClientService.updateInvoiceDetail(eventData.invoiceNum, eventData.lineItemNum, eventData).then((data) => { if (!data) { - this.refreshDetailsOfSelected(); this.notif('Detail Updating Failed, Check Input Fields'); } else { this.updateSelectedBillAmt(); } + this.refreshDetailsOfSelected(); }, (reason) => { this.notif('Update Detail failed: ' + reason); }); @@ -251,18 +261,21 @@ export class InvoiceComponent implements OnInit { this.selectedInDetails = this.astuteClientService.getInvoiceDetail(this.chosenInv.invoiceNumber).then((data) => { if (data) { data.forEach((invDetail) => { - const tempPo = this.selectedPODetails.filter((po) => { - return po.lineItemNo === invDetail.poLineItemNum; - })[0]; - if (tempPo) { - invDetail.remainingQty = tempPo.remainingQty; - } - - invDetail.serviceTypeName = this.serviceNames[invDetail.serviceTypeId - 1]; - invDetail.rateTypeName = this.rateNames[invDetail.feeTypeId - 1]; if (invDetail.poLineItemNum === -1) { + invDetail.remainingQty = '-'; invDetail.poDetailName = 'Out of Pocket Expenses'; } else { + if (this.chosenInv.invoiceStatus === 1) { + invDetail.remainingQty = invDetail.draftRemainingQty; + } else { + const tempPo = this.selectedPODetails[invDetail.poLineItemNum - 1]; + if (tempPo) { + invDetail.remainingQty = tempPo.remainingQty; + } else { + invDetail.remainingQty = ''; + } + } + const temp = this.selectedPODetails[invDetail.poLineItemNum - 1]; if (temp) { invDetail.poDetailName = this.selectedPODetails[invDetail.poLineItemNum - 1].serviceDesc; @@ -270,6 +283,9 @@ export class InvoiceComponent implements OnInit { invDetail.poDetailName = ''; } } + + invDetail.serviceTypeName = this.serviceNames[invDetail.serviceTypeId - 1]; + invDetail.rateTypeName = this.rateNames[invDetail.feeTypeId - 1]; }); this.updateSelectedBillAmt(); return data; @@ -339,7 +355,19 @@ export class InvoiceComponent implements OnInit { }); } } - + // updateSelectedDetailRemainingQty(poLineItemNum: number) { + // this.selectedInDetails.then((data) => { + // if (data) { + // let newRemainingQty = this.selectedPODetails[poLineItemNum - 1].remainingQty; + // data.forEach(invDetail => { + // if (invDetail.poLineItemNum.toString() === poLineItemNum.toString()) { + // newRemainingQty = newRemainingQty - invDetail.qty; + // } + // }); + // this.selectedPODetails[poLineItemNum - 1].tempRemainingQty = newRemainingQty; + // } + // }); + // } printInvoice() { this.printService.printPDF (this.chosenInv.invoiceNumber); @@ -555,7 +583,19 @@ export class InvoiceComponent implements OnInit { // creates empty line item detail addEmptyDetail(poLineItemNum) { let emptyData; - if (poLineItemNum === -1) { + if (poLineItemNum === '-1') { + emptyData = { + desc: 'Out of Pocket Expenses', + fee: 0, + feeTypeId: 1, + invoiceNum: this.chosenInv.invoiceNumber, + // lineItemNum: 1, + poLineItemNum: poLineItemNum, + qty: 0, + // remainingQty: 1, + serviceTypeId: 6 + }; + } else { emptyData = { desc: this.selectedPODetails[poLineItemNum - 1].serviceDesc, fee: this.selectedPODetails[poLineItemNum - 1].fee, @@ -563,20 +603,8 @@ export class InvoiceComponent implements OnInit { invoiceNum: this.chosenInv.invoiceNumber, // lineItemNum: 1, poLineItemNum: poLineItemNum, - qty: 1, - remainingQty: this.selectedPODetails[poLineItemNum - 1].remainingQty, - serviceTypeId: this.selectedPODetails[poLineItemNum - 1].serviceTypeId - }; - } else { - emptyData = { - desc: 'Out of Pocket Expenses', - fee: this.selectedPODetails[poLineItemNum - 1].fee, - feeTypeId: this.selectedPODetails[poLineItemNum - 1].feeTypeId, - invoiceNum: this.chosenInv.invoiceNumber, - // lineItemNum: 1, - poLineItemNum: poLineItemNum, - qty: 1, - remainingQty: this.selectedPODetails[poLineItemNum - 1].remainingQty, + qty: 0, + // remainingQty: this.selectedPODetails[poLineItemNum - 1].remainingQty, serviceTypeId: this.selectedPODetails[poLineItemNum - 1].serviceTypeId }; } @@ -709,5 +737,4 @@ export class InvoiceComponent implements OnInit { notif(text: string) { this.toastService.show(text, {classname: 'bg-danger text-light'}); } - } diff --git a/AstuteClient2/src/app/login/login.component.html b/AstuteClient2/src/app/login/login.component.html index 131840c..1943e36 100644 --- a/AstuteClient2/src/app/login/login.component.html +++ b/AstuteClient2/src/app/login/login.component.html @@ -8,16 +8,20 @@
- + - + diff --git a/AstuteClient2/src/app/login/login.component.ts b/AstuteClient2/src/app/login/login.component.ts index 52ba8a4..d25d032 100644 --- a/AstuteClient2/src/app/login/login.component.ts +++ b/AstuteClient2/src/app/login/login.component.ts @@ -30,7 +30,7 @@ export class LoginComponent implements OnInit { } else { this.notif('login failed, checked credentials'); } - }) + }); } // ** toast notification method diff --git a/AstuteClient2/src/app/nav-bar/nav-bar.component.html b/AstuteClient2/src/app/nav-bar/nav-bar.component.html index 5256b30..a159948 100644 --- a/AstuteClient2/src/app/nav-bar/nav-bar.component.html +++ b/AstuteClient2/src/app/nav-bar/nav-bar.component.html @@ -21,10 +21,11 @@ diff --git a/AstuteClient2/src/app/nav-bar/nav-bar.component.ts b/AstuteClient2/src/app/nav-bar/nav-bar.component.ts index 7378382..8b4a484 100644 --- a/AstuteClient2/src/app/nav-bar/nav-bar.component.ts +++ b/AstuteClient2/src/app/nav-bar/nav-bar.component.ts @@ -17,11 +17,17 @@ export class NavBarComponent implements OnInit { // @Input() logoffActive: boolean; @Input() settingsActive: boolean; + loggedIn: boolean; constructor(private astuteClientService: AstuteClientService, private router: Router, private toastService: ToastManagerService) { } ngOnInit() { + if (localStorage.getItem('SESSION_ID') && localStorage.getItem('SESSION_USER')) { + this.loggedIn = true; + } else { + this.loggedIn = false; + } } logout() { diff --git a/AstuteClient2/src/app/sales-order/sales-order.component.html b/AstuteClient2/src/app/sales-order/sales-order.component.html index 2fa1168..3cb0dde 100644 --- a/AstuteClient2/src/app/sales-order/sales-order.component.html +++ b/AstuteClient2/src/app/sales-order/sales-order.component.html @@ -1,194 +1,55 @@ -

Sales Orders

-
-
-
- -
-
-
-
-
- - - - - +
+

Sales Orders

+ +
+
+
+
- - - - - - - - - - - - -
-
- - - -
-

General

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Astute Proj. No.
Customer - -
SO Title
SO NumberSO Date
Contract NumberContract Amount
Notes
+
+
+
+ + + + + +
+
+ + + + + + + + + + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - - -
+ +

General

@@ -196,163 +57,102 @@ Astute Proj. No. - + Customer - + SO Title - + SO Number - + SO Date - + Contract Number - + Contract Amount - + Notes - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - + - + - - - - + + - - + + - - - - - - - + + + + + + - - + + - + - - - - - - - - + + + + + + - - - + + - - + + + + + + @@ -369,8 +169,9 @@ - - + + + @@ -378,76 +179,295 @@
- -
-
-
-
- Choose a Sales Order First! +
+ -
- - -
-
- - - - -
-
-
-
- -
+ + +
+
+

General

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Astute Proj. No.
Customer + +
SO Title
SO NumberSO Date
Contract NumberContract Amount
Notes
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
-
-
- -
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+
+ Choose a Sales Order First! +
+ +
+ + +
+
+ + + + +
+
+
+
+ +
+
+
+
+
+ +
+ + +
+
+
+
+

Contract Amount: {{contractAmount | currency}}

+
+
-
-
-
-

Contract Amount: {{contractAmount | currency}}

+
+ +
+ +
+
+
+
+
+

Please Log In First!

+

Once you do, you will be able to create new sales orders and edit existing ones to your hearts content!

+

+ Log In +

- +
\ No newline at end of file diff --git a/AstuteClient2/src/app/sales-order/sales-order.component.ts b/AstuteClient2/src/app/sales-order/sales-order.component.ts index 2867d96..a27326d 100644 --- a/AstuteClient2/src/app/sales-order/sales-order.component.ts +++ b/AstuteClient2/src/app/sales-order/sales-order.component.ts @@ -3,6 +3,7 @@ import {AstuteClientService} from '../services/astute-client-service'; import {formatCurrency, formatNumber} from '@angular/common'; import {ToastManagerService} from '../services/toast-manager/toast-service.service'; import {NumberFormatterComponent} from '../ag-grid-components/number-formatter/number-formatter.component'; +import {EmptyErrorEditorComponent} from "../ag-grid-components/empty-error-editor/empty-error-editor.component"; @Component({ selector: 'app-sales-order', @@ -10,6 +11,8 @@ import {NumberFormatterComponent} from '../ag-grid-components/number-formatter/n styleUrls: ['./sales-order.component.css'] }) export class SalesOrderComponent implements OnInit { + loggedIn: boolean; + // both of the grid api's gridApi; gridColumnApi; @@ -26,15 +29,15 @@ export class SalesOrderComponent implements OnInit { // data for SO grid rowData: any; columnDefs = [ - {headerName: 'Project Number ✎', field: 'astuteProjectNumber', editable: (node => !node.data.isFinal)}, + {headerName: 'Project Number ✎', field: 'astuteProjectNumber', editable: (node => !node.data.isFinal), cellEditor: 'emptyErrorEditorComponent'}, {headerName: 'SO Number', field: 'ponum'}, // {headerName: 'Customer ID', field: 'customerId'}, {headerName: 'Customer Name', field: 'customerName'}, - {headerName: 'Contract Number ✎', field: 'contractNum', editable: (node => !node.data.isFinal)}, - {headerName: 'SO Title ✎', field: 'title', editable: (node => !node.data.isFinal)}, + {headerName: 'Contract Number ✎', field: 'contractNum', editable: (node => !node.data.isFinal), cellEditor: 'emptyErrorEditorComponent'}, + {headerName: 'SO Title ✎', field: 'title', editable: (node => !node.data.isFinal), cellEditor: 'emptyErrorEditorComponent'}, {headerName: 'Contract Amount', field: 'contractAmt', cellRenderer: 'numberFormatterComponent'}, // {headerName: 'Contract Amount', field: 'contractAmt'}, - {headerName: 'SO Date ✎', field: 'podate', editable: (node => !node.data.isFinal)}, + {headerName: 'SO Date ✎', field: 'podate', editable: (node => !node.data.isFinal), cellEditor: 'emptyErrorEditorComponent'}, {headerName: '# of Invoices', field: 'invoiceSequence'}, {headerName: 'notes ✎', field: 'notes', editable: (node => !node.data.isFinal), cellEditor: 'agLargeTextCellEditor'} // {headerName: 'oneInvInDraft', field: 'oneInvInDraft'} @@ -52,6 +55,7 @@ export class SalesOrderComponent implements OnInit { }; frameworkComponents = { + emptyErrorEditorComponent: EmptyErrorEditorComponent, numberFormatterComponent: NumberFormatterComponent }; @@ -61,7 +65,8 @@ export class SalesOrderComponent implements OnInit { selectedPODetail; detailColumnDefs = [ {headerName: '#', field: 'lineItemNo'}, - {headerName: 'Description ✎', field: 'serviceDesc', editable: (_ => (this.selected && !this.selected.isFinal))}, + {headerName: 'Description ✎', field: 'serviceDesc', editable: (_ => (this.selected && !this.selected.isFinal)), + cellEditor: 'emptyErrorEditorComponent'}, {headerName: 'Rate Type ✎', field: 'rateTypeName', editable: (_ => (this.selected && !this.selected.isFinal)), cellEditor: 'agSelectCellEditor', cellEditorParams: {values: this.rateNames}}, {headerName: 'Service Type ✎', field: 'serviceTypeName', editable: (_ => (this.selected && !this.selected.isFinal)), @@ -76,41 +81,46 @@ export class SalesOrderComponent implements OnInit { } ngOnInit() { - this.astuteClientService.getServiceTypes().then((d) => { - if (d) { - this.serviceTypes = d; - this.serviceTypes.forEach((type) => { - this.serviceNames.push(type.serviceTypeDesc); - }); - // console.log(this.serviceNames); - } else { - this.notif ('Get service types failed'); - } - }, reason => { - this.notif('Get service type failed: ' + reason); - }); - this.astuteClientService.getRateTypes().then((d) => { - if (d) { - this.rateTypes = d; - this.rateTypes.forEach((type) => { - this.rateNames.push(type.feeTypeDesc); - }); - } else { - this.notif ('Get rate types failed'); - } - }, reason => { - this.notif('Get rate type failed: ' + reason); - }); - this.astuteClientService.getCustomers().then((customers) => { - if (customers) { - this.customers = customers; - } else { - this.notif('Get Customers Failed!'); - } - }, (reason) => { - this.notif('Get Customers Failed: ' + reason); - }); - this.refreshData(); + if (localStorage.getItem('SESSION_ID') && localStorage.getItem('SESSION_USER')) { + this.loggedIn = true; + this.astuteClientService.getServiceTypes().then((d) => { + if (d) { + this.serviceTypes = d; + this.serviceTypes.forEach((type) => { + this.serviceNames.push(type.serviceTypeDesc); + }); + // console.log(this.serviceNames); + } else { + this.notif ('Get service types failed'); + } + }, reason => { + this.notif('Get service type failed: ' + reason); + }); + this.astuteClientService.getRateTypes().then((d) => { + if (d) { + this.rateTypes = d; + this.rateTypes.forEach((type) => { + this.rateNames.push(type.feeTypeDesc); + }); + } else { + this.notif ('Get rate types failed'); + } + }, reason => { + this.notif('Get rate type failed: ' + reason); + }); + this.astuteClientService.getCustomers().then((customers) => { + if (customers) { + this.customers = customers; + } else { + this.notif('Get Customers Failed!'); + } + }, (reason) => { + this.notif('Get Customers Failed: ' + reason); + }); + this.refreshData(); + } else { + this.loggedIn = false; + } } // callback for grid selection