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 18e7487..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Constants.class and /dev/null differ 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 39a4085..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Utility.class and /dev/null differ 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 6967033..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/DAO.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/SqlDAO.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/SqlDAO.class deleted file mode 100644 index 854dfd8..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/SqlDAO.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/AstuteException.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/AstuteException.class deleted file mode 100644 index e11cc50..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/AstuteException.class and /dev/null differ 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 04bcb1c..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/DatabaseException.class and /dev/null differ 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 7fc8a04..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/filter/CORSFilter.class and /dev/null differ 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 0832c27..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/helpers/JsonHelper.class and /dev/null differ 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 d919be9..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/ChangeOrder.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Customer.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Customer.class deleted file mode 100644 index 4c738de..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Customer.class and /dev/null differ 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 2cb1924..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/GeneratedInvoice.class and /dev/null differ 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 f9f0e07..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Invoice.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/InvoiceDetail.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/InvoiceDetail.class deleted file mode 100644 index fff3f34..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/InvoiceDetail.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PO.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PO.class deleted file mode 100644 index 299c614..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PO.class and /dev/null differ 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 80a5615..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PODetail.class and /dev/null differ 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 b2eecd3..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/User.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/GeneralExceptionMapper.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/GeneralExceptionMapper.class deleted file mode 100644 index 2362651..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/GeneralExceptionMapper.class and /dev/null differ 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 5c5c522..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/JacksonJsonProvider.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RFC3339DateFormat.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RFC3339DateFormat.class deleted file mode 100644 index 2a15096..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RFC3339DateFormat.class and /dev/null differ 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 7aa11ef..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RuntimeExceptionMapper.class and /dev/null differ 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 b11d102..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/WebApplicationExceptionMapper.class and /dev/null differ 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 ab19273..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/ChangeOrderRequest.class and /dev/null differ 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 17a6067..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/CustomerRequest.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceDetailRequest.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceDetailRequest.class deleted file mode 100644 index e181f49..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceDetailRequest.class and /dev/null differ 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 5ef8705..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceMasterRequest.class and /dev/null differ 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 1c287bb..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/LoginRequest.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/PODetailRequest.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/PODetailRequest.class deleted file mode 100644 index 18fca60..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/PODetailRequest.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/POMasterRequest.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/POMasterRequest.class deleted file mode 100644 index 3598f99..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/POMasterRequest.class and /dev/null differ 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 d793681..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/AuthResource.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/ChangeOrderResource.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/ChangeOrderResource.class deleted file mode 100644 index b181b5e..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/ChangeOrderResource.class and /dev/null differ 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 92fd568..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/CustomerResource.class and /dev/null differ 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 6c644c6..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/InvoiceResource.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/POResource.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/POResource.class deleted file mode 100644 index d8087ed..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/POResource.class and /dev/null differ 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 ddae3ee..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/response/ApiResponse.class and /dev/null differ 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 780a797..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/AuthService.class and /dev/null differ 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 cbeea9c..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/ChangeOrderService.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/CustomerService.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/CustomerService.class deleted file mode 100644 index 49e2e28..0000000 Binary files a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/CustomerService.class and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/css/nav.css b/AstuteSystem/target/astutesystem/css/nav.css deleted file mode 100644 index 58ed605..0000000 --- a/AstuteSystem/target/astutesystem/css/nav.css +++ /dev/null @@ -1,54 +0,0 @@ -body {margin:0;} - -.header ul { - list-style-type: none; - margin: 0; - padding: 0; - overflow: hidden; - background-color: #333; - position: fixed; - top: 0; - width: 100%; -} - -.header li { - float: left; -} - -.header li a { - display: block; - color: white; - text-align: center; - padding: 14px 16px; - text-decoration: none; -} - -.header li a:hover:not(.active) { - background-color: #111; -} - -.pmactive { - background-color: var(--pm-blue); -} - -.content{ - margin: 55px 0 0 0; -} - -.footer{ - position: fixed; - top: 45px; - width: 100%; -} - -.error{ - color: white; - background: #f44336; - cursor: pointer; -} - -.success{ - color: white; - background: #4CAF50; - cursor: pointer; -} \ No newline at end of file diff --git a/AstuteSystem/target/astutesystem/css/theme.css b/AstuteSystem/target/astutesystem/css/theme.css deleted file mode 100644 index d3d5552..0000000 --- a/AstuteSystem/target/astutesystem/css/theme.css +++ /dev/null @@ -1,122 +0,0 @@ -:root{ - --pm-background-color: lightgrey; - --pm-blue: #5998ff; - --pm-green: #4CAF50; - --pm-dark-blue: #2e79f4; - --pm-dark-green: #4c9450; - --pm-button-hover-shadow: 0 0 8px rgba(0, 0, 0, 0.6); - --pm-button-active-shadow: none; - --pm-font: "Roboto", sans-serif; -} - -*{ - font-family: var(--pm-font); -} - -.card { - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2); - transition: 0.3s; - padding: 5px; - background: white; -} - -body { - background: lightgrey; -} - -/* BUTTONS */ -.green-btn { - text-transform: uppercase; - outline: 0; - background: var(--pm-green); - width: 100%; - border: 0; - padding: 15px; - color: white; - font-size: 14px; - cursor: pointer; -} -.green-btn:hover{ - box-shadow: 0 0 8px rgba(0, 0, 0, 0.6); -} -.green-btn:active{ - box-shadow:none; - background: var(--pm-dark-green); -} - -.blue-btn { - text-transform: uppercase; - outline: 0; - background: var(--pm-blue); - width: 100%; - border: 0; - padding: 15px; - color: white; - font-size: 14px; - cursor: pointer; -} - -.blue-btn:hover{ - box-shadow: 0 0 8px rgba(0, 0, 0, 0.6); -} - -.blue-btn:active{ - box-shadow:none; - background: var(--pm-dark-blue); -} - -.expand input { - background: #eee; - padding: 10px; - border: none; -} - -.expand:after { - display: block; - content: ""; - border-bottom: 3px solid var(--pm-dark-blue); - transform: scaleX(0); - transition: transform 0.5s; - transform-origin: 0% 50%; -} - -.expand:hover:after { - transform: scaleX(1); -} - -/* TEXT INPUT */ -.blue-txt { - background: white; - width: 100%; - border:0; - border-bottom: solid var(--pm-blue); - padding: 15px; - box-sizing: border-box; - font-size: 14px; -} -.green-txt { - background: white; - width: 100%; - border:0; - border-bottom: solid var(--pm-green); - padding: 15px; - box-sizing: border-box; - font-size: 14px; -} -.blue-txt:focus{ - border-bottom: solid var(--pm-dark-blue); -} -.green-txt:focus{ - border-bottom: solid var(--pm-dark-green); -} -.blue-txt, .green-txt{ - outline: none; -} -.blue-txt, .green-txt{ - outline: none; -} - -form label{ - margin-top: 5%; -} - diff --git a/AstuteSystem/target/astutesystem/doc/user-guide.jsp b/AstuteSystem/target/astutesystem/doc/user-guide.jsp deleted file mode 100644 index 2592a79..0000000 --- a/AstuteSystem/target/astutesystem/doc/user-guide.jsp +++ /dev/null @@ -1,105 +0,0 @@ - - - - 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 a4b9d99..0000000 Binary files a/AstuteSystem/target/astutesystem/images/logo.png and /dev/null differ diff --git a/AstuteSystem/target/astutesystem/images/nist-logo.svg b/AstuteSystem/target/astutesystem/images/nist-logo.svg deleted file mode 100644 index 5dd9aef..0000000 --- a/AstuteSystem/target/astutesystem/images/nist-logo.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - 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