rushilwiz/astute
1
0
Fork 0
mirror of https://github.com/dyiop/astute.git synced 2025-04-05 21:10:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
gopi17701 2019-01-13 11:46:33 -05:00
parent d76671f0ca
commit 31769ebd8f
60 changed files with 1396 additions and 1562 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
AstuteClient2/src/app/customer/customer.component.html
View File

@ -18,6 +18,9 @@
</div> </div>
</div> </div>
<div class="row justify-content-center mt-2"> <div class="row justify-content-center mt-2">
<div class="col-6">
<button class="btn btn-primary" style="width: 100%" (click)="deleteCustomer(selected.customerId)">Delete Customer</button>
</div>
<div class="col-6"> <div class="col-6">
<button class="btn btn-primary" style="width: 100%" (click)="open(edit)">Edit Customer</button> <button class="btn btn-primary" style="width: 100%" (click)="open(edit)">Edit Customer</button>
</div> </div>
@ -127,7 +130,16 @@
<tr> <tr>
<td style="width: 1%"> <td style="width: 1%">
<span class="input-group-text">Fax*</span> <span class="input-group-text">Ext*</span>
</td>
<td colspan="3">
<input type="tel" class="form-control" placeholder="123456" #inPhExt [value]="">
</td>
</tr>
<tr>
<td style="width: 1%">
<span class="input-group-text">Fax</span>
</td> </td>
<td colspan="7"> <td colspan="7">
<input type="tel" class="form-control" placeholder="(123) 456-7890" [value]="''" [textMask]="{mask: usPhoneMask, guide: false}" #inFax> <input type="tel" class="form-control" placeholder="(123) 456-7890" [value]="''" [textMask]="{mask: usPhoneMask, guide: false}" #inFax>
@ -139,8 +151,8 @@
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-success" type="button" <button class="btn btn-success" type="button"
[disabled]="!(inId.value && inName.value && inBillToDept.value && inAdd1.value && inCity.value && inState.value && inZIP.value && inEmail.value && inPhone.value && inFax.value)" [disabled]="!(inId.value && inName.value && inBillToDept.value && inAdd1.value && inCity.value && inState.value && inZIP.value && inEmail.value && inPhone.value)"
(click)="addCustomer(inId.value, inName.value, inBillToDept.value, inAdd1.value, inAdd2.value, inCity.value, inState.value, inZIP.value, inZIP4.value, inEmail.value, inPhone.value, inFax.value, new)"> (click)="addCustomer(inId.value, inName.value, inBillToDept.value, inAdd1.value, inAdd2.value, inCity.value, inState.value, inZIP.value, inZIP4.value, inEmail.value, inPhone.value, inPhExt.value, inFax.value, new)">
Add Add
</button> </button>
<button type="button" class="btn btn-danger" (click)="close(new)">Cancel</button> <button type="button" class="btn btn-danger" (click)="close(new)">Cancel</button>
@ -237,6 +249,15 @@
</td> </td>
</tr> </tr>
<tr>
<td style="width: 1%">
<span class="input-group-text">Ext*</span>
</td>
<td colspan="3">
<input type="tel" class="form-control" placeholder="123456" #inPhExt [value]="selected.phExt">
</td>
</tr>
<tr> <tr>
<td style="width: 1%"> <td style="width: 1%">
<span class="input-group-text">Fax</span> <span class="input-group-text">Fax</span>
@ -252,7 +273,7 @@
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-warning" type="button" <button class="btn btn-warning" type="button"
[disabled]="!(inName.value && inBillToDept.value && inAdd1.value && inCity.value && inState.value && inZIP.value && inEmail.value && inPhone.value)" [disabled]="!(inName.value && inBillToDept.value && inAdd1.value && inCity.value && inState.value && inZIP.value && inEmail.value && inPhone.value)"
(click)="editCustomer(selected.customerId ,inName.value, inBillToDept.value, inAdd1.value, inAdd2.value, inCity.value, inState.value, inZIP.value, inZIP4.value, inEmail.value, inPhone.value, inFax.value, edit)"> (click)="editCustomer(selected.customerId ,inName.value, inBillToDept.value, inAdd1.value, inAdd2.value, inCity.value, inState.value, inZIP.value, inZIP4.value, inEmail.value, inPhone.value, inPhExt.value, inFax.value, edit)">
Update Update
</button> </button>
<button type="button" class="btn btn-danger" (click)="close(edit)">Cancel</button> <button type="button" class="btn btn-danger" (click)="close(edit)">Cancel</button>

357
AstuteClient2/src/app/customer/customer.component.ts
View File

@ -1,170 +1,187 @@
import {Component, OnInit, ViewChild} from '@angular/core'; import {Component, OnInit, ViewChild} from '@angular/core';
import {AstuteClientService} from '../services/astute-client-service'; import {AstuteClientService} from '../services/astute-client-service';
@Component({ @Component({
selector: 'app-customer', selector: 'app-customer',
templateUrl: './customer.component.html', templateUrl: './customer.component.html',
styleUrls: ['./customer.component.css'] styleUrls: ['./customer.component.css']
}) })
export class CustomerComponent implements OnInit { export class CustomerComponent implements OnInit {
@ViewChild('agGrid') agGrid; @ViewChild('agGrid') agGrid;
selected = null; selected = null;
customers; customers;
columnDefs = [ columnDefs = [
{headerName: 'Customer ID', field: 'customerId', checkboxSelection: true}, {headerName: 'Customer ID', field: 'customerId', checkboxSelection: true},
{headerName: 'Customer Name', field: 'customerName'}, {headerName: 'Customer Name', field: 'customerName'},
{headerName: 'Bill To Department', field: 'billToDept'}, {headerName: 'Bill To Department', field: 'billToDept'},
{headerName: 'Address 1', field: 'add1'}, {headerName: 'Address 1', field: 'add1'},
{headerName: 'Address 2', field: 'add2'}, {headerName: 'Address 2', field: 'add2'},
{headerName: 'City', field: 'city'}, {headerName: 'City', field: 'city'},
{headerName: 'Email', field: 'email'}, {headerName: 'Email', field: 'email'},
{headerName: 'Fax', field: 'fax'}, {headerName: 'Fax', field: 'fax'},
{headerName: 'Phone', field: 'phone'}, {headerName: 'Phone', field: 'phone'},
{headerName: 'State', field: 'state'}, {headerName: 'phExt', field: 'phExt'},
{headerName: 'ZIP', field: 'zip'}, {headerName: 'State', field: 'state'},
{headerName: 'ZIP-4', field: 'ziplast4'} {headerName: 'ZIP', field: 'zip'},
]; {headerName: 'ZIP-4', field: 'ziplast4'}
rowData: any; ];
states = [ rowData: any;
'AL', states = [
'AK', 'AL',
'AR', 'AK',
'AZ', 'AR',
'CA', 'AZ',
'CO', 'CA',
'CT', 'CO',
'DC', 'CT',
'DE', 'DC',
'FL', 'DE',
'GA', 'FL',
'HI', 'GA',
'IA', 'HI',
'ID', 'IA',
'IL', 'ID',
'IN', 'IL',
'KS', 'IN',
'KY', 'KS',
'LA', 'KY',
'MA', 'LA',
'MD', 'MA',
'ME', 'MD',
'MI', 'ME',
'MN', 'MI',
'MO', 'MN',
'MS', 'MO',
'MT', 'MS',
'NC', 'MT',
'NE', 'NC',
'NH', 'NE',
'NJ', 'NH',
'NM', 'NJ',
'NV', 'NM',
'NY', 'NV',
'ND', 'NY',
'OH', 'ND',
'OK', 'OH',
'OR', 'OK',
'PA', 'OR',
'RI', 'PA',
'SC', 'RI',
'SD', 'SC',
'TN', 'SD',
'TX', 'TN',
'UT', 'TX',
'VT', 'UT',
'VA', 'VT',
'WA', 'VA',
'WI', 'WA',
'WV', 'WI',
'WY' 'WV',
]; 'WY'
usPhoneMask = ['(', /[1-9]/, /\d/, /\d/, ')', ' ', /\d/, /\d/, /\d/, '-', /\d/, /\d/, /\d/, /\d/]; ];
usPhoneMask = ['(', /[1-9]/, /\d/, /\d/, ')', ' ', /\d/, /\d/, /\d/, '-', /\d/, /\d/, /\d/, /\d/];
constructor(protected astuteClientService: AstuteClientService) {
} constructor(protected astuteClientService: AstuteClientService) {
}
ngOnInit() {
this.refreshData(); ngOnInit() {
} this.refreshData();
}
getSelectedRows() {
const selectedNodes = this.agGrid.api.getSelectedNodes(); getSelectedRows() {
if (selectedNodes.length) { const selectedNodes = this.agGrid.api.getSelectedNodes();
this.selected = selectedNodes.map(node => node.data)[0]; if (selectedNodes.length) {
} else { this.selected = selectedNodes.map(node => node.data)[0];
this.selected = null; } 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) { // inName.value, inBillToDept.value, inAdd1.value, inAdd2.value, inCity.value, inState.value, inZIP.value, inZIP4.value, inEmail.value, inPhone.value, inFax.value
let customerData = { addCustomer(customerId, name, billTo, add1, add2, city, state, zip, zip4, email, phone, phExt, fax, ref) {
"customerId": customerId, let customerData = {
"customerName": name, "customerId": customerId,
"billToDept": billTo, "customerName": name,
"add1": add1, "billToDept": billTo,
"add2": add2, "add1": add1,
"city": city, "add2": add2,
"state": state, "city": city,
"zip": zip, "state": state,
"ziplast4": zip4, "zip": zip,
"email": email, "ziplast4": zip4,
"phone": phone, "email": email,
"fax": fax "phone": phone,
}; "phExt": phExt,
this.astuteClientService.createCustomer(customerData).then((data) => { "fax": fax
if (data) { };
this.refreshData(); this.astuteClientService.createCustomer(customerData).then((data) => {
ref.close(); if (data) {
} else { this.refreshData();
alert("Customer Creation Failed, Check Input Fields") ref.close();
} } else {
}, (reason) => { alert("Customer Creation Failed, Check Input Fields")
alert("add customer failed for " + reason); }
}); }, (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, editCustomer(id, name, billTo, add1, add2, city, state, zip, zip4, email, phone, phExt, fax, ref) {
"customerName": name, const customerData = {
"billToDept": billTo, "customerId": id,
"add1": add1, "customerName": name,
"add2": add2, "billToDept": billTo,
"city": city, "add1": add1,
"state": state, "add2": add2,
"zip": zip, "city": city,
"ziplast4": zip4, "state": state,
"email": email, "zip": zip,
"phone": phone, "ziplast4": zip4,
"fax": fax "email": email,
}; "phone": phone,
this.astuteClientService.updateCustomer(id, customerData).then((data) => { "phExt": phExt,
if (data) { "fax": fax
this.refreshData(); };
ref.close(); this.astuteClientService.updateCustomer(id, customerData).then((data) => {
} else { if (data) {
alert("Customer Updating Failed, Check Input Fields") this.refreshData();
} ref.close();
}, (reason) => { } else {
alert("update customer failed for " + reason); alert("Customer Updating Failed, Check Input Fields")
}); }
} }, (reason) => {
alert("update customer failed for " + reason);
open(ref) { });
this.getSelectedRows(); }
ref.open();
} deleteCustomer (customerId) {
if (confirm('Are you sure you want to delete customer, ' + customerId)) {
close(ref) { this.astuteClientService.deleteCustomer(customerId).then((data) => {
ref.close(); if (data) {
} console.log('Customer, ' + customerId + ' successfully deleted');
this.refreshData();
refreshData() { } else {
this.rowData = this.astuteClientService.getCustomers(); alert ('Error in deleting; Customer, ' + customerId + ' has not been deleted');
this.astuteClientService.getCustomers().then((data) => { }
this.customers = data; });
}); }
} }
}
open(ref) {
this.getSelectedRows();
ref.open();
}
close(ref) {
ref.close();
}
refreshData() {
this.rowData = this.astuteClientService.getCustomers();
this.astuteClientService.getCustomers().then((data) => {
this.customers = data;
});
}
}

22
AstuteClient2/src/app/invoice/invoice.component.html
View File

@ -21,6 +21,16 @@
<!--Buttons--> <!--Buttons-->
<div class="row justify-content-center mt-2"> <div class="row justify-content-center mt-2">
<div class="col-2">
<button class="btn btn-success" style="width: 100%" (click)="open(new,null,null)">
Add
</button>
</div>
<div class="col-2">
<button class="btn btn-info" style="width: 100%" (click)="open(edit,null,null)" [disabled]="!chosenInv">
Edit
</button>
</div>
<div class="col-2"> <div class="col-2">
<button class="btn btn-primary" style="width: 100%" (click)="submitInvoice(chosenInv.invoiceNumber)" [disabled]="!(chosenInv && chosenInv.invoiceStatus === 1)"> <button class="btn btn-primary" style="width: 100%" (click)="submitInvoice(chosenInv.invoiceNumber)" [disabled]="!(chosenInv && chosenInv.invoiceStatus === 1)">
Submit Submit
@ -36,16 +46,6 @@
Void Void
</button> </button>
</div> </div>
<div class="col-2">
<button class="btn btn-info" style="width: 100%" (click)="open(edit,null,null)" [disabled]="!chosenInv">
Edit
</button>
</div>
<div class="col-2">
<button class="btn btn-success" style="width: 100%" (click)="open(new,null,null)">
Add
</button>
</div>
<div class="col-2"> <div class="col-2">
<!--<button class="btn btn-light" style="width: 100%" (click)="assignActity()" [disabled]="!chosenInv">--> <!--<button class="btn btn-light" style="width: 100%" (click)="assignActity()" [disabled]="!chosenInv">-->
<button class="btn btn-light" style="width: 100%" (click)="assignActity()" disabled> <button class="btn btn-light" style="width: 100%" (click)="assignActity()" disabled>
@ -459,7 +459,7 @@
<td colspan="2"> <td colspan="2">
<p *ngIf="customerSelec.value >= 0" class="p-0 m-0 mt-2"> <p *ngIf="customerSelec.value >= 0" class="p-0 m-0 mt-2">
{{customers[customerSelec.value].city}} {{customers[customerSelec.value].state}} {{customers[customerSelec.value].zip}} {{customers[customerSelec.value].city}} {{customers[customerSelec.value].state}} {{customers[customerSelec.value].zip}}
<!-- -{{customers[customerSelec.value].ziplast4}}--> {{customers[customerSelec.value].ziplast4}}
</p> </p>
</td> </td>
<td></td> <td></td>

12
AstuteClient2/src/app/sales-order/sales-order.component.html
View File

@ -61,6 +61,10 @@
<td style="width: 20%"><span class="input-group-text">Contract Amount</span></td> <td style="width: 20%"><span class="input-group-text">Contract Amount</span></td>
<td style="width: 30%"><input type="text" class="form-control" placeholder="Derived From Details" [value]="newContractAmount | currency" #contractamt disabled></td> <td style="width: 30%"><input type="text" class="form-control" placeholder="Derived From Details" [value]="newContractAmount | currency" #contractamt disabled></td>
</tr> </tr>
<tr>
<td style="width: 80%"><span class="input-group-text">Notes</span></td>
<td style="width: 70%"><input type="text" class="form-control" placeholder="Notes..." [value]="selected.notes" #notes></td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
@ -162,7 +166,7 @@
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-success" type="button" <button class="btn btn-success" type="button"
[disabled]="!(ponum.value && podate.value && customerid.value && contractnum.value && contractamt.value && projNum.value)" [disabled]="!(ponum.value && podate.value && customerid.value && contractnum.value && contractamt.value && projNum.value)"
(click)="addPo(projNum.value, ponum.value, podate.value, customerid.value, contractnum.value, contractamt.value.replace('$', '').replace(',', ''), title.value, new)" (click)="addPo(projNum.value, ponum.value, podate.value, customerid.value, contractnum.value, contractamt.value.replace('$', '').replace(',', ''), title.value, notes.value, new)"
> >
Add Add
</button> </button>
@ -207,6 +211,10 @@
<td style="width: 20%"><span class="input-group-text">Contract Amount</span></td> <td style="width: 20%"><span class="input-group-text">Contract Amount</span></td>
<td style="width: 30%"><input type="text" class="form-control" placeholder="Contract Amount" [value]="editContractAmount | currency" #contractamt disabled></td> <td style="width: 30%"><input type="text" class="form-control" placeholder="Contract Amount" [value]="editContractAmount | currency" #contractamt disabled></td>
</tr> </tr>
<tr>
<td style="width: 20%"><span class="input-group-text">Notes</span></td>
<td style="width: 70%"><input type="text" class="form-control" placeholder="Notes..." [value]="selected.notes" #notes></td>
</tr>
</tbody> </tbody>
</table> </table>
<!--<form>--> <!--<form>-->
@ -358,7 +366,7 @@
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-success" type="button" <button class="btn btn-success" type="button"
[disabled]="!(ponum.value && podate.value && contractnum.value && contractamt.value && projNum.value)" [disabled]="!(ponum.value && podate.value && contractnum.value && contractamt.value && projNum.value)"
(click)="editPo(projNum.value, ponum.value, podate.value, contractnum.value, contractamt.value.replace(',', '').replace('$', ''), title.value, edit)" (click)="editPo(projNum.value, ponum.value, podate.value, contractnum.value, contractamt.value.replace(',', '').replace('$', ''), title.value, notes.value, edit)"
> >
Update Update
</button> </button>

530
AstuteClient2/src/app/sales-order/sales-order.component.ts
View File

@ -1,264 +1,266 @@
import {Component, OnInit, ViewChild} from '@angular/core'; import {Component, OnInit, ViewChild} from '@angular/core';
import {AstuteClientService} from '../services/astute-client-service'; import {AstuteClientService} from '../services/astute-client-service';
import {formatCurrency} from "@angular/common"; import {formatCurrency} from "@angular/common";
@Component({ @Component({
selector: 'app-sales-order', selector: 'app-sales-order',
templateUrl: './sales-order.component.html', templateUrl: './sales-order.component.html',
styleUrls: ['./sales-order.component.css'] styleUrls: ['./sales-order.component.css']
}) })
export class SalesOrderComponent implements OnInit { export class SalesOrderComponent implements OnInit {
@ViewChild('agGrid') agGrid; @ViewChild('agGrid') agGrid;
selected = null; selected = null;
selectedPODetail = []; selectedPODetail = [];
newPODetail = []; newPODetail = [];
newContractAmount = 0; newContractAmount = 0;
editContractAmount = 0; editContractAmount = 0;
customers; customers;
pos; pos;
serviceTypes; serviceTypes;
columnDefs = [ columnDefs = [
{headerName: 'Project Number', field: 'astuteProjectNumber'}, {headerName: 'Project Number', field: 'astuteProjectNumber'},
{headerName: 'SO Number', field: 'ponum'}, {headerName: 'SO Number', field: 'ponum'},
// {headerName: 'Customer ID', field: 'customerId'}, // {headerName: 'Customer ID', field: 'customerId'},
{headerName: 'Customer Name', field: 'customerName'}, {headerName: 'Customer Name', field: 'customerName'},
{headerName: 'Contract Number', field: 'contractNum'}, {headerName: 'Contract Number', field: 'contractNum'},
{headerName: 'SO Title', field: 'title'}, {headerName: 'SO Title', field: 'title'},
{headerName: 'Contract Amount', field: 'contractAmt'}, {headerName: 'Contract Amount', field: 'contractAmt'},
{headerName: 'SO Date', field: 'podate'}, {headerName: 'SO Date', field: 'podate'},
{headerName: '# of Invoice', field: 'invoiceSequence'} {headerName: '# of Invoice', field: 'invoiceSequence'}
]; ];
rowData: any; rowData: any;
constructor(private astuteClientService: AstuteClientService) { constructor(private astuteClientService: AstuteClientService) {
} }
ngOnInit() { ngOnInit() {
this.refreshData(); this.refreshData();
this.astuteClientService.getServiceTypes().then((d) => { this.astuteClientService.getServiceTypes().then((d) => {
if (d) { if (d) {
this.serviceTypes = d; this.serviceTypes = d;
} else { } else {
alert ('get service types failed'); alert ('get service types failed');
} }
}); });
} }
printValue(val) { printValue(val) {
console.log(val); console.log(val);
} }
addPo(projNum, ponum, podate, customerid, contractnum, contractamt, title, ref) { addPo(projNum, ponum, podate, customerid, contractnum, contractamt, title, notes, ref) {
const poData = { const poData = {
"astuteProjectNumber": projNum, "astuteProjectNumber": projNum,
"poNum": ponum, "poNum": ponum,
"podate": podate, "podate": podate,
"customerId": customerid, "customerId": customerid,
"contractNum": contractnum, "contractNum": contractnum,
"contractAmt": contractamt, "contractAmt": contractamt,
"title": title, "title": title,
} "notes": notes,
console.log(poData); }
this.astuteClientService.createPO(poData).then((data) => { console.log(poData);
if (data) { this.astuteClientService.createPO(poData).then((data) => {
this.refreshData(); if (data) {
this.addPODetail(this.newPODetail); this.refreshData();
ref.close(); this.addPODetail(this.newPODetail);
} else { ref.close();
alert("PO Creation failed, check input fields"); } else {
} alert("PO Creation failed, check input fields");
}, (reason) => { }
alert("add po failed for " + reason); }, (reason) => {
}); alert("add po failed for " + reason);
} });
}
addPODetail(details) {
if (details.length) { addPODetail(details) {
console.log(details[0]); if (details.length) {
this.astuteClientService.createPODetail(details[0]).then((data) => { console.log(details[0]);
if (data) { this.astuteClientService.createPODetail(details[0]).then((data) => {
details.splice(0, 1); if (data) {
this.addPODetail(details); details.splice(0, 1);
} else { this.addPODetail(details);
alert("add detail failed"); } else {
} alert("add detail failed");
}); }
} else { });
this.newPODetail = []; } else {
} this.newPODetail = [];
} }
}
editPo(projNum, ponum, podate, contractnum, contractamt, title, ref) {
const poData = { editPo(projNum, ponum, podate, contractnum, contractamt, title, notes, ref) {
"astuteProjectNumber": projNum, const poData = {
"poNum": ponum, "astuteProjectNumber": projNum,
"podate": podate, "poNum": ponum,
"contractNum": contractnum, "podate": podate,
"contractAmt": contractamt, "contractNum": contractnum,
"title": title, "contractAmt": contractamt,
} "title": title,
console.log(poData); "notes": notes,
this.astuteClientService.updatePO(ponum, poData).then((data) => { }
if (data) { console.log(poData);
this.refreshData(); this.astuteClientService.updatePO(ponum, poData).then((data) => {
this.editPODetail(this.selectedPODetail); if (data) {
ref.close(); this.refreshData();
} else { this.editPODetail(this.selectedPODetail);
alert("PO updating failed, check input fields"); ref.close();
} } else {
}, (reason) => { alert("PO updating failed, check input fields");
alert("update po failed for " + reason); }
}); }, (reason) => {
} alert("update po failed for " + reason);
});
editPODetail(details) { }
if (details.length) {
console.log(details[0]); editPODetail(details) {
this.astuteClientService.updatePODetail(details[0].ponum, details[0].lineItemNo, details[0]).then((data) => { if (details.length) {
if (data) { console.log(details[0]);
details.splice(0, 1); this.astuteClientService.updatePODetail(details[0].ponum, details[0].lineItemNo, details[0]).then((data) => {
this.editPODetail(details); if (data) {
} else { details.splice(0, 1);
alert('add detail failed'); this.editPODetail(details);
} } else {
}); alert('add detail failed');
} else { }
this.newPODetail = []; });
} } else {
} this.newPODetail = [];
}
pushOntoSelectedDetail(lineItemNo: number, ponum, serviceDesc, feeTypeId, serviceTypeId, qty, fee, remainingQty) { }
this.selectedPODetail.push({
'lineItemNo': lineItemNo, pushOntoSelectedDetail(lineItemNo: number, ponum, serviceDesc, feeTypeId, serviceTypeId, qty, fee, remainingQty) {
'ponum': ponum, this.selectedPODetail.push({
'serviceDesc': serviceDesc, 'lineItemNo': lineItemNo,
'feeTypeId': feeTypeId, 'ponum': ponum,
'serviceTypeId': serviceTypeId, 'serviceDesc': serviceDesc,
'qty': qty, 'feeTypeId': feeTypeId,
'fee': fee, 'serviceTypeId': serviceTypeId,
'remainingQty': remainingQty 'qty': qty,
}); 'fee': fee,
} 'remainingQty': remainingQty
});
pushOntoNewDetail(lineItemNo: number, ponum, serviceDesc, feeTypeId, serviceTypeId, qty, fee, remainingQty) { }
this.newPODetail.push({
'lineItemNo': lineItemNo, pushOntoNewDetail(lineItemNo: number, ponum, serviceDesc, feeTypeId, serviceTypeId, qty, fee, remainingQty) {
'poNum': ponum, this.newPODetail.push({
'serviceDesc': serviceDesc, 'lineItemNo': lineItemNo,
'feeTypeId': feeTypeId, 'poNum': ponum,
'serviceTypeId': serviceTypeId, 'serviceDesc': serviceDesc,
'qty': qty, 'feeTypeId': feeTypeId,
'fee': fee, 'serviceTypeId': serviceTypeId,
'remainingQty': remainingQty 'qty': qty,
}); 'fee': fee,
} 'remainingQty': remainingQty
});
updateNewContractAmt() { }
let tot = 0;
this.newPODetail.forEach((d) => { updateNewContractAmt() {
tot += +d.qty * +d.fee; let tot = 0;
}); this.newPODetail.forEach((d) => {
this.newContractAmount = tot; tot += +d.qty * +d.fee;
} });
this.newContractAmount = tot;
updateEditContractAmt() { }
let tot = 0;
this.selectedPODetail.forEach((d) => { updateEditContractAmt() {
tot += +d.qty * +d.fee; let tot = 0;
}); this.selectedPODetail.forEach((d) => {
this.editContractAmount = tot; tot += +d.qty * +d.fee;
} });
this.editContractAmount = tot;
open(ref) { }
this.getSelectedRows();
ref.open(); open(ref) {
} this.getSelectedRows();
ref.open();
close(ref) { }
this.newPODetail = [];
this.selectedPODetail = []; close(ref) {
this.newPODetail = [];
ref.close(); this.selectedPODetail = [];
}
ref.close();
onSelectedCellChange(row: number, col: string, value) { }
this.selectedPODetail[row][col] = value;
console.log(this.selectedPODetail); 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); onNewCellChange(row: number, col: string, value) {
} this.newPODetail[row][col] = value;
console.log(this.newPODetail);
getCurrDate() { }
const d = new Date();
return this.formatDate(d); getCurrDate() {
} const d = new Date();
return this.formatDate(d);
formatDate(d: Date) { }
let month = '' + (d.getMonth() + 1),
day = '' + d.getDate(), formatDate(d: Date) {
year = d.getFullYear(); let month = '' + (d.getMonth() + 1),
day = '' + d.getDate(),
if (month.length < 2) { year = d.getFullYear();
month = '0' + month;
} if (month.length < 2) {
if (day.length < 2) { month = '0' + month;
day = '0' + day; }
} if (day.length < 2) {
return [year, month, day].join('-'); day = '0' + day;
} }
return [year, month, day].join('-');
getSelectedRows() { }
const selectedNodes = this.agGrid.api.getSelectedNodes();
if (selectedNodes.length) { getSelectedRows() {
this.selected = selectedNodes.map(node => node.data)[0]; const selectedNodes = this.agGrid.api.getSelectedNodes();
// this.editContractAmount = +this.selected.contractAmt; if (selectedNodes.length) {
console.log(this.selected.contractNum); this.selected = selectedNodes.map(node => node.data)[0];
this.astuteClientService.getPODetail(this.selected.ponum).then((data) => { // this.editContractAmount = +this.selected.contractAmt;
if (data) { console.log(this.selected.contractNum);
this.selectedPODetail = data; this.astuteClientService.getPODetail(this.selected.ponum).then((data) => {
// console.log(this.selectedPODetail); if (data) {
this.updateEditContractAmt(); this.selectedPODetail = data;
} else { // console.log(this.selectedPODetail);
alert('get PO detail failed!'); this.updateEditContractAmt();
} } else {
}); alert('get PO detail failed!');
} else { }
this.selected = null; });
this.selectedPODetail = []; } else {
} this.selected = null;
} this.selectedPODetail = [];
}
refreshData() { }
this.astuteClientService.getCustomers().then((customers) => {
if (customers) { refreshData() {
this.customers = customers; this.astuteClientService.getCustomers().then((customers) => {
this.astuteClientService.getPOs().then((data) => { if (customers) {
if (data) { this.customers = customers;
this.pos = data; this.astuteClientService.getPOs().then((data) => {
this.rowData = data; if (data) {
this.rowData.forEach((row) => { this.pos = data;
row.customerName = this.getCustomerName(row.customerId); this.rowData = data;
row.contractAmt = formatCurrency(row.contractAmt, 'en-US', '$', 'USD'); this.rowData.forEach((row) => {
}); row.customerName = this.getCustomerName(row.customerId);
} row.contractAmt = formatCurrency(row.contractAmt, 'en-US', '$', 'USD');
}); });
} else { }
alert('get Customers Failed!'); });
} } else {
}); alert('get Customers Failed!');
// this.rowData = this.astuteClientService.getPOs(); }
} });
// this.rowData = this.astuteClientService.getPOs();
getCustomerName(customerId) { }
let name = '';
this.customers.forEach((customer) => { getCustomerName(customerId) {
if (customer.customerId === customerId) { let name = '';
name = customer.customerName; this.customers.forEach((customer) => {
} if (customer.customerId === customerId) {
}); name = customer.customerName;
return name; }
} });
} return name;
}
}

895
AstuteClient2/src/app/services/astute-client-service.ts
View File

@ -1,442 +1,453 @@
import {HttpClient, HttpHeaders} from '@angular/common/http'; import {HttpClient, HttpHeaders} from '@angular/common/http';
import {Injectable} from '@angular/core'; import {Injectable} from '@angular/core';
@Injectable() @Injectable()
export class AstuteClientService { export class AstuteClientService {
headers = { headers = {
headers: new HttpHeaders().set('Content-Type', 'application/json'), headers: new HttpHeaders().set('Content-Type', 'application/json'),
}; };
private authUrl = 'http://localhost:8080/astutesystem/auth'; private authUrl = 'http://localhost:8080/astutesystem/auth';
private customerUrl = 'http://localhost:8080/astutesystem/customer'; private customerUrl = 'http://localhost:8080/astutesystem/customer';
private POUrl = 'http://localhost:8080/astutesystem/po'; private POUrl = 'http://localhost:8080/astutesystem/po';
private POServiceTypesUrl = 'http://localhost:8080/astutesystem/po/serviceTypes'; private POServiceTypesUrl = 'http://localhost:8080/astutesystem/po/serviceTypes';
private PODetailUrl = 'http://localhost:8080/astutesystem/po/detail'; private PODetailUrl = 'http://localhost:8080/astutesystem/po/detail';
private invoiceUrl = 'http://localhost:8080/astutesystem/invoice'; private invoiceUrl = 'http://localhost:8080/astutesystem/invoice';
private invoiceDetailUrl = 'http://localhost:8080/astutesystem/invoice/detail'; private invoiceDetailUrl = 'http://localhost:8080/astutesystem/invoice/detail';
private invoiceGenUrl = 'http://localhost:8080/astutesystem/invoice/generatedInvoice'; private invoiceGenUrl = 'http://localhost:8080/astutesystem/invoice/generatedInvoice';
private invoicePaymentUrl = 'http://localhost:8080/astutesystem/invoicePayment'; private invoicePaymentUrl = 'http://localhost:8080/astutesystem/invoicePayment';
private sessionId = localStorage.getItem(''); private sessionId = localStorage.getItem('');
private sessionString = `?sessionId=${this.sessionId}`; private sessionString = `?sessionId=${this.sessionId}`;
constructor(private http: HttpClient) { } constructor(private http: HttpClient) { }
// **************************************** AUTH Service methods // **************************************** AUTH Service methods
public login(username: string, password: string): Promise<string> { public login(username: string, password: string): Promise<string> {
const data = { const data = {
'username': username, 'username': username,
'password': password 'password': password
}; };
return this.http return this.http
.post(this.authUrl, data) .post(this.authUrl, data)
.toPromise() .toPromise()
.then(response => { .then(response => {
console.log(response['entity']); console.log(response['entity']);
const name = response['entity'].name; const name = response['entity'].name;
const sessionId = response['entity'].sessionId; const sessionId = response['entity'].sessionId;
if (sessionId != null) { if (sessionId != null) {
localStorage.setItem('SESSION_ID', sessionId); localStorage.setItem('SESSION_ID', sessionId);
localStorage.setItem('SESSION_USER', name); localStorage.setItem('SESSION_USER', name);
return sessionId; return sessionId;
} else { } else {
return null; return null;
} }
}); });
} }
public logout() { public logout() {
localStorage.removeItem('SESSION_ID'); localStorage.removeItem('SESSION_ID');
localStorage.removeItem('SESSION_USER'); localStorage.removeItem('SESSION_USER');
console.log(localStorage.getItem('SESSION_ID')); console.log(localStorage.getItem('SESSION_ID'));
} }
public getSessionId(): string { public getSessionId(): string {
console.log(localStorage.getItem('SESSION_ID')); console.log(localStorage.getItem('SESSION_ID'));
return localStorage.getItem('SESSION_ID'); return localStorage.getItem('SESSION_ID');
} }
public getSessionUser(): string { public getSessionUser(): string {
console.log(localStorage.getItem('SESSION_USER')); console.log(localStorage.getItem('SESSION_USER'));
return localStorage.getItem('SESSION_USER'); return localStorage.getItem('SESSION_USER');
} }
// **************************************** Customer Service methods // **************************************** Customer Service methods
public getCustomers(): Promise<any> { public getCustomers(): Promise<any> {
console.log("*** In getCustomers()"); console.log("*** In getCustomers()");
const url = `${this.customerUrl}${this.sessionString}`; const url = `${this.customerUrl}${this.sessionString}`;
return this.http.get(url) return this.http.get(url)
.toPromise() .toPromise()
.then(response => { .then(response => {
console.log(response['entity']); console.log(response['entity']);
return response['entity']; return response['entity'];
}) })
.catch( error => { .catch( error => {
alert(error); alert(error);
}); });
} }
public updateCustomer(customerId: number, data: any): Promise<any> { public updateCustomer(customerId: number, data: any): Promise<any> {
console.log("*** In updateCustomer()"); console.log("*** In updateCustomer()");
const url = `${this.customerUrl}/${customerId}`; //TODO send sessionId const url = `${this.customerUrl}/${customerId}`; //TODO send sessionId
return this.http.put(url, data) return this.http.put(url, data)
.toPromise() .toPromise()
.then(response => response['entity']); .then(response => response['entity']);
} }
public createCustomer(data: any): Promise<any> { public createCustomer(data: any): Promise<any> {
console.log("*** In createCustomer()"); console.log("*** In createCustomer()");
const url = `${this.customerUrl}`; //TODO send sessionId const url = `${this.customerUrl}`; //TODO send sessionId
return this.http.post(url, data) return this.http.post(url, data)
.toPromise() .toPromise()
.then(response => response['entity']); .then(response => response['entity']);
} }
// **************************************** PO Service methods public deleteCustomer(customerId) {
console.log("*** In deleteCustomer()");
const url = `${this.customerUrl}/${customerId}/delete`;
public getPOs(): Promise<any> { return this.http.put(url, {})
console.log("*** In getPOs()"); .toPromise()
const url = `${this.POUrl}`; .then(response => {
return this.http.get(url) console.log (response['entity']);
.toPromise() return response['entity'];
.then(response => { });
console.log(response['entity']); }
return response['entity'];
}); // **************************************** PO Service methods
}
public getServiceTypes(): Promise<any> { public getPOs(): Promise<any> {
console.log("*** In getPOServiceTypes()"); console.log("*** In getPOs()");
const url = `${this.POServiceTypesUrl}`; const url = `${this.POUrl}`;
return this.http.get(url) return this.http.get(url)
.toPromise() .toPromise()
.then(response => { .then(response => {
console.log(response['entity']); console.log(response['entity']);
return response['entity']; return response['entity'];
}); });
} }
public getPODetail(ponum): Promise<any> { public getServiceTypes(): Promise<any> {
console.log("*** In getPODetails()"); console.log("*** In getPOServiceTypes()");
const url = `${this.PODetailUrl}?PONum=${ponum}`; const url = `${this.POServiceTypesUrl}`;
console.log(url); return this.http.get(url)
return this.http.get(url) .toPromise()
.toPromise() .then(response => {
.then(response => { console.log(response['entity']);
console.log(response['entity']); return response['entity'];
return response['entity']; });
}); }
}
public getPODetail(ponum): Promise<any> {
public updatePO(ponum: string, data: any): Promise<any> { console.log("*** In getPODetails()");
console.log("*** In updatePO()"); const url = `${this.PODetailUrl}?PONum=${ponum}`;
const url = `${this.POUrl}/${ponum}`; //TODO send sessionId console.log(url);
return this.http.put(url, data) return this.http.get(url)
.toPromise() .toPromise()
.then(response => response['entity']); .then(response => {
} console.log(response['entity']);
return response['entity'];
public createPO(data: any): Promise<any> { });
console.log("*** In createPO()"); }
const url = `${this.POUrl}`; //TODO send sessionId
return this.http.post(url, data) public updatePO(ponum: string, data: any): Promise<any> {
.toPromise() console.log("*** In updatePO()");
.then(response => response['entity']); const url = `${this.POUrl}/${ponum}`; //TODO send sessionId
} return this.http.put(url, data)
.toPromise()
// String serviceDesc; .then(response => response['entity']);
// int feeTypeId; }
// Double qty;
// int serviceTypeId; public createPO(data: any): Promise<any> {
// String schedule; console.log("*** In createPO()");
// Date deliverBy; const url = `${this.POUrl}`; //TODO send sessionId
public updatePODetail(ponum, lineItemNo, data) { return this.http.post(url, data)
console.log("*** In updatePODetail()"); .toPromise()
const sessionId = localStorage.getItem('sessionId'); .then(response => response['entity']);
const url = `${this.POUrl}/detail/${ponum}/${lineItemNo}`; //TODO send sessionId }
return this.http.put(url, data)
.toPromise() // String serviceDesc;
.then(response => response['entity']); // int feeTypeId;
} // Double qty;
// int serviceTypeId;
public createPODetail(data) { // String schedule;
console.log("*** In createPODetail()"); // Date deliverBy;
const url = `${this.POUrl}/detail`; //TODO send sessionId public updatePODetail(ponum, lineItemNo, data) {
return this.http.post(url, data) console.log("*** In updatePODetail()");
.toPromise() const sessionId = localStorage.getItem('sessionId');
.then(response => response['entity']); const url = `${this.POUrl}/detail/${ponum}/${lineItemNo}`; //TODO send sessionId
} return this.http.put(url, data)
.toPromise()
// **************************************** Invoice Service methods .then(response => response['entity']);
}
// /{InvoiceNumber}/void
public submitInvoice (invoiceNumber) { public createPODetail(data) {
console.log("*** In submitInvoice(), invoiceNumber" + invoiceNumber); console.log("*** In createPODetail()");
const url = `${this.invoiceUrl}/${invoiceNumber}/submit`; const url = `${this.POUrl}/detail`; //TODO send sessionId
return this.http.put(url, {}) return this.http.post(url, data)
.toPromise() .toPromise()
.then(response => { .then(response => response['entity']);
console.log (response['entity']); }
return response['entity'];
}); // **************************************** Invoice Service methods
}
// /{InvoiceNumber}/void
public voidInvoice (invoiceNumber) { public submitInvoice (invoiceNumber) {
console.log("*** In voidInvoice(), invoiceNumber" + invoiceNumber); console.log("*** In submitInvoice(), invoiceNumber" + invoiceNumber);
const url = `${this.invoiceUrl}/${invoiceNumber}/void`; const url = `${this.invoiceUrl}/${invoiceNumber}/submit`;
return this.http.put(url, {}) return this.http.put(url, {})
.toPromise() .toPromise()
.then(response => { .then(response => {
console.log (response['entity']); console.log (response['entity']);
return response['entity']; return response['entity'];
}); });
} }
public deleteInvoice (invoiceNumber) { public voidInvoice (invoiceNumber) {
console.log("*** In deleteInvoice(), invoiceNumber" + invoiceNumber); console.log("*** In voidInvoice(), invoiceNumber" + invoiceNumber);
const url = `${this.invoiceUrl}/${invoiceNumber}/delete`; const url = `${this.invoiceUrl}/${invoiceNumber}/void`;
return this.http.put(url, {}) return this.http.put(url, {})
.toPromise() .toPromise()
.then(response => { .then(response => {
console.log (response['entity']); console.log (response['entity']);
return response['entity']; return response['entity'];
}); });
} }
public generateInvoiceNumber (ponum) { public deleteInvoice (invoiceNumber) {
console.log("*** In generateInvoiceNumber()"); console.log("*** In deleteInvoice(), invoiceNumber" + invoiceNumber);
const url = `${this.invoiceUrl}/generateInvoiceNumber/${ponum}`; const url = `${this.invoiceUrl}/${invoiceNumber}/delete`;
return this.http.get(url) return this.http.put(url, {})
.toPromise() .toPromise()
.then(response => { .then(response => {
console.log (response['entity']) console.log (response['entity']);
return response['entity']; return response['entity'];
}); });
} }
public getInvoices(): Promise<any> { public generateInvoiceNumber (ponum) {
console.log("*** In getInvoices()"); console.log("*** In generateInvoiceNumber()");
const url = `${this.invoiceUrl}`; const url = `${this.invoiceUrl}/generateInvoiceNumber/${ponum}`;
return this.http.get(url) return this.http.get(url)
.toPromise() .toPromise()
.then(response => { .then(response => {
console.log(response['entity']); console.log (response['entity'])
return response['entity']; return response['entity'];
}); });
} }
public getInvoiceDetail(invoiceId: string): Promise<any> { public getInvoices(): Promise<any> {
console.log("*** In getInvoiceDetail()"); console.log("*** In getInvoices()");
const url = `${this.invoiceDetailUrl}?invoiceNumber=${invoiceId}`; const url = `${this.invoiceUrl}`;
return this.http.get(url) return this.http.get(url)
.toPromise() .toPromise()
.then(response => { .then(response => {
console.log(response['entity']); console.log(response['entity']);
return response['entity']; return response['entity'];
}); });
} }
public getInvoiceGen (invoiceId: string): Promise<any> { public getInvoiceDetail(invoiceId: string): Promise<any> {
console.log("*** In getInvoiceGen()"); console.log("*** In getInvoiceDetail()");
const url = `${this.invoiceGenUrl}/${invoiceId}`; const url = `${this.invoiceDetailUrl}?invoiceNumber=${invoiceId}`;
return this.http.get(url) return this.http.get(url)
.toPromise() .toPromise()
.then(response => { .then(response => {
console.log(response['entity']); console.log(response['entity']);
return response['entity']; return response['entity'];
}); });
} }
public updateInvoice(invoiceNumber: string, data: any): Promise<any> { public getInvoiceGen (invoiceId: string): Promise<any> {
console.log("*** In updateInvoice()"); console.log("*** In getInvoiceGen()");
const url = `${this.invoiceUrl}/${invoiceNumber}`; //TODO send sessionId const url = `${this.invoiceGenUrl}/${invoiceId}`;
return this.http.put(url, data) return this.http.get(url)
.toPromise() .toPromise()
.then(response => response['entity']); .then(response => {
} console.log(response['entity']);
return response['entity'];
public createInvoice(data: any): Promise<any> { });
console.log("*** In createInvoice()"); }
const url = `${this.invoiceUrl}`; //TODO send sessionId
return this.http.post(url, data) public updateInvoice(invoiceNumber: string, data: any): Promise<any> {
.toPromise() console.log("*** In updateInvoice()");
.then(response => response['entity']); const url = `${this.invoiceUrl}/${invoiceNumber}`; //TODO send sessionId
} return this.http.put(url, data)
.toPromise()
public updateInvoiceDetail(invNum, lineItemNo, data) { .then(response => response['entity']);
console.log("*** In updateInvoiceDetail()"); }
const url = `${this.invoiceUrl}/detail/${invNum}/${lineItemNo}`; //TODO send sessionId
return this.http.put(url, data) public createInvoice(data: any): Promise<any> {
.toPromise() console.log("*** In createInvoice()");
.then(response => response['entity']); const url = `${this.invoiceUrl}`; //TODO send sessionId
} return this.http.post(url, data)
.toPromise()
public createInvoiceDetail(data) { .then(response => response['entity']);
console.log("*** In createInvoiceDetail()"); }
const url = `${this.invoiceUrl}/detail`; //TODO send sessionId
return this.http.post(url, data) public updateInvoiceDetail(invNum, lineItemNo, data) {
.toPromise() console.log("*** In updateInvoiceDetail()");
.then(response => response['entity']); const url = `${this.invoiceUrl}/detail/${invNum}/${lineItemNo}`; //TODO send sessionId
} return this.http.put(url, data)
.toPromise()
.then(response => response['entity']);
// **************************************** Invoice Payment Service methods }
public getSumittedInvoices(): Promise<any> { public createInvoiceDetail(data) {
console.log("*** In getSumittedInvoices()"); console.log("*** In createInvoiceDetail()");
const url = `${this.invoiceUrl}/submitted`; const url = `${this.invoiceUrl}/detail`; //TODO send sessionId
return this.http.get(url) return this.http.post(url, data)
.toPromise() .toPromise()
.then(response => { .then(response => response['entity']);
console.log(response['entity']); }
return response['entity'];
});
} // **************************************** Invoice Payment Service methods
public getInvoiceTypes(): Promise<any> { public getSumittedInvoices(): Promise<any> {
const url = `${this.invoicePaymentUrl}/paymentTypes`; console.log("*** In getSumittedInvoices()");
console.log("*** In getInvoiceTypes() ... calling " + url); const url = `${this.invoiceUrl}/submitted`;
return this.http.get(url) return this.http.get(url)
.toPromise() .toPromise()
.then(response => { .then(response => {
console.log(response['entity']); console.log(response['entity']);
return response['entity']; return response['entity'];
}); });
} }
public getInvoicePayments(): Promise<any> { public getInvoiceTypes(): Promise<any> {
console.log("*** In getInvoicePayments()"); const url = `${this.invoicePaymentUrl}/paymentTypes`;
const url = `${this.invoicePaymentUrl}`; console.log("*** In getInvoiceTypes() ... calling " + url);
return this.http.get(url) return this.http.get(url)
.toPromise() .toPromise()
.then(response => { .then(response => {
console.log(response['entity']); console.log(response['entity']);
return response['entity']; return response['entity'];
}); });
} }
public updateInvoicePayment(invoiceNumber: string, invoicePaymentId: string, data: any): Promise<any> { public getInvoicePayments(): Promise<any> {
console.log("*** In updateInvoicePayment()"); console.log("*** In getInvoicePayments()");
const url = `${this.invoicePaymentUrl}/${invoiceNumber}/${invoicePaymentId}`; //TODO send sessionId const url = `${this.invoicePaymentUrl}`;
console.log("*** invoicePaymentUrl is " + url); return this.http.get(url)
return this.http.put(url, data) .toPromise()
.toPromise() .then(response => {
.then(response => response['entity']); console.log(response['entity']);
} return response['entity'];
});
public addInvoicePayment(data: any): Promise<any> { }
console.log("*** In addInvoicePayment()");
const url = `${this.invoicePaymentUrl}`; //TODO send sessionId public updateInvoicePayment(invoiceNumber: string, invoicePaymentId: string, data: any): Promise<any> {
return this.http.post(url, data) console.log("*** In updateInvoicePayment()");
.toPromise() const url = `${this.invoicePaymentUrl}/${invoiceNumber}/${invoicePaymentId}`; //TODO send sessionId
.then(response => response['entity']); console.log("*** invoicePaymentUrl is " + url);
} return this.http.put(url, data)
.toPromise()
// public getRecord(patientId: number): Promise<any> { .then(response => response['entity']);
// const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`; }
// return this.http.get(url)
// .toPromise() public addInvoicePayment(data: any): Promise<any> {
// .then(response => { console.log("*** In addInvoicePayment()");
// console.log(response); const url = `${this.invoicePaymentUrl}`; //TODO send sessionId
// }); return this.http.post(url, data)
// } .toPromise()
// .then(response => response['entity']);
// public getInfo(patientId: number): Promise<any> { }
// const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`;
// return this.http.get(url) // public getRecord(patientId: number): Promise<any> {
// .toPromise() // const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`;
// .then(response => { // return this.http.get(url)
// return response['entity']; // .toPromise()
// }); // .then(response => {
// } // console.log(response);
// // });
// public getVisits(patientId: number): Promise<any> { // }
// const url = `${this.recordsUrl}/${patientId}/visits?sessionId=${this.getSessionId()}`; //
// return this.http.get(url) // public getInfo(patientId: number): Promise<any> {
// .toPromise() // const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`;
// .then(response => { // return this.http.get(url)
// return response['entity']; // .toPromise()
// }); // .then(response => {
// } // return response['entity'];
// // });
// public getAllVisits(): Promise<any> { // }
// const url = `${this.recordsUrl}/visits?sessionId=${this.getSessionId()}`; //
// return this.http.get(url) // public getVisits(patientId: number): Promise<any> {
// .toPromise() // const url = `${this.recordsUrl}/${patientId}/visits?sessionId=${this.getSessionId()}`;
// .then(response => { // return this.http.get(url)
// return response['entity']; // .toPromise()
// }); // .then(response => {
// } // return response['entity'];
// // });
// public getVitals(visitId: number): Promise<any> { // }
// const url = `${this.visitsUrl}/${visitId}/vitals?sessionId=${this.getSessionId()}`; //
// return this.http.get(url) // public getAllVisits(): Promise<any> {
// .toPromise() // const url = `${this.recordsUrl}/visits?sessionId=${this.getSessionId()}`;
// .then(response => { // return this.http.get(url)
// return response['entity']; // .toPromise()
// }); // .then(response => {
// } // return response['entity'];
// // });
// public getLatestVitals(patientId: number): Promise<any> { // }
// const url = `${this.recordsUrl}/${patientId}/vitals?sessionId=${this.getSessionId()}`; //
// return this.http.get(url) // public getVitals(visitId: number): Promise<any> {
// .toPromise() // const url = `${this.visitsUrl}/${visitId}/vitals?sessionId=${this.getSessionId()}`;
// .then(response => { // return this.http.get(url)
// return response['entity']; // .toPromise()
// }); // .then(response => {
// } // return response['entity'];
// // });
// public updateInfo(patientId: number, data: any): Promise<any> { // }
// const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`; //
// return this.http.put(url, data) // public getLatestVitals(patientId: number): Promise<any> {
// .toPromise() // const url = `${this.recordsUrl}/${patientId}/vitals?sessionId=${this.getSessionId()}`;
// .then(response => response['entity']); // return this.http.get(url)
// } // .toPromise()
// public updateVisit(patientId: number, visit: any): Promise<any> { // .then(response => {
// console.log(visit); // return response['entity'];
// // });
// const url = `${this.recordsUrl}/${patientId}/visits/${visit.visitId}?sessionId=${this.getSessionId()}`; // }
// return this.http.put(url, visit) //
// .toPromise() // public updateInfo(patientId: number, data: any): Promise<any> {
// .then(response => { // const url = `${this.recordsUrl}/${patientId}?sessionId=${this.getSessionId()}`;
// console.log(response['entity']); // return this.http.put(url, data)
// return response['entity']; // .toPromise()
// }); // .then(response => response['entity']);
// } // }
// // public updateVisit(patientId: number, visit: any): Promise<any> {
// public getSessionPatientId(): Promise<number> { // console.log(visit);
// const url = `${this.sessionsUrl}/${this.getSessionId()}`; //
// console.log(url); // const url = `${this.recordsUrl}/${patientId}/visits/${visit.visitId}?sessionId=${this.getSessionId()}`;
// return this.http.get(url) // return this.http.put(url, visit)
// .toPromise() // .toPromise()
// .then(response => { // .then(response => {
// console.log(response); // console.log(response['entity']);
// return response['entity'].patientId; // return response['entity'];
// }); // });
// } // }
// //
// public startVisit(patientId: number): Promise<any> { // public getSessionPatientId(): Promise<number> {
// const url = `${this.recordsUrl}/${patientId}/visits?${this.getSessionId()}`; // const url = `${this.sessionsUrl}/${this.getSessionId()}`;
// return this.http.post(url, null) // console.log(url);
// .toPromise() // return this.http.get(url)
// .then(response => { // .toPromise()
// console.log(response); // .then(response => {
// return response['entity']; // console.log(response);
// }); // return response['entity'].patientId;
// } // });
// // }
// getMedications() { //
// const url = `${this.medsUrl}?${this.getSessionId()}`; // public startVisit(patientId: number): Promise<any> {
// return this.http.get(url) // const url = `${this.recordsUrl}/${patientId}/visits?${this.getSessionId()}`;
// .toPromise() // return this.http.post(url, null)
// .then(response => { // .toPromise()
// console.log(response); // .then(response => {
// return response['entity']; // 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'];
// });
// }
}

10
AstuteSystem/src/main/java/com/astute/dao/DAO.java
View File

@ -97,11 +97,11 @@ public abstract class DAO {
public abstract List<PODetail> getPODetail(String PONum, int lineItemNo) throws AstuteException; public abstract List<PODetail> 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 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; 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 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<PaymentStatus> getPaymentStatuses() throws AstuteException; public abstract List<PaymentStatus> getPaymentStatuses() throws AstuteException;

49
AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
View File

@ -42,7 +42,7 @@ public class SqlDAO extends DAO {
try { try {
List<PO> pos = new ArrayList<>(); List<PO> pos = new ArrayList<>();
Statement stmt = conn.createStatement(); 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()) { if (PONum != null && !PONum.isEmpty()) {
sql += "WHERE UPPER(PO_num) = '" + PONum.toUpperCase() + "'"; sql += "WHERE UPPER(PO_num) = '" + PONum.toUpperCase() + "'";
} else if (contractNum != null && !contractNum.isEmpty()) { } else if (contractNum != null && !contractNum.isEmpty()) {
@ -64,12 +64,13 @@ public class SqlDAO extends DAO {
String title = rs.getString(7); String title = rs.getString(7);
Double previouslyBilledAmount = rs.getDouble(8); Double previouslyBilledAmount = rs.getDouble(8);
int invoiceSequence = rs.getInt(8); int invoiceSequence = rs.getInt(8);
String notes = rs.getString(9);
String date = null; String date = null;
if (poDate != null) { if (poDate != null) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
date = formatter.format(poDate); 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); pos.add(po);
} }
return pos; 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 { try {
System.out.println("PODate in SQLDAO is "+ PODate); System.out.println("PODate in SQLDAO is "+ PODate);
@ -136,6 +137,7 @@ public class SqlDAO extends DAO {
updateClause = updateClause + " contract_amt = " + contractAmt+ ","; updateClause = updateClause + " contract_amt = " + contractAmt+ ",";
updateClause = updateClause + " astute_project_num = '" + astuteProjectNumber +"',"; updateClause = updateClause + " astute_project_num = '" + astuteProjectNumber +"',";
updateClause = updateClause + " title = '" + title +"'"; updateClause = updateClause + " title = '" + title +"'";
updateClause = updateClause + " notes = '" + notes +"'";
sql = sql+ updateClause + whereClause; sql = sql+ updateClause + whereClause;
System.out.println(sql); System.out.println(sql);
Statement stmt = conn.createStatement(); 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 { try {
java.util.Date date = null; java.util.Date date = null;
java.sql.Date poDate = null; java.sql.Date poDate = null;
@ -205,7 +207,7 @@ public class SqlDAO extends DAO {
date = new SimpleDateFormat("yyyy-MM-dd").parse(PODate); date = new SimpleDateFormat("yyyy-MM-dd").parse(PODate);
poDate = new java.sql.Date(date.getTime()); 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(1, PONum);
stmt.setString(2, contractNum); stmt.setString(2, contractNum);
stmt.setDate(3, poDate); stmt.setDate(3, poDate);
@ -213,6 +215,7 @@ public class SqlDAO extends DAO {
stmt.setString(5, customerId); stmt.setString(5, customerId);
stmt.setString(6, astuteProjectNumber); stmt.setString(6, astuteProjectNumber);
stmt.setString(7, title); stmt.setString(7, title);
stmt.setString(8, notes);
stmt.executeUpdate(); stmt.executeUpdate();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@ -648,7 +651,7 @@ public class SqlDAO extends DAO {
try { try {
List<Customer> customers = new ArrayList<>(); List<Customer> customers = new ArrayList<>();
Statement stmt = conn.createStatement(); 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()) { if (customerId!=null && !customerId.isEmpty()) {
sql += " WHERE customer_id = '" + customerId + "'"; sql += " WHERE customer_id = '" + customerId + "'";
} }
@ -665,8 +668,9 @@ public class SqlDAO extends DAO {
int ziplast4 = rs.getInt(9); int ziplast4 = rs.getInt(9);
String email = rs.getString(10); String email = rs.getString(10);
String phone = rs.getString(11); String phone = rs.getString(11);
String fax = rs.getString(12); int phExt = rs.getInt(12);
Customer customer = new Customer(customerID, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax); 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); customers.add(customer);
} }
return customers; 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 { try {
CallableStatement stmt = conn.prepareCall("{? = call create_customer_fun(?,?,?,?,?,?,?,?,?,?,?,?)}"); CallableStatement stmt = conn.prepareCall("{? = call create_customer_fun(?,?,?,?,?,?,?,?,?,?,?,?,?)}");
stmt.registerOutParameter(1, Types.INTEGER); stmt.registerOutParameter(1, Types.INTEGER);
stmt.setString(2, customerId); stmt.setString(2, customerId);
stmt.setString(3, customerName); stmt.setString(3, customerName);
@ -715,7 +719,8 @@ public class SqlDAO extends DAO {
stmt.setInt(10, ziplast4); stmt.setInt(10, ziplast4);
stmt.setString(11, email); stmt.setString(11, email);
stmt.setString(12, phone); stmt.setString(12, phone);
stmt.setString(13, fax); stmt.setInt(13, phExt);
stmt.setString(14, fax);
stmt.executeUpdate(); stmt.executeUpdate();
String customerIdOut = stmt.getString(1); String customerIdOut = stmt.getString(1);
return customerIdOut; return customerIdOut;
@ -725,7 +730,7 @@ public class SqlDAO extends DAO {
} }
} }
public void updateCustomer( String customerId, String customerName, String billToDept, String add1, String 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 { AstuteException {
try { try {
String sql = "UPDATE CUSTOMER "; String sql = "UPDATE CUSTOMER ";
@ -747,6 +752,7 @@ public class SqlDAO extends DAO {
updateClause = updateClause + " zip_last_4 = " + ziplast4 + ","; updateClause = updateClause + " zip_last_4 = " + ziplast4 + ",";
updateClause = updateClause + " email = '" + email + "',"; updateClause = updateClause + " email = '" + email + "',";
updateClause = updateClause + " phone = '" + phone + "',"; updateClause = updateClause + " phone = '" + phone + "',";
updateClause = updateClause + " phext = " + phExt + ",";
updateClause = updateClause + " fax = '" + fax + "',"; updateClause = updateClause + " fax = '" + fax + "',";
if (!updateClause.equalsIgnoreCase(" SET ")) { if (!updateClause.equalsIgnoreCase(" SET ")) {
sql = sql + trimLastCharacter(updateClause, ",") + whereClause; sql = sql + trimLastCharacter(updateClause, ",") + whereClause;
@ -763,6 +769,25 @@ public class SqlDAO extends DAO {
throw new AstuteException(DB_ERROR,e.getMessage()); 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 =============================================== =============================== User/Session Methods ===============================================
*/ */

269
AstuteSystem/src/main/java/com/astute/model/Customer.java
View File

@ -1,129 +1,140 @@
package com.astute.model; package com.astute.model;
import java.util.Date; import java.util.Date;
public class Customer { public class Customer {
String customerId; String customerId;
String customerName; String customerName;
String billToDept; String billToDept;
String add1; String add1;
String add2; String add2;
String city; String city;
String state; String state;
int zip; int zip;
int ziplast4; int ziplast4;
String email; String email;
String phone; String phone;
String fax; 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, String fax) {
this.customerId = customerId; 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.customerName = customerName; this.customerId = customerId;
this.billToDept = billToDept; this.customerName = customerName;
this.add1 = add1; this.billToDept = billToDept;
this.add2 = add2; this.add1 = add1;
this.city = city; this.add2 = add2;
this.state = state; this.city = city;
this.zip = zip; this.state = state;
this.ziplast4 = ziplast4; this.zip = zip;
this.email = email; this.ziplast4 = ziplast4;
this.phone = phone; this.email = email;
this.fax = fax; this.phone = phone;
} this.phExt = phExt;
this.fax = fax;
public String getCustomerId() { }
return customerId;
} public String getCustomerId() {
return customerId;
public void setCustomerId(String customerId) { }
this.customerId = customerId;
} public void setCustomerId(String customerId) {
this.customerId = customerId;
public String getCustomerName() { }
return customerName;
} public String getCustomerName() {
return customerName;
public void setCustomerName(String customerName) { }
this.customerName = customerName;
} public void setCustomerName(String customerName) {
this.customerName = customerName;
public String getBillToDept() { }
return billToDept;
} public String getBillToDept() {
return billToDept;
public void setBillToDept(String billToDept) { }
this.billToDept = billToDept;
} public void setBillToDept(String billToDept) {
this.billToDept = billToDept;
public String getAdd1() { }
return add1;
} public String getAdd1() {
return add1;
public void setAdd1(String add1) { }
this.add1 = add1;
} public void setAdd1(String add1) {
this.add1 = add1;
public String getAdd2() { }
return add2;
} public String getAdd2() {
return add2;
public void setAdd2(String add2) { }
this.add2 = add2;
} public void setAdd2(String add2) {
this.add2 = add2;
public String getCity() { }
return city;
} public String getCity() {
return city;
public void setCity(String city) { }
this.city = city;
} public void setCity(String city) {
this.city = city;
public String getState() { }
return state;
} public String getState() {
return state;
public void setState(String state) { }
this.state = state;
} public void setState(String state) {
this.state = state;
public int getZip() { }
return zip;
} public int getZip() {
return zip;
public void setZip(int zip) { }
this.zip = zip;
} public void setZip(int zip) {
this.zip = zip;
public int getZiplast4() { }
return ziplast4;
} public int getZiplast4() {
return ziplast4;
public void setZiplast4(int ziplast4) { }
this.ziplast4 = ziplast4;
} public void setZiplast4(int ziplast4) {
this.ziplast4 = ziplast4;
public String getEmail() { }
return email;
} public String getEmail() {
return email;
public void setEmail(String email) { }
this.email = email;
} public void setEmail(String email) {
this.email = email;
public String getPhone() { }
return phone;
} public String getPhone() {
return phone;
public void setPhone(String phone) { }
this.phone = phone;
} public void setPhone(String phone) {
this.phone = phone;
public String getFax() { }
return fax;
} public String getFax() {
return fax;
public void setFax(String fax) { }
this.fax = fax;
} public int getPhExt() {
} return phExt;
}
public void setPhExt(int phExt) {
this.phExt = phExt;
}
public void setFax(String fax) {
this.fax = fax;
}
}

12
AstuteSystem/src/main/java/com/astute/model/PO.java
View File

@ -14,8 +14,9 @@ public class PO implements Serializable{
private String title; private String title;
private Double previouslyBilledAmount; private Double previouslyBilledAmount;
private int invoiceSequence; 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.PONum = PONum;
this.contractNum = contractNum; this.contractNum = contractNum;
this.PODate = PODate; this.PODate = PODate;
@ -25,6 +26,7 @@ public class PO implements Serializable{
this.title = title; this.title = title;
this.previouslyBilledAmount = previouslyBilledAmount; this.previouslyBilledAmount = previouslyBilledAmount;
this.invoiceSequence = invoiceSequence; this.invoiceSequence = invoiceSequence;
this.notes = notes;
} }
private String PONum; private String PONum;
@ -100,4 +102,12 @@ public class PO implements Serializable{
public void setInvoiceSequence(int invoiceSequence) { public void setInvoiceSequence(int invoiceSequence) {
this.invoiceSequence = invoiceSequence; this.invoiceSequence = invoiceSequence;
} }
public String getNotes() {
return notes;
}
public void setNotes(String notes) {
this.notes = notes;
}
} }

237
AstuteSystem/src/main/java/com/astute/requests/CustomerRequest.java
View File

@ -1,114 +1,123 @@
package com.astute.requests; package com.astute.requests;
import java.sql.Date; import java.sql.Date;
public class CustomerRequest { public class CustomerRequest {
String customerId; String customerId;
String customerName; String customerName;
String billToDept; String billToDept;
String add1; String add1;
String add2; String add2;
String city; String city;
String state; String state;
int zip; int zip;
int ziplast4; int ziplast4;
String email; String email;
String phone; String phone;
String fax; int phExt;
String fax;
public String getCustomerId() {
return customerId; public String getCustomerId() {
} return customerId;
}
public void setCustomerId(String customerId) {
this.customerId = customerId; public void setCustomerId(String customerId) {
} this.customerId = customerId;
}
public String getCustomerName() {
return customerName; public String getCustomerName() {
} return customerName;
}
public void setCustomerName(String customerName) {
this.customerName = customerName; public void setCustomerName(String customerName) {
} this.customerName = customerName;
}
public String getBillToDept() {
return billToDept; public String getBillToDept() {
} return billToDept;
}
public void setBillToDept(String billToDept) {
this.billToDept = billToDept; public void setBillToDept(String billToDept) {
} this.billToDept = billToDept;
}
public String getAdd1() {
return add1; public String getAdd1() {
} return add1;
}
public void setAdd1(String add1) {
this.add1 = add1; public void setAdd1(String add1) {
} this.add1 = add1;
}
public String getAdd2() {
return add2; public String getAdd2() {
} return add2;
}
public void setAdd2(String add2) {
this.add2 = add2; public void setAdd2(String add2) {
} this.add2 = add2;
}
public String getCity() {
return city; public String getCity() {
} return city;
}
public void setCity(String city) {
this.city = city; public void setCity(String city) {
} this.city = city;
}
public String getState() {
return state; public String getState() {
} return state;
}
public void setState(String state) {
this.state = state; public void setState(String state) {
} this.state = state;
}
public int getZip() {
return zip; public int getZip() {
} return zip;
}
public void setZip(int zip) {
this.zip = zip; public void setZip(int zip) {
} this.zip = zip;
}
public int getZiplast4() {
return ziplast4; public int getZiplast4() {
} return ziplast4;
}
public void setZiplast4(int ziplast4) {
this.ziplast4 = ziplast4; public void setZiplast4(int ziplast4) {
} this.ziplast4 = ziplast4;
}
public String getEmail() {
return email; public String getEmail() {
} return email;
}
public void setEmail(String email) {
this.email = email; public void setEmail(String email) {
} this.email = email;
}
public String getPhone() {
return phone; public String getPhone() {
} return phone;
}
public void setPhone(String phone) {
this.phone = phone; public void setPhone(String phone) {
} this.phone = phone;
}
public String getFax() {
return fax; public int getPhExt() {
} return phExt;
}
public void setFax(String fax) {
this.fax = fax; public void setPhExt(int phExt) {
} this.phExt = phExt;
} }
public String getFax() {
return fax;
}
public void setFax(String fax) {
this.fax = fax;
}
}

9
AstuteSystem/src/main/java/com/astute/requests/POMasterRequest.java
View File

@ -11,6 +11,7 @@ public class POMasterRequest {
String customerId; String customerId;
String astuteProjectNumber; String astuteProjectNumber;
String title; String title;
String notes;
public String getPoNum() { public String getPoNum() {
return poNum; return poNum;
@ -67,4 +68,12 @@ public class POMasterRequest {
public void setTitle(String title) { public void setTitle(String title) {
this.title = title; this.title = title;
} }
public String getNotes() {
return notes;
}
public void setNotes(String notes) {
this.notes = notes;
}
} }

123
AstuteSystem/src/main/java/com/astute/resources/CustomerResource.java
View File

@ -1,57 +1,66 @@
package com.astute.resources; package com.astute.resources;
import com.astute.exceptions.AstuteException; import com.astute.exceptions.AstuteException;
import com.astute.requests.CustomerRequest; import com.astute.requests.CustomerRequest;
import com.astute.response.ApiResponse; import com.astute.response.ApiResponse;
import com.astute.service.AuthService; import com.astute.service.AuthService;
import com.astute.service.CustomerService; import com.astute.service.CustomerService;
import javax.ws.rs.*; import javax.ws.rs.*;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import java.sql.SQLException; import java.sql.SQLException;
@Path("/customer") @Path("/customer")
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
public class CustomerResource { public class CustomerResource {
private com.astute.service.CustomerService service = new CustomerService(); private com.astute.service.CustomerService service = new CustomerService();
private com.astute.service.AuthService authService = new AuthService(); private com.astute.service.AuthService authService = new AuthService();
public CustomerResource() { public CustomerResource() {
} }
@GET @GET
public Response getCustomers(@QueryParam("customerId") String customerId) public Response getCustomers(@QueryParam("customerId") String customerId)
throws AstuteException { throws AstuteException {
// TODO , @QueryParam("sessionId") String sessionId // TODO , @QueryParam("sessionId") String sessionId
// authService.getUser(sessionId); // authService.getUser(sessionId);
return new ApiResponse(service.getCustomers(customerId)).toResponse(); return new ApiResponse(service.getCustomers(customerId)).toResponse();
} }
@Path("/{poNumber}") @Path("/{poNumber}")
@GET @GET
public Response getCustomer(@PathParam("poNumber") String poNumber) public Response getCustomer(@PathParam("poNumber") String poNumber)
throws AstuteException { throws AstuteException {
return new ApiResponse(service.getCustomer(poNumber)).toResponse(); return new ApiResponse(service.getCustomer(poNumber)).toResponse();
} }
@Path("/{customerId}") @Path("/{customerId}")
@PUT @PUT
public Response updateCustomer(@PathParam("customerId") String customerId, CustomerRequest request) public Response updateCustomer(@PathParam("customerId") String customerId, CustomerRequest request)
throws AstuteException { throws AstuteException {
System.out.println("in updateCustomer()"); System.out.println("in updateCustomer()");
service.updateCustomer(customerId, request.getCustomerName(), request.getBillToDept(), request.getAdd1(), 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()); 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(); return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
} }
@POST @Path("/{customerId}/delete")
public Response createCustomer(CustomerRequest request) @PUT
throws AstuteException { public Response deleteCustomer(@PathParam("customerId") String customerId)
System.out.println("in AstuteSyste createCustomer()"); throws AstuteException {
return new ApiResponse(service.createCustomer(request.getCustomerId(), request.getCustomerName(), request.getBillToDept(), request.getAdd1(), System.out.println("in deleteCustomer()");
request.getAdd2(), request.getCity(), request.getState(), request.getZip(), request.getZiplast4(), request.getEmail(), request.getPhone(), request.getFax())).toResponse(); 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();
}
}

4
AstuteSystem/src/main/java/com/astute/resources/POResource.java
View File

@ -45,7 +45,7 @@ public class POResource {
throws AstuteException, ParseException { throws AstuteException, ParseException {
System.out.println("PODate in Resource is "+ request.getPODate()); 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(); return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
} }
@ -62,7 +62,7 @@ public class POResource {
public Response createPOMaster(POMasterRequest request) public Response createPOMaster(POMasterRequest request)
throws AstuteException, ParseException { 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(); return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
} }
@Path("/detail") @Path("/detail")

78
AstuteSystem/src/main/java/com/astute/service/CustomerService.java
View File

@ -1,37 +1,41 @@
package com.astute.service; package com.astute.service;
import com.astute.exceptions.AstuteException; import com.astute.exceptions.AstuteException;
import com.astute.model.Customer; import com.astute.model.Customer;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.List; import java.util.List;
import static com.astute.dao.DAO.getDao; import static com.astute.dao.DAO.getDao;
public class CustomerService extends Service{ public class CustomerService extends Service{
public CustomerService(){ public CustomerService(){
super(); super();
} }
public List<Customer> getCustomers(String customerId) public List<Customer> getCustomers(String customerId)
throws AstuteException { throws AstuteException {
return getDao().getCustomers(customerId); return getDao().getCustomers(customerId);
} }
public Customer getCustomer(String poNumber) public Customer getCustomer(String poNumber)
throws AstuteException { throws AstuteException {
return getDao().getCustomer(poNumber); 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) 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 { throws AstuteException {
getDao().updateCustomer(customerId, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax); getDao().updateCustomer(customerId, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, phExt, fax);
} }
public void deleteCustomer(String 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, String fax) throws AstuteException {
throws AstuteException { getDao().deleteCustomer(customerId);
return getDao().createCustomer(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, int phExt, String fax)
} throws AstuteException {
return getDao().createCustomer(customerId, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, phExt, fax);
}
}

10
AstuteSystem/src/main/java/com/astute/service/POService.java
View File

@ -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 { throws AstuteException {
System.out.print("PODate in Service is "+ PODate); 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) 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); 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 { 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) 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<ServiceType> getServiceTypes() throws AstuteException { public List<ServiceType> getServiceTypes() throws AstuteException {
return getDao().getServiceTypes(); return getDao().getServiceTypes();
} }
} }

10
AstuteSystem/target/astutesystem/META-INF/MANIFEST.MF
View File

@ -1,5 +1,5 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Built-By: gnk5 Built-By: gnk5
Created-By: IntelliJ IDEA Created-By: IntelliJ IDEA
Build-Jdk: 1.8.0_171 Build-Jdk: 1.8.0_191

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Constants.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Utility.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/DAO.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/SqlDAO.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/AstuteException.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/DatabaseException.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/filter/CORSFilter.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/helpers/JsonHelper.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/ChangeOrder.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Customer.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/GeneratedInvoice.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Invoice.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/InvoiceDetail.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PO.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PODetail.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/User.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/GeneralExceptionMapper.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/JacksonJsonProvider.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RFC3339DateFormat.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RuntimeExceptionMapper.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/WebApplicationExceptionMapper.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/ChangeOrderRequest.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/CustomerRequest.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceDetailRequest.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceMasterRequest.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/LoginRequest.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/PODetailRequest.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/POMasterRequest.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/AuthResource.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/ChangeOrderResource.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/CustomerResource.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/InvoiceResource.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/POResource.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/response/ApiResponse.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/AuthService.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/ChangeOrderService.class
View File

Binary file not shown.

BIN
AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/CustomerService.class
View File

Binary file not shown.

54
AstuteSystem/target/astutesystem/css/nav.css
View File

@ -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;
}

122
AstuteSystem/target/astutesystem/css/theme.css
View File

@ -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%;
}

105
AstuteSystem/target/astutesystem/doc/user-guide.jsp
View File

@ -1,105 +0,0 @@
<html>
<body>
<head>
<title>PM User Guide</title>
<link rel="stylesheet" href="./css/theme.css">
<link rel="stylesheet" href="./css/nav.css">
<style type="text/css">
h1, h3, h5 {
font-family: "Times New Roman", Times, serif;
color: #2196F3;
}
body {
font-family: "Times New Roman", Times, serif;
background: lightgrey;
}
dt {
font-weight: bold;
padding-left: 30px;
font-family: "Times New Roman", Times, serif;
color: #2196F3;
}
dd {
padding-left: 30px;
}
.doc-div {
margin-left: 14%;
margin-right: 14%;
margin-bottom: 3%;
background: white;
}
.card {
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
transition: 0.3s;
padding: 5px;
border-radius: 5px 5px 5px 5px;
}
</style>
</head>
<div class="doc-div card">
<h1 align="center">Policy Machine Overview</h1>
<p>Click <a href="./doc/PMUserGuide.pdf" target="_blank">here</a> for the Policy Machine User Guide</p>
</div>
<div class="doc-div card">
<h1 align="center">Policy Machine Entities</h1>
<h3>Nodes</h3>
<dl style="list-style-type: none">
<dt>Policy Class</dt>
<br>
<dd>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.</dd>
<br>
<dt>Object Attribute</dt>
<br>
<dd>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".</dd>
<br>
<dt>Object</dt>
<br>
<dd>An Object is a representation of data, whether the data is on a file system or in a schema.</dd>
<br>
<dt>User Attribute</dt>
<br>
<dd>A User Attribute node is a collection of one or many users.</dd>
<br>
<dt>User</dt>
<br>
<dd>A User node is a representation of a User of the Policy Machine.</dd>
<br>
<dt>Operation Set</dt>
<br>
<dd>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".</dd>
<br>
</dl>
<h3>Deny Constraints</h3>
<p>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.</p>
<h3>Assignments</h3>
<p>Assignments are fundamental to the Policy Machine because they are how Policies are created and enforced.</p>
<h3>Operations</h3>
<p>Brief explanation of different kinds (class) of Operations. Describe resource vs admin</p>
<h3>Policy Scripts</h3>
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 <a href="./doc/policyScriptsDoc.pdf" target="_blank">here</a>.
</div>
<div class="doc-div card">
<h1 align="center">Examples</h1>
<p>Examples and use cases of Policy Machine calls</p>
</div>
<div class="doc-div card">
<h1 align="center">Policy Machine API</h1>
</div>
</body>
</html>

BIN
AstuteSystem/target/astutesystem/images/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.1 KiB

18
AstuteSystem/target/astutesystem/images/nist-logo.svg
View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-237 385.7 109.7 29.3" style="enable-background:new -237 385.7 109.7 29.3;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
</style>
<g>
<g>
<path class="st0" d="M-231,415h-6v-23.1c0,0,0-4.4,4.4-5.8c4-1.3,6.6,1.3,6.6,1.3l19.7,21.3c1,0.6,1.4,0,1.4-0.6v-22h6.1V409
c0,1.9-1.6,4.4-4,5.3c-2.4,0.9-4.9,0.9-7.9-1.7l-18.5-20c-0.5-0.5-1.8-0.6-1.8,0.4L-231,415L-231,415z"/>
<path class="st0" d="M-195,386.1h6.1v20.7c0,2.2,1.9,2.2,3.6,2.2h26.8c1.1,0,2.4-1.3,2.4-2.7c0-1.4-1.3-2.8-2.5-2.8H-176
c-3,0.1-9.2-2.7-9.2-8.5c0-7.1,5.9-8.8,8.6-9h49.4v6.1h-12.3V415h-6v-22.9h-30.2c-2.9-0.2-4.9,4.7-0.2,5.4h18.6
c2.8,0,7.4,2.4,7.5,8.4c0,6.1-3.6,9-7.5,9H-185c-4.5,0-6.2-1.1-7.8-2.5c-1.5-1.5-1.7-2.3-2.2-5.3L-195,386.1
C-194.9,386.1-195,386.1-195,386.1z"/>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

3
AstuteSystem/target/astutesystem/index.html
View File

@ -1,3 +0,0 @@
Welcome
Astute LLC