diff --git a/AstuteClient2/src/app/customer/customer.component.html b/AstuteClient2/src/app/customer/customer.component.html index ff46bcf..9c3d506 100644 --- a/AstuteClient2/src/app/customer/customer.component.html +++ b/AstuteClient2/src/app/customer/customer.component.html @@ -26,7 +26,7 @@
- +
diff --git a/AstuteClient2/src/app/customer/customer.component.ts b/AstuteClient2/src/app/customer/customer.component.ts index 6a9665d..ede7ff2 100644 --- a/AstuteClient2/src/app/customer/customer.component.ts +++ b/AstuteClient2/src/app/customer/customer.component.ts @@ -215,7 +215,7 @@ export class CustomerComponent implements OnInit { const newContactData = { address: '', customerId: this.selected.customerId, - email: 'example@email.com', + email: '', fax: null, mobile: null, name: '', diff --git a/AstuteClient2/src/app/invoice/invoice.component.html b/AstuteClient2/src/app/invoice/invoice.component.html index 1ad6be4..4694123 100644 --- a/AstuteClient2/src/app/invoice/invoice.component.html +++ b/AstuteClient2/src/app/invoice/invoice.component.html @@ -429,7 +429,7 @@ - {{customerSelec.value}} +

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

diff --git a/AstuteClient2/src/app/invoice/invoice.component.ts b/AstuteClient2/src/app/invoice/invoice.component.ts index c8b41fe..6bd9cc2 100644 --- a/AstuteClient2/src/app/invoice/invoice.component.ts +++ b/AstuteClient2/src/app/invoice/invoice.component.ts @@ -83,7 +83,7 @@ export class InvoiceComponent implements OnInit { this.chosenCustomerID = this.customers[index].customerId; this.correspondingPos = this.pos.filter((po) => { // console.log(po); - return po.customerId === this.chosenCustomerID && !po.oneInvInDraft && po.isFinal; + return po.customerId === this.chosenCustomerID && !po.oneInvInDraft && po.isFinal && !po.fulfilled; }); } poDropdownChange(ponum) { diff --git a/AstuteClient2/src/assets/img/AstuteLogo.gif b/AstuteClient2/src/assets/img/AstuteLogo.gif deleted file mode 100644 index 4d8d250..0000000 Binary files a/AstuteClient2/src/assets/img/AstuteLogo.gif and /dev/null differ diff --git a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java index c4d4a9a..43adfb6 100644 --- a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java +++ b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java @@ -43,7 +43,7 @@ public class SqlDAO extends DAO { try { List pos = new ArrayList<>(); Statement stmt = conn.createStatement(); - String sql = "SELECT PO_num, contract_num, PO_date, customer_id, contract_amt, astute_project_num , title, get_previously_billed_amt(PO_num), inv_seq, notes, final, isAnyInvInDraft(PO_num) 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, final, isAnyInvInDraft(PO_num), is_po_fulfilled(PO_num) as fulfilled FROM PO "; if (PONum != null && !PONum.isEmpty()) { sql += "WHERE UPPER(PO_num) = '" + PONum.toUpperCase() + "'"; } else if (contractNum != null && !contractNum.isEmpty()) { @@ -68,13 +68,13 @@ public class SqlDAO extends DAO { String notes = rs.getString(10); boolean isFinal = rs.getInt(11) == 0 ? false : true; boolean oneInvInDraft = rs.getInt(12) == 0 ? false : true; - + boolean isfulfilled = rs.getInt(13) == 0 ? false : true; String date = null; if (poDate != null) { SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); date = formatter.format(poDate); } - PO po = new PO(poNum, cntrctNum, date, customerId, contractAmt,astuteProjectNum,title,previouslyBilledAmount,invoiceSequence, notes, isFinal, oneInvInDraft); + PO po = new PO(poNum, cntrctNum, date, customerId, contractAmt,astuteProjectNum,title,previouslyBilledAmount,invoiceSequence, notes, isFinal, oneInvInDraft, isfulfilled); pos.add(po); } return pos; diff --git a/AstuteSystem/src/main/java/com/astute/model/PO.java b/AstuteSystem/src/main/java/com/astute/model/PO.java index 210c8ee..d7e4177 100644 --- a/AstuteSystem/src/main/java/com/astute/model/PO.java +++ b/AstuteSystem/src/main/java/com/astute/model/PO.java @@ -16,9 +16,14 @@ public class PO implements Serializable{ private int invoiceSequence; private String notes; private boolean isFinal; + + + private boolean oneInvInDraft; - public PO(String PONum, String contractNum, String PODate, String customerId, Double contractAmt, String astuteProjectNum, String title, Double previouslyBilledAmount, int invoiceSequence, String notes, boolean isFinal, boolean oneInvInDraft) { + private boolean fulfilled; + + public PO(String PONum, String contractNum, String PODate, String customerId, Double contractAmt, String astuteProjectNum, String title, Double previouslyBilledAmount, int invoiceSequence, String notes, boolean isFinal, boolean oneInvInDraft, boolean fulfilled) { this.PONum = PONum; this.contractNum = contractNum; this.PODate = PODate; @@ -31,6 +36,7 @@ public class PO implements Serializable{ this.notes = notes; this.isFinal = isFinal; this.oneInvInDraft = oneInvInDraft; + this.fulfilled = fulfilled; } private String PONum; @@ -130,4 +136,13 @@ public class PO implements Serializable{ public void setOneInvInDraft(boolean oneInvInDraft) { this.oneInvInDraft = oneInvInDraft; } + + + public boolean isFulfilled() { + return fulfilled; + } + + public void setFulfilled(boolean fulfilled) { + this.fulfilled = fulfilled; + } } \ No newline at end of file