diff --git a/AstuteClient2/src/app/app-box/app-box.component.ts b/AstuteClient2/src/app/app-box/app-box.component.ts index db65c33..6a1aa0f 100644 --- a/AstuteClient2/src/app/app-box/app-box.component.ts +++ b/AstuteClient2/src/app/app-box/app-box.component.ts @@ -22,6 +22,7 @@ export class AppBoxComponent implements OnInit { return this.color; } else { const clr = this.padStart(Math.floor((Math.random() * 16777215)).toString(16), 6, '0'); + console.log (clr); return '#' + clr; } } diff --git a/AstuteClient2/src/app/app-routing.module.ts b/AstuteClient2/src/app/app-routing.module.ts index b24699f..41f605c 100644 --- a/AstuteClient2/src/app/app-routing.module.ts +++ b/AstuteClient2/src/app/app-routing.module.ts @@ -11,6 +11,7 @@ import {LoginComponent} from './login/login.component'; const routes: Routes = [ { path: '', redirectTo: 'login', pathMatch: 'full'}, + { path: 'home', redirectTo: 'homepage', pathMatch: 'full'}, { path: 'homepage', component: HomepageComponent }, { path: 'customer', component: CustomerComponent }, { path: 'sales-order', component: SalesOrderComponent }, diff --git a/AstuteClient2/src/app/customer/customer.component.html b/AstuteClient2/src/app/customer/customer.component.html index 712e442..bbe01d5 100644 --- a/AstuteClient2/src/app/customer/customer.component.html +++ b/AstuteClient2/src/app/customer/customer.component.html @@ -125,7 +125,7 @@ - Fax + Fax* @@ -137,7 +137,7 @@
diff --git a/AstuteClient2/src/app/invoice-payment/invoice-payment.component.html b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.html index 0dfb3cc..e2760b1 100644 --- a/AstuteClient2/src/app/invoice-payment/invoice-payment.component.html +++ b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.html @@ -9,7 +9,7 @@ class="ag-theme-balham" [enableSorting]="true" [enableFilter]="true" - [rowData]="rowData | async" + [rowData]="rowData" [columnDefs]="columnDefs" rowSelection="single" > @@ -27,68 +27,71 @@ -
- - - - - - + +
+
- Invoice Number* - - -
+ + + + + - - - - + + + + - - - + + - + + + + + - - - - + + + + - -
+ Invoice Number* + + +
- Payment Received* - - -
+ Payment Received* + + +
- Payment Type* - -
+ Payment Type* + + -
- Payment Date* - - -
+ Payment Date* + + +
-
+ + +
-
- - -
+
+ + + +
+ @@ -126,7 +129,6 @@ -
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Original Contract Amount +
{{chosenPo.contractAmt | currency}}
+ 		  
Net Changes by Change Orders
{{0 | currency}}
  
Total Contract Amount
{{chosenPo.contractAmt | currency}}
  
Previously Billed
{{chosenPo.previouslyBilledAmount | currency}}
  
Balance to be Billed
{{(chosenPo.contractAmt - chosenPo.previouslyBilledAmount - newBillAmt) | currency}}
Total due this invoice{{newBillAmt | currency}}
+ + + +
+

Footer

+
+
+
+ Notes: +
+ +
+ +
+
+ Certification: +
+ +
+
+ + +
+ + +
+ diff --git a/AstuteClient2/src/app/invoice/invoice.component.ts b/AstuteClient2/src/app/invoice/invoice.component.ts index 5a586e9..b9eecc5 100644 --- a/AstuteClient2/src/app/invoice/invoice.component.ts +++ b/AstuteClient2/src/app/invoice/invoice.component.ts @@ -49,7 +49,7 @@ export class InvoiceComponent implements OnInit { // EVENTS - add event callback handlers onRowClicked: (event) => { - this.getSelectedRows() + this.getSelectedRows(); }, onColumnResized: function (event) { console.log('a column was resized'); @@ -221,7 +221,6 @@ export class InvoiceComponent implements OnInit { this.selectedBillAmt = tot; } - assignActity(): void { window.open('/invoice-gen'); } @@ -288,6 +287,7 @@ export class InvoiceComponent implements OnInit { close(content) { content.close(); + // this.newInDetails = []; } getCurrDate() { diff --git a/AstuteClient2/src/app/sales-order/sales-order.component.html b/AstuteClient2/src/app/sales-order/sales-order.component.html index 185bb4b..0171e5e 100644 --- a/AstuteClient2/src/app/sales-order/sales-order.component.html +++ b/AstuteClient2/src/app/sales-order/sales-order.component.html @@ -86,8 +86,8 @@ Description Rate Type Service Type - Qty - Rate + Qty(#) + Rate($) @@ -282,8 +282,8 @@ Description Rate Type Service Type - Qty - Rate + Qty(#) + Rate($) @@ -358,7 +358,7 @@
diff --git a/AstuteClient2/src/app/sales-order/sales-order.component.ts b/AstuteClient2/src/app/sales-order/sales-order.component.ts index 52e700d..8bbe0ca 100644 --- a/AstuteClient2/src/app/sales-order/sales-order.component.ts +++ b/AstuteClient2/src/app/sales-order/sales-order.component.ts @@ -41,7 +41,7 @@ export class SalesOrderComponent implements OnInit { } else { alert ('get service types failed'); } - }) + }); } printValue(val) { @@ -119,7 +119,7 @@ export class SalesOrderComponent implements OnInit { details.splice(0, 1); this.editPODetail(details); } else { - alert("add detail failed") + alert('add detail failed'); } }); } else { @@ -214,13 +214,15 @@ export class SalesOrderComponent implements OnInit { const selectedNodes = this.agGrid.api.getSelectedNodes(); if (selectedNodes.length) { this.selected = selectedNodes.map(node => node.data)[0]; - this.editContractAmount = +this.selected.contractAmt; + // this.editContractAmount = +this.selected.contractAmt; + console.log(this.selected.contractNum); this.astuteClientService.getPODetail(this.selected.ponum).then((data) => { if (data) { this.selectedPODetail = data; - console.log(this.selectedPODetail); + // console.log(this.selectedPODetail); + this.updateEditContractAmt(); } else { - alert("get PO detail failed!") + alert('get PO detail failed!'); } }); } else { @@ -244,14 +246,14 @@ export class SalesOrderComponent implements OnInit { } }); } else { - alert("get Customers Failed!"); + alert('get Customers Failed!'); } }); // this.rowData = this.astuteClientService.getPOs(); } getCustomerName(customerId) { - let name = ""; + let name = ''; this.customers.forEach((customer) => { if (customer.customerId === customerId) { name = customer.customerName; diff --git a/AstuteClient2/src/app/services/astute-client-service.ts b/AstuteClient2/src/app/services/astute-client-service.ts index 10251cf..4365e4e 100644 --- a/AstuteClient2/src/app/services/astute-client-service.ts +++ b/AstuteClient2/src/app/services/astute-client-service.ts @@ -15,7 +15,7 @@ export class AstuteClientService { private invoiceDetailUrl = 'http://localhost:8080/astutesystem/invoice/detail'; private invoiceGenUrl = 'http://localhost:8080/astutesystem/invoice/generatedInvoice'; private invoicePaymentUrl = 'http://localhost:8080/astutesystem/invoicePayment'; - private sessionId=localStorage.getItem(''); + private sessionId = localStorage.getItem(''); private sessionString = `?sessionId=${this.sessionId}`; constructor(private http: HttpClient) { }