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-15 16:43:17 -05:00
parent 2330b5ae02
commit c8043cbd82
11 changed files with 284 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,15 +18,15 @@
</div>
</div>
<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">
<button class="btn btn-primary" style="width: 100%" (click)="open(edit)">Edit Customer</button>
</div>
<div class="col-6">
<div class="col-4">
<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>

2
AstuteClient2/src/app/invoice-gen/invoice-gen.component.ts
View File

@ -60,7 +60,7 @@ export class InvoiceGenComponent implements OnInit {
}
console.log('Layout Grid X: ' + this.gridX);
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.email = data.customer.email;
this.address = data.customer.add1 + ' ' + data.customer.add2 + ' ' +

4
AstuteClient2/src/app/invoice-payment/invoice-payment.component.html
View File

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

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

@ -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">
To, {{customers[chosenInv.customerId].billToDept}}
<p *ngIf="chosenInv.customerId" class="p-0 m-0 mt-2">
<!--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">
{{customers[chosenInv.customerId].add1}} {{customers[chosenInv.customerId].add2}}
<p *ngIf="chosenInv.customerId" class="p-0 m-0 mt-2">
<!--{{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">
<!--{{customers[customerSelec.value].city}} {{customers[customerSelec.value].state}} {{customers[customerSelec.value].zip}}-{{customers[customerSelec.value].ziplast4}}-->
{{customers[chosenInv.customerId].city}} {{customers[chosenInv.customerId].state}} {{customers[chosenInv.customerId].zip}}{{(customers[chosenInv.customerId].ziplast4 == 0) ? '':'-' + customers[chosenInv.customerId].ziplast4}}
<p *ngIf="chosenInv.customerId" class="p-0 m-0 mt-2">
<!--{{correspondingCustomer[0].city}} {{correspondingCustomer[0].state}} {{correspondingCustomer[0].zip}}{{(correspondingCustomer[0].ziplast4 == 0) ? '':'-' + correspondingCustomer[0].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>

11
AstuteClient2/src/app/invoice/invoice.component.ts
View File

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

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

@ -16,11 +16,17 @@
</div>
</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 Sales Order</button>
<div class="col-3">
<button class="btn btn-success" style="width: 100%" (click)="open(new)">Add</button>
</div>
<div class="col-6">
<button class="btn btn-success" style="width: 100%" (click)="open(new)">Add Sales Order</button>
<div class="col-3">
<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 style="width: 70%"><input type="text" class="form-control" placeholder="Notes..." [value]="selected.notes" #notes></td>
<td><span class="input-group-text">Notes</span></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 style="width: 70%"><input type="text" class="form-control" placeholder="Notes..." [value]="selected.notes" #notes></td>
<td><span class="input-group-text">Notes</span></td>
<td colspan="3"><input type="text" class="form-control" placeholder="Notes..." [value]="selected.notes" #notes></td>
</tr>
</tbody>
</table>

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

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

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

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

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

@ -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);
String notes = rs.getString(9);
int invoiceSequence = rs.getInt(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;

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

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