Fixed defects

AstuteClient2/src/app/customer/customer.component.html

@@ -26,7 +26,7 @@
       <div class="btn-group w-100">
         <button class="btn btn-success" style="width: 100%" (click)="open(new)">Add Customer</button>
         <button class="btn btn-info" style="width: 100%" (click)="open(edit)" [disabled]="!selected">Edit Customer</button>
-        <button class="btn btn-primary" style="width: 100%" (click)="open(contacts)" [disabled]="!selected">Contact Book</button>
+        <button class="btn btn-primary" style="width: 100%" (click)="open(contacts)" [disabled]="!selected">Contacts</button>
         <button class="btn btn-danger" style="width: 100%" (click)="deleteCustomer(selected.customerId)" [disabled]="!selected">Delete Customer</button>
       </div>
     </div>

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: '',

AstuteClient2/src/app/invoice/invoice.component.html

@@ -429,7 +429,7 @@
             </tr>
             <!--add1, add2, billToDept, city, customerId, customerName, email, fax, phone, state, zip, ziplast4-->
             <tr>
-                <td colspan="2">{{customerSelec.value}}
+                <td colspan="2">
                     <p *ngIf="customerSelec.value >= 0" class="p-0 m-0 mt-2">
                         {{customers[customerSelec.value].billToDept}}
                     </p>

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) {

AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java

@@ -43,7 +43,7 @@ public class SqlDAO extends DAO {
         try {
             List<PO> 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;

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