From 31769ebd8f6b223b8f050abca7374b3453d4afee Mon Sep 17 00:00:00 2001 From: gopi17701 Date: Sun, 13 Jan 2019 11:46:33 -0500 Subject: [PATCH] Bug fixes --- .../src/app/customer/customer.component.html | 29 +- .../src/app/customer/customer.component.ts | 357 +++---- .../src/app/invoice/invoice.component.html | 22 +- .../sales-order/sales-order.component.html | 12 +- .../app/sales-order/sales-order.component.ts | 530 +++++------ .../src/app/services/astute-client-service.ts | 895 +++++++++--------- .../src/main/java/com/astute/dao/DAO.java | 10 +- .../src/main/java/com/astute/dao/SqlDAO.java | 49 +- .../main/java/com/astute/model/Customer.java | 269 +++--- .../src/main/java/com/astute/model/PO.java | 12 +- .../com/astute/requests/CustomerRequest.java | 237 ++--- .../com/astute/requests/POMasterRequest.java | 9 + .../astute/resources/CustomerResource.java | 123 +-- .../java/com/astute/resources/POResource.java | 4 +- .../com/astute/service/CustomerService.java | 78 +- .../java/com/astute/service/POService.java | 10 +- .../target/astutesystem/META-INF/MANIFEST.MF | 10 +- .../classes/com/astute/common/Constants.class | Bin 380 -> 0 bytes .../classes/com/astute/common/Utility.class | Bin 1556 -> 0 bytes .../WEB-INF/classes/com/astute/dao/DAO.class | Bin 5214 -> 0 bytes .../classes/com/astute/dao/SqlDAO.class | Bin 28091 -> 0 bytes .../astute/exceptions/AstuteException.class | Bin 907 -> 0 bytes .../astute/exceptions/DatabaseException.class | Bin 424 -> 0 bytes .../com/astute/filter/CORSFilter.class | Bin 1302 -> 0 bytes .../com/astute/helpers/JsonHelper.class | Bin 293 -> 0 bytes .../com/astute/model/ChangeOrder.class | Bin 1708 -> 0 bytes .../classes/com/astute/model/Customer.class | Bin 3005 -> 0 bytes .../com/astute/model/GeneratedInvoice.class | Bin 2601 -> 0 bytes .../classes/com/astute/model/Invoice.class | Bin 2399 -> 0 bytes .../com/astute/model/InvoiceDetail.class | Bin 2206 -> 0 bytes .../WEB-INF/classes/com/astute/model/PO.class | Bin 1737 -> 0 bytes .../classes/com/astute/model/PODetail.class | Bin 2061 -> 0 bytes .../classes/com/astute/model/User.class | Bin 1036 -> 0 bytes .../provider/GeneralExceptionMapper.class | Bin 1013 -> 0 bytes .../astute/provider/JacksonJsonProvider.class | Bin 1632 -> 0 bytes .../astute/provider/RFC3339DateFormat.class | Bin 913 -> 0 bytes .../provider/RuntimeExceptionMapper.class | Bin 1050 -> 0 bytes .../WebApplicationExceptionMapper.class | Bin 1166 -> 0 bytes .../astute/requests/ChangeOrderRequest.class | Bin 1558 -> 0 bytes .../com/astute/requests/CustomerRequest.class | Bin 2654 -> 0 bytes .../requests/InvoiceDetailRequest.class | Bin 2024 -> 0 bytes .../requests/InvoiceMasterRequest.class | Bin 2364 -> 0 bytes .../com/astute/requests/LoginRequest.class | Bin 757 -> 0 bytes .../com/astute/requests/PODetailRequest.class | Bin 2086 -> 0 bytes .../com/astute/requests/POMasterRequest.class | Bin 1555 -> 0 bytes .../com/astute/resources/AuthResource.class | Bin 1371 -> 0 bytes .../resources/ChangeOrderResource.class | Bin 2458 -> 0 bytes .../astute/resources/CustomerResource.class | Bin 2727 -> 0 bytes .../astute/resources/InvoiceResource.class | Bin 4255 -> 0 bytes .../com/astute/resources/POResource.class | Bin 3815 -> 0 bytes .../com/astute/response/ApiResponse.class | Bin 2406 -> 0 bytes .../com/astute/service/AuthService.class | Bin 1650 -> 0 bytes .../astute/service/ChangeOrderService.class | Bin 1260 -> 0 bytes .../com/astute/service/CustomerService.class | Bin 1529 -> 0 bytes AstuteSystem/target/astutesystem/css/nav.css | 54 -- .../target/astutesystem/css/theme.css | 122 --- .../target/astutesystem/doc/user-guide.jsp | 105 -- .../target/astutesystem/images/logo.png | Bin 4208 -> 0 bytes .../target/astutesystem/images/nist-logo.svg | 18 - AstuteSystem/target/astutesystem/index.html | 3 - 60 files changed, 1396 insertions(+), 1562 deletions(-) delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Constants.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Utility.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/DAO.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/SqlDAO.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/AstuteException.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/DatabaseException.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/filter/CORSFilter.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/helpers/JsonHelper.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/ChangeOrder.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Customer.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/GeneratedInvoice.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Invoice.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/InvoiceDetail.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PO.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PODetail.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/User.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/GeneralExceptionMapper.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/JacksonJsonProvider.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RFC3339DateFormat.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RuntimeExceptionMapper.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/WebApplicationExceptionMapper.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/ChangeOrderRequest.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/CustomerRequest.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceDetailRequest.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceMasterRequest.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/LoginRequest.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/PODetailRequest.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/POMasterRequest.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/AuthResource.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/ChangeOrderResource.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/CustomerResource.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/InvoiceResource.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/POResource.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/response/ApiResponse.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/AuthService.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/ChangeOrderService.class delete mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/CustomerService.class delete mode 100644 AstuteSystem/target/astutesystem/css/nav.css delete mode 100644 AstuteSystem/target/astutesystem/css/theme.css delete mode 100644 AstuteSystem/target/astutesystem/doc/user-guide.jsp delete mode 100644 AstuteSystem/target/astutesystem/images/logo.png delete mode 100644 AstuteSystem/target/astutesystem/images/nist-logo.svg delete mode 100644 AstuteSystem/target/astutesystem/index.html diff --git a/AstuteClient2/src/app/customer/customer.component.html b/AstuteClient2/src/app/customer/customer.component.html index 47d95a8..755e53e 100644 --- a/AstuteClient2/src/app/customer/customer.component.html +++ b/AstuteClient2/src/app/customer/customer.component.html @@ -18,6 +18,9 @@
+
+ +
@@ -127,7 +130,16 @@ - Fax* + Ext* + + + + + + + + + Fax @@ -139,8 +151,8 @@
@@ -237,6 +249,15 @@ + + + Ext* + + + + + + Fax @@ -252,7 +273,7 @@
diff --git a/AstuteClient2/src/app/customer/customer.component.ts b/AstuteClient2/src/app/customer/customer.component.ts index 93c45d6..ecc025e 100644 --- a/AstuteClient2/src/app/customer/customer.component.ts +++ b/AstuteClient2/src/app/customer/customer.component.ts @@ -1,170 +1,187 @@ -import {Component, OnInit, ViewChild} from '@angular/core'; -import {AstuteClientService} from '../services/astute-client-service'; - -@Component({ - selector: 'app-customer', - templateUrl: './customer.component.html', - styleUrls: ['./customer.component.css'] -}) -export class CustomerComponent implements OnInit { - @ViewChild('agGrid') agGrid; - selected = null; - customers; - columnDefs = [ - {headerName: 'Customer ID', field: 'customerId', checkboxSelection: true}, - {headerName: 'Customer Name', field: 'customerName'}, - {headerName: 'Bill To Department', field: 'billToDept'}, - {headerName: 'Address 1', field: 'add1'}, - {headerName: 'Address 2', field: 'add2'}, - {headerName: 'City', field: 'city'}, - {headerName: 'Email', field: 'email'}, - {headerName: 'Fax', field: 'fax'}, - {headerName: 'Phone', field: 'phone'}, - {headerName: 'State', field: 'state'}, - {headerName: 'ZIP', field: 'zip'}, - {headerName: 'ZIP-4', field: 'ziplast4'} - ]; - rowData: any; - states = [ - 'AL', - 'AK', - 'AR', - 'AZ', - 'CA', - 'CO', - 'CT', - 'DC', - 'DE', - 'FL', - 'GA', - 'HI', - 'IA', - 'ID', - 'IL', - 'IN', - 'KS', - 'KY', - 'LA', - 'MA', - 'MD', - 'ME', - 'MI', - 'MN', - 'MO', - 'MS', - 'MT', - 'NC', - 'NE', - 'NH', - 'NJ', - 'NM', - 'NV', - 'NY', - 'ND', - 'OH', - 'OK', - 'OR', - 'PA', - 'RI', - 'SC', - 'SD', - 'TN', - 'TX', - 'UT', - 'VT', - 'VA', - 'WA', - 'WI', - 'WV', - 'WY' - ]; - usPhoneMask = ['(', /[1-9]/, /\d/, /\d/, ')', ' ', /\d/, /\d/, /\d/, '-', /\d/, /\d/, /\d/, /\d/]; - - constructor(protected astuteClientService: AstuteClientService) { - } - - ngOnInit() { - this.refreshData(); - } - - getSelectedRows() { - const selectedNodes = this.agGrid.api.getSelectedNodes(); - if (selectedNodes.length) { - this.selected = selectedNodes.map(node => node.data)[0]; - } else { - this.selected = null; - } - } - - // inName.value, inBillToDept.value, inAdd1.value, inAdd2.value, inCity.value, inState.value, inZIP.value, inZIP4.value, inEmail.value, inPhone.value, inFax.value - addCustomer(customerId, name, billTo, add1, add2, city, state, zip, zip4, email, phone, fax, ref) { - let customerData = { - "customerId": customerId, - "customerName": name, - "billToDept": billTo, - "add1": add1, - "add2": add2, - "city": city, - "state": state, - "zip": zip, - "ziplast4": zip4, - "email": email, - "phone": phone, - "fax": fax - }; - this.astuteClientService.createCustomer(customerData).then((data) => { - if (data) { - this.refreshData(); - ref.close(); - } else { - alert("Customer Creation Failed, Check Input Fields") - } - }, (reason) => { - alert("add customer failed for " + reason); - }); - } - - - editCustomer(id, name, billTo, add1, add2, city, state, zip, zip4, email, phone, fax, ref) { - const customerData = { - "customerId": id, - "customerName": name, - "billToDept": billTo, - "add1": add1, - "add2": add2, - "city": city, - "state": state, - "zip": zip, - "ziplast4": zip4, - "email": email, - "phone": phone, - "fax": fax - }; - this.astuteClientService.updateCustomer(id, customerData).then((data) => { - if (data) { - this.refreshData(); - ref.close(); - } else { - alert("Customer Updating Failed, Check Input Fields") - } - }, (reason) => { - alert("update customer failed for " + reason); - }); - } - - open(ref) { - this.getSelectedRows(); - ref.open(); - } - - close(ref) { - ref.close(); - } - - refreshData() { - this.rowData = this.astuteClientService.getCustomers(); - this.astuteClientService.getCustomers().then((data) => { - this.customers = data; - }); - } -} +import {Component, OnInit, ViewChild} from '@angular/core'; +import {AstuteClientService} from '../services/astute-client-service'; + +@Component({ + selector: 'app-customer', + templateUrl: './customer.component.html', + styleUrls: ['./customer.component.css'] +}) +export class CustomerComponent implements OnInit { + @ViewChild('agGrid') agGrid; + selected = null; + customers; + columnDefs = [ + {headerName: 'Customer ID', field: 'customerId', checkboxSelection: true}, + {headerName: 'Customer Name', field: 'customerName'}, + {headerName: 'Bill To Department', field: 'billToDept'}, + {headerName: 'Address 1', field: 'add1'}, + {headerName: 'Address 2', field: 'add2'}, + {headerName: 'City', field: 'city'}, + {headerName: 'Email', field: 'email'}, + {headerName: 'Fax', field: 'fax'}, + {headerName: 'Phone', field: 'phone'}, + {headerName: 'phExt', field: 'phExt'}, + {headerName: 'State', field: 'state'}, + {headerName: 'ZIP', field: 'zip'}, + {headerName: 'ZIP-4', field: 'ziplast4'} + ]; + rowData: any; + states = [ + 'AL', + 'AK', + 'AR', + 'AZ', + 'CA', + 'CO', + 'CT', + 'DC', + 'DE', + 'FL', + 'GA', + 'HI', + 'IA', + 'ID', + 'IL', + 'IN', + 'KS', + 'KY', + 'LA', + 'MA', + 'MD', + 'ME', + 'MI', + 'MN', + 'MO', + 'MS', + 'MT', + 'NC', + 'NE', + 'NH', + 'NJ', + 'NM', + 'NV', + 'NY', + 'ND', + 'OH', + 'OK', + 'OR', + 'PA', + 'RI', + 'SC', + 'SD', + 'TN', + 'TX', + 'UT', + 'VT', + 'VA', + 'WA', + 'WI', + 'WV', + 'WY' + ]; + usPhoneMask = ['(', /[1-9]/, /\d/, /\d/, ')', ' ', /\d/, /\d/, /\d/, '-', /\d/, /\d/, /\d/, /\d/]; + + constructor(protected astuteClientService: AstuteClientService) { + } + + ngOnInit() { + this.refreshData(); + } + + getSelectedRows() { + const selectedNodes = this.agGrid.api.getSelectedNodes(); + if (selectedNodes.length) { + this.selected = selectedNodes.map(node => node.data)[0]; + } else { + this.selected = null; + } + } + + // inName.value, inBillToDept.value, inAdd1.value, inAdd2.value, inCity.value, inState.value, inZIP.value, inZIP4.value, inEmail.value, inPhone.value, inFax.value + addCustomer(customerId, name, billTo, add1, add2, city, state, zip, zip4, email, phone, phExt, fax, ref) { + let customerData = { + "customerId": customerId, + "customerName": name, + "billToDept": billTo, + "add1": add1, + "add2": add2, + "city": city, + "state": state, + "zip": zip, + "ziplast4": zip4, + "email": email, + "phone": phone, + "phExt": phExt, + "fax": fax + }; + this.astuteClientService.createCustomer(customerData).then((data) => { + if (data) { + this.refreshData(); + ref.close(); + } else { + alert("Customer Creation Failed, Check Input Fields") + } + }, (reason) => { + alert("add customer failed for " + reason); + }); + } + + + editCustomer(id, name, billTo, add1, add2, city, state, zip, zip4, email, phone, phExt, fax, ref) { + const customerData = { + "customerId": id, + "customerName": name, + "billToDept": billTo, + "add1": add1, + "add2": add2, + "city": city, + "state": state, + "zip": zip, + "ziplast4": zip4, + "email": email, + "phone": phone, + "phExt": phExt, + "fax": fax + }; + this.astuteClientService.updateCustomer(id, customerData).then((data) => { + if (data) { + this.refreshData(); + ref.close(); + } else { + alert("Customer Updating Failed, Check Input Fields") + } + }, (reason) => { + alert("update customer failed for " + reason); + }); + } + + deleteCustomer (customerId) { + if (confirm('Are you sure you want to delete customer, ' + customerId)) { + this.astuteClientService.deleteCustomer(customerId).then((data) => { + if (data) { + console.log('Customer, ' + customerId + ' successfully deleted'); + this.refreshData(); + } else { + alert ('Error in deleting; Customer, ' + customerId + ' has not been deleted'); + } + }); + } + } + + + open(ref) { + this.getSelectedRows(); + ref.open(); + } + + close(ref) { + ref.close(); + } + + refreshData() { + this.rowData = this.astuteClientService.getCustomers(); + this.astuteClientService.getCustomers().then((data) => { + this.customers = data; + }); + } +} diff --git a/AstuteClient2/src/app/invoice/invoice.component.html b/AstuteClient2/src/app/invoice/invoice.component.html index ca072af..ca6b719 100644 --- a/AstuteClient2/src/app/invoice/invoice.component.html +++ b/AstuteClient2/src/app/invoice/invoice.component.html @@ -21,6 +21,16 @@
+
+ +
+
+ +
-
- -
-
- -
@@ -162,7 +166,7 @@
@@ -207,6 +211,10 @@ Contract Amount + + Notes + + @@ -358,7 +366,7 @@
diff --git a/AstuteClient2/src/app/sales-order/sales-order.component.ts b/AstuteClient2/src/app/sales-order/sales-order.component.ts index 8bbe0ca..0d35911 100644 --- a/AstuteClient2/src/app/sales-order/sales-order.component.ts +++ b/AstuteClient2/src/app/sales-order/sales-order.component.ts @@ -1,264 +1,266 @@ -import {Component, OnInit, ViewChild} from '@angular/core'; -import {AstuteClientService} from '../services/astute-client-service'; -import {formatCurrency} from "@angular/common"; - -@Component({ - selector: 'app-sales-order', - templateUrl: './sales-order.component.html', - styleUrls: ['./sales-order.component.css'] -}) -export class SalesOrderComponent implements OnInit { - @ViewChild('agGrid') agGrid; - selected = null; - selectedPODetail = []; - newPODetail = []; - newContractAmount = 0; - editContractAmount = 0; - customers; - pos; - serviceTypes; - columnDefs = [ - {headerName: 'Project Number', field: 'astuteProjectNumber'}, - {headerName: 'SO Number', field: 'ponum'}, - // {headerName: 'Customer ID', field: 'customerId'}, - {headerName: 'Customer Name', field: 'customerName'}, - {headerName: 'Contract Number', field: 'contractNum'}, - {headerName: 'SO Title', field: 'title'}, - {headerName: 'Contract Amount', field: 'contractAmt'}, - {headerName: 'SO Date', field: 'podate'}, - {headerName: '# of Invoice', field: 'invoiceSequence'} - ]; - rowData: any; - - constructor(private astuteClientService: AstuteClientService) { - } - - ngOnInit() { - this.refreshData(); - this.astuteClientService.getServiceTypes().then((d) => { - if (d) { - this.serviceTypes = d; - } else { - alert ('get service types failed'); - } - }); - } - - printValue(val) { - console.log(val); - } - - addPo(projNum, ponum, podate, customerid, contractnum, contractamt, title, ref) { - const poData = { - "astuteProjectNumber": projNum, - "poNum": ponum, - "podate": podate, - "customerId": customerid, - "contractNum": contractnum, - "contractAmt": contractamt, - "title": title, - } - console.log(poData); - this.astuteClientService.createPO(poData).then((data) => { - if (data) { - this.refreshData(); - this.addPODetail(this.newPODetail); - ref.close(); - } else { - alert("PO Creation failed, check input fields"); - } - }, (reason) => { - alert("add po failed for " + reason); - }); - } - - addPODetail(details) { - if (details.length) { - console.log(details[0]); - this.astuteClientService.createPODetail(details[0]).then((data) => { - if (data) { - details.splice(0, 1); - this.addPODetail(details); - } else { - alert("add detail failed"); - } - }); - } else { - this.newPODetail = []; - } - } - - editPo(projNum, ponum, podate, contractnum, contractamt, title, ref) { - const poData = { - "astuteProjectNumber": projNum, - "poNum": ponum, - "podate": podate, - "contractNum": contractnum, - "contractAmt": contractamt, - "title": title, - } - console.log(poData); - this.astuteClientService.updatePO(ponum, poData).then((data) => { - if (data) { - this.refreshData(); - this.editPODetail(this.selectedPODetail); - ref.close(); - } else { - alert("PO updating failed, check input fields"); - } - }, (reason) => { - alert("update po failed for " + reason); - }); - } - - editPODetail(details) { - if (details.length) { - console.log(details[0]); - this.astuteClientService.updatePODetail(details[0].ponum, details[0].lineItemNo, details[0]).then((data) => { - if (data) { - details.splice(0, 1); - this.editPODetail(details); - } else { - alert('add detail failed'); - } - }); - } else { - this.newPODetail = []; - } - } - - pushOntoSelectedDetail(lineItemNo: number, ponum, serviceDesc, feeTypeId, serviceTypeId, qty, fee, remainingQty) { - this.selectedPODetail.push({ - 'lineItemNo': lineItemNo, - 'ponum': ponum, - 'serviceDesc': serviceDesc, - 'feeTypeId': feeTypeId, - 'serviceTypeId': serviceTypeId, - 'qty': qty, - 'fee': fee, - 'remainingQty': remainingQty - }); - } - - pushOntoNewDetail(lineItemNo: number, ponum, serviceDesc, feeTypeId, serviceTypeId, qty, fee, remainingQty) { - this.newPODetail.push({ - 'lineItemNo': lineItemNo, - 'poNum': ponum, - 'serviceDesc': serviceDesc, - 'feeTypeId': feeTypeId, - 'serviceTypeId': serviceTypeId, - 'qty': qty, - 'fee': fee, - 'remainingQty': remainingQty - }); - } - - updateNewContractAmt() { - let tot = 0; - this.newPODetail.forEach((d) => { - tot += +d.qty * +d.fee; - }); - this.newContractAmount = tot; - } - - updateEditContractAmt() { - let tot = 0; - this.selectedPODetail.forEach((d) => { - tot += +d.qty * +d.fee; - }); - this.editContractAmount = tot; - } - - open(ref) { - this.getSelectedRows(); - ref.open(); - } - - close(ref) { - this.newPODetail = []; - this.selectedPODetail = []; - - ref.close(); - } - - onSelectedCellChange(row: number, col: string, value) { - this.selectedPODetail[row][col] = value; - console.log(this.selectedPODetail); - } - - onNewCellChange(row: number, col: string, value) { - this.newPODetail[row][col] = value; - console.log(this.newPODetail); - } - - getCurrDate() { - const d = new Date(); - return this.formatDate(d); - } - - formatDate(d: Date) { - let month = '' + (d.getMonth() + 1), - day = '' + d.getDate(), - year = d.getFullYear(); - - if (month.length < 2) { - month = '0' + month; - } - if (day.length < 2) { - day = '0' + day; - } - return [year, month, day].join('-'); - } - - getSelectedRows() { - const selectedNodes = this.agGrid.api.getSelectedNodes(); - if (selectedNodes.length) { - this.selected = selectedNodes.map(node => node.data)[0]; - // 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); - this.updateEditContractAmt(); - } else { - alert('get PO detail failed!'); - } - }); - } else { - this.selected = null; - this.selectedPODetail = []; - } - } - - refreshData() { - this.astuteClientService.getCustomers().then((customers) => { - if (customers) { - this.customers = customers; - this.astuteClientService.getPOs().then((data) => { - if (data) { - this.pos = data; - this.rowData = data; - this.rowData.forEach((row) => { - row.customerName = this.getCustomerName(row.customerId); - row.contractAmt = formatCurrency(row.contractAmt, 'en-US', '$', 'USD'); - }); - } - }); - } else { - alert('get Customers Failed!'); - } - }); - // this.rowData = this.astuteClientService.getPOs(); - } - - getCustomerName(customerId) { - let name = ''; - this.customers.forEach((customer) => { - if (customer.customerId === customerId) { - name = customer.customerName; - } - }); - return name; - } -} +import {Component, OnInit, ViewChild} from '@angular/core'; +import {AstuteClientService} from '../services/astute-client-service'; +import {formatCurrency} from "@angular/common"; + +@Component({ + selector: 'app-sales-order', + templateUrl: './sales-order.component.html', + styleUrls: ['./sales-order.component.css'] +}) +export class SalesOrderComponent implements OnInit { + @ViewChild('agGrid') agGrid; + selected = null; + selectedPODetail = []; + newPODetail = []; + newContractAmount = 0; + editContractAmount = 0; + customers; + pos; + serviceTypes; + columnDefs = [ + {headerName: 'Project Number', field: 'astuteProjectNumber'}, + {headerName: 'SO Number', field: 'ponum'}, + // {headerName: 'Customer ID', field: 'customerId'}, + {headerName: 'Customer Name', field: 'customerName'}, + {headerName: 'Contract Number', field: 'contractNum'}, + {headerName: 'SO Title', field: 'title'}, + {headerName: 'Contract Amount', field: 'contractAmt'}, + {headerName: 'SO Date', field: 'podate'}, + {headerName: '# of Invoice', field: 'invoiceSequence'} + ]; + rowData: any; + + constructor(private astuteClientService: AstuteClientService) { + } + + ngOnInit() { + this.refreshData(); + this.astuteClientService.getServiceTypes().then((d) => { + if (d) { + this.serviceTypes = d; + } else { + alert ('get service types failed'); + } + }); + } + + printValue(val) { + console.log(val); + } + + addPo(projNum, ponum, podate, customerid, contractnum, contractamt, title, notes, ref) { + const poData = { + "astuteProjectNumber": projNum, + "poNum": ponum, + "podate": podate, + "customerId": customerid, + "contractNum": contractnum, + "contractAmt": contractamt, + "title": title, + "notes": notes, + } + console.log(poData); + this.astuteClientService.createPO(poData).then((data) => { + if (data) { + this.refreshData(); + this.addPODetail(this.newPODetail); + ref.close(); + } else { + alert("PO Creation failed, check input fields"); + } + }, (reason) => { + alert("add po failed for " + reason); + }); + } + + addPODetail(details) { + if (details.length) { + console.log(details[0]); + this.astuteClientService.createPODetail(details[0]).then((data) => { + if (data) { + details.splice(0, 1); + this.addPODetail(details); + } else { + alert("add detail failed"); + } + }); + } else { + this.newPODetail = []; + } + } + + editPo(projNum, ponum, podate, contractnum, contractamt, title, notes, ref) { + const poData = { + "astuteProjectNumber": projNum, + "poNum": ponum, + "podate": podate, + "contractNum": contractnum, + "contractAmt": contractamt, + "title": title, + "notes": notes, + } + console.log(poData); + this.astuteClientService.updatePO(ponum, poData).then((data) => { + if (data) { + this.refreshData(); + this.editPODetail(this.selectedPODetail); + ref.close(); + } else { + alert("PO updating failed, check input fields"); + } + }, (reason) => { + alert("update po failed for " + reason); + }); + } + + editPODetail(details) { + if (details.length) { + console.log(details[0]); + this.astuteClientService.updatePODetail(details[0].ponum, details[0].lineItemNo, details[0]).then((data) => { + if (data) { + details.splice(0, 1); + this.editPODetail(details); + } else { + alert('add detail failed'); + } + }); + } else { + this.newPODetail = []; + } + } + + pushOntoSelectedDetail(lineItemNo: number, ponum, serviceDesc, feeTypeId, serviceTypeId, qty, fee, remainingQty) { + this.selectedPODetail.push({ + 'lineItemNo': lineItemNo, + 'ponum': ponum, + 'serviceDesc': serviceDesc, + 'feeTypeId': feeTypeId, + 'serviceTypeId': serviceTypeId, + 'qty': qty, + 'fee': fee, + 'remainingQty': remainingQty + }); + } + + pushOntoNewDetail(lineItemNo: number, ponum, serviceDesc, feeTypeId, serviceTypeId, qty, fee, remainingQty) { + this.newPODetail.push({ + 'lineItemNo': lineItemNo, + 'poNum': ponum, + 'serviceDesc': serviceDesc, + 'feeTypeId': feeTypeId, + 'serviceTypeId': serviceTypeId, + 'qty': qty, + 'fee': fee, + 'remainingQty': remainingQty + }); + } + + updateNewContractAmt() { + let tot = 0; + this.newPODetail.forEach((d) => { + tot += +d.qty * +d.fee; + }); + this.newContractAmount = tot; + } + + updateEditContractAmt() { + let tot = 0; + this.selectedPODetail.forEach((d) => { + tot += +d.qty * +d.fee; + }); + this.editContractAmount = tot; + } + + open(ref) { + this.getSelectedRows(); + ref.open(); + } + + close(ref) { + this.newPODetail = []; + this.selectedPODetail = []; + + ref.close(); + } + + onSelectedCellChange(row: number, col: string, value) { + this.selectedPODetail[row][col] = value; + console.log(this.selectedPODetail); + } + + onNewCellChange(row: number, col: string, value) { + this.newPODetail[row][col] = value; + console.log(this.newPODetail); + } + + getCurrDate() { + const d = new Date(); + return this.formatDate(d); + } + + formatDate(d: Date) { + let month = '' + (d.getMonth() + 1), + day = '' + d.getDate(), + year = d.getFullYear(); + + if (month.length < 2) { + month = '0' + month; + } + if (day.length < 2) { + day = '0' + day; + } + return [year, month, day].join('-'); + } + + getSelectedRows() { + const selectedNodes = this.agGrid.api.getSelectedNodes(); + if (selectedNodes.length) { + this.selected = selectedNodes.map(node => node.data)[0]; + // 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); + this.updateEditContractAmt(); + } else { + alert('get PO detail failed!'); + } + }); + } else { + this.selected = null; + this.selectedPODetail = []; + } + } + + refreshData() { + this.astuteClientService.getCustomers().then((customers) => { + if (customers) { + this.customers = customers; + this.astuteClientService.getPOs().then((data) => { + if (data) { + this.pos = data; + this.rowData = data; + this.rowData.forEach((row) => { + row.customerName = this.getCustomerName(row.customerId); + row.contractAmt = formatCurrency(row.contractAmt, 'en-US', '$', 'USD'); + }); + } + }); + } else { + alert('get Customers Failed!'); + } + }); + // this.rowData = this.astuteClientService.getPOs(); + } + + getCustomerName(customerId) { + let name = ''; + this.customers.forEach((customer) => { + if (customer.customerId === customerId) { + name = customer.customerName; + } + }); + return name; + } +} diff --git a/AstuteClient2/src/app/services/astute-client-service.ts b/AstuteClient2/src/app/services/astute-client-service.ts index 4365e4e..b377660 100644 --- a/AstuteClient2/src/app/services/astute-client-service.ts +++ b/AstuteClient2/src/app/services/astute-client-service.ts @@ -1,442 +1,453 @@ -import {HttpClient, HttpHeaders} from '@angular/common/http'; -import {Injectable} from '@angular/core'; - -@Injectable() -export class AstuteClientService { - headers = { - headers: new HttpHeaders().set('Content-Type', 'application/json'), - }; - private authUrl = 'http://localhost:8080/astutesystem/auth'; - private customerUrl = 'http://localhost:8080/astutesystem/customer'; - private POUrl = 'http://localhost:8080/astutesystem/po'; - private POServiceTypesUrl = 'http://localhost:8080/astutesystem/po/serviceTypes'; - private PODetailUrl = 'http://localhost:8080/astutesystem/po/detail'; - private invoiceUrl = 'http://localhost:8080/astutesystem/invoice'; - 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 sessionString = `?sessionId=${this.sessionId}`; - - constructor(private http: HttpClient) { } - - // **************************************** AUTH Service methods - - public login(username: string, password: string): Promise { - const data = { - 'username': username, - 'password': password - }; - - return this.http - .post(this.authUrl, data) - .toPromise() - .then(response => { - console.log(response['entity']); - const name = response['entity'].name; - const sessionId = response['entity'].sessionId; - if (sessionId != null) { - localStorage.setItem('SESSION_ID', sessionId); - localStorage.setItem('SESSION_USER', name); - return sessionId; - } else { - return null; - } - }); - } - - public logout() { - localStorage.removeItem('SESSION_ID'); - localStorage.removeItem('SESSION_USER'); - console.log(localStorage.getItem('SESSION_ID')); - } - - public getSessionId(): string { - console.log(localStorage.getItem('SESSION_ID')); - return localStorage.getItem('SESSION_ID'); - } - - public getSessionUser(): string { - console.log(localStorage.getItem('SESSION_USER')); - return localStorage.getItem('SESSION_USER'); - } - - - // **************************************** Customer Service methods - - public getCustomers(): Promise { - console.log("*** In getCustomers()"); - const url = `${this.customerUrl}${this.sessionString}`; - return this.http.get(url) - .toPromise() - .then(response => { - console.log(response['entity']); - return response['entity']; - }) - .catch( error => { - alert(error); - }); - } - - public updateCustomer(customerId: number, data: any): Promise { - console.log("*** In updateCustomer()"); - const url = `${this.customerUrl}/${customerId}`; //TODO send sessionId - return this.http.put(url, data) - .toPromise() - .then(response => response['entity']); - } - - public createCustomer(data: any): Promise { - console.log("*** In createCustomer()"); - const url = `${this.customerUrl}`; //TODO send sessionId - return this.http.post(url, data) - .toPromise() - .then(response => response['entity']); - } - - // **************************************** PO Service methods - - - public getPOs(): Promise { - console.log("*** In getPOs()"); - const url = `${this.POUrl}`; - return this.http.get(url) - .toPromise() - .then(response => { - console.log(response['entity']); - return response['entity']; - }); - } - - public getServiceTypes(): Promise { - console.log("*** In getPOServiceTypes()"); - const url = `${this.POServiceTypesUrl}`; - return this.http.get(url) - .toPromise() - .then(response => { - console.log(response['entity']); - return response['entity']; - }); - } - - public getPODetail(ponum): Promise { - console.log("*** In getPODetails()"); - const url = `${this.PODetailUrl}?PONum=${ponum}`; - console.log(url); - return this.http.get(url) - .toPromise() - .then(response => { - console.log(response['entity']); - return response['entity']; - }); - } - - public updatePO(ponum: string, data: any): Promise { - console.log("*** In updatePO()"); - const url = `${this.POUrl}/${ponum}`; //TODO send sessionId - return this.http.put(url, data) - .toPromise() - .then(response => response['entity']); - } - - public createPO(data: any): Promise { - console.log("*** In createPO()"); - const url = `${this.POUrl}`; //TODO send sessionId - return this.http.post(url, data) - .toPromise() - .then(response => response['entity']); - } - - // String serviceDesc; - // int feeTypeId; - // Double qty; - // int serviceTypeId; - // String schedule; - // Date deliverBy; - public updatePODetail(ponum, lineItemNo, data) { - console.log("*** In updatePODetail()"); - const sessionId = localStorage.getItem('sessionId'); - const url = `${this.POUrl}/detail/${ponum}/${lineItemNo}`; //TODO send sessionId - return this.http.put(url, data) - .toPromise() - .then(response => response['entity']); - } - - public createPODetail(data) { - console.log("*** In createPODetail()"); - const url = `${this.POUrl}/detail`; //TODO send sessionId - return this.http.post(url, data) - .toPromise() - .then(response => response['entity']); - } - - // **************************************** Invoice Service methods - - // /{InvoiceNumber}/void - public submitInvoice (invoiceNumber) { - console.log("*** In submitInvoice(), invoiceNumber" + invoiceNumber); - const url = `${this.invoiceUrl}/${invoiceNumber}/submit`; - return this.http.put(url, {}) - .toPromise() - .then(response => { - console.log (response['entity']); - return response['entity']; - }); - } - - public voidInvoice (invoiceNumber) { - console.log("*** In voidInvoice(), invoiceNumber" + invoiceNumber); - const url = `${this.invoiceUrl}/${invoiceNumber}/void`; - return this.http.put(url, {}) - .toPromise() - .then(response => { - console.log (response['entity']); - return response['entity']; - }); - } - - public deleteInvoice (invoiceNumber) { - console.log("*** In deleteInvoice(), invoiceNumber" + invoiceNumber); - const url = `${this.invoiceUrl}/${invoiceNumber}/delete`; - return this.http.put(url, {}) - .toPromise() - .then(response => { - console.log (response['entity']); - return response['entity']; - }); - } - - public generateInvoiceNumber (ponum) { - console.log("*** In generateInvoiceNumber()"); - const url = `${this.invoiceUrl}/generateInvoiceNumber/${ponum}`; - return this.http.get(url) - .toPromise() - .then(response => { - console.log (response['entity']) - return response['entity']; - }); - } - - public getInvoices(): Promise { - console.log("*** In getInvoices()"); - const url = `${this.invoiceUrl}`; - return this.http.get(url) - .toPromise() - .then(response => { - console.log(response['entity']); - return response['entity']; - }); - } - - public getInvoiceDetail(invoiceId: string): Promise { - console.log("*** In getInvoiceDetail()"); - const url = `${this.invoiceDetailUrl}?invoiceNumber=${invoiceId}`; - return this.http.get(url) - .toPromise() - .then(response => { - console.log(response['entity']); - return response['entity']; - }); - } - - public getInvoiceGen (invoiceId: string): Promise { - console.log("*** In getInvoiceGen()"); - const url = `${this.invoiceGenUrl}/${invoiceId}`; - return this.http.get(url) - .toPromise() - .then(response => { - console.log(response['entity']); - return response['entity']; - }); - } - - public updateInvoice(invoiceNumber: string, data: any): Promise { - console.log("*** In updateInvoice()"); - const url = `${this.invoiceUrl}/${invoiceNumber}`; //TODO send sessionId - return this.http.put(url, data) - .toPromise() - .then(response => response['entity']); - } - - public createInvoice(data: any): Promise { - console.log("*** In createInvoice()"); - const url = `${this.invoiceUrl}`; //TODO send sessionId - return this.http.post(url, data) - .toPromise() - .then(response => response['entity']); - } - - public updateInvoiceDetail(invNum, lineItemNo, data) { - console.log("*** In updateInvoiceDetail()"); - const url = `${this.invoiceUrl}/detail/${invNum}/${lineItemNo}`; //TODO send sessionId - return this.http.put(url, data) - .toPromise() - .then(response => response['entity']); - } - - public createInvoiceDetail(data) { - console.log("*** In createInvoiceDetail()"); - const url = `${this.invoiceUrl}/detail`; //TODO send sessionId - return this.http.post(url, data) - .toPromise() - .then(response => response['entity']); - } - - - // **************************************** Invoice Payment Service methods - - public getSumittedInvoices(): Promise { - console.log("*** In getSumittedInvoices()"); - const url = `${this.invoiceUrl}/submitted`; - return this.http.get(url) - .toPromise() - .then(response => { - console.log(response['entity']); - return response['entity']; - }); - } - - public getInvoiceTypes(): Promise { - const url = `${this.invoicePaymentUrl}/paymentTypes`; - console.log("*** In getInvoiceTypes() ... calling " + url); - return this.http.get(url) - .toPromise() - .then(response => { - console.log(response['entity']); - return response['entity']; - }); - } - - public getInvoicePayments(): Promise { - console.log("*** In getInvoicePayments()"); - const url = `${this.invoicePaymentUrl}`; - return this.http.get(url) - .toPromise() - .then(response => { - console.log(response['entity']); - return response['entity']; - }); - } - - public updateInvoicePayment(invoiceNumber: string, invoicePaymentId: string, data: any): Promise { - console.log("*** In updateInvoicePayment()"); - const url = `${this.invoicePaymentUrl}/${invoiceNumber}/${invoicePaymentId}`; //TODO send sessionId - console.log("*** invoicePaymentUrl is " + url); - return this.http.put(url, data) - .toPromise() - .then(response => response['entity']); - } - - public addInvoicePayment(data: any): Promise { - console.log("*** In addInvoicePayment()"); - const url = `${this.invoicePaymentUrl}`; //TODO send sessionId - return this.http.post(url, data) - .toPromise() - .then(response => response['entity']); - } - - // public getRecord(patientId: number): Promise { - // const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`; - // return this.http.get(url) - // .toPromise() - // .then(response => { - // console.log(response); - // }); - // } - // - // public getInfo(patientId: number): Promise { - // const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`; - // return this.http.get(url) - // .toPromise() - // .then(response => { - // return response['entity']; - // }); - // } - // - // public getVisits(patientId: number): Promise { - // const url = `${this.recordsUrl}/${patientId}/visits?sessionId=${this.getSessionId()}`; - // return this.http.get(url) - // .toPromise() - // .then(response => { - // return response['entity']; - // }); - // } - // - // public getAllVisits(): Promise { - // const url = `${this.recordsUrl}/visits?sessionId=${this.getSessionId()}`; - // return this.http.get(url) - // .toPromise() - // .then(response => { - // return response['entity']; - // }); - // } - // - // public getVitals(visitId: number): Promise { - // const url = `${this.visitsUrl}/${visitId}/vitals?sessionId=${this.getSessionId()}`; - // return this.http.get(url) - // .toPromise() - // .then(response => { - // return response['entity']; - // }); - // } - // - // public getLatestVitals(patientId: number): Promise { - // const url = `${this.recordsUrl}/${patientId}/vitals?sessionId=${this.getSessionId()}`; - // return this.http.get(url) - // .toPromise() - // .then(response => { - // return response['entity']; - // }); - // } - // - // public updateInfo(patientId: number, data: any): Promise { - // const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`; - // return this.http.put(url, data) - // .toPromise() - // .then(response => response['entity']); - // } - // public updateVisit(patientId: number, visit: any): Promise { - // console.log(visit); - // - // const url = `${this.recordsUrl}/${patientId}/visits/${visit.visitId}?sessionId=${this.getSessionId()}`; - // return this.http.put(url, visit) - // .toPromise() - // .then(response => { - // console.log(response['entity']); - // return response['entity']; - // }); - // } - // - // public getSessionPatientId(): Promise { - // const url = `${this.sessionsUrl}/${this.getSessionId()}`; - // console.log(url); - // return this.http.get(url) - // .toPromise() - // .then(response => { - // console.log(response); - // return response['entity'].patientId; - // }); - // } - // - // public startVisit(patientId: number): Promise { - // const url = `${this.recordsUrl}/${patientId}/visits?${this.getSessionId()}`; - // return this.http.post(url, null) - // .toPromise() - // .then(response => { - // console.log(response); - // return response['entity']; - // }); - // } - // - // getMedications() { - // const url = `${this.medsUrl}?${this.getSessionId()}`; - // return this.http.get(url) - // .toPromise() - // .then(response => { - // console.log(response); - // return response['entity']; - // }); - // } - - -} +import {HttpClient, HttpHeaders} from '@angular/common/http'; +import {Injectable} from '@angular/core'; + +@Injectable() +export class AstuteClientService { + headers = { + headers: new HttpHeaders().set('Content-Type', 'application/json'), + }; + private authUrl = 'http://localhost:8080/astutesystem/auth'; + private customerUrl = 'http://localhost:8080/astutesystem/customer'; + private POUrl = 'http://localhost:8080/astutesystem/po'; + private POServiceTypesUrl = 'http://localhost:8080/astutesystem/po/serviceTypes'; + private PODetailUrl = 'http://localhost:8080/astutesystem/po/detail'; + private invoiceUrl = 'http://localhost:8080/astutesystem/invoice'; + 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 sessionString = `?sessionId=${this.sessionId}`; + + constructor(private http: HttpClient) { } + + // **************************************** AUTH Service methods + + public login(username: string, password: string): Promise { + const data = { + 'username': username, + 'password': password + }; + + return this.http + .post(this.authUrl, data) + .toPromise() + .then(response => { + console.log(response['entity']); + const name = response['entity'].name; + const sessionId = response['entity'].sessionId; + if (sessionId != null) { + localStorage.setItem('SESSION_ID', sessionId); + localStorage.setItem('SESSION_USER', name); + return sessionId; + } else { + return null; + } + }); + } + + public logout() { + localStorage.removeItem('SESSION_ID'); + localStorage.removeItem('SESSION_USER'); + console.log(localStorage.getItem('SESSION_ID')); + } + + public getSessionId(): string { + console.log(localStorage.getItem('SESSION_ID')); + return localStorage.getItem('SESSION_ID'); + } + + public getSessionUser(): string { + console.log(localStorage.getItem('SESSION_USER')); + return localStorage.getItem('SESSION_USER'); + } + + + // **************************************** Customer Service methods + + public getCustomers(): Promise { + console.log("*** In getCustomers()"); + const url = `${this.customerUrl}${this.sessionString}`; + return this.http.get(url) + .toPromise() + .then(response => { + console.log(response['entity']); + return response['entity']; + }) + .catch( error => { + alert(error); + }); + } + + public updateCustomer(customerId: number, data: any): Promise { + console.log("*** In updateCustomer()"); + const url = `${this.customerUrl}/${customerId}`; //TODO send sessionId + return this.http.put(url, data) + .toPromise() + .then(response => response['entity']); + } + + public createCustomer(data: any): Promise { + console.log("*** In createCustomer()"); + const url = `${this.customerUrl}`; //TODO send sessionId + return this.http.post(url, data) + .toPromise() + .then(response => response['entity']); + } + + public deleteCustomer(customerId) { + console.log("*** In deleteCustomer()"); + const url = `${this.customerUrl}/${customerId}/delete`; + return this.http.put(url, {}) + .toPromise() + .then(response => { + console.log (response['entity']); + return response['entity']; + }); + } + + // **************************************** PO Service methods + + + public getPOs(): Promise { + console.log("*** In getPOs()"); + const url = `${this.POUrl}`; + return this.http.get(url) + .toPromise() + .then(response => { + console.log(response['entity']); + return response['entity']; + }); + } + + public getServiceTypes(): Promise { + console.log("*** In getPOServiceTypes()"); + const url = `${this.POServiceTypesUrl}`; + return this.http.get(url) + .toPromise() + .then(response => { + console.log(response['entity']); + return response['entity']; + }); + } + + public getPODetail(ponum): Promise { + console.log("*** In getPODetails()"); + const url = `${this.PODetailUrl}?PONum=${ponum}`; + console.log(url); + return this.http.get(url) + .toPromise() + .then(response => { + console.log(response['entity']); + return response['entity']; + }); + } + + public updatePO(ponum: string, data: any): Promise { + console.log("*** In updatePO()"); + const url = `${this.POUrl}/${ponum}`; //TODO send sessionId + return this.http.put(url, data) + .toPromise() + .then(response => response['entity']); + } + + public createPO(data: any): Promise { + console.log("*** In createPO()"); + const url = `${this.POUrl}`; //TODO send sessionId + return this.http.post(url, data) + .toPromise() + .then(response => response['entity']); + } + + // String serviceDesc; + // int feeTypeId; + // Double qty; + // int serviceTypeId; + // String schedule; + // Date deliverBy; + public updatePODetail(ponum, lineItemNo, data) { + console.log("*** In updatePODetail()"); + const sessionId = localStorage.getItem('sessionId'); + const url = `${this.POUrl}/detail/${ponum}/${lineItemNo}`; //TODO send sessionId + return this.http.put(url, data) + .toPromise() + .then(response => response['entity']); + } + + public createPODetail(data) { + console.log("*** In createPODetail()"); + const url = `${this.POUrl}/detail`; //TODO send sessionId + return this.http.post(url, data) + .toPromise() + .then(response => response['entity']); + } + + // **************************************** Invoice Service methods + + // /{InvoiceNumber}/void + public submitInvoice (invoiceNumber) { + console.log("*** In submitInvoice(), invoiceNumber" + invoiceNumber); + const url = `${this.invoiceUrl}/${invoiceNumber}/submit`; + return this.http.put(url, {}) + .toPromise() + .then(response => { + console.log (response['entity']); + return response['entity']; + }); + } + + public voidInvoice (invoiceNumber) { + console.log("*** In voidInvoice(), invoiceNumber" + invoiceNumber); + const url = `${this.invoiceUrl}/${invoiceNumber}/void`; + return this.http.put(url, {}) + .toPromise() + .then(response => { + console.log (response['entity']); + return response['entity']; + }); + } + + public deleteInvoice (invoiceNumber) { + console.log("*** In deleteInvoice(), invoiceNumber" + invoiceNumber); + const url = `${this.invoiceUrl}/${invoiceNumber}/delete`; + return this.http.put(url, {}) + .toPromise() + .then(response => { + console.log (response['entity']); + return response['entity']; + }); + } + + public generateInvoiceNumber (ponum) { + console.log("*** In generateInvoiceNumber()"); + const url = `${this.invoiceUrl}/generateInvoiceNumber/${ponum}`; + return this.http.get(url) + .toPromise() + .then(response => { + console.log (response['entity']) + return response['entity']; + }); + } + + public getInvoices(): Promise { + console.log("*** In getInvoices()"); + const url = `${this.invoiceUrl}`; + return this.http.get(url) + .toPromise() + .then(response => { + console.log(response['entity']); + return response['entity']; + }); + } + + public getInvoiceDetail(invoiceId: string): Promise { + console.log("*** In getInvoiceDetail()"); + const url = `${this.invoiceDetailUrl}?invoiceNumber=${invoiceId}`; + return this.http.get(url) + .toPromise() + .then(response => { + console.log(response['entity']); + return response['entity']; + }); + } + + public getInvoiceGen (invoiceId: string): Promise { + console.log("*** In getInvoiceGen()"); + const url = `${this.invoiceGenUrl}/${invoiceId}`; + return this.http.get(url) + .toPromise() + .then(response => { + console.log(response['entity']); + return response['entity']; + }); + } + + public updateInvoice(invoiceNumber: string, data: any): Promise { + console.log("*** In updateInvoice()"); + const url = `${this.invoiceUrl}/${invoiceNumber}`; //TODO send sessionId + return this.http.put(url, data) + .toPromise() + .then(response => response['entity']); + } + + public createInvoice(data: any): Promise { + console.log("*** In createInvoice()"); + const url = `${this.invoiceUrl}`; //TODO send sessionId + return this.http.post(url, data) + .toPromise() + .then(response => response['entity']); + } + + public updateInvoiceDetail(invNum, lineItemNo, data) { + console.log("*** In updateInvoiceDetail()"); + const url = `${this.invoiceUrl}/detail/${invNum}/${lineItemNo}`; //TODO send sessionId + return this.http.put(url, data) + .toPromise() + .then(response => response['entity']); + } + + public createInvoiceDetail(data) { + console.log("*** In createInvoiceDetail()"); + const url = `${this.invoiceUrl}/detail`; //TODO send sessionId + return this.http.post(url, data) + .toPromise() + .then(response => response['entity']); + } + + + // **************************************** Invoice Payment Service methods + + public getSumittedInvoices(): Promise { + console.log("*** In getSumittedInvoices()"); + const url = `${this.invoiceUrl}/submitted`; + return this.http.get(url) + .toPromise() + .then(response => { + console.log(response['entity']); + return response['entity']; + }); + } + + public getInvoiceTypes(): Promise { + const url = `${this.invoicePaymentUrl}/paymentTypes`; + console.log("*** In getInvoiceTypes() ... calling " + url); + return this.http.get(url) + .toPromise() + .then(response => { + console.log(response['entity']); + return response['entity']; + }); + } + + public getInvoicePayments(): Promise { + console.log("*** In getInvoicePayments()"); + const url = `${this.invoicePaymentUrl}`; + return this.http.get(url) + .toPromise() + .then(response => { + console.log(response['entity']); + return response['entity']; + }); + } + + public updateInvoicePayment(invoiceNumber: string, invoicePaymentId: string, data: any): Promise { + console.log("*** In updateInvoicePayment()"); + const url = `${this.invoicePaymentUrl}/${invoiceNumber}/${invoicePaymentId}`; //TODO send sessionId + console.log("*** invoicePaymentUrl is " + url); + return this.http.put(url, data) + .toPromise() + .then(response => response['entity']); + } + + public addInvoicePayment(data: any): Promise { + console.log("*** In addInvoicePayment()"); + const url = `${this.invoicePaymentUrl}`; //TODO send sessionId + return this.http.post(url, data) + .toPromise() + .then(response => response['entity']); + } + + // public getRecord(patientId: number): Promise { + // const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`; + // return this.http.get(url) + // .toPromise() + // .then(response => { + // console.log(response); + // }); + // } + // + // public getInfo(patientId: number): Promise { + // const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`; + // return this.http.get(url) + // .toPromise() + // .then(response => { + // return response['entity']; + // }); + // } + // + // public getVisits(patientId: number): Promise { + // const url = `${this.recordsUrl}/${patientId}/visits?sessionId=${this.getSessionId()}`; + // return this.http.get(url) + // .toPromise() + // .then(response => { + // return response['entity']; + // }); + // } + // + // public getAllVisits(): Promise { + // const url = `${this.recordsUrl}/visits?sessionId=${this.getSessionId()}`; + // return this.http.get(url) + // .toPromise() + // .then(response => { + // return response['entity']; + // }); + // } + // + // public getVitals(visitId: number): Promise { + // const url = `${this.visitsUrl}/${visitId}/vitals?sessionId=${this.getSessionId()}`; + // return this.http.get(url) + // .toPromise() + // .then(response => { + // return response['entity']; + // }); + // } + // + // public getLatestVitals(patientId: number): Promise { + // const url = `${this.recordsUrl}/${patientId}/vitals?sessionId=${this.getSessionId()}`; + // return this.http.get(url) + // .toPromise() + // .then(response => { + // return response['entity']; + // }); + // } + // + // public updateInfo(patientId: number, data: any): Promise { + // const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`; + // return this.http.put(url, data) + // .toPromise() + // .then(response => response['entity']); + // } + // public updateVisit(patientId: number, visit: any): Promise { + // console.log(visit); + // + // const url = `${this.recordsUrl}/${patientId}/visits/${visit.visitId}?sessionId=${this.getSessionId()}`; + // return this.http.put(url, visit) + // .toPromise() + // .then(response => { + // console.log(response['entity']); + // return response['entity']; + // }); + // } + // + // public getSessionPatientId(): Promise { + // const url = `${this.sessionsUrl}/${this.getSessionId()}`; + // console.log(url); + // return this.http.get(url) + // .toPromise() + // .then(response => { + // console.log(response); + // return response['entity'].patientId; + // }); + // } + // + // public startVisit(patientId: number): Promise { + // const url = `${this.recordsUrl}/${patientId}/visits?${this.getSessionId()}`; + // return this.http.post(url, null) + // .toPromise() + // .then(response => { + // console.log(response); + // return response['entity']; + // }); + // } + // + // getMedications() { + // const url = `${this.medsUrl}?${this.getSessionId()}`; + // return this.http.get(url) + // .toPromise() + // .then(response => { + // console.log(response); + // return response['entity']; + // }); + // } + + +} diff --git a/AstuteSystem/src/main/java/com/astute/dao/DAO.java b/AstuteSystem/src/main/java/com/astute/dao/DAO.java index 92a9c9c..9034a51 100644 --- a/AstuteSystem/src/main/java/com/astute/dao/DAO.java +++ b/AstuteSystem/src/main/java/com/astute/dao/DAO.java @@ -97,11 +97,11 @@ public abstract class DAO { public abstract List getPODetail(String PONum, int lineItemNo) throws AstuteException; - public abstract void updatePOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String astuteProjectNumber, String title) throws AstuteException; + public abstract void updatePOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String astuteProjectNumber, String title, String notes) throws AstuteException; public abstract void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) throws AstuteException; - public abstract void createPOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String customerId, String astuteProjectNumber, String title) throws AstuteException, ParseException; + public abstract void createPOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String customerId, String astuteProjectNumber, String title, String notes) throws AstuteException, ParseException; public abstract void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) throws AstuteException; @@ -138,9 +138,11 @@ public abstract class DAO { public abstract Customer getCustomer(String poNumber) throws AstuteException; - public abstract String createCustomer(String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, String fax) throws AstuteException; + public abstract String createCustomer(String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, int phExt, String fax) throws AstuteException; - public abstract void updateCustomer(String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, String fax) throws AstuteException; + public abstract void updateCustomer(String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, int phExt, String fax) throws AstuteException; + + public abstract void deleteCustomer(String customerId) throws AstuteException; public abstract List getPaymentStatuses() throws AstuteException; diff --git a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java index 3e1dd0e..7664169 100644 --- a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java +++ b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java @@ -42,7 +42,7 @@ public class SqlDAO extends DAO { try { List pos = new ArrayList<>(); Statement stmt = conn.createStatement(); - String sql = "SELECT PO_num, contract_num, PO_date, customer_id, contract_amt, astute_project_num , title, get_previously_billed_amt(PO_num), inv_seq FROM PO "; + String sql = "SELECT PO_num, contract_num, PO_date, customer_id, contract_amt, astute_project_num , title, get_previously_billed_amt(PO_num), inv_seq, notes FROM PO "; if (PONum != null && !PONum.isEmpty()) { sql += "WHERE UPPER(PO_num) = '" + PONum.toUpperCase() + "'"; } else if (contractNum != null && !contractNum.isEmpty()) { @@ -64,12 +64,13 @@ public class SqlDAO extends DAO { String title = rs.getString(7); Double previouslyBilledAmount = rs.getDouble(8); int invoiceSequence = rs.getInt(8); + String notes = rs.getString(9); String date = null; if (poDate != null) { SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); date = formatter.format(poDate); } - PO po = new PO(poNum, cntrctNum, date, customerId, contractAmt,astuteProjectNum,title,previouslyBilledAmount,invoiceSequence); + PO po = new PO(poNum, cntrctNum, date, customerId, contractAmt,astuteProjectNum,title,previouslyBilledAmount,invoiceSequence, notes); pos.add(po); } return pos; @@ -118,7 +119,7 @@ public class SqlDAO extends DAO { } } - public void updatePOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String astuteProjectNumber, String title) throws AstuteException { + public void updatePOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String astuteProjectNumber, String title, String notes) throws AstuteException { try { System.out.println("PODate in SQLDAO is "+ PODate); @@ -136,6 +137,7 @@ public class SqlDAO extends DAO { updateClause = updateClause + " contract_amt = " + contractAmt+ ","; updateClause = updateClause + " astute_project_num = '" + astuteProjectNumber +"',"; updateClause = updateClause + " title = '" + title +"'"; + updateClause = updateClause + " notes = '" + notes +"'"; sql = sql+ updateClause + whereClause; System.out.println(sql); Statement stmt = conn.createStatement(); @@ -197,7 +199,7 @@ public class SqlDAO extends DAO { } } - public void createPOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String customerId, String astuteProjectNumber, String title) throws AstuteException, ParseException { + public void createPOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String customerId, String astuteProjectNumber, String title, String notes) throws AstuteException, ParseException { try { java.util.Date date = null; java.sql.Date poDate = null; @@ -205,7 +207,7 @@ public class SqlDAO extends DAO { date = new SimpleDateFormat("yyyy-MM-dd").parse(PODate); poDate = new java.sql.Date(date.getTime()); } - CallableStatement stmt = conn.prepareCall("{call create_PO(?,?,?,?,?,?,?)}"); + CallableStatement stmt = conn.prepareCall("{call create_PO(?,?,?,?,?,?,?,?)}"); stmt.setString(1, PONum); stmt.setString(2, contractNum); stmt.setDate(3, poDate); @@ -213,6 +215,7 @@ public class SqlDAO extends DAO { stmt.setString(5, customerId); stmt.setString(6, astuteProjectNumber); stmt.setString(7, title); + stmt.setString(8, notes); stmt.executeUpdate(); } catch (SQLException e) { e.printStackTrace(); @@ -648,7 +651,7 @@ public class SqlDAO extends DAO { try { List customers = new ArrayList<>(); Statement stmt = conn.createStatement(); - String sql = "SELECT customer_id, customer_name, bill_to_dept, add1, add2, city, state ,zip, zip_last_4, email, phone, fax FROM customer "; + String sql = "SELECT customer_id, customer_name, bill_to_dept, add1, add2, city, state ,zip, zip_last_4, email, phone, phext, fax FROM customer "; if (customerId!=null && !customerId.isEmpty()) { sql += " WHERE customer_id = '" + customerId + "'"; } @@ -665,8 +668,9 @@ public class SqlDAO extends DAO { int ziplast4 = rs.getInt(9); String email = rs.getString(10); String phone = rs.getString(11); - String fax = rs.getString(12); - Customer customer = new Customer(customerID, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax); + int phExt = rs.getInt(12); + String fax = rs.getString(13); + Customer customer = new Customer(customerID, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, phExt, fax); customers.add(customer); } return customers; @@ -700,9 +704,9 @@ public class SqlDAO extends DAO { } - public String createCustomer(String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, String fax) throws AstuteException { + public String createCustomer(String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, int phExt, String fax) throws AstuteException { try { - CallableStatement stmt = conn.prepareCall("{? = call create_customer_fun(?,?,?,?,?,?,?,?,?,?,?,?)}"); + CallableStatement stmt = conn.prepareCall("{? = call create_customer_fun(?,?,?,?,?,?,?,?,?,?,?,?,?)}"); stmt.registerOutParameter(1, Types.INTEGER); stmt.setString(2, customerId); stmt.setString(3, customerName); @@ -715,7 +719,8 @@ public class SqlDAO extends DAO { stmt.setInt(10, ziplast4); stmt.setString(11, email); stmt.setString(12, phone); - stmt.setString(13, fax); + stmt.setInt(13, phExt); + stmt.setString(14, fax); stmt.executeUpdate(); String customerIdOut = stmt.getString(1); return customerIdOut; @@ -725,7 +730,7 @@ public class SqlDAO extends DAO { } } public void updateCustomer( String customerId, String customerName, String billToDept, String add1, String - add2, String city, String state, int zip, int ziplast4, String email,String phone, String fax) throws + add2, String city, String state, int zip, int ziplast4, String email,String phone, int phExt, String fax) throws AstuteException { try { String sql = "UPDATE CUSTOMER "; @@ -747,6 +752,7 @@ public class SqlDAO extends DAO { updateClause = updateClause + " zip_last_4 = " + ziplast4 + ","; updateClause = updateClause + " email = '" + email + "',"; updateClause = updateClause + " phone = '" + phone + "',"; + updateClause = updateClause + " phext = " + phExt + ","; updateClause = updateClause + " fax = '" + fax + "',"; if (!updateClause.equalsIgnoreCase(" SET ")) { sql = sql + trimLastCharacter(updateClause, ",") + whereClause; @@ -763,6 +769,25 @@ public class SqlDAO extends DAO { throw new AstuteException(DB_ERROR,e.getMessage()); } } + + public void deleteCustomer(String customerId) throws AstuteException { + String result = ""; + try { + System.out.println("Calling delete_customer DB function"); + CallableStatement stmt = conn.prepareCall("{? = call delete_customer(?)}"); + stmt.registerOutParameter(1, Types.VARCHAR); + stmt.setString(2, customerId); + stmt.executeUpdate(); + result = stmt.getString(1); + System.out.println(result); + if (!result.equals("SUCCESS")) { + throw new AstuteException(DB_ERROR, result); + } + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR, e.getMessage()); + } + } /* =============================== User/Session Methods =============================================== */ diff --git a/AstuteSystem/src/main/java/com/astute/model/Customer.java b/AstuteSystem/src/main/java/com/astute/model/Customer.java index 614c058..c11ecc6 100644 --- a/AstuteSystem/src/main/java/com/astute/model/Customer.java +++ b/AstuteSystem/src/main/java/com/astute/model/Customer.java @@ -1,129 +1,140 @@ -package com.astute.model; - -import java.util.Date; - -public class Customer { - String customerId; - String customerName; - String billToDept; - String add1; - String add2; - String city; - String state; - int zip; - int ziplast4; - String email; - String phone; - String fax; - - public Customer(String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, String fax) { - this.customerId = customerId; - this.customerName = customerName; - this.billToDept = billToDept; - this.add1 = add1; - this.add2 = add2; - this.city = city; - this.state = state; - this.zip = zip; - this.ziplast4 = ziplast4; - this.email = email; - this.phone = phone; - this.fax = fax; - } - - public String getCustomerId() { - return customerId; - } - - public void setCustomerId(String customerId) { - this.customerId = customerId; - } - - public String getCustomerName() { - return customerName; - } - - public void setCustomerName(String customerName) { - this.customerName = customerName; - } - - public String getBillToDept() { - return billToDept; - } - - public void setBillToDept(String billToDept) { - this.billToDept = billToDept; - } - - public String getAdd1() { - return add1; - } - - public void setAdd1(String add1) { - this.add1 = add1; - } - - public String getAdd2() { - return add2; - } - - public void setAdd2(String add2) { - this.add2 = add2; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public int getZip() { - return zip; - } - - public void setZip(int zip) { - this.zip = zip; - } - - public int getZiplast4() { - return ziplast4; - } - - public void setZiplast4(int ziplast4) { - this.ziplast4 = ziplast4; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getFax() { - return fax; - } - - public void setFax(String fax) { - this.fax = fax; - } -} +package com.astute.model; + +import java.util.Date; + +public class Customer { + String customerId; + String customerName; + String billToDept; + String add1; + String add2; + String city; + String state; + int zip; + int ziplast4; + String email; + String phone; + int phExt; + String fax; + + public Customer(String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, int phExt, String fax) { + this.customerId = customerId; + this.customerName = customerName; + this.billToDept = billToDept; + this.add1 = add1; + this.add2 = add2; + this.city = city; + this.state = state; + this.zip = zip; + this.ziplast4 = ziplast4; + this.email = email; + this.phone = phone; + this.phExt = phExt; + this.fax = fax; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getBillToDept() { + return billToDept; + } + + public void setBillToDept(String billToDept) { + this.billToDept = billToDept; + } + + public String getAdd1() { + return add1; + } + + public void setAdd1(String add1) { + this.add1 = add1; + } + + public String getAdd2() { + return add2; + } + + public void setAdd2(String add2) { + this.add2 = add2; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public int getZip() { + return zip; + } + + public void setZip(int zip) { + this.zip = zip; + } + + public int getZiplast4() { + return ziplast4; + } + + public void setZiplast4(int ziplast4) { + this.ziplast4 = ziplast4; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getFax() { + return fax; + } + + public int getPhExt() { + return phExt; + } + + public void setPhExt(int phExt) { + this.phExt = phExt; + } + + public void setFax(String fax) { + this.fax = fax; + } + +} diff --git a/AstuteSystem/src/main/java/com/astute/model/PO.java b/AstuteSystem/src/main/java/com/astute/model/PO.java index 2833e8b..621773e 100644 --- a/AstuteSystem/src/main/java/com/astute/model/PO.java +++ b/AstuteSystem/src/main/java/com/astute/model/PO.java @@ -14,8 +14,9 @@ public class PO implements Serializable{ private String title; private Double previouslyBilledAmount; private int invoiceSequence; + private String notes; - public PO(String PONum, String contractNum, String PODate, String customerId, Double contractAmt, String astuteProjectNum, String title, Double previouslyBilledAmount, int invoiceSequence) { + public PO(String PONum, String contractNum, String PODate, String customerId, Double contractAmt, String astuteProjectNum, String title, Double previouslyBilledAmount, int invoiceSequence, String notes) { this.PONum = PONum; this.contractNum = contractNum; this.PODate = PODate; @@ -25,6 +26,7 @@ public class PO implements Serializable{ this.title = title; this.previouslyBilledAmount = previouslyBilledAmount; this.invoiceSequence = invoiceSequence; + this.notes = notes; } private String PONum; @@ -100,4 +102,12 @@ public class PO implements Serializable{ public void setInvoiceSequence(int invoiceSequence) { this.invoiceSequence = invoiceSequence; } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } } \ No newline at end of file diff --git a/AstuteSystem/src/main/java/com/astute/requests/CustomerRequest.java b/AstuteSystem/src/main/java/com/astute/requests/CustomerRequest.java index 9a2df84..cc4491c 100644 --- a/AstuteSystem/src/main/java/com/astute/requests/CustomerRequest.java +++ b/AstuteSystem/src/main/java/com/astute/requests/CustomerRequest.java @@ -1,114 +1,123 @@ -package com.astute.requests; - -import java.sql.Date; - -public class CustomerRequest { - String customerId; - String customerName; - String billToDept; - String add1; - String add2; - String city; - String state; - int zip; - int ziplast4; - String email; - String phone; - String fax; - - public String getCustomerId() { - return customerId; - } - - public void setCustomerId(String customerId) { - this.customerId = customerId; - } - - public String getCustomerName() { - return customerName; - } - - public void setCustomerName(String customerName) { - this.customerName = customerName; - } - - public String getBillToDept() { - return billToDept; - } - - public void setBillToDept(String billToDept) { - this.billToDept = billToDept; - } - - public String getAdd1() { - return add1; - } - - public void setAdd1(String add1) { - this.add1 = add1; - } - - public String getAdd2() { - return add2; - } - - public void setAdd2(String add2) { - this.add2 = add2; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public int getZip() { - return zip; - } - - public void setZip(int zip) { - this.zip = zip; - } - - public int getZiplast4() { - return ziplast4; - } - - public void setZiplast4(int ziplast4) { - this.ziplast4 = ziplast4; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getFax() { - return fax; - } - - public void setFax(String fax) { - this.fax = fax; - } -} +package com.astute.requests; + +import java.sql.Date; + +public class CustomerRequest { + String customerId; + String customerName; + String billToDept; + String add1; + String add2; + String city; + String state; + int zip; + int ziplast4; + String email; + String phone; + int phExt; + String fax; + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getBillToDept() { + return billToDept; + } + + public void setBillToDept(String billToDept) { + this.billToDept = billToDept; + } + + public String getAdd1() { + return add1; + } + + public void setAdd1(String add1) { + this.add1 = add1; + } + + public String getAdd2() { + return add2; + } + + public void setAdd2(String add2) { + this.add2 = add2; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public int getZip() { + return zip; + } + + public void setZip(int zip) { + this.zip = zip; + } + + public int getZiplast4() { + return ziplast4; + } + + public void setZiplast4(int ziplast4) { + this.ziplast4 = ziplast4; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public int getPhExt() { + return phExt; + } + + public void setPhExt(int phExt) { + this.phExt = phExt; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } +} diff --git a/AstuteSystem/src/main/java/com/astute/requests/POMasterRequest.java b/AstuteSystem/src/main/java/com/astute/requests/POMasterRequest.java index 10c4660..38a4dcb 100644 --- a/AstuteSystem/src/main/java/com/astute/requests/POMasterRequest.java +++ b/AstuteSystem/src/main/java/com/astute/requests/POMasterRequest.java @@ -11,6 +11,7 @@ public class POMasterRequest { String customerId; String astuteProjectNumber; String title; + String notes; public String getPoNum() { return poNum; @@ -67,4 +68,12 @@ public class POMasterRequest { public void setTitle(String title) { this.title = title; } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } } diff --git a/AstuteSystem/src/main/java/com/astute/resources/CustomerResource.java b/AstuteSystem/src/main/java/com/astute/resources/CustomerResource.java index 9381c7f..fe93b67 100644 --- a/AstuteSystem/src/main/java/com/astute/resources/CustomerResource.java +++ b/AstuteSystem/src/main/java/com/astute/resources/CustomerResource.java @@ -1,57 +1,66 @@ -package com.astute.resources; - -import com.astute.exceptions.AstuteException; -import com.astute.requests.CustomerRequest; -import com.astute.response.ApiResponse; -import com.astute.service.AuthService; -import com.astute.service.CustomerService; - -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import java.sql.SQLException; - -@Path("/customer") -@Consumes(MediaType.APPLICATION_JSON) -@Produces(MediaType.APPLICATION_JSON) -public class CustomerResource { - - private com.astute.service.CustomerService service = new CustomerService(); - private com.astute.service.AuthService authService = new AuthService(); - - public CustomerResource() { - } - - @GET - public Response getCustomers(@QueryParam("customerId") String customerId) - throws AstuteException { - // TODO , @QueryParam("sessionId") String sessionId -// authService.getUser(sessionId); - return new ApiResponse(service.getCustomers(customerId)).toResponse(); - } - - @Path("/{poNumber}") - @GET - public Response getCustomer(@PathParam("poNumber") String poNumber) - throws AstuteException { - return new ApiResponse(service.getCustomer(poNumber)).toResponse(); - } - - @Path("/{customerId}") - @PUT - public Response updateCustomer(@PathParam("customerId") String customerId, CustomerRequest request) - throws AstuteException { - System.out.println("in updateCustomer()"); - service.updateCustomer(customerId, request.getCustomerName(), request.getBillToDept(), request.getAdd1(), - request.getAdd2(), request.getCity(), request.getState(), request.getZip(), request.getZiplast4(), request.getEmail(), request.getPhone(), request.getFax()); - return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); - } - - @POST - public Response createCustomer(CustomerRequest request) - throws AstuteException { - System.out.println("in AstuteSyste createCustomer()"); - return new ApiResponse(service.createCustomer(request.getCustomerId(), request.getCustomerName(), request.getBillToDept(), request.getAdd1(), - request.getAdd2(), request.getCity(), request.getState(), request.getZip(), request.getZiplast4(), request.getEmail(), request.getPhone(), request.getFax())).toResponse(); - } -} +package com.astute.resources; + +import com.astute.exceptions.AstuteException; +import com.astute.requests.CustomerRequest; +import com.astute.response.ApiResponse; +import com.astute.service.AuthService; +import com.astute.service.CustomerService; + +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import java.sql.SQLException; + +@Path("/customer") +@Consumes(MediaType.APPLICATION_JSON) +@Produces(MediaType.APPLICATION_JSON) +public class CustomerResource { + + private com.astute.service.CustomerService service = new CustomerService(); + private com.astute.service.AuthService authService = new AuthService(); + + public CustomerResource() { + } + + @GET + public Response getCustomers(@QueryParam("customerId") String customerId) + throws AstuteException { + // TODO , @QueryParam("sessionId") String sessionId +// authService.getUser(sessionId); + return new ApiResponse(service.getCustomers(customerId)).toResponse(); + } + + @Path("/{poNumber}") + @GET + public Response getCustomer(@PathParam("poNumber") String poNumber) + throws AstuteException { + return new ApiResponse(service.getCustomer(poNumber)).toResponse(); + } + + @Path("/{customerId}") + @PUT + public Response updateCustomer(@PathParam("customerId") String customerId, CustomerRequest request) + throws AstuteException { + System.out.println("in updateCustomer()"); + service.updateCustomer(customerId, request.getCustomerName(), request.getBillToDept(), request.getAdd1(), + request.getAdd2(), request.getCity(), request.getState(), request.getZip(), request.getZiplast4(), request.getEmail(), request.getPhone(), request.getPhExt(), request.getFax()); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } + + @Path("/{customerId}/delete") + @PUT + public Response deleteCustomer(@PathParam("customerId") String customerId) + throws AstuteException { + System.out.println("in deleteCustomer()"); + service.deleteCustomer(customerId); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } + + @POST + public Response createCustomer(CustomerRequest request) + throws AstuteException { + System.out.println("in AstuteSyste createCustomer()"); + return new ApiResponse(service.createCustomer(request.getCustomerId(), request.getCustomerName(), request.getBillToDept(), request.getAdd1(), + request.getAdd2(), request.getCity(), request.getState(), request.getZip(), request.getZiplast4(), request.getEmail(), request.getPhone(), request.getPhExt(), request.getFax())).toResponse(); + } +} diff --git a/AstuteSystem/src/main/java/com/astute/resources/POResource.java b/AstuteSystem/src/main/java/com/astute/resources/POResource.java index 8bc7398..6e2797d 100644 --- a/AstuteSystem/src/main/java/com/astute/resources/POResource.java +++ b/AstuteSystem/src/main/java/com/astute/resources/POResource.java @@ -45,7 +45,7 @@ public class POResource { throws AstuteException, ParseException { System.out.println("PODate in Resource is "+ request.getPODate()); - POService.updatePOMaster(PONum, request.getContractNum(), request.getPODate(), request.getContractAmt(), request.getAstuteProjectNumber(), request.getTitle()); + POService.updatePOMaster(PONum, request.getContractNum(), request.getPODate(), request.getContractAmt(), request.getAstuteProjectNumber(), request.getTitle(), request.getNotes()); return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); } @@ -62,7 +62,7 @@ public class POResource { public Response createPOMaster(POMasterRequest request) throws AstuteException, ParseException { - POService.createPOMaster(request.getPoNum(), request.getContractNum(), request.getPODate(), request.getContractAmt(), request.getCustomerId(), request.getAstuteProjectNumber(),request.getTitle()); + POService.createPOMaster(request.getPoNum(), request.getContractNum(), request.getPODate(), request.getContractAmt(), request.getCustomerId(), request.getAstuteProjectNumber(),request.getTitle(), request.getNotes()); return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); } @Path("/detail") diff --git a/AstuteSystem/src/main/java/com/astute/service/CustomerService.java b/AstuteSystem/src/main/java/com/astute/service/CustomerService.java index d35d27b..e0ca7b2 100644 --- a/AstuteSystem/src/main/java/com/astute/service/CustomerService.java +++ b/AstuteSystem/src/main/java/com/astute/service/CustomerService.java @@ -1,37 +1,41 @@ -package com.astute.service; - -import com.astute.exceptions.AstuteException; -import com.astute.model.Customer; - -import java.sql.SQLException; -import java.util.List; - -import static com.astute.dao.DAO.getDao; - -public class CustomerService extends Service{ - public CustomerService(){ - super(); - } - - public List getCustomers(String customerId) - throws AstuteException { - return getDao().getCustomers(customerId); - } - - public Customer getCustomer(String poNumber) - throws AstuteException { - return getDao().getCustomer(poNumber); - } - - public void updateCustomer( String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, String fax) - throws AstuteException { - getDao().updateCustomer(customerId, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax); - } - - - public String createCustomer(String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, String fax) - throws AstuteException { - return getDao().createCustomer(customerId, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax); - } - -} +package com.astute.service; + +import com.astute.exceptions.AstuteException; +import com.astute.model.Customer; + +import java.sql.SQLException; +import java.util.List; + +import static com.astute.dao.DAO.getDao; + +public class CustomerService extends Service{ + public CustomerService(){ + super(); + } + + public List getCustomers(String customerId) + throws AstuteException { + return getDao().getCustomers(customerId); + } + + public Customer getCustomer(String poNumber) + throws AstuteException { + return getDao().getCustomer(poNumber); + } + + public void updateCustomer( String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, int phExt, String fax) + throws AstuteException { + getDao().updateCustomer(customerId, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, phExt, fax); + } + + public void deleteCustomer(String customerId) + throws AstuteException { + getDao().deleteCustomer(customerId); + } + + public String createCustomer(String customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, String phone, int phExt, String fax) + throws AstuteException { + return getDao().createCustomer(customerId, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, phExt, fax); + } + +} diff --git a/AstuteSystem/src/main/java/com/astute/service/POService.java b/AstuteSystem/src/main/java/com/astute/service/POService.java index 5e116bf..44c2ef2 100644 --- a/AstuteSystem/src/main/java/com/astute/service/POService.java +++ b/AstuteSystem/src/main/java/com/astute/service/POService.java @@ -29,10 +29,10 @@ public class POService extends Service{ } - public void updatePOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String astuteProjectNumber, String title) + public void updatePOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String astuteProjectNumber, String title, String notes) throws AstuteException { System.out.print("PODate in Service is "+ PODate); - getDao().updatePOMaster(PONum, contractNum, PODate, contractAmt, astuteProjectNumber, title); + getDao().updatePOMaster(PONum, contractNum, PODate, contractAmt, astuteProjectNumber, title, notes); } public void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) @@ -40,9 +40,9 @@ public class POService extends Service{ getDao().updatePODetail(POnum, lineItemNo, serviceDesc, feeTypeId, qty, fee, serviceTypeId, remainingQuantity); } - public void createPOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String customerId, String astuteProjectNumber, String title) + public void createPOMaster(String PONum, String contractNum, String PODate, Double contractAmt, String customerId, String astuteProjectNumber, String title, String notes) throws AstuteException, ParseException { - getDao().createPOMaster(PONum, contractNum, PODate, contractAmt, customerId, astuteProjectNumber, title); + getDao().createPOMaster(PONum, contractNum, PODate, contractAmt, customerId, astuteProjectNumber, title, notes); } public void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, Double fee, int serviceTypeId, Double remainingQuantity) @@ -53,6 +53,4 @@ public class POService extends Service{ public List getServiceTypes() throws AstuteException { return getDao().getServiceTypes(); } - - } diff --git a/AstuteSystem/target/astutesystem/META-INF/MANIFEST.MF b/AstuteSystem/target/astutesystem/META-INF/MANIFEST.MF index 07f7fbf..b27112a 100644 --- a/AstuteSystem/target/astutesystem/META-INF/MANIFEST.MF +++ b/AstuteSystem/target/astutesystem/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ -Manifest-Version: 1.0 -Built-By: gnk5 -Created-By: IntelliJ IDEA -Build-Jdk: 1.8.0_171 - +Manifest-Version: 1.0 +Built-By: gnk5 +Created-By: IntelliJ IDEA +Build-Jdk: 1.8.0_191 + diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Constants.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Constants.class deleted file mode 100644 index 18e7487542264ab1290c7a003cecee75b2ff8d73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmaKo%}T>S6ot=ilSb2D>mMR6#7%YKY}_e=gjNcng{19PCUMY|Bm>RFrSIfQaNz^^ zP~vS+apmT4zjN=LnYkaIZ|?vuu;-$VZ3jCJb_rXVYO!nx-S!;tZ0KxkYgd19^!^}*?aV0rpp5xRbot4WzfYBiHl%1+0JC=U0f2}P?xJ%jgoax=eKjdluxn+7fr(9 zKM921dQzk^e-P7XsbYg;)OZ76J%9xp{E>O!I?`rs Vuni9Eu(qn&Mi)IM-Y#nm{VzQwO`ZS% diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Utility.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Utility.class deleted file mode 100644 index 39a408510612fdd62cc1a0bbd14ce431b30217de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1556 zcmZ`(OH&g;5dJ3FWJ6d4LBiAbgYXEEhoA&eK~XG%hbUF*X$V`e7&fWRhLXE~!mAgq zdVx}_EInD}*@HjDvP$ur&4PiANo{v;PfySHb@%MIKOa5;7{|jnPGB&Gp*T_)ZbTYa zl^D@6s$(n;9fL}YD{(E3C?=Gc)Nx(M4T0#iWn1oyKsedIETGL5S51NDMawpqDw`{& z^H{DF=xJRn=4D}7I+l9(otnFDl?8eh^To}yEV~ugOw-&f+UX~*Rj}Ocj6h@AbRQRU zu4CD20ymP28*)pgD_l=MkmdE9>1L{~g0$Dt)woQ5&?OMrl7)(g#Y<5eFQ8lYa&@__ z&ItkyWwRt5=@uQ5_7V|!;wY=_(gCx+V2ylNlYArIKl{3Z(oF*G^=x+&*h=jJb#R;b>}q`kA_5+H3B*hl4d~C|6d>{tZeb z7Z!raGdPbXehJhs4BlY0P@d%57&Y64$iN=NI~pOhQpTx)257X}Xc^TYoI<-6^D_iu4ij}R@s1PmBoCb9ssc2?xL$Pf-$jeZqZ>Wc%Ic+$wc-4n zrWL{&daDFf)LFir<8uO`--ziruj9fm4C5kwAzUKq%ecb*irg3G)~P*mOQ}y2T6iMT z9%B(ynFI3TC|ikvEgg55`5 fkK8$WyAj$a!>Ep=$A^@Xf?fT|G70oEB7}jzgt2Ga diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/DAO.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/DAO.class deleted file mode 100644 index 696703338817de66d7877a1646b338231b12de84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5214 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 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/DatabaseException.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/DatabaseException.class deleted file mode 100644 index 04bcb1caea0ccb9785eb5fecacb9322c297f6981..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 424 zcma)2O-sW-5Pg%ztj4OfN-tjYAX<^;;;kZx9}oy$D!p&w5?7L}BpdN>c@lc?2l%7J z+4^y*2WMb*=FQuA!@PgY-T<6nJ46SY0)2rkLU5`pZO;gU!#H`6PckZGl}8g>>na}) zrv(4P+$q9FqAPXNmZ_?5Wm+)OPfR9@sjRiDzd_&L>xM8)GE+vfv8`2+dd}3N)uw8q zOKD{)8+G*qjaeX@3s6kxluhmiFDya`C#J14b*-KBU}4V4ed)r-65-&V+JybTndkGp ze|N+lJieJTVrLDG0ar1j4i`r|$FHClPCW>YA-`Z+z`o4c?iUR!+;JwbiY^av*&5cF K%?IYnL+=v+KW1G3 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/filter/CORSFilter.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/filter/CORSFilter.class deleted file mode 100644 index 7fc8a04a71a000adaeb401589fea03112cbd1881..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1302 zcmah}ZBx@g5Ppsp5=#{>Nj$AqLN7eN1lzs64v ze((qQqZ~I0ZygyrnYr8D>^{%l?%w_R`|CG=mw1=KZ9E>tES~6?)A4i=^T_Kc=vdIP zsKeAz)Ul+&(y*-I8N5A>}uqFHkZ#iViRXv+KP43G` zKQpG)z6=B@^(%U`gcy1uh{i8EzeuBYZ^$zc1W6*t(05UB14({e=$W%^j(NU5z z((s)0x)=JkpgKe~y)4O6R0M{x-OyF?P&8#Asi-B_^%Rez8OFQVsT9_Z?;Xju@K>@J z!mx%HS?c&JhKZ7Giy$aQCGb6`SaKZixLEV$o^%=5f`->wyun+B$!k3~1SeE#*-F_SCOWhpc CS6vGL diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/helpers/JsonHelper.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/helpers/JsonHelper.class deleted file mode 100644 index 0832c277f52a1a6a644b45a85badc9978da3709f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmaJ+O-sW-5Pg&8L(|j*?^1eG58X>|Enb8o676PDG%w{* zMsVQ~ZvG7+B>k?aWc@B)vr^?2GdTQ8U&PHJj6N$dXu!Mw1bwjKAYk;_1|M87Mg#Y7 MiI5dx%;+Hc0XEM-j{pDw diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/ChangeOrder.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/ChangeOrder.class deleted file mode 100644 index d919be9f2134817e355969f2cab14d3e4a9e67ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1708 zcmaKr+fEZv6o&uZ&J-wPq2-|EC@R_xhY% zW8#Gm;6oYzwP%Fsbnv2k?^*NDzrMBB?(aW8e*xIR^E^heF@_Or%HqiKRF*ASwny-6 z1Um|a`i0v%_l`PeUguq}si0~K=2cstONW>4C)a6E;T#7YzjgjfVIua$fg5;?gtG3( zh9d!L;;wI+fkNErpxrxdh-&=I>()E|Rp7T<3c1&Q%MbPxYL(h>-b9L+AhL@^BGl@M zg0bH|(}aG@V@ao8=Yz}S0@SX%jT5)y%X1Vof(yT^uyj~&HyyVd^a9Um(xBn&-*k!K z#d9x+MRc#Sl`1<|><+&%Dm6hFTb@6x#wx590GJkZ2%~KW_Irb?>b&^O%hFb5m}e zg%Wlxj3IAf9F~PUC|H=lq=h0Zg@ymkh<-OW_vrM}tMd+WLMK?^qgs;XbZIw56dh1g^FPiBMGva3i1$-(m;$PNR=S= zEg&*30a?Z46c95BvXKh%1eG)pGYPUqknLMQ1ccQ2d z`e6BKe9$VVsPe%N;D@sO|9d8~c6uIt*mF*w>C3PGr@QyBzyJ7CL>8n|mMLkK!Pt`N)$Xw0#76f+zuCtGy=E(s7phfv{P3Vj zwX=;`=v^KEH=Apy^`|B}$CWtIm^~~62q(tJ9czul{kSEre`lg_TzRrx!1vp#mIZuC zqBw`bCOJk#Q&nazj*7^2;*uAUOhOykr#t{Qaw@3AndC53;&jsD9QWeW!8r~>WH;io z!fX<9<`s2vkW)dqGu$6_{gr@4svhWkk*C*@cjOaCj><7dj>~I~oS>=EoTPc3<_(%U zySzy=&E{K--j-vQ)Kd#<$qf4>g-D8Str$tkt(77vyY+G;6}MK2#Bpm*B-P(ATL$|PxrRLn7;@0C z1PPB&K?qofey3p1K)pGLHxKO=A>9pdweY14viC6ZrgWNKD6WLZWzmln}vga_Sp=LN4_xg9+cCu|tX2nhBngq%I zib*Fy=8Pb7a{ds=97?T&Gy!rc1%#?ofeS{EoDOou2y)R3lG8yJ0dh43gheMv(+HB+ zL6(dlm&_n}9polJZl!?m%n@YX2x99XEhETfGl;E&+y}^m6c8SHf?P3z6m*bBMvw(F zNI?f#2gpVW2yYxgJ}`n5b&!q`bx(ARie)$~s8b2y)E~Qr1Cs0J56`!sm`4OUBYv^wNA~1i5Z5O+^P80%R`* zgs&|@ZWtADbVbHSkY%$Xjt=q-KwhMP@UbVzO(RHE2l?Iza?1=d@lO~(@jn3M#}p9$ M*AV2kddu(p1E}eAc>n+a diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/GeneratedInvoice.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/GeneratedInvoice.class deleted file mode 100644 index 2cb1924322c7f37997bb6421ac354a2389f26d6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2601 zcmb`HTT|0O6vzMDHmNO95n8YyC|~KZ{>L zXY4q`gCD>T<#^5}p(RNj9(>5|=IqJ;{La}u`TghQ7l1`<<&nd)94=smhgBZdc&PF4 zoQD@#tY@(ykhPn~u3eV`6WevSQMKA$$CK5DyDy#UTYqmw;9}smB|Xb_1ctW{tz)a& z@ocBMZMQvg$$hX7nwHmTk=Db=_Ub@wUvQ;H0;wZcpcwbuc~6@c>YcXdHe^d+GVZb& zY?9-Zqn13j-A>#2ykpt>>kUs}#K&>0=0SDK?d&;{9rr9U)a6HaLvGlPBliXLRl8|> zHGwbXc#yCfk=$0|o|_;;v_#*=EI z`bZ-L_PCl*336bOArc8MtH4x}RJcuTG(>{otH5-EY`Ck$3rraA&_YnnS zDYBX=IL+)kj;rKbqPG*8voz0|KOxL}U8KypF4E?F7a6mZ=|VG0S{J%m(!0ohC(kq{ zXuL@rplBJ2mZNx=RJ2jjEZ{oDxkIT=lE)ig9oH~LZxlyS3$dIJBNWO>`APGw4R`79+ zyctMWh2UiUuk*?}ML5$+Va)eBO-c`v61Yu?`-SZXNk>6u5uBF~~zaN&wNLAWsuP7O|8BqDMj22&6Uu ngs(hvAdizlRPXj*=a&TXY5)j#9D_VjE%5X&j(Q9c diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Invoice.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Invoice.class deleted file mode 100644 index f9f0e07e98dd11d338385d1ff185c8305d1ad2f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2399 zcmZ{kTTc^F5XWcR?UkkFE(H`&(RR5M6crSao5m)@OCUrOUzTNsC2g0KEzf=+A2hKs z@xc$^lb^`=pR)^X4`)L-=j z1uq-CY^G={McW$ny7ddswVgN3+M(0XXkho$y0FSstA1SG^BZpc_?bpMq0^4#I~w%` zE=}L9me~S_#F>Wx8s+R0Ty)+xj+}-tWX@{-o^SchbB(l$MyW%$THUPq-HCR*=3$lN z80Tk>?ON40p6}pBukAE^_p@tTzU$RBO0Kze*I(D@OYu6UOcmwPDXr4s6hd@ZLjBh* zr2~!hZSM%h$nU!Kuz33xM6fW=wyFnK!{zVLsQV`_1dZ+5Uaf4M`%T{|*ASput_1am z_`YMu55F$EF;pyF&koP?Yo5c3iZEub9W?0Pz-7qJ{^i;M1Fyj_T-%9*r4j61(CIX8 zgvWkZx23-KoDZA%28@BVx%8j_3^2nmjN0y zXo!Xl8sX0y)T_~G)Ci!j?YH;#@YJ#KOi-l*n#POm!6Q%O7iq8(XA(P-i5>aGj+A0Y zRvPCJg zkZMudETmhM`HovL8pmpajliNqb_VftEE+!r=$-__45ZIO`4aL@!1Gg(k#5p0d?B|` zq=^%2iis1eii;EL(#476Cd7%gCB=!=rNoK#rJ-w*rb2aP>>M{?{-D@590K5^Fir>< zBX9^|G!*(aEL@s(cr!{;l%*{SX1yUuHyyX> zcyP9C$M&`bEoQp`ip64guuv%Ej!|gOJ+%Z4Fb(KVtoo68QbA<6*62(dRp2vbKep=- zES$|j#(uos5!SLrP9H@2L8rolNDYRNb=avpX9Yr0WEJFTMDeHZrFsAEqX85SC(V_* z|J1Tl@EBg*_fIc|#I_qpbhmw$afGk@#3544)@xfHNr%WwJZMR}MY~B#QYuOPG?1i0 zHbZQNIW|J+B#p8eqqLwq|35bfcRjuDPA;r6Mhi_H(>)A)AMQvDKNN!{t|wQNlq;&r z6@}%B+HysCxq<-e5D746V8`+Fo5I+SXw~>m!kBMS$e3(V*qCaOW{heriWuXO7U@Pt zZ&B39#99W#zDngBM@R7weCWOSv<|7_6mfUK;{Qzp(0Jv z6jt`QBOyJ0HzYmoDl9$jOOqaV7LgwJrb~~zV^vmJVUR#%RQ0>dW95A##y1Lmf#U<~ zGMJGtNk5?tgR2Fp{g=0q%_zE*<+|O3j7|b%O71Y`XZ>qOZ?_}pK0RpfbrU4~DF8C9 z1et+uL68X?O%P-TAhSI{SWQ;op%O$3f@GB-b7~MR2(kc>#U3Dhm<*Ctf<%HK%Sw=( z8YB_~Sp&#=4-lRu1~HT~q6cSWLkTjko)J9=vIUUmJwSMr8Ds&PT@7mpoUExIv>dm02O0OVB<5WYzavaAG&1wr|awp3+GE?~Yt_Nb&J#zZ9wavbkOiQY^Z3Q{I)#L`G-lDmR} zR0$o*k<8>iDI)td%{%T`TwD50QOD{y&(yK*Rz_TMfJQw~Fwe=v{8r*s7`ZWF@xmVj zj(h5HGjgrw9*?7eGL8%^Va`C27X$MK7IDi!2@5n+DSe?~olJ7`>c(|wJeQ@(^Q{Y) z8r<=|giX)Z>X&#x-$fo&MQF&d41Gr#R+2mE$el#xPAs&~k$)M>v{vZfSMt|s-!Okd zF}H`vm^(vc&D|kXb5$KeGgq}C^zSml3a#s;3CcmG=mkosMA6HX=PIpLig}xE8(~b` zAuInjxDKSqC#KBE6LV(ei3wGCVrGpz*Kn6sCbVehmzwzlnQwH+fH8DwT$6G}=n%;% zxQF{>;l~Z~W-(o+Hc6r=t?MLJl@V4#uQ9M50V|Yl8b~$?vY84}O$W&)LAD6w$qW## z7gu0|y8VAe)FgdzcF~}o4P65%AAp5BxTa;%?Yhv>iw&svP qj%I-Hj4((I^%M{-3Gylx#Kd+Qh?cBKgFxQS0O7G^kR3UdyZ-=+k{liY diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PODetail.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PODetail.class deleted file mode 100644 index 80a5615e1035aed642268f224df3e1f59a70450b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2061 zcmaKsZ%-3J5XNWQ>m98}TY;hl6h(n@2&agkfF)6aX(WI^cz=`?kMxhWR}%b8zR<+R z#27z-AIkX5_Db91YMRW>&CSjJ=9%68`TO%X5iQeZf)eyJPH|dh^Nh_3n^iW?*}P!0 zX3)Ap8wR};6x-jcG|Ga8cFvs($1XXQGyBl1xs|hZL5Y%Ekp)kdcdLR#LC}r5tX;T8 zxh3mGLGkxe9$kKvg;PP%Pu^v3m91*yq$E*g(Eq5NYSv`gaVyy39e<;5!1wZkc5~Mm z3jYuJdvs^{p}Av0+Ux466qMRQ7rTw}iL4ztKw`{l(J37}HJ6|LpyqvW>w?C2iq*31 z)V+o$?J^3K?ESqh={ar*y$qa5&sS_DH+LNl8TG4-Oh`k_HHae2)K)f{n}fEHsVA!C z3Y?ro@?p2?N#ykeOk`|#CSl@z*Q1WNO6OkQtLf-SSMPghyHref0NN8wcM#g46tWI_ z=9)rMZzOS8ZPbc#+vOPywpCr^gJ;qx}Cul^4+^P-9T&LuIZk+%~eoXgq7ZQY1O$P1{_J$?iUacTdDP6tO0n6txzbq*)oQNii!MYm#nd^d=cr)@ahe zH{?es3p)cIuBf5=IGRs#@AzfW{v^7e#!mCtYYbTjt$k>mCh&wE6~9m(cMwq?_YhSc zccCedYsQqvo#@KrUJUebhwl2F*jTw*%=%7|uW(w3x(bdd1hbXkBM2bgLxg3>Bbxzq zB|)dbgo@t9_LHi@Xe;Zg3Egi(U^G*Ht!|L$mjK9AD98hPcnxG6V+exG0A#ig2y4g+ zOou9>1r@PEL1w}g(Sjh00I~ak@CX@XHdK*VP?4ojkX*PTu^`9_Kvw&J@Cjm&IkI4R z%-y5WgNm$$g3RNfhMW;S2$BcLW*-nfzznhws)!L(EtAIL8#DgXcg diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/User.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/User.class deleted file mode 100644 index b2eecd358afc8e0e54e997cb00f85630121c67d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1036 zcmZ{iPjAye5XIj*uG6HZDNWh}DU{L{Ip&Wq+(5k`Aw`M+sgS#qTESHkSGEIRiUUYQ zNF4Y8d?>`5UDH%?ddTd~`0bnD&gReGU%vsoz~ed`9MrIehY}7YJgVZTiem+5mPKjz zTtRge)+L#SlSpB^cM*OLgK;<=1!s90Pe(8L{W8q5FG)(d^D3Uk`Kf~Eb<5InrPEii zUnl3ZZuH`5^maBGMCpfcFxJhIVL0xGX)JkBwDV7Krm)u=CX*n{@>w1Q6B>+zkEA3` zZ4~9Q75a+TA%87fRBW#+JvR!GxmC;Sl+h?E&Kc2;SJwQudVe(lIkU*>XUQxbMsH%d zPEDwu%lurpIB`+Mx{Dg>E;dkC*jafag{{TN-wiIJVXp7h#~~lg;Zs)lqZK2>O|LZM zT7_b#Ta25`#;{;>ZTUZ;{PrA{|8$Ou|7;HXJL?u2jJtFN-E4Y^+a}?fblGCnH|KF1 z+sx>s`zpN?t)+L;yTYDLem9*1uA*A=f57_6jcMiRVnbWIMo?ID7z8ngPpKATMTiRjQsIK6g0*?O`+$p@SgH*mPf$XgWxr=)xkS845GDw>s`!|5dY-9rMl_2&q e$iYgG{na4Xp3Y3+%F1>XEVlMyt@X;qxQY5k(}Wl=F=$O8Bt8z?Njnv0H?u>_pQSG} z(Zu-dAJy~>EP{&mWzNo-bAJ2HH|OX1*Y5zHqv9fmO&3|*cCh6ljXQSPc5v6l72I=h z-@yY14;ivMQc1JRkS>+m44D_OO0cG!u>8+ zhyJhHT6vTm_@}Y2V?PMB@FzV)VAQxgx9<;N>qv*ER`4ajTvHw@Zu*+QZ)d=JonsN0 z+HYdSz)XdXFSRq%GQGpDy=yb<>p;Ac*29hYmOQZrFs$wOm61Ksma!zob)`bXt#Rb= z`dO@^hsL!azQgfB+4`hdMrns@J#Ti+-1eM0k(N9;gHj3-m JplIuF0T+%``*Q#Q diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/JacksonJsonProvider.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/JacksonJsonProvider.class deleted file mode 100644 index 5c5c522f8cfb61e637f3176d2cdc0850837da935..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1632 zcmbVMTTc@~6#k|ZmX_rrA_6K}6lu9FQVB^nLm>XM5WW zvQestvYq7hx-c1*+Ny`7E6irCs#H2kipp(X(sWfxU%F1}{+!V;%Oa*ZoF-gMELZpu zXPC@3bX%*5f@W#NH=^r?&27!liSAUwxzkiWTZ(BZqG>Ca_>EsVqyx2478Y6VJ>t~{ z866?!Rju3xQ!3<~j9VCGSa4!+O-CfG$ascT8DXqRSeNk}8;-Eau>5Zv`%7IY6+`99 zJ`G8tRuwX~@Pc91Ed$xuZa5s?+T*r}8D@>!GPbcJ<0UBHb8Z?g0cF^9XH?-$3ZD~! z^HlR@>2kUm*4vbNs+h^9Gtq25 z9?daqbgLP6RLY^GYF4M54}<>+(y8@p=9x@}yF?)8>i^_HHlB|b_agadt{BM`^YLUf zmyaYfbR~bKL4^tkPzM62Q*L9$;08LN0J<*RSvf9-H5$%ga+4C&um=9{gaI-tmBQ7Q;HIk1L zJyn5B`0LJ2tJQk=To~EW$w-(sRSPqZ;r&K;D5ip^Mn&AFwDWT$;sf3@iHZ-NrC}(O zS=`7&!#hew!7DvcM(Mb{c^rbe2#ArvKU#yqGy3UxEaPBLGprrYPz~p6G1T+azdVDX zG!;>rNtCrT*8+9y^>msHWJg&MYYUp(v5*SNa9v!jpo(=D*DAP<8w`zqQkCJJ%?n9> znH-KHJ`{tG6CHEXK=f4{@?00)+Ls+sL|sY&Sk7?zX4qx=BNMw diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RuntimeExceptionMapper.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RuntimeExceptionMapper.class deleted file mode 100644 index 7aa11ef75ec53307f5b4c48efd5a7f2a891a5389..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1050 zcmah|T~8B16g|_HZo4c{5vuYb;%7gQHR_8gAt6Q+k|L2dBtA};NxRtYZf2*@pQSG) z(Zu-dk22ob-G-&8Jj}gw@7#0t&Y8Qvet-J`;5A;Dn8mt@0`42w(7^*8Y?{d8p*D{U zJT_tCiGimEo*AexH6x+Kq-5jiK}CRO`7;wFj(}HWXY4HWEUv1$usgZwF|JXw8@}EHXkL6xJ7#_F2EvgQ$)RC znXCpMB1iSWo%$G=@5p{4pQAN%f&3W87dndR%&5$w^0|nz9K#YyB0!lIEA0{a-GuxV f)oAi!t^N~*F^ZRT*SjkwR2kfhKDvU{$glkYolOL3 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/WebApplicationExceptionMapper.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/WebApplicationExceptionMapper.class deleted file mode 100644 index b11d102f7690f5930bac24f1e15db38f79bcf023..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1166 zcma)5T~8B16g|@x)-DUJh*eZXK(rs)6^c(KB-Lm_QZS)SjlNBnNm(qro7pM!XX#5x zG%-H=ql|aD+t{jAUgpl;J@=eD=gxfp@%bx&9XvN-;l7D9Rt-GRam~a!HuUbHi6l1l z^2oqr6LZKLC>SUjC^5|Lx}K}{7?Sxyiy`&WKNbv`y6cI<-dS77CU18svsm{X-feN| z>hCz2QYUW6P^mlqnaxAhQ^F3Uf9@U&X}=ZiS`c(yhb!0jUiBRj=*DeMskF)||BoIp(Jfw0?=pxxzO$8MfT|3aVZ zKLY87+wr*SNfLTL6pHHKv`>YjsuR+puk7Cry*mMz*4v);rs4ObBVN1O`t>Qu$jP$y z&B6jQ7M>u(usSvj85?ZZ0(WGTg{LSRuq`~pmW6FpboGvfn#2s~&WEPt4p}nS5o&ZEhL!xk@5S=C!o;OvND~t=s~+8B zdIJ08J!K9=81fDYEydJP%MC@1bZ9=g{QlVZ<8+~gHF{kZ80P6!CMnWXXwA}>O_5QY zDPDqoqD=zVX`LM=O)S!07ZLzButbq*lWEn(M@SJKxKkP+@de3u6jKAtP?)`hF~GHt z^fzKOhsb%VSQxVAqRN<+IB*NM!Ll{tUyk`Jgwg!zV(A;w1DL<){%kNEQzeK>i{8b( HVO;qMhw3ZP diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/ChangeOrderRequest.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/ChangeOrderRequest.class deleted file mode 100644 index ab192734b6c3f963d4e135e0c031ddd987f53253..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1558 zcma))ZBNrs6vzK}&x|ryVIUytP;eVU1@V=J#ITr<5HMnR-*wF>*;Z&fKb0>uk(l_x z58#I~o^xAS+ubF;=(+cvo`>Ig`2FYSF93&lT}BDJGbmz@g~8$_i+vUcMZ7BFP@rO6 znZura?saYNY%~xMCj$8!SKjs0YxA>d^vS}w2s~%ldm}I(^JtraO`6cmzwH~WAe(s9 zcY{D69;xk)I(@d9?b^QOIX8jh4h0HtouLyP31l11OM%?6+m*4Mp-nIy+xuja8;5c& zvwvxN4!?_AqffI97RiS|8DAH^pLP9aaqB2P*rPs%0#(gd&wfhBqw zbP782tsfBI=#oK=WFb^yneJM2U%>-<39Mp`WYYONGG9{8b4urRJdB)=C{>12wbt*D z8K*8wZIvq0WrXF>3SoLi<2spo1CJCS*{>;(niAwOo=kx3+##C=StXFQDInZv2B~9H z0g_9DY$!pV;+YC0mjZ1tAWh|H e3TcpCB}hv>nnD_6pFj?#fbgy}$c|iw7k>d=!2MtV diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/CustomerRequest.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/CustomerRequest.class deleted file mode 100644 index 17a60676316dd8235650ec254e9d43ddb112040a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2654 zcma*oTT|0O6bJAV=#3IAARq`T2x<#R0Z~B_xl6TjA4VM?3~huky+E5f>SyvnXJnl5 z!4KevaytRSo+JVRJR$RIpN zc!7{bc!{u%uo0!rC~X-O&(*4KxoB51d4r6MLFQRu-74A!wP%m44_3Nhl@8K7ZpA4b zJmx|BPNA?{Ubc^2gF;q5KjEcGPC3W@WKg*3S}qT7{OlYX6ysR1s_qn@u#1*c;Cy^o zE}_GF>!U%DS*PT1`RReiK(-RU61P)rjwuYn7b6 z>R`J%&eqvq{V_aCCS9i+Cbd$VN$qsmqz;5mgf4_D2;B%h=yDaI7l(alU86RG2LEHH z4Qf4qayRym?3_yj{NyM21v2@^^K&E+RAzV?Q6IIUAhA!#~LQ#*GH15JkKq-Q>3Ew+Cs6kN9b(+Z_A3eLna*HGJVh{ooF9 z@EuC}gXg$+1CNOe_nuP2`P6Y$?WQnGF@2ZUi@fPU!}>s-qG18j_*H}SiI5Q*y#N_G zrA8gn&yaxt2sQ|iyCNi{Lxx1im<$Q&kR(G=0T4VPfTTr8Sci;?kZ~Cj)*<5znFxU3 z5d~yIghX`6ln9xWArT!i&5)S@2;LDu?un474w)4pQ!*r~L*^N>5CFkT3dnsC64N2e zBIJP#iRq9vhGYUD_(}lsP<(xx^w&2lLZ;={w@HU=GGr?Ng3lBnGa@9eLv}^TBN-Cc zA+H$nIsk(2Bp{E)t!dV`=B)^smA9r@hrDBm6#&798jvUAikSL}6AWua|iw-G>ka-!>qC<`uauNW+Ulkw=>RZ0}7ZZ~uD^-qq`s#P4LHCJ+-} z_yPP-#{b;aV7GgTX*#nvH?#Ab+1dN``^QfrTBF?z4bkH?W#|curz|#DY_iy5vCU$K zMI}kklJs0q#wXXd$CZkqNw2>6 z%8y;y@jB&NP+V1drq%oqSW!~;M0&kfeo^^CQCB(Y>T??}40It7?MRet%!tOED$kRrR}_#LHln=lus;4=6N0&zS~a#tKzNOCj`i za5^bC_LgZ_cY9}*hWYP0vk%vXd}Zb-H1YL0N-_X~dvW7C9DUY`aEz zgT`4*P+m~se-9F!yc*YcM`yC((JW?r2-hKnKN3O`=kztw`Wl&ijpV*YeqRH@*PwvT zkzj7fNj#OI1$4ahoy0dRA~Xe=@QqQL#@YxR=qAnJNzg624cQ-jL6NUYa8?_92bBcD z6{L!As?y>mMXpk3d~1&4XdN&cr0f~NAK*qHo_h^0qWcre#D##>2 zrb0mY02t)H79^&E%xFOt^dK=6WELQEAs{>f3{ud7#8r@aEl5!h5?4Wr04arl@CY(U zNjoD6bw-x7AdC7LNvI$z09g$I;XA+}4`>N87}f|@Jn0vd{G!arx)x;FzaAW1p(uVl ztP7WvR6#ZXvKa!xmykgoYC%#e$c`3dMGulvL3RQ1A_RoL0t~XM1xc$QFSQ_#^dM;! Tqy~^TAt3x2Vvsfe4A%bu@`4rH diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceMasterRequest.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceMasterRequest.class deleted file mode 100644 index 5ef8705bb3c6082ce750a3b1961c169dbd8dc89d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2364 zcma)-TT|0e5P&zOcT#%cqJXHNXj_Dcipo`?fYw29sDsaGIKpAt2GUc0l@B^2uC8R&;K60ba7TfK$o6OOmv~yyfn?}p*92pJa@Xpb)2K~O%rYV>PdC#SL)-uR| z&l9IM#%nNO9b+8Za}Jr~8ZxJC(GaHSbv4lH8l;-M)mm?haGg!N*KAQ9y?e?mZnk!9 z!7w6cF-P#v+%g5XJ6IUA?K6w_z7g+7{?nX1{A z**Y*CPWQesE{-`?sqR>I+c3MLCz#=|vmWb;u2J{e@*eHX+4rnSSU6(Be{|Wgp>jpl zvqJZp=WzMDBVi8&Nxj!9UZ(t~#{)q=&#B~RyYit_X-xIO8%7!f{L3O*Ytm?n_*k~- z6dg@1&!wk3JYMfb&yz&XXyzfGZ@|dU*8hakY!WQa!ExZfV zUddGQ=))UQ^610HY{Tw37Te~u8>6aG&(SH+VGPD~$iaXPc_`>mq^lB%K^W3u7)Ers zLAN(aj6y+!^8YRq?ox2l_L?Wm5-^D;Q^ymX!5>yd2~^nCSliWD-qlFpYJ_k#a=02% zT#YoS2SKBkKzR%A4AdIxMD+(~-|!*^6DX6O5pLtP?qA=5yLhJ|(iF;Y@OOxP#fSd} z=aj+s;JzQchTbuZNmgerAQqI)y4E5ju&q>n#Pb5LJfTq^hE{Ln-e_@{6=1vq}&H9{a(;j*MSGQU;kvkS7r!bQTC?9zCvuq~wk)C_$d$ zAE_4{fZ(#GWROJ!S&9Im!$=?t%F(1{kX0qfbM`n$i5O}Nqu~?GROgfe2M^}?;(LKyIZ;P7aP4^jsO4v diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/LoginRequest.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/LoginRequest.class deleted file mode 100644 index 1c287bb1fb889b91e0b60cb08e52ccfad0c4f7f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 757 zcmaix%TB^j5QhH)w1raTBH%qySAdD#xYMvPan-01Wq&9qwFX-4MPEx3jfo2%z=tx< zDFhH}Oq1!E>HPD5XZrc|{sG_++d34i6_CTa3>z9YHEc2D<4^=19|?x4b;}>PIpm&W zcB8=coFn>v$HVZ^4+aeCvFo`}hauZ+^%!y|{(w{^%k{)rJnDzU0m~^06q|Br@lhyVc*mKfmP*js*7E5$C#tm3Ti83-nh2l@~3o=g&;(V&O zij|4DldzFhd;b-gnYB)JX{wN3+BcG1o!Cn>c^^q#O9ja;f|OH1>ggcaMUWbS)c*jH L3zZ;^o*a-pnRG#^g2apdc$Uw%^I7xY}VOqu-Rnu zEla}j$M`oPhRX*1c`#6j4P{Gc2VY~ zTNIS~EalPl7g;C?>bmr8mcwG&6;lp8w#(TAztDyOkDZpp2A;Pq<9Pa!MGx~fWsk$%e;%R@9y3613!qV& z-WEb*E5lyRf}sK0Rt%VLRj{uiTw4tpy3M6OP_F60AnC(Oty+{jHWzbHsm%iSr9q=~ z#~_2c4eFt+LA^Zd<5@oq7&OSUA>JFN5kXV`QFFY1tK;`i&SlY~N!*MKE>jXeM44p z0qOdxfDC9srs?r5kg*%;Qb9%lGTH%z3&0>VT1BF&B4b*RoL-Tr3Nj9mi4Gv#0Sq#$ zRV1b=GNlEX(<>5FL1qAw>j1(n$RP9d1Xk^lxT?s!7UU@{1i_&miK`$cKo&cI@Eu?f zQ>#cqRb)vEvZz-ip@J*}WTgWLUqS|XrtOiWs>rGqb>Kxf~zD}?G4Wb5(tS4 z9)O2J%&bjon~lWH?C$vA`9JT>uirm@0@%mP8Y*~NMH#ysY!1&jJm>JDjJ-1U1&U|A zcaxF8;>nfs$+3sdcwnEaz#9)<3DjMGtOCbXT2eae9XU!0%thMpdT4VZDSR_h=~_qr zq(5Xy&7FkGAIaeOQeY|Jc05*cAOn(=UVCFt9SG#xoeP1&p?|5}ys;#Jz6?G%REz8T zt~0!F0*}vevYyK<;#foOKN-W?avrLtI^I5h}CaT&d>chfcpF}6B+9dkE z7`xnj&RXbhrD<>am2}p+6mu-&g0*vh61eiM$E|5(UV4|O%EBU+EX-rULKQU&bq*G0 zEX-m~p!FXu6PUjp&|d#ax(XXK$Q2s)B63`pb~!GsSE{a8GSDlT(^>~j50)r4=w#C> zXf1ZXLwwP)CdE>e#4_!zc)x->bP~9Wdlb``zasZJbGdH3yo$B>@&S?N*s8nz4Y^zE zn$FJAAI<9u%aIC^J)`k|F!g;rFo5K+;IkJk>cOh6tf^(MvzTBi7%&GQ_O;F6UfdK5FR-O*+Sa@Qp$qZ aMvxA=CXiAVWRF1hr-1OxGsw1{%AG%sWBR-R diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/AuthResource.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/AuthResource.class deleted file mode 100644 index d7936813236550dba12dba2bbeae576d5e21c94e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1371 zcmah}YflqV5IvU`wv_UIC?HV4M|rLfR1^dOH8ClI6iJAmF3Spw?QYq-3;Y59k0uI< zB!2XRzsVTS-L^u7=!Z^cX3sfu@67D}`1SQ0fGIpnq7mZ;CX%SZcs){>Ov1!%ZSLsY zT?6-$NMK5v`w2WS@X)}tfT3*vz_DzBbk_0;rc^-~*k(CvE`-5uu7sEosGD_MCzun6 zWkxmx;!EB(iOpHZwO@sWE!$t0TX|;MvYsXL8`5`lTu#P=T}KHFpD*Lv$_stVR#Bm~ za>Potd2h#Y1?Dr=@cqzMfikoD>6#ryGb7nOc_5F>LuLBPv^?K7sZ{h_WmC!UOE7_< z|4RwfD_beYb6;-jYiMCJFWnt87x<35L%qgaAg%YyvKU>E0pwpY3_sSk01C4*hEY7b;S zBq1(I5a_Dv#H#OYhwLqJEwWh5J63c8b5D8fY&CX?XAcX+rqF^`f&PE*LJCc2HZYsQ z6U?PBugw)a6&N_j<8Y%PmW`89sQtEvazH|iB|wQdZ8s0t!$Q4Cqc19$ zE{T>4Ql6L|7H;A5UR>j)`p8Q_{6yM7KL!}pF`H%sh9aLI9RAnfdSq`z*pNfic&%mjZGjFi}kf^F0hzn!#=Q`PXCk6 zSa9r&KfoX5_}$%vWW&HPPA2zp_S|#6^X)n3?mz$j^*4YIQAuJ1iyA&pq6>@txQZ_{ zEUC@?Bzmx{hFlUWc#y;@zErC%LnSFBQN+524Gkp$&6DntZApRK zdCRF9rsoH~G#XN4dEcz<$%0#!ZYfgC3iRHyYqq~A(4C&$5=bmNWu70*+co(xsP0I2 z)7+_0GMslTv$AEnw%Rv@34h=A1TyX3Tb(M<@_$O@f=R zp=kR1jBdhs9-et&JddAw(aC1K) z%?Gwh>G8Jr(oE0=l~4k@(H5D&SS*5NW>!#@9_8Bj!}#WOtmSqtitR!mg;u15_G(YEoJyy9gnfC;X55q@V$l~bo_{)bo>lc z#||tV8I%RCmja7eyxpKuc{Uy8W_j8SWjdtN+r^%aJJ{D?>o~wKOreU^0Di ze%y-1b#4_hrQ;22smicM8pflZm2(1i6_pOHs3Mubm2&uSD{2UAvN={&++vO;KsQa3 ziYz6fy#Xrbq-VKy*v~rsHhQJN-F8A6(zRUFKTge^Z6}JeKDsDI-Lxanun7<_+ra;| z&!edpC2KWb?n#&TRM;L1yDXM;qoqYeHZ-z$ix=YvFHFHZj-|j=f@@X~#|iH4qnj&W zD02dld4;a+6Lh~s;&;lr@H)ox}ZXu z|5=aPyf!h{aDNDmD_};so}Z-i{$nILUEyCp#%l`J@IWUZ^#uT$8mDU&UnVkg3Tg)P zc!!Q?7z@-<+A}clF1hIhI>@K*McCfQ2UJvuClrT*pDiKgh1SyG@(wzbt diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/CustomerResource.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/CustomerResource.class deleted file mode 100644 index 92fd5683148fcca9f317e5c2c8872798b68d5cc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2727 zcmc&$ZFkgE5Pohc&2~xOU!Y*2P>^jwB3NHr(NYRT*LKU6D&SkXduda%$Siij^q zzx&C*p&l(BImaL1kMj83B-?H(R=#-rFq3;HGjr#enLEiJfByD6fC+q^$1pByn9ZXF zm)r3Su4uTbHrMjl4^y$X+VM7uIlPm{9Om;VVL`F$ij@^xRP2UgONza#*n5iIRP2^w zx0TEHbNC>K57qLcJU)h{VOc{(KntY5Zdath$zsK;8CDQRp)^vdF%t!$SCf7@(V7%! zo3dRyyeP1*Ft#MnI^$Jo+*Pz)ITzKIrN3w`JCyVmy^7^5S-!3IsjxL%wF80E%}4n% z@FKq=gYCnvrxKo~ugI_w0}YQB%(3E{wQg+~_X5KYjEd(=gZg#P4J7sRl{8?pDj-Y> zW;ZIb9@>1bp{jwA4PB4i(5}fPJFpqrwCj4I6>A9eWV~OUU8K(wS^bjbTQwOK-qHs>K0OzsU?^JT0iaO$bNsnRs3 zuw;d+jIzVHzmvNMyE9R`p)zssZ-xzwofThZuw5!VRWN%)+ZE`1Sp|_V$L(^(R$VsG z$Y!Hw&M9aD?M4HPz+fio8FoTclL0+-TlKnQSK`_mYk}wP)-Cy7HDYH@>KMUscEZ2k z5FJNxOyF3PCL26%Ph+}nH(FK4Y1~m>S9Gkx*084I6F35WwmXvTlfsyWnhqD9hPsZs z@O1==g^ERrtt)mxDz?fW_nC@#ENB%nMY5@ z*T1|OgmNTX(!!XINj%i>g^n-r6}v49@gMFmv#cs&IF`F&%rCFWO313kqTsG$loyKI z7nI<4RGX!ZOK(J>?HENn2wA*=LR{8n$CGLxuJP0)!mOA>w62sK_D?1%TG{SO9MxzhSx>&_oT5$BZjM7npg#qWz)T(T zvQqJq?Kq3xWezt6!2NW!dVYI#Az97X;if>2Z_6BU^w-AaExR61Z%)Sp$=2c2pGfp( zYnIJ6R3@cW&rMCPSQ`T0a$M~cD2?U6lbBC9%`{bsziBT0{}l(b*Rzui(+%Z{^qKW| z*w5eLDA{h?xc5_yNgU^wewcp%g5P4!3a(nY=6oSP!QCb7;|k~=e*`i97%ev+Vc#!k z{gJX3jFNX!1L&h&54zBglicZv4Nl=%?)ZsCf$x>St9-U7{m0mUbNpwt9@#?MBWPR5 z{XlWzvMn|rid_vR>ZvPr&=|(~{tUI-`0gy8!?}1ZVDR}oN$1xV=Sdd=Y735=iS+pI z(GiDh{)G14{1y(xA)MWUPU;|alDbIUq#jZ)sgKl88XygB;h+k=_t5U32lTIFpwM05bncxhZqHC4d z?^pLvA&`bh&Mf;;>xj_gKun281>&N1=BjC6|6 vSw64vsn8`QGMmsTOiwP+>(p<-#hAYl7jBdQQlxKUT7kO_5wP)QcGiCZ&kV)u diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/InvoiceResource.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/InvoiceResource.class deleted file mode 100644 index 6c644c63f5bab5464759a7fee95eb6ebf7acb7a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4255 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 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/response/ApiResponse.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/response/ApiResponse.class deleted file mode 100644 index ddae3eefb512e8dbe41ad5ddf6bf0262e30d3987..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2406 zcmaJ@Yg5}s6g@J2$U+I>5dtBA4YU|TqqIp&TWE-59O{-wih;h%2qTPABQchog#XkJ z?MzEE{m>uKAJyquX>H3Mr{kHG?%uoSocmaf|M~Z?zX3eLaSESm7{Xc_DXfd-GqF6@ zuz@Ej6jVGF?xKcGl*HyU4O{qJLm6L)<;xVd6~wFVsik0a`-S<^H0q{PGs=!{)vU&v zg4BiOd1j6Nk%+(IH*BXychYiv+rR4e?w!1_sy@AATlCDQRuWs4HlZO8T>D;UTv z9Wk3?kj>Dx?O40bixaDHV4l~__?Fig*H`j*kKyh{qS zjKZb8FW;HW?Odb)GDSf+o-0QjvNFP5=5rj?@t6#JH zFdrsIxRlqjd;tjDT34Pk;X&qn64}$V$%dF$zFEjw7Z!mPAf$7-BxK7 zOiSL^#w*Wgct+K2SVqgu%4rq1*{E92Y|(~Wk*eMo6Q^J*QhdH%xQ@}95KqSpW_8@c zu#ORo>KMcA6rSt&3i}FXBPaW{jTNgjt5p_AM+GY>9OyX2106@g_*%y|_&$Xn1nQ4E ze!?pCb#6hJIrS9+h>RCPoi*$At4yuI0k%%*l?>r_^YYZ>cE${jDA2dvn(JiFOeW9Z z;SRdIW0d$(T!X!{V3eXA?A${2-1N@FK^W~Iv?oP@>bqex`D)9HrC?IT_U(#-nESJW zp;nikHtqVU)u7(8<5-Pi-Sj+*7vsJEYwbeMX|{Ult&F|F3O1s5qjjNz0q!fg7l3Su z6CoQ}e)ER-K};bg28C}iF)P87QlA!wUA%YH4Al0-qrL|tbnG_12H zYq8i*#PT)LQU_nPK2owhQsxLf&kPqLRak6GS!5mZBv!DD6)E6@zy{R(?-;no;4c&! zqf{VC4=BCUOjRQB&fva0Uyuo;^Ri@}YH4(VR4U0jO-Z-qq-A9k74h*njX(PaID;ngw3Jjfk{C YnPChcGb)Bp@ExBT;mZ7v^ld!-AA{_~TL1t6 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/AuthService.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/AuthService.class deleted file mode 100644 index 780a797e214163980ff4c761c5f6d888488620e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1650 zcmd6nO>fgc5Qg7P^Xa-@ffQ1w&;o^|Uxv0Iq#~rM1r#YNhgRk6Iwm!8>?n3h=^6Mv zaA^?-4jlPWh<7(8N}HtfciOwwzDG^I7TA`zXSH3qj+M#izzqdv zYIe{xtuX3Dju|@bL)Ui9jZSp1)0Ni+QeMz-eSyd2+8gW8GCj+0m^)G1^&9Jhn#!O` zAlsp9-)gF02ApueWrg9}pj{Wxo*mgvD{=!r%;15*Xs1=TB4@J`MnThQ3w$hB2e0^d zn(76&RjV@JnjObfW!R!Bp#N5ED^hLW^}O9+i!>~bRj-pqPAi;jH+sj+h7r+Nzhk$> zByjXti8XFGP0RH-w+;ed8oaiSmlk!8tX53h|jj0>d0N z&VWwi5sp$)MqG_@#V-WLX(1iFzz`oG_XUZC#S;vD;-c#$tqx5n2Qyux*a6KkfxOz! z;R>Y$uJW9Wt-wEP8@vC`6C>Oy(Y>*_R7@6A#dI-K$QE)%tuS2BPmnwx_9P6Rmtnu} zp6%UQ!gUnYttCvUTj`nBc@`2R)>zeM|)s~!jUyH z6ppN(!2r5ohQg6x1|*IIGazv!n4xean87ybf*FuF63kFI63kFI!)I{rQJ+Bh7gZZ( AZ~y=R diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/ChangeOrderService.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/ChangeOrderService.class deleted file mode 100644 index cbeea9cd544b9ebbdb535b0982271359be52c929..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1260 zcmb`G&u-H|5XQf4{H*A)-N z0WJk`-~o6j#O&G%F3q8b`mj45e>3yj+41i`KYsyugI5+R*s-vS=X%-GOH(hc3ic~F zU?_KFAXS&4&}^MD6pzB8V5s$FAU-7HGZB5{XFhqB`=Q7EQyxkEo;i!^T*eH0eJ>n4 zJXVPkPAsBJ=?UlPoChOu5)DN(NL_8pI}$4Qfns->{R@7{9iPa_CtaqP1F;OxM;tF0cEDYo*;3|oT+r35pPM&{E4e;~y?Jm_{N+v_D zM2?-|?TpmNZVDKG@*S4~+BbQ1o2%Zx?wE72X7#f9TxMyXN0Lh*mfHOksB zRl0OYO`TF|E3Klf2G$Kj6_2n%?ArGjn`eKR}+3U(+e2-xx(1YDJn5YVJagNqXO!*ncTrk$pp5@fCZH7?Wz z8W%2H`bQbRbNfgUj4Nkx@0oMIbLafdIrH<^x9MS)IF~z4!a@h3h)x!Vt6z}+2u_&cCdgRA;O&46(W-u!jZxo`fka%q8mDf;6aP`@kT^_hK+w-|M&V#xLUfGu{htqU#l;d6Q|FPe``7hOw zwwHr;({W#TGJMm$c6EnoQ%YkXfn*%p26nJ(U>p+$W^v!ZGFB88|2>il<{hH$ClrylzUe0Uf;+>GSN&d6Hh17$xJFek~Xdp z`7`HP%rRbae%p!de>2 - - - PM User Guide - - - - -
-

Policy Machine Overview

-

Click here for the Policy Machine User Guide

-
- -
-

Policy Machine Entities

-

Nodes

-
-
Policy Class
-
-
A Policy Class node is the base node for any policy. For example, the Role Based Access Control policy will have a Policy Class node called RBAC in which the policy is contained.
-
-
Object Attribute
-
-
An Object Attribure node is a container that can hold other Object Attrbibutes or objects, and are often the target of the policies that are defined by the Policy Class they are assigned to. - For example, in a Multiple Layer Security (MLS) Policy Class, there may be an Object Attribute labeled "Top Secret". The nodes (Object Attributes or Objects) that are then assigned to this Object - Attribute might be subjected to the policies defined by the MLS policy class on "Top Secret".
-
-
Object
-
-
An Object is a representation of data, whether the data is on a file system or in a schema.
-
-
User Attribute
-
-
A User Attribute node is a collection of one or many users.
-
-
User
-
-
A User node is a representation of a User of the Policy Machine.
-
-
Operation Set
-
-
An Operation Set node is a collection of Operations. This set is then used to connect a User Attribute to an Object Attribute, creating an association relationship in which the users that belong to the - User Attribute are granted the rights in the Operation set on the Object Attribute. For example, if there is an Object Attribute called "Medical Records" and a User Attribute called "Doctors" and we want to give - doctors the permission to read and write, we would create the association: "Doctor" ---> Operation Set{read, write} ---> "Medical Records".
-
-
- -

Deny Constraints

-

While Policies can be defined on tables and columns, there is still a need to restrict access at the record field level. For example, consider a table called "Employee Record" with the columns: Name, Phone Number, Salary and a User Bob. - The Name and Phone Number fields may be public information available to everyone, however, the Salary field is private data and Bob can only read his own salary, no one elses. We can use a deny constraint to deny - Bob the ability to read the column "Salary" instersected with the complement of his own Record. This would lead to Bob only being able to read the Salary field of his own record.

-

Assignments

-

Assignments are fundamental to the Policy Machine because they are how Policies are created and enforced.

-

Operations

-

Brief explanation of different kinds (class) of Operations. Describe resource vs admin

-

Policy Scripts

- Policy Scripts are another means of defining policies in the Policy Machine. For example, we can write a script that when a User is created, an Object Attribute called User Home is also created. We can then grant the new User the permissions - read and write on that Object Attribute. This is just one example of using Policy Scripts. An in-depth documentation with example scripts is available here. -
-
-

Examples

-

Examples and use cases of Policy Machine calls

-
-
-

Policy Machine API

-
- - - diff --git a/AstuteSystem/target/astutesystem/images/logo.png b/AstuteSystem/target/astutesystem/images/logo.png deleted file mode 100644 index a4b9d99810488943e91f08c398752500538ef729..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4208 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 - - - - - - - - - - diff --git a/AstuteSystem/target/astutesystem/index.html b/AstuteSystem/target/astutesystem/index.html deleted file mode 100644 index adf7ac4..0000000 --- a/AstuteSystem/target/astutesystem/index.html +++ /dev/null @@ -1,3 +0,0 @@ -Welcome - -Astute LLC \ No newline at end of file