Fixed the edit invoice issue, removed the font awesome dependency, re…

…placed it with bootstrap icon, fixed some report related bugs
surajcm · Jun 18, 2020 · 9ff9982 · 9ff9982
1 parent 9ed5eef
commit 9ff9982
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 34 deletions.
diff --git a/src/main/resources/static/css/font-awesome.min.css b/src/main/resources/static/css/font-awesome.min.css
diff --git a/src/main/resources/static/img/calendar3.svg b/src/main/resources/static/img/calendar3.svg
diff --git a/src/main/resources/static/js/invoice-scripts.js b/src/main/resources/static/js/invoice-scripts.js
@@ -1,17 +1,19 @@
-function addInvoice(){
+function addInvoice() {
     /*if(document.getElementById('amount').value.length == 0){
      document.getElementById('amount').value = "0.0";
      }*/
     document.forms[0].action = "addInvoice.htm";
     document.forms[0].submit();
 }
+
 function search() {
     /*if(document.getElementById('amount').value.length == 0){
      document.getElementById('amount').value = "0.0";
      }*/
     document.forms[0].action = "SearchInvoice.htm";
     document.forms[0].submit();
 }
+
 function clearOut() {
     document.getElementById('invoiceId').value = "";
     document.getElementById('description').value = "";
@@ -23,6 +25,7 @@ function clearOut() {
     document.getElementById('lesser').checked = false;
     document.getElementById('startsWith').checked = false;
 }
+
 //validation before edit
 function editMe() {
     var check = 'false';
@@ -154,6 +157,6 @@ function checkCall(e) {
     }
 }
 
-function hideAlerts(){
+function hideAlerts() {
     document.getElementById('invmgt').text = "Invoice <span class='sr-only'>Invoice</span>";
 }
diff --git a/src/main/webapp/invoice/EditInvoice.jsp b/src/main/webapp/invoice/EditInvoice.jsp
@@ -54,7 +54,7 @@
     <form:form method="POST" modelAttribute="invoiceForm">
         <form:hidden name="loggedInUser" path="loggedInUser" />
         <form:hidden name="loggedInRole" path="loggedInRole" />
-        <form:hidden name="id" path="currentInvoiceVO.id" />
+        <form:hidden name="id" path="currentInvoiceVo.id" />
         <%@include file="../navbar.jsp" %>
         <div class="container">
             <div class="wrap">
@@ -69,7 +69,7 @@
                             </td>
                             <td colspan="2">&nbsp;</td>
                             <td style="text-align:left;">
-                                <form:input path="currentInvoiceVO.tagNo" cssClass="form-control" id="tagNo"/>
+                                <form:input path="currentInvoiceVo.tagNo" cssClass="form-control" id="tagNo"/>
                             </td>
                             <td colspan="2">&nbsp;</td>
                             <td style="text-align:right;">
@@ -79,7 +79,7 @@
                             </td>
                             <td colspan="2">&nbsp;</td>
                             <td colspan="7" style="text-align:left;">
-                                <form:textarea path="currentInvoiceVO.description" cssClass="form-control" id="description"/>
+                                <form:textarea path="currentInvoiceVo.description" cssClass="form-control" id="description"/>
                             </td>
                         </tr>
                         <tr>
@@ -90,7 +90,7 @@
                             </td>
                             <td colspan="2">&nbsp;</td>
                             <td style="text-align:left;">
-                                <form:input path="currentInvoiceVO.quantity" cssClass="form-control" id="quantity"/>
+                                <form:input path="currentInvoiceVo.quantity" cssClass="form-control" id="quantity"/>
                             </td>
                             <td colspan="2">&nbsp;</td>
                             <td style="text-align:right;">
@@ -100,7 +100,7 @@
                             </td>
                             <td colspan="2">&nbsp;</td>
                             <td style="text-align:left;">
-                                <form:input path="currentInvoiceVO.rate" cssClass="form-control" id="rate"/>
+                                <form:input path="currentInvoiceVo.rate" cssClass="form-control" id="rate"/>
                             </td>
                             <td colspan="2">&nbsp;</td>
                             <td style="text-align:right;">
@@ -110,7 +110,7 @@
                             </td>
                             <td colspan="2">&nbsp;</td>
                             <td style="text-align:left;">
-                                <form:input path="currentInvoiceVO.amount" cssClass="form-control" id="amount"/>
+                                <form:input path="currentInvoiceVo.amount" cssClass="form-control" id="amount"/>
                             </td>
                         </tr>
                         <tr>

diff --git a/src/main/webapp/make/ModelEdit.jsp b/src/main/webapp/make/ModelEdit.jsp
@@ -12,8 +12,6 @@
     <meta name="author" content="Suraj">
     <spring:url value="/resources/images/Poseidon_Ico.ico" var="posIcon" />
     <link rel="shortcut icon" href="${posIcon}" />
-    <link rel="stylesheet" href="/css/jquery-ui.css" type="text/css" />
-    <link rel="stylesheet" href="/css/font-awesome.min.css" type="text/css" />
     <link rel="stylesheet" href="/css/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
     <title>Edit Model</title>

diff --git a/src/main/webapp/make/ModelList.jsp b/src/main/webapp/make/ModelList.jsp
@@ -12,8 +12,6 @@
     <meta name="author" content="Suraj">
     <spring:url value="/resources/images/Poseidon_Ico.ico" var="posIcon" />
     <link rel="shortcut icon" href="${posIcon}" />
-    <link rel="stylesheet" href="/css/jquery-ui.css" type="text/css" />
-    <link rel="stylesheet" href="/css/font-awesome.min.css" type="text/css" />
     <link rel="stylesheet" href="/css/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
     <title>Make and Model List</title>
@@ -156,7 +154,6 @@
                 </div>
             </div>
         </div>
-        <script src="/js/core/jquery-3.2.1.min.js"></script>
         <script src="/js/core/popper.min.js"></script>
         <script src="/js/core/bootstrap.min.js"></script>
         <script src="/js/core/jquery-ui.min.js"></script>

diff --git a/src/main/webapp/reports/List.jsp b/src/main/webapp/reports/List.jsp
@@ -15,7 +15,6 @@
     <spring:url value="/resources/images/Poseidon_Ico.ico" var="posIcon" />
     <link rel="shortcut icon" href="${posIcon}" />
     <link rel="stylesheet" href="/css/jquery-ui.css" type="text/css" />
-    <link rel="stylesheet" href="/css/font-awesome.min.css" type="text/css" />
     <link rel="stylesheet" href="/css/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
 
@@ -192,6 +191,9 @@
                     </td>
                     <td>
                         <form:input path="txnReportTransactionVO.startDate" cssClass="form-control" id="txnReportStartDate"/>
+                        <label for="startDate" class="input-group-addon btn">
+                            <img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
+                        </label>
                     </td>
                     <td colspan="2">&nbsp;</td>
                     <td>
@@ -201,6 +203,9 @@
                     </td>
                     <td>
                         <form:input path="txnReportTransactionVO.endDate" cssClass="form-control" id="txnReportEndDate"/>
+                        <label for="endDate" class="input-group-addon btn">
+                            <img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
+                        </label>
                     </td>
                 </tr>
                 <tr>
@@ -363,6 +368,9 @@
                     </td>
                     <td>
                         <form:input path="invoiceListReportTransactionVO.startDate" cssClass="form-control" id="invoiceListStartDate"/>
+                        <label for="startDate" class="input-group-addon btn">
+                            <img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
+                        </label>
                     </td>
                     <td colspan="2">&nbsp;</td>
                     <td>
@@ -372,6 +380,9 @@
                     </td>
                     <td>
                         <form:input path="invoiceListReportTransactionVO.endDate" cssClass="form-control" id="invoiceListEndDate"/>
+                        <label for="endDate" class="input-group-addon btn">
+                            <img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
+                        </label>
                     </td>
                 </tr>
                 <tr>

diff --git a/src/main/webapp/resources/reports/callReport.jrxml b/src/main/webapp/resources/reports/callReport.jrxml
@@ -32,10 +32,6 @@
 	</background>
 	<title>
 		<band height="88" splitType="Stretch">
-			<image>
-				<reportElement uuid="c7219682-6d21-4193-9bb0-69d4f4573544" x="6" y="6" width="74" height="74"/>
-				<imageExpression><![CDATA["C:\\CompanyLogo.gif"]]></imageExpression>
-			</image>
 			<textField>
 				<reportElement uuid="e7af506d-39c6-48a6-a204-e04ab96bb2ab" x="360" y="18" width="179" height="36"/>
 				<textElement>

diff --git a/src/main/webapp/resources/reports/serviceBillReport.jrxml b/src/main/webapp/resources/reports/serviceBillReport.jrxml
@@ -33,10 +33,6 @@
 				</textElement>
 				<text><![CDATA[SERVICE BILL]]></text>
 			</staticText>
-			<image isLazy="true">
-				<reportElement uuid="4cadb756-cbb3-42bb-94dd-4b2753daab25" x="8" y="47" width="74" height="74"/>
-				<imageExpression><![CDATA["C:\\CompanyLogo.gif"]]></imageExpression>
-			</image>
 			<textField>
 				<reportElement uuid="bb7b6665-51a4-4613-9d8b-5140f8a75dbe" x="101" y="56" width="180" height="30"/>
 				<textElement>

diff --git a/src/main/webapp/txs/TransactionList.jsp b/src/main/webapp/txs/TransactionList.jsp
@@ -15,7 +15,6 @@
     <spring:url value="/resources/images/Poseidon_Ico.ico" var="posIcon" />
     <link rel="shortcut icon" href="${posIcon}" />
     <link rel="stylesheet" href="/css/jquery-ui.css" type="text/css" />
-    <link rel="stylesheet" href="/css/font-awesome.min.css" type="text/css" />
     <link rel="stylesheet" href="/css/bootstrap.min.css"  type="text/css" />
     <link rel="stylesheet" href="/css/custom.css" type="text/css" />
     <title>Transaction List</title>
@@ -75,7 +74,9 @@
                                 <td>
                                     <div class="input-group">
                                         <form:input path="searchTransaction.startDate" class="date-picker form-control" id = "startDate" />
-                                        <label for="start" class="input-group-addon btn"><span class="fa fa-calendar"></span>
+                                        <label for="start" class="input-group-addon btn">
+                                            <img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
+                                        </label>
                                     </div>
                                 </td>
                                 <td colspan="2">&nbsp;</td>
@@ -87,7 +88,9 @@
                                 <td>
                                     <div class="input-group">
                                         <form:input path="searchTransaction.endDate" class="date-picker form-control" id = "endDate" />
-                                        <label for="end" class="input-group-addon btn"><span class="fa fa-calendar"></span></label>
+                                        <label for="end" class="input-group-addon btn">
+                                            <img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
+                                        </label>
                                     </div>
                                 </td>
                             </tr>

diff --git a/src/main/webapp/txs/TxnAdd.jsp b/src/main/webapp/txs/TxnAdd.jsp
@@ -15,7 +15,6 @@
         <spring:url value="/resources/images/Poseidon_Ico.ico" var="posIcon" />
         <link rel="shortcut icon" href="${posIcon}" />
         <link rel="stylesheet" href="/css/jquery-ui.css" type="text/css" />
-        <link rel="stylesheet" href="/css/font-awesome.min.css" type="text/css" />
         <link rel="stylesheet" href="/css/bootstrap.min.css"  type="text/css" />
         <link rel="stylesheet" href="/css/custom.css" type="text/css" />
         <title>Add Transaction</title>
@@ -67,7 +66,9 @@
                             <td style="text-align:left;">
                                 <div class="input-group">
                                     <form:input path="currentTransaction.dateReported" class="date-picker form-control" id = "dateReported" />
-                                    <label for="reported" class="input-group-addon btn"><span class="fa fa-calendar"></span>
+                                    <label for="reported" class="input-group-addon btn">
+                                        <img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
+                                    </label>
                                 </div>
                             </td>
                         </tr>

diff --git a/src/main/webapp/txs/TxnEdit.jsp b/src/main/webapp/txs/TxnEdit.jsp
@@ -15,7 +15,6 @@
         <spring:url value="/resources/images/Poseidon_Ico.ico" var="posIcon" />
         <link rel="shortcut icon" href="${posIcon}" />
         <link rel="stylesheet" href="/css/jquery-ui.css" type="text/css" />
-        <link rel="stylesheet" href="/css/font-awesome.min.css" type="text/css" />
         <link rel="stylesheet" href="/css/bootstrap.min.css"  type="text/css" />
         <link rel="stylesheet" href="/css/custom.css" type="text/css" />
         <title>Edit Transaction</title>
@@ -68,7 +67,9 @@
                         <td style="text-align:left;">
                             <div class="input-group">
                                 <form:input path="currentTransaction.dateReported" class="date-picker form-control" id = "dateReported" />
-                                <label for="reported" class="input-group-addon btn"><span class="fa fa-calendar"></span>
+                                <label for="reported" class="input-group-addon btn">
+                                    <img src="/img/calendar3.svg" alt="" width="16" height="16" title="calendar" />
+                                </label>
                             </div>
                         </td>
                     </tr>