Skip to content

Commit e61a074

Browse files
joebertjjoebertj
committed
improved user search
1 parent cb8eb60 commit e61a074

29 files changed

+116
-62
lines changed

‎WebContent/WEB-INF/applicationContext.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,10 @@
9898
<prop key="hibernate.show_sql">false</prop>
9999
<prop key="hibernate.cache.use_second_level_cache">true</prop>
100100
<prop key="hibernate.cache.use_query_cache">true</prop>
101-
<prop key="hibernate.cache.provider_class">net.sf.ehcache.hibernate.SingletonEhCacheProvider
102-
</prop>
101+
<prop key="hibernate.cache.provider_class">net.sf.ehcache.hibernate.SingletonEhCacheProvider</prop>
102+
<prop key="hibernate.show_sql">true</prop>
103+
<prop key="hibernate.format_sql">true</prop>
104+
<prop key="hibernate.use_sql_comments">true</prop>
103105
</props>
104106
</property>
105107
</bean>

‎WebContent/admin/auction.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ LIMIT <c:out value="${(pagenum-1)*perpage}" />,<c:out value="${perpage}" />
8686
<TH>Availability Date</TH>
8787
<TH>Description</TH>
8888
<TH>Price</TH>
89-
<!--TH>Interest Rate</TH>
89+
<!--TH>Rate</TH>
9090
<TH>Interest</TH>
9191
<TH>Net</TH-->
9292
</TR>

‎WebContent/admin/auctionselect.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ LIMIT <c:out value="${(pagenum-1)*perpage}" />,<c:out value="${perpage}" />
8181
<TH>Availability Date</TH>
8282
<TH>Description</TH>
8383
<TH>Price</TH>
84-
<!--TH>Interest Rate</TH>
84+
<!--TH>Rate</TH>
8585
<TH>Interest</TH>
8686
<TH>Net</TH-->
8787
</TR>

‎WebContent/admin/menu.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Pullout History <br/>
4444
Pawned Items<br/>
4545
<a href=${contextPath}/admin/pawnsummarystat.jsp>loan value</a><br/>
4646
Redeemed Items<br/>
47-
<a href=${contextPath}/admin/redeemsummarystat.jsp>loan value</a> | <a href="${contextPath}/admin/redeemsummarystatrate.jsp">interest rate</a><br/>
47+
<a href=${contextPath}/admin/redeemsummarystat.jsp>loan value</a> | <a href="${contextPath}/admin/redeemsummarystatrate.jsp">Rate</a><br/>
4848
Pulled-out Items<br/>
4949
<a href=${contextPath}/admin/pulloutsummarystat.jsp>loan value</a><br/>
5050
Inventory Items<br/>

‎WebContent/admin/settings.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<br/>
4545
<TABLE border="1">
4646
<TR>
47-
<TH colspan="100%">Interest Rates</TH>
47+
<TH colspan="100%">Rates</TH>
4848
</TR>
4949
<c:forEach var="i" begin="0" end="6">
5050
<TR>

‎WebContent/auction.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ LIMIT <c:out value="${(pagenum-1)*perpage}" />,<c:out value="${perpage}" />
8686
<TH>Availability Date</TH>
8787
<TH>Description</TH>
8888
<TH>Price</TH>
89-
<!--TH>Interest Rate</TH>
89+
<!--TH>Rate</TH>
9090
<TH>Interest</TH>
9191
<TH>Net</TH-->
9292
</TR>

‎WebContent/customer/auction.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ LIMIT <c:out value="${(pagenum-1)*perpage}" />,<c:out value="${perpage}" />
8484
<TH>Availability Date</TH>
8585
<TH>Description</TH>
8686
<TH>Price</TH>
87-
<!--TH>Interest Rate</TH>
87+
<!--TH>Rate</TH>
8888
<TH>Interest</TH>
8989
<TH>Net</TH-->
9090
</TR>

‎WebContent/customer/itemdetail.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ WHERE pid=<c:out value="${param.pid}" />
7878
<TD>: <fmt:formatNumber maxFractionDigits="2" minFractionDigits="2" value="${pawn.rows[0].loan}" /></TD>
7979
</TR>
8080
<TR>
81-
<TD>Interest Rate</TD>
81+
<TD>Rate</TD>
8282
<TD>: <fmt:formatNumber maxFractionDigits="2" minFractionDigits="2" value="${pawn.rows[0].rate}" /></TD>
8383
</TR>
8484
<TR>

‎WebContent/findcustomer.jsp‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,23 @@
1414
<TD valign=top><%@include file="menu.jsp"%></TD>
1515
<TD align=center>
1616
<%@include file="../common/msg.jsp"%>
17-
<FORM method="post" action="findcustomerdetail.jsp">
17+
<FORM method="post" action="FindCustomer.htm">
18+
<INPUT type="hidden" name="referer" value="findcustomerdetail">
1819
<TABLE border="1">
1920
<TR>
2021
<TH colspan="2">Find Customer</TH>
2122
</TR>
2223
<TR>
23-
<TD>Name Contains</TD>
24-
<TD><INPUT type="text" name="customer"></TD>
24+
<TD>Last Name</TD>
25+
<TD><INPUT type="text" name="lastName"></TD>
26+
</TR>
27+
<TR>
28+
<TD>First Name</TD>
29+
<TD><INPUT type="text" name="firstName"></TD>
30+
</TR>
31+
<TR>
32+
<TD>Middle Name</TD>
33+
<TD><INPUT type="text" name="middleName"></TD>
2534
</TR>
2635
<TR>
2736
<TD colspan="2" align="center"><INPUT type="submit" value="Find"></TD>

‎WebContent/findcustomerdetail.jsp‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,6 @@ AND archive=0
5454
<c:if test="${pagenum<(pages-(adjust/perpage))}">
5555
<A href='customer.jsp?pagenum=<c:out value="${pagenum+1}"/>'>next</A>
5656
</c:if>
57-
<sql:query var="customer" dataSource="${prenda}">
58-
SELECT * FROM customer
59-
WHERE (last_name like '%<c:out value="${param.customer}" />%'
60-
OR first_name like '%<c:out value="${param.customer}" />%'
61-
OR middle_name like '%<c:out value="${param.customer}" />%')
62-
<c:if test="${users.rows[0].level<7}">
63-
AND archive=0
64-
</c:if>
65-
ORDER BY last_name
66-
LIMIT <c:out value="${(pagenum-1)*perpage}" />,<c:out
67-
value="${perpage}" />
68-
</sql:query>
6957
<TABLE border="1">
7058
<TR>
7159
<TH colspan="4">Find Customer Detail</TH>
@@ -79,7 +67,7 @@ LIMIT <c:out value="${(pagenum-1)*perpage}" />,<c:out
7967
<TH>Archived</TH>
8068
</c:if>
8169
</TR>
82-
<c:forEach var="row" items="${customer.rows}" varStatus="line">
70+
<c:forEach var="row" items="${customers}" varStatus="line">
8371
<c:choose>
8472
<c:when test="${line.count % 2 == 1}">
8573
<TR bgcolor="#3366FF">
@@ -88,31 +76,31 @@ LIMIT <c:out value="${(pagenum-1)*perpage}" />,<c:out
8876
<TR>
8977
</c:otherwise>
9078
</c:choose>
91-
<TD><c:out value="${row.last_name}" /></TD>
92-
<TD><c:out value="${row.first_name}" /></TD>
93-
<TD><c:out value="${row.middle_name}" /></TD>
79+
<TD><c:out value="${row.lastName}" /></TD>
80+
<TD><c:out value="${row.firstName}" /></TD>
81+
<TD><c:out value="${row.middleName}" /></TD>
9482
<TD><c:out value="${row.address}" />
9583
<c:if test="${users.rows[0].level>=7}">
9684
<TD>
9785
<c:choose>
98-
<c:when test="${row.archive==false}">
99-
No
86+
<c:when test="${row.isArchive()}">
87+
Yes
10088
</c:when>
10189
<c:otherwise>
102-
Yes
90+
No
10391
</c:otherwise>
10492
</c:choose>
10593
</TD>
10694
</c:if>
107-
<!-- FORM method="post" action="pawn.jsp">
95+
<TD>
96+
<FORM method="post" action="pawn.jsp">
10897
<INPUT name="cid" type="hidden" value="${row.id}">
109-
<INPUT name="lname" type="hidden" value="${row.last_name}">
110-
<INPUT name="fname" type="hidden" value="${row.first_name}">
111-
<INPUT name="mname" type="hidden" value="${row.middle_name}">
98+
<INPUT name="lname" type="hidden" value="${row.lastName}">
99+
<INPUT name="fname" type="hidden" value="${row.firstName}">
100+
<INPUT name="mname" type="hidden" value="${row.middleName}">
112101
<INPUT name="cadd" type="hidden" value="${row.address}">
113-
</TD>
114-
<TD><INPUT name="modtype" type="submit" value="Select">
115-
</FORM-->
102+
<INPUT name="modtype" type="submit" value="Pawn">
103+
</FORM>
116104
</TD>
117105
</TR>
118106
</c:forEach>

0 commit comments

Comments
 (0)