Bug fixes

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

@@ -18,15 +18,15 @@
     </div>
   </div>
   <div class="row justify-content-center mt-2">
-    <div class="col-6">
+    <div class="col-4">
-      <button class="btn btn-primary" style="width: 100%" (click)="deleteCustomer(selected.customerId)">Delete Customer</button>
-    </div>
-    <div class="col-6">
-      <button class="btn btn-primary" style="width: 100%" (click)="open(edit)">Edit Customer</button>
-    </div>
-    <div class="col-6">
       <button class="btn btn-success" style="width: 100%" (click)="open(new)">Add Customer</button>
     </div>
+    <div class="col-4">
+      <button class="btn btn-info" style="width: 100%" (click)="open(edit)">Edit Customer</button>
+    </div>
+    <div class="col-4">
+      <button class="btn btn-danger" style="width: 100%" (click)="deleteCustomer(selected.customerId)">Delete Customer</button>
+    </div>
   </div>
 </div>
 

AstuteClient2/src/app/customer/customer.component.ts

@@ -184,4 +184,4 @@ export class CustomerComponent implements OnInit {
             this.customers = data;
         });
     }
-}
+}

AstuteClient2/src/app/invoice-gen/invoice-gen.component.ts

@@ -1,207 +1,207 @@
-import {Component, ElementRef, OnInit, ViewChild} from '@angular/core';
+import {Component, ElementRef, OnInit, ViewChild} from '@angular/core';
-import {AstuteClientService} from '../services/astute-client-service';
+import {AstuteClientService} from '../services/astute-client-service';
-
+
-declare var html2pdf: any;
+declare var html2pdf: any;
-declare var html2canvas: any;
+declare var html2canvas: any;
-declare var jsPDF: any;
+declare var jsPDF: any;
-declare var $: any
+declare var $: any
-
+
-@Component({
+@Component({
-    selector: 'app-invoice-gen',
+    selector: 'app-invoice-gen',
-    templateUrl: './invoice-gen.component.html',
+    templateUrl: './invoice-gen.component.html',
-    styleUrls: ['./invoice-gen.component.css']
+    styleUrls: ['./invoice-gen.component.css']
-})
+})
-export class InvoiceGenComponent implements OnInit {
+export class InvoiceGenComponent implements OnInit {
-    @ViewChild('doc') invoiceHTML: ElementRef;
+    @ViewChild('doc') invoiceHTML: ElementRef;
-
+
-    gridX = []; // these are the layout grid STARTING
+    gridX = []; // these are the layout grid STARTING
-    gridY = []; // from the 1 inch border (x: 25; y:23)
+    gridY = []; // from the 1 inch border (x: 25; y:23)
-
+
-    name;
+    name;
-    email;
+    email;
-    address;
+    address;
-
+
-    poNum;
+    poNum;
-    coNum;
+    coNum;
-    inNum;
+    inNum;
-    inDate;
+    inDate;
-
+
-    inDetails; // :[{lineNum:number, desc:string, rate:string, hrs:number, amount:number}];
+    inDetails; // :[{lineNum:number, desc:string, rate:string, hrs:number, amount:number}];
-
+
-    ogCoAmt;
+    ogCoAmt;
-    netChanges = 0;
+    netChanges = 0;
-    totCoAmt = 0;
+    totCoAmt = 0;
-    prevBill;
+    prevBill;
-    inAmt;
+    inAmt;
-    balToBeBill;
+    balToBeBill;
-    subTotal; // =inAmt
+    subTotal; // =inAmt
-    milage = 0;
+    milage = 0;
-    otherExp = 0;
+    otherExp = 0;
-    outOf = 0;
+    outOf = 0;
-    finTot; // = inAmt;
+    finTot; // = inAmt;
-
+
-    notes;
+    notes;
-    cert;
+    cert;
-
+
-    constructor(protected astuteClientService: AstuteClientService) {
+    constructor(protected astuteClientService: AstuteClientService) {
-        // console.log('********** ' + this.astuteClientService.getInvoiceGen('123').then());
+        // console.log('********** ' + this.astuteClientService.getInvoiceGen('123').then());
-    }
+    }
-
+
-    ngOnInit() {
+    ngOnInit() {
-        let x = 25;
+        let x = 25;
-        let y = 23;
+        let y = 23;
-        for (let i = 0; i < 17; i++) {
+        for (let i = 0; i < 17; i++) {
-            this.gridX[i] = x;
+            this.gridX[i] = x;
-            x += 10;
+            x += 10;
-        }
+        }
-        for (let j = 0; j < 26; j++) {
+        for (let j = 0; j < 26; j++) {
-            this.gridY[j] = y;
+            this.gridY[j] = y;
-            y += 10;
+            y += 10;
-        }
+        }
-        console.log('Layout Grid X: ' + this.gridX);
+        console.log('Layout Grid X: ' + this.gridX);
-        console.log('Layout Grid Y: ' + this.gridY);
+        console.log('Layout Grid Y: ' + this.gridY);
-        this.astuteClientService.getInvoiceGen('3-01_DRAFT_258').then((data) => {
+        this.astuteClientService.getInvoiceGen('VDO-02_0108_3').then((data) => {
-            this.name = data.customer.customerName;
+            this.name = data.customer.customerName;
-            this.email = data.customer.email;
+            this.email = data.customer.email;
-            this.address = data.customer.add1 + ' ' + data.customer.add2 + ' ' +
+            this.address = data.customer.add1 + ' ' + data.customer.add2 + ' ' +
-                data.customer.city + ', ' + data.customer.state.toUpperCase() + ', ' +
+                data.customer.city + ', ' + data.customer.state.toUpperCase() + ', ' +
-                data.customer.zip + '-' + data.customer.ziplast4;
+                data.customer.zip + '-' + data.customer.ziplast4;
-
+
-            this.poNum = data.po.ponum;
+            this.poNum = data.po.ponum;
-            this.coNum = data.po.contractNum;
+            this.coNum = data.po.contractNum;
-            this.inNum = data.invoice.invoiceNumber;
+            this.inNum = data.invoice.invoiceNumber;
-            this.inDate = data.invoice.invoiceDate;
+            this.inDate = data.invoice.invoiceDate;
-
+
-            this.inDetails = data.invoiceDetail;
+            this.inDetails = data.invoiceDetail;
-
+
-            this.ogCoAmt = data.po.contractAmt;
+            this.ogCoAmt = data.po.contractAmt;
-            this.netChanges = 0;
+            this.netChanges = 0;
-            this.totCoAmt = 0;
+            this.totCoAmt = 0;
-            this.prevBill = data.previouslyPaidAmt;
+            this.prevBill = data.previouslyPaidAmt;
-            this.inAmt = data.invoice.billAmt;
+            this.inAmt = data.invoice.billAmt;
-            this.balToBeBill = data.balanceToBeBilled;
+            this.balToBeBill = data.balanceToBeBilled;
-            this.subTotal = this.inAmt;
+            this.subTotal = this.inAmt;
-            this.milage = 0;
+            this.milage = 0;
-            this.otherExp = 0;
+            this.otherExp = 0;
-            this.outOf = 0;
+            this.outOf = 0;
-            this.finTot = this.inAmt;
+            this.finTot = this.inAmt;
-
+
-            this.notes = data.invoice.specialNotes;
+            this.notes = data.invoice.specialNotes;
-            this.cert = data.invoice.certification;
+            this.cert = data.invoice.certification;
-        });
+        });
-    }
+    }
-
+
-    downloadPDF() {
+    downloadPDF() {
-        // new html2pdf(document.getElementById('doc'));
+        // new html2pdf(document.getElementById('doc'));
-
+
-        const A4_width = 210;//425; // pixels
+        const A4_width = 210;//425; // pixels
-        const A4_height = 297;//550; // pixels
+        const A4_height = 297;//550; // pixels
-        const ratio = 2;
+        const ratio = 2;
-        // //
+        // //
-        const oldCanvas = document.createElement('canvas');
+        const oldCanvas = document.createElement('canvas');
-        oldCanvas.width = A4_width;
+        oldCanvas.width = A4_width;
-        oldCanvas.height = A4_height;
+        oldCanvas.height = A4_height;
-        const oldContext = oldCanvas.getContext('2d');
+        const oldContext = oldCanvas.getContext('2d');
-        const oldImg = new Image();
+        const oldImg = new Image();
-        oldImg.src = oldCanvas.toDataURL();
+        oldImg.src = oldCanvas.toDataURL();
-        oldContext.drawImage(oldImg, 0, 0, A4_width, A4_height);
+        oldContext.drawImage(oldImg, 0, 0, A4_width, A4_height);
-
+
-        const newImg = new Image();
+        const newImg = new Image();
-        newImg.onload = () => {
+        newImg.onload = () => {
-            html2canvas(this.invoiceHTML.nativeElement).then((newCanvas) => {
+            html2canvas(this.invoiceHTML.nativeElement).then((newCanvas) => {
-                    console.log(this.invoiceHTML.nativeElement);
+                    console.log(this.invoiceHTML.nativeElement);
-                    // newCanvas.width = A4_width / 50;
+                    // newCanvas.width = A4_width / 50;
-                    // newCanvas.height = A4_height / 50;
+                    // newCanvas.height = A4_height / 50;
-                    const newContext = newCanvas.getContext('2d');
+                    const newContext = newCanvas.getContext('2d');
-                    // Scale and draw the source image to the canvas
+                    // Scale and draw the source image to the canvas
-                    newContext.drawImage(newImg, 0, 0, A4_width * ratio, A4_height * ratio);
+                    newContext.drawImage(newImg, 0, 0, A4_width * ratio, A4_height * ratio);
-                    newImg.src = newCanvas.toDataURL();
+                    newImg.src = newCanvas.toDataURL();
-                    const pdfDoc = new jsPDF({
+                    const pdfDoc = new jsPDF({
-                        unit: 'mm'
+                        unit: 'mm'
-                    });
+                    });
-                    pdfDoc.addImage(newImg, 'png', 0, 0, 210, 297); // imageData, format, x, y, w, h
+                    pdfDoc.addImage(newImg, 'png', 0, 0, 210, 297); // imageData, format, x, y, w, h
-                    //pdfDoc.addHTML(this.invoiceHTML.nativeElement);
+                    //pdfDoc.addHTML(this.invoiceHTML.nativeElement);
-                    pdfDoc.save(this.inNum + '.pdf'); // save file
+                    pdfDoc.save(this.inNum + '.pdf'); // save file
-                    newImg.onload = undefined; // kill the func
+                    newImg.onload = undefined; // kill the func
-                }
+                }
-            );
+            );
-        };
+        };
-        newImg.src = oldImg.src;
+        newImg.src = oldImg.src;
-
+
-
+
-        // let pdf = new jsPDF();
+        // let pdf = new jsPDF();
-        // pdf.addHTML(this.invoiceHTML.nativeElement, (data) => {
+        // pdf.addHTML(this.invoiceHTML.nativeElement, (data) => {
-        //   pdf.save('testFile.pdf');
+        //   pdf.save('testFile.pdf');
-        //   console.log(data);
+        //   console.log(data);
-        // });
+        // });
-
+
-        // setTimeout(window.close, 5000);
+        // setTimeout(window.close, 5000);
-    }
+    }
-
+
-    testjsPDF() {
+    testjsPDF() {
-        const doc = jsPDF();
+        const doc = jsPDF();
-        doc.text('INVOICE', this.gridX[13], this.gridY[0]);
+        doc.text('INVOICE', this.gridX[13], this.gridY[0]);
-        doc.text('ASTUTE', this.gridX[0], this.gridY[0]);
+        doc.text('ASTUTE', this.gridX[0], this.gridY[0]);
-
+
-        // No. Column (header and rows)
+        // No. Column (header and rows)
-        doc.rect(this.gridX[0], this.gridY[5], 10, 10);
+        doc.rect(this.gridX[0], this.gridY[5], 10, 10);
-        for (let i = 6; i < 15; i += 2) {
+        for (let i = 6; i < 15; i += 2) {
-            doc.rect(this.gridX[0], this.gridY[i], 10, 20);
+            doc.rect(this.gridX[0], this.gridY[i], 10, 20);
-        }
+        }
-
+
-        // Description Column (header and rows)
+        // Description Column (header and rows)
-        doc.rect(this.gridX[1], this.gridY[5], 70, 10);
+        doc.rect(this.gridX[1], this.gridY[5], 70, 10);
-        for (let i = 6; i < 15; i += 2) {
+        for (let i = 6; i < 15; i += 2) {
-            doc.rect(this.gridX[1], this.gridY[i], 70, 20);
+            doc.rect(this.gridX[1], this.gridY[i], 70, 20);
-        }
+        }
-
+
-        // Hourly Rate Column (header and rows)
+        // Hourly Rate Column (header and rows)
-        doc.rect(this.gridX[8], this.gridY[5], 30, 10);
+        doc.rect(this.gridX[8], this.gridY[5], 30, 10);
-        for (let i = 6; i < 15; i += 2) {
+        for (let i = 6; i < 15; i += 2) {
-            doc.rect(this.gridX[8], this.gridY[i], 30, 20);
+            doc.rect(this.gridX[8], this.gridY[i], 30, 20);
-        }
+        }
-
+
-        // Hours Column (header and rows)
+        // Hours Column (header and rows)
-        doc.rect(this.gridX[11], this.gridY[5], 20, 10);
+        doc.rect(this.gridX[11], this.gridY[5], 20, 10);
-        for (let i = 6; i < 15; i += 2) {
+        for (let i = 6; i < 15; i += 2) {
-            doc.rect(this.gridX[11], this.gridY[i], 20, 20);
+            doc.rect(this.gridX[11], this.gridY[i], 20, 20);
-        }
+        }
-
+
-        // Amount Column (header and rows)
+        // Amount Column (header and rows)
-        doc.rect(this.gridX[13], this.gridY[5], 30, 10);
+        doc.rect(this.gridX[13], this.gridY[5], 30, 10);
-        for (let i = 6; i < 15; i += 2) {
+        for (let i = 6; i < 15; i += 2) {
-            doc.rect(this.gridX[13], this.gridY[i], 30, 20);
+            doc.rect(this.gridX[13], this.gridY[i], 30, 20);
-        }
+        }
-        doc.addPage()
+        doc.addPage()
-        doc.addPage()
+        doc.addPage()
-        doc.text('I am on page 3', 10, 10)
+        doc.text('I am on page 3', 10, 10)
-        doc.setPage(1)
+        doc.setPage(1)
-        doc.save('a4.pdf');
+        doc.save('a4.pdf');
-    }
+    }
-
+
-    moreTestJsPDF() {
+    moreTestJsPDF() {
-        const doc = new jsPDF();
+        const doc = new jsPDF();
-        // const specialElementHandlers = {
+        // const specialElementHandlers = {
-        //     '#editor': function (element, renderer) {
+        //     '#editor': function (element, renderer) {
-        //         return true;
+        //         return true;
-        //     }
+        //     }
-        // };
+        // };
-        // doc.fromHTML(this.invoiceHTML.nativeElement, 15, 15, {
+        // doc.fromHTML(this.invoiceHTML.nativeElement, 15, 15, {
-        //     'width': 170,
+        //     'width': 170,
-        //     'elementHandlers': specialElementHandlers
+        //     'elementHandlers': specialElementHandlers
-        // });
+        // });
-        console.log (this.invoiceHTML);
+        console.log (this.invoiceHTML);
-        doc.addHTML(this.invoiceHTML.nativeElement);
+        doc.addHTML(this.invoiceHTML.nativeElement);
-        doc.save('sample-file.pdf');
+        doc.save('sample-file.pdf');
-    }
+    }
-
+
-    // html2pdf((<HTMLInputElement>document.getElementById('doc')));
+    // html2pdf((<HTMLInputElement>document.getElementById('doc')));
-    //  var data='hello';
+    //  var data='hello';
-    //  $.get('http://localhost/ws/service.asmx/HelloWord', function(response) {
+    //  $.get('http://localhost/ws/service.asmx/HelloWord', function(response) {
-    //    data = response;
+    //    data = response;
-    //  }).error(function(){
+    //  }).error(function(){
-    //    alert('Sorry could not proceed');
+    //    alert('Sorry could not proceed');
-    //  });
+    //  });
-
+
-
+
-}
+}

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

@@ -17,10 +17,10 @@
   </div>
   <div class="row justify-content-center mt-2">
     <div class="col-6">
-      <button class="btn btn-primary" style="width: 100%" (click)="open(edit)">Edit Invoice payment</button>
+      <button class="btn btn-success" style="width: 100%" (click)="open(new)">Add Invoice Payment</button>
     </div>
     <div class="col-6">
-      <button class="btn btn-success" style="width: 100%" (click)="open(new)">Add Invoice Payment</button>
+      <button class="btn btn-info" style="width: 100%" (click)="open(edit)">Edit Invoice payment</button>
     </div>
   </div>
 </div>

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

@@ -65,12 +65,12 @@
             <tbody>
             <tr>
                 <td style="width: 1%">
-                    <span class="input-group-text">Customer </span>
+                    <span class="input-group-text">Customer</span>
                 </td>
                 <td>
                     <input type="text" class="form-control" [value]=chosenInv.customerId disabled>
                     <!--<select class="custom-select" (change)="customerDropdownChange(chosenInv.customerId)"-->
-                            <!--#customerSelec disabled>-->
+                            <!--#test>-->
                         <!--[value]="chosenInv.customerId"-->
                         <!--<option [value]="-1">Choose Customer...</option>-->
                         <!--<option *ngFor="let customer of customers; let i = index;" [value]="i">{{customer.customerName}}-->
@@ -90,11 +90,10 @@
                     <!--</select>-->
                 </td>
             </tr>
-            <!--add1, add2, billToDept, city, customerId, customerName, email, fax, phone, state, zip, ziplast4-->
             <tr>
                 <td colspan="2">
-                    <p *ngIf="chosenInv.customerId >= 0" class="p-0 m-0 mt-2">
+                    <p *ngIf="chosenInv.customerId" class="p-0 m-0 mt-2">
-                        To, {{customers[chosenInv.customerId].billToDept}}
+                        <!--To, {{correspondingCustomer[0].billToDept}}-->
                     </p>
                 </td>
                 <td></td>
@@ -107,8 +106,8 @@
             </tr>
             <tr>
                 <td colspan="2">
-                    <p *ngIf="chosenInv.customerId >= 0" class="p-0 m-0 mt-2">
+                    <p *ngIf="chosenInv.customerId" class="p-0 m-0 mt-2">
-                        {{customers[chosenInv.customerId].add1}} {{customers[chosenInv.customerId].add2}}
+                        <!--{{correspondingCustomer[0].add1}} {{correspondingCustomer[0].add2}}-->
                     </p>
                 </td>
                 <td></td>
@@ -121,9 +120,8 @@
             </tr>
             <tr>
                 <td colspan="2">
-                    <p *ngIf="chosenInv.customerId >= 0" class="p-0 m-0 mt-2">
+                    <p *ngIf="chosenInv.customerId" class="p-0 m-0 mt-2">
-                        <!--{{customers[customerSelec.value].city}} {{customers[customerSelec.value].state}} {{customers[customerSelec.value].zip}}-{{customers[customerSelec.value].ziplast4}}-->
+                        <!--{{correspondingCustomer[0].city}} {{correspondingCustomer[0].state}} {{correspondingCustomer[0].zip}}{{(correspondingCustomer[0].ziplast4 == 0) ? '':'-' + correspondingCustomer[0].ziplast4}}-->
-                        {{customers[chosenInv.customerId].city}} {{customers[chosenInv.customerId].state}} {{customers[chosenInv.customerId].zip}}{{(customers[chosenInv.customerId].ziplast4 == 0) ? '':'-' + customers[chosenInv.customerId].ziplast4}}
                     </p>
                 </td>
                 <td></td>
@@ -364,14 +362,14 @@
             <div class="input-group-prepend">
                 <span class="input-group-text">Special Notes*</span>
             </div>
-            <textarea class="form-control" [value]="chosenInv.specialNotes" #notesIn></textarea>
+            <textarea class="form-control" [value]="chosenInv.specialNotes" #notesIn [disabled]="chosenInv.invoiceStatus !== 1"></textarea>
         </div>
 
         <div class="input-group mb-3">
             <div class="input-group-prepend">
                 <span class="input-group-text">Certification*</span>
             </div>
-            <textarea class="form-control" [value]="chosenInv.certification" #certIn></textarea>
+            <textarea class="form-control" [value]="chosenInv.certification" #certIn [disabled]="chosenInv.invoiceStatus !== 1"></textarea>
         </div>
     </div>
 
@@ -429,7 +427,7 @@
                     </tr>
                     <!--add1, add2, billToDept, city, customerId, customerName, email, fax, phone, state, zip, ziplast4-->
                     <tr>
-                        <td colspan="2">
+                        <td colspan="2">{{customerSelec.value}}
                             <p *ngIf="customerSelec.value >= 0" class="p-0 m-0 mt-2">
                                 {{customers[customerSelec.value].billToDept}}
                             </p>
@@ -633,7 +631,6 @@
 
         <!--Invoice Footer-->
         <div class="modal-body">
-            <p class="h4 text-right">Footer</p>
             <hr>
             <div class="input-group mb-3">
                 <div class="input-group-prepend">
@@ -657,7 +654,7 @@
         <div class="modal-footer">
             <button type="button" class="btn btn-success"
                     (click)="addInvoice(inNumIn.value, poNumIn.value, coNumIn.value,  pmtStatusIn.value, newBillAmt, notesIn.value, certIn.value, 1, new)"
-                    [disabled]="!(inNumIn.value && poNumIn.value && newBillAmt && notesIn.value && certIn.value)">
+                    [disabled]="!(inNumIn.value && poNumIn.value && newBillAmt && certIn.value)">
                 Confirm
             </button>
             <button type="reset" class="btn btn-danger" (click)="close(new)">Cancel</button>

AstuteClient2/src/app/invoice/invoice.component.ts

@@ -1,6 +1,7 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
 import {AstuteClientService} from '../services/astute-client-service';
 import {formatCurrency} from "@angular/common";
+import {log} from "util";
 
 declare var $: any;
 
@@ -18,6 +19,7 @@ export class InvoiceComponent implements OnInit {
     pos = [];
     chosenPo;
     correspondingPos = [];
+    correspondingCustomer = [];
     generatedInvoiceNumber = '';
     feeTypes = ['Fixed Fee', 'Hourly'];
     serviceTypes = ['Study', 'Design', 'Peer Review', 'Cost Investigation', 'Forensic Investigation'];
@@ -267,6 +269,7 @@ export class InvoiceComponent implements OnInit {
     }
 
     open(content, indexPO, indexINV) {
+        this.setCorrespondingCustomer();
         content.open();
         // this.detailDescription = ViewChild('detailDescription');
         // this.detailAmount = ViewChild('detailAmount');
@@ -487,7 +490,13 @@ export class InvoiceComponent implements OnInit {
 
     setCorrespondingPos() {
         this.correspondingPos = this.pos.filter((po, index, array) => {
-            return po.customerId === this.chosenCustomerID;
+            return po.customerId === this.chosenCustomerID && !po.oneInvInDraft;
+        });
+    }
+
+    setCorrespondingCustomer() {
+        this.correspondingCustomer = this.customers.filter((customer, index, array) => {
+            return customer.customerId === this.chosenInv.customerId;
         });
     }
 }

AstuteClient2/src/app/sales-order/sales-order.component.html

@@ -16,11 +16,17 @@
     </div>
   </div>
   <div class="row justify-content-center mt-2">
-    <div class="col-6">
+    <div class="col-3">
-      <button class="btn btn-primary" style="width: 100%" (click)="open(edit)">Edit Sales Order</button>
+      <button class="btn btn-success" style="width: 100%" (click)="open(new)">Add</button>
     </div>
-    <div class="col-6">
+    <div class="col-3">
-      <button class="btn btn-success" style="width: 100%" (click)="open(new)">Add Sales Order</button>
+      <button class="btn btn-info" style="width: 100%" (click)="open(edit)">Edit</button>
+    </div>
+    <div class="col-3">
+      <button class="btn btn-primary" style="width: 100%" (click)="open(edit)">Finalize</button>
+    </div>
+    <div class="col-3">
+      <button class="btn btn-danger" style="width: 100%" (click)="open(edit)">Delete</button>
     </div>
   </div>
 </div>
@@ -62,22 +68,13 @@
           <td style="width: 30%"><input type="text" class="form-control" placeholder="Derived From Details" [value]="newContractAmount | currency" #contractamt disabled></td>
         </tr>
         <tr>
-          <td style="width: 80%"><span class="input-group-text">Notes</span></td>
+          <td><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>
+          <td colspan="3"><input type="text" class="form-control" placeholder="Notes..." #notes></td>
         </tr>
       </tbody>
     </table>
   </div>
 
-  <!--fee-->
-  <!--feeTypeId-->
-  <!--lineItemNo-->
-  <!--ponum-->
-  <!--qty-->
-  <!--remainingQty-->
-  <!--serviceDesc-->
-  <!--serviceTypeId-->
-
   <!--Detail-->
   <div class="modal-body">
     <p class="h4 text-right">Detail</p>
@@ -212,8 +209,8 @@
           <td style="width: 30%"><input type="text" class="form-control" placeholder="Contract Amount" [value]="editContractAmount | currency" #contractamt disabled></td>
         </tr>
         <tr>
-          <td style="width: 20%"><span class="input-group-text">Notes</span></td>
+          <td><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>
+          <td colspan="3"><input type="text" class="form-control" placeholder="Notes..." [value]="selected.notes" #notes></td>
         </tr>
         </tbody>
       </table>

AstuteClient2/src/app/sales-order/sales-order.component.ts

@@ -26,7 +26,9 @@ export class SalesOrderComponent implements OnInit {
         {headerName: 'SO Title', field: 'title'},
         {headerName: 'Contract Amount', field: 'contractAmt'},
         {headerName: 'SO Date', field: 'podate'},
-        {headerName: '# of Invoice', field: 'invoiceSequence'}
+        {headerName: '# of Invoice', field: 'invoiceSequence'},
+        {headerName: 'notes', field: 'notes'}
+        // {headerName: 'oneInvInDraft', field: 'oneInvInDraft'}
     ];
     rowData: any;
 

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

@@ -3,16 +3,11 @@ package com.astute.dao;
 import com.astute.exceptions.AstuteException;
 import com.astute.model.*;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.Date;
 import java.sql.ResultSet;
 import java.text.ParseException;
 import java.util.List;
-import java.util.Properties;
 
 public abstract class DAO {
     public static DAO dao;

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

@@ -42,7 +42,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 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) FROM PO ";
             if (PONum != null && !PONum.isEmpty()) {
                 sql += "WHERE UPPER(PO_num) = '" + PONum.toUpperCase() + "'";
             } else if (contractNum != null && !contractNum.isEmpty()) {
@@ -63,14 +63,17 @@ public class SqlDAO extends DAO {
                 String astuteProjectNum = rs.getString(6);
                 String title = rs.getString(7);
                 Double previouslyBilledAmount = rs.getDouble(8);
-                int invoiceSequence = rs.getInt(8);
+                int invoiceSequence = rs.getInt(9);
-                String notes = rs.getString(9);
+                String notes = rs.getString(10);
+                boolean isFinal = rs.getInt(11) == 0 ? false : true;
+                boolean oneInvInDraft = rs.getInt(12) == 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);
+                PO po = new PO(poNum, cntrctNum, date, customerId, contractAmt,astuteProjectNum,title,previouslyBilledAmount,invoiceSequence, notes, isFinal, oneInvInDraft);
                 pos.add(po);
             }
             return pos;

AstuteSystem/src/main/java/com/astute/model/PO.java

@@ -15,8 +15,10 @@ public class PO implements Serializable{
     private Double         previouslyBilledAmount;
     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) {
+    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) {
         this.PONum = PONum;
         this.contractNum = contractNum;
         this.PODate = PODate;
@@ -27,6 +29,8 @@ public class PO implements Serializable{
         this.previouslyBilledAmount = previouslyBilledAmount;
         this.invoiceSequence = invoiceSequence;
         this.notes = notes;
+        this.isFinal = isFinal;
+        this.oneInvInDraft = oneInvInDraft;
     }
 
     private String         PONum;
@@ -110,4 +114,20 @@ public class PO implements Serializable{
     public void setNotes(String notes) {
         this.notes = notes;
     }
+
+    public boolean getIsFinal() {
+        return isFinal;
+    }
+
+    public void setIsFinal(boolean isFinal) {
+        this.isFinal = isFinal;
+    }
+
+    public boolean isOneInvInDraft() {
+        return oneInvInDraft;
+    }
+
+    public void setOneInvInDraft(boolean oneInvInDraft) {
+        this.oneInvInDraft = oneInvInDraft;
+    }
 }