Skip to content

Commit 9ff9982

Browse files
surajcmsurajcm
committed
Fixed the edit invoice issue, removed the font awesome dependency, replaced it with bootstrap icon, fixed some report related bugs
1 parent 9ed5eef commit 9ff9982

File tree

12 files changed

+39
-34
lines changed

12 files changed

+39
-34
lines changed

‎src/main/resources/static/css/font-awesome.min.css

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/main/resources/static/img/calendar3.svg

Lines changed: 4 additions & 0 deletions
Loading

‎src/main/resources/static/js/invoice-scripts.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
function addInvoice(){
1+
function addInvoice() {
22
/*if(document.getElementById('amount').value.length == 0){
33
document.getElementById('amount').value = "0.0";
44
}*/
55
document.forms[0].action = "addInvoice.htm";
66
document.forms[0].submit();
77
}
8+
89
function search() {
910
/*if(document.getElementById('amount').value.length == 0){
1011
document.getElementById('amount').value = "0.0";
1112
}*/
1213
document.forms[0].action = "SearchInvoice.htm";
1314
document.forms[0].submit();
1415
}
16+
1517
function clearOut() {
1618
document.getElementById('invoiceId').value = "";
1719
document.getElementById('description').value = "";
@@ -23,6 +25,7 @@ function clearOut() {
2325
document.getElementById('lesser').checked = false;
2426
document.getElementById('startsWith').checked = false;
2527
}
28+
2629
//validation before edit
2730
function editMe() {
2831
var check = 'false';
@@ -154,6 +157,6 @@ function checkCall(e) {
154157
}
155158
}
156159

157-
function hideAlerts(){
160+
function hideAlerts() {
158161
document.getElementById('invmgt').text = "Invoice <span class='sr-only'>Invoice</span>";
159162
}

‎src/main/webapp/invoice/EditInvoice.jsp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<form:form method="POST" modelAttribute="invoiceForm">
5555
<form:hidden name="loggedInUser" path="loggedInUser" />
5656
<form:hidden name="loggedInRole" path="loggedInRole" />
57-
<form:hidden name="id" path="currentInvoiceVO.id" />
57+
<form:hidden name="id" path="currentInvoiceVo.id" />
5858
<%@include file="../navbar.jsp" %>
5959
<div class="container">
6060
<div class="wrap">
@@ -69,7 +69,7 @@
6969
</td>
7070
<td colspan="2">&nbsp;</td>
7171
<td style="text-align:left;">
72-
<form:input path="currentInvoiceVO.tagNo" cssClass="form-control" id="tagNo"/>
72+
<form:input path="currentInvoiceVo.tagNo" cssClass="form-control" id="tagNo"/>
7373
</td>
7474
<td colspan="2">&nbsp;</td>
7575
<td style="text-align:right;">
@@ -79,7 +79,7 @@
7979
</td>
8080
<td colspan="2">&nbsp;</td>
8181
<td colspan="7" style="text-align:left;">
82-
<form:textarea path="currentInvoiceVO.description" cssClass="form-control" id="description"/>
82+
<form:textarea path="currentInvoiceVo.description" cssClass="form-control" id="description"/>
8383
</td>
8484
</tr>
8585
<tr>
@@ -90,7 +90,7 @@
9090
</td>
9191
<td colspan="2">&nbsp;</td>
9292
<td style="text-align:left;">
93-
<form:input path="currentInvoiceVO.quantity" cssClass="form-control" id="quantity"/>
93+
<form:input path="currentInvoiceVo.quantity" cssClass="form-control" id="quantity"/>
9494
</td>
9595
<td colspan="2">&nbsp;</td>
9696
<td style="text-align:right;">
@@ -100,7 +100,7 @@
100100
</td>
101101
<td colspan="2">&nbsp;</td>
102102
<td style="text-align:left;">
103-
<form:input path="currentInvoiceVO.rate" cssClass="form-control" id="rate"/>
103+
<form:input path="currentInvoiceVo.rate" cssClass="form-control" id="rate"/>
104104
</td>
105105
<td colspan="2">&nbsp;</td>
106106
<td style="text-align:right;">
@@ -110,7 +110,7 @@
110110
</td>
111111
<td colspan="2">&nbsp;</td>
112112
<td style="text-align:left;">
113-
<form:input path="currentInvoiceVO.amount" cssClass="form-control" id="amount"/>
113+
<form:input path="currentInvoiceVo.amount" cssClass="form-control" id="amount"/>
114114
</td>
115115
</tr>
116116
<tr>

‎src/main/webapp/make/ModelEdit.jsp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<meta name="author" content="Suraj">
1313
<spring:url value="/resources/images/Poseidon_Ico.ico" var="posIcon" />
1414
<link rel="shortcut icon" href="${posIcon}" />
15-
<link rel="stylesheet" href="/css/jquery-ui.css" type="text/css" />
16-
<link rel="stylesheet" href="/css/font-awesome.min.css" type="text/css" />
1715
<link rel="stylesheet" href="/css/bootstrap.min.css" type="text/css" />
1816
<link rel="stylesheet" href="/css/custom.css" type="text/css" />
1917
<title>Edit Model</title>

‎src/main/webapp/make/ModelList.jsp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<meta name="author" content="Suraj">
1313
<spring:url value="/resources/images/Poseidon_Ico.ico" var="posIcon" />
1414
<link rel="shortcut icon" href="${posIcon}" />
15-
<link rel="stylesheet" href="/css/jquery-ui.css" type="text/css" />
16-
<link rel="stylesheet" href="/css/font-awesome.min.css" type="text/css" />
1715
<link rel="stylesheet" href="/css/bootstrap.min.css" type="text/css" />
1816
<link rel="stylesheet" href="/css/custom.css" type="text/css" />
1917
<title>Make and Model List</title>
@@ -156,7 +154,6 @@
156154
</div>
157155
</div>
158156
</div>
159-
<script src="/js/core/jquery-3.2.1.min.js"></script>
160157
<script src="/js/core/popper.min.js"></script>
161158
<script src="/js/core/bootstrap.min.js"></script>
162159
<script src="/js/core/jquery-ui.min.js"></script>

‎src/main/webapp/reports/List.jsp

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<spring:url value="/resources/images/Poseidon_Ico.ico" var="posIcon" />
1616
<link rel="shortcut icon" href="${posIcon}" />
1717
<link rel="stylesheet" href="/css/jquery-ui.css" type="text/css" />
18-
<link rel="stylesheet" href="/css/font-awesome.min.css" type="text/css" />
1918
<link rel="stylesheet" href="/css/bootstrap.min.css" type="text/css" />
2019
<link rel="stylesheet" href="/css/custom.css" type="text/css" />
2120

@@ -192,6 +191,9 @@
192191
</td>
193192
<td>
194193
<form:input path="txnReportTransactionVO.startDate" cssClass="form-control" id="txnReportStartDate"/>
194+
<label for="startDate" class="input-group-addon btn">
195+
<img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
196+
</label>
195197
</td>
196198
<td colspan="2">&nbsp;</td>
197199
<td>
@@ -201,6 +203,9 @@
201203
</td>
202204
<td>
203205
<form:input path="txnReportTransactionVO.endDate" cssClass="form-control" id="txnReportEndDate"/>
206+
<label for="endDate" class="input-group-addon btn">
207+
<img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
208+
</label>
204209
</td>
205210
</tr>
206211
<tr>
@@ -363,6 +368,9 @@
363368
</td>
364369
<td>
365370
<form:input path="invoiceListReportTransactionVO.startDate" cssClass="form-control" id="invoiceListStartDate"/>
371+
<label for="startDate" class="input-group-addon btn">
372+
<img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
373+
</label>
366374
</td>
367375
<td colspan="2">&nbsp;</td>
368376
<td>
@@ -372,6 +380,9 @@
372380
</td>
373381
<td>
374382
<form:input path="invoiceListReportTransactionVO.endDate" cssClass="form-control" id="invoiceListEndDate"/>
383+
<label for="endDate" class="input-group-addon btn">
384+
<img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
385+
</label>
375386
</td>
376387
</tr>
377388
<tr>

‎src/main/webapp/resources/reports/callReport.jrxml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
</background>
3333
<title>
3434
<band height="88" splitType="Stretch">
35-
<image>
36-
<reportElement uuid="c7219682-6d21-4193-9bb0-69d4f4573544" x="6" y="6" width="74" height="74"/>
37-
<imageExpression><![CDATA["C:\\CompanyLogo.gif"]]></imageExpression>
38-
</image>
3935
<textField>
4036
<reportElement uuid="e7af506d-39c6-48a6-a204-e04ab96bb2ab" x="360" y="18" width="179" height="36"/>
4137
<textElement>

‎src/main/webapp/resources/reports/serviceBillReport.jrxml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
</textElement>
3434
<text><![CDATA[SERVICE BILL]]></text>
3535
</staticText>
36-
<image isLazy="true">
37-
<reportElement uuid="4cadb756-cbb3-42bb-94dd-4b2753daab25" x="8" y="47" width="74" height="74"/>
38-
<imageExpression><![CDATA["C:\\CompanyLogo.gif"]]></imageExpression>
39-
</image>
4036
<textField>
4137
<reportElement uuid="bb7b6665-51a4-4613-9d8b-5140f8a75dbe" x="101" y="56" width="180" height="30"/>
4238
<textElement>

‎src/main/webapp/txs/TransactionList.jsp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<spring:url value="/resources/images/Poseidon_Ico.ico" var="posIcon" />
1616
<link rel="shortcut icon" href="${posIcon}" />
1717
<link rel="stylesheet" href="/css/jquery-ui.css" type="text/css" />
18-
<link rel="stylesheet" href="/css/font-awesome.min.css" type="text/css" />
1918
<link rel="stylesheet" href="/css/bootstrap.min.css" type="text/css" />
2019
<link rel="stylesheet" href="/css/custom.css" type="text/css" />
2120
<title>Transaction List</title>
@@ -75,7 +74,9 @@
7574
<td>
7675
<div class="input-group">
7776
<form:input path="searchTransaction.startDate" class="date-picker form-control" id = "startDate" />
78-
<label for="start" class="input-group-addon btn"><span class="fa fa-calendar"></span>
77+
<label for="start" class="input-group-addon btn">
78+
<img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
79+
</label>
7980
</div>
8081
</td>
8182
<td colspan="2">&nbsp;</td>
@@ -87,7 +88,9 @@
8788
<td>
8889
<div class="input-group">
8990
<form:input path="searchTransaction.endDate" class="date-picker form-control" id = "endDate" />
90-
<label for="end" class="input-group-addon btn"><span class="fa fa-calendar"></span></label>
91+
<label for="end" class="input-group-addon btn">
92+
<img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
93+
</label>
9194
</div>
9295
</td>
9396
</tr>

0 commit comments

Comments
 (0)