Committing after long time

pvepamb1 · Sep 26, 2019 · 7a37b80 · 7a37b80
1 parent efca17d
commit 7a37b80
Show file tree

Hide file tree

Showing 4 changed files with 169 additions and 26 deletions.
diff --git a/applications/tripit/src/main/webapp/WEB-INF/filterflights.jsp b/applications/tripit/src/main/webapp/WEB-INF/filterflights.jsp
@@ -0,0 +1,76 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: sayali.khare
+  Date: 9/23/2019
+  Time: 11:23 AM
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<c:set var="language" value="${pageContext.request.locale}"/>
+<fmt:setLocale value="${language}"/>
+<html>
+<head>
+    <title>Filter Flights</title>
+    <link href="../assests/css/tripit.css" rel="stylesheet">
+    <style>
+        .button {
+            background-color: #4CAF50; /* Green */
+            border: none;
+            color: white;
+
+        }
+
+        .button2 {
+            background-color: white;
+            color: black;
+            border: 1px solid #008CBA;
+        }
+
+        .button2:hover {
+            background-color: #008CBA;
+            color: white;
+        }
+
+        .go {
+            background-color: #4CAF50; /* Green */
+            border: none;
+            border-radius: 20px;
+            color: white;
+            padding: 15px 32px;
+            text-align: center;
+            text-decoration: none;
+            display: inline-block;
+            margin: 4px 2px;
+            cursor: pointer;
+            margin-left: 120px;
+        }
+
+    </style>
+
+    <meta charset = "utf-8">
+    <title>Hotels</title>
+
+</head>
+<body>
+<div class=nav>
+
+    <h1 style="padding-top :10px; padding-left: 30px ; color:white; font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif">Tripit</h1>
+    <h1 style="padding-top :40px;margin-top:150px ;padding-left: 600px ; color:cornflowerblue ;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif"> Book Your Hotel Now</h1>
+</div>
+
+
+<div  style="padding-top:250px;margin-left: 630px" >
+
+    <form action="/flights/filter" method="get">
+        <p>Enter Start Date: <input  name="begin" type = "date"></p>
+        <p style="margin-left:65px">From: <input  type="text" name="from" size="18"></p>
+        <p style="margin-left:80px">To: <input  type="text" name="to" size="19" ></p>
+        <button type ="submit" class="go">Go</button>
+    </form>
+
+</div>
+</body>
+</html>
diff --git a/applications/tripit/src/main/webapp/WEB-INF/filterhotels.jsp b/applications/tripit/src/main/webapp/WEB-INF/filterhotels.jsp
@@ -0,0 +1,75 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: sayali.khare
+  Date: 9/23/2019
+  Time: 11:23 AM
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<c:set var="language" value="${pageContext.request.locale}"/>
+<fmt:setLocale value="${language}"/>
+<html>
+<head>
+    <title>Filter Hotels</title>
+    <link href="../assests/css/tripit.css" rel="stylesheet">
+    <style>
+        .button {
+            background-color: #4CAF50; /* Green */
+            border: none;
+            color: white;
+
+        }
+
+        .button2 {
+            background-color: white;
+            color: black;
+            border: 1px solid #008CBA;
+        }
+
+        .button2:hover {
+            background-color: #008CBA;
+            color: white;
+        }
+
+        .go {
+            background-color: #4CAF50; /* Green */
+            border: none;
+            border-radius: 20px;
+            color: white;
+            padding: 15px 32px;
+            text-align: center;
+            text-decoration: none;
+            display: inline-block;
+            margin: 4px 2px;
+            cursor: pointer;
+            margin-left: 120px;
+        }
+
+    </style>
+
+    <meta charset = "utf-8">
+    <title>Hotels</title>
+
+</head>
+<body>
+<div class=nav>
+
+    <h1 style="padding-top :10px; padding-left: 30px ; color:white; font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif">Tripit</h1>
+    <h1 style="padding-top :40px;margin-top:150px ;padding-left: 600px ; color:cornflowerblue ;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif"> Book Your Hotel Now</h1>
+</div>
+
+
+<div  style="padding-top:250px;margin-left: 630px" >
+
+    <form action="/hotels/filter" method="get">
+        <p>Enter Start Date: <input  name="begin" type = "date"></p>
+        <p>Enter End Date: <input  name="end" type = "date"></p>
+        <button type ="submit" class="go">Go</button>
+    </form>
+
+</div>
+</body>
+</html>
diff --git a/applications/tripit/src/main/webapp/WEB-INF/flight.jsp b/applications/tripit/src/main/webapp/WEB-INF/flight.jsp
@@ -6,10 +6,16 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<c:set var="language" value="${pageContext.request.locale}"/>
+<fmt:setLocale value="${language}"/>
+
 <html>
 <head>
     <title>Flight</title>
-    <link href="../../assests/css/tripit.css" rel="stylesheet">
+    <link href="../assests/css/tripit.css" rel="stylesheet">
     <style>
         .button {
             background-color: #4CAF50; /* Green */
@@ -87,21 +93,26 @@
 </div>
 
 
+<form action="/flights/filter" method="get">
 <div  style="padding-top:80px;margin-left: 630px">
     <p>Enter Start Date: <input type = "text" id = "datepicker-8"></p>
-    <p>Enter End Date: <input type = "text" id = "datepicker-9"></p>
+    <p style="margin-left:65px">From: <input  type="text" name="from" size="18"></p>
+    <p style="margin-left:80px">To: <input type="text" name="to" size="19" ></p>
     <button class="go">Go</button>
 
 </div>
+</form>
 
 <div>
     <table>
         <thead>
         <tr>
             <th>Airlines</th>
             <th>Flight Number</th>
-            <th>Arrival</th>
             <th>Departure</th>
+            <th>Arrival</th>
+            <th>From</th>
+            <th>To</th>
             <th>Cost</th>
             <th>Select</th>
         </tr>
@@ -113,26 +124,17 @@
             <tr>
                 <td><c:out value="${flights.airlinesName}"/></td>
                 <td><c:out value="${flights.flightNumber}"/></td>
-                <td><c:out value="${flights.arrival}"/></td>
                 <td><c:out value="${flights.departure}"/></td>
+                <td><c:out value="${flights.arrival}"/></td>
+                <td><c:out value="${flights.from}"/></td>
+                <td><c:out value="${flights.to}"/></td>
                 <td><c:out value="${flights.cost}"/></td>
                 <td><button class="button button2">Book</button></td>
             </tr>
         </c:forEach>
         </tbody>
     </table>
 
-    <c:if test="${count > 0}">
-        <c:if test="${page > 1}">
-            <a href="<c:url value="flights"><c:param name="page" value="${page - 1}"/><c:param name="field" value="${field}"/><c:param name="key" value="${key}"/></c:url>">&lt; Prev</a>&nbsp;
-        </c:if>
-        Showing records ${start} to ${end} of ${count}
-        <c:if test="${page < pageCount}">
-            &nbsp;<a href="<c:url value="flights"><c:param name="page" value="${page + 1}"/><c:param name="field" value="${field}"/><c:param name="key"
-                                                                                                                                              value="${key}"/></c:url>">Next &gt;</a>
-        </c:if>
-    </c:if>
-
 </div>
 </body>
 </html>
diff --git a/applications/tripit/src/main/webapp/WEB-INF/hotel.jsp b/applications/tripit/src/main/webapp/WEB-INF/hotel.jsp
@@ -14,7 +14,7 @@
 <html>
 <head>
     <title>Hotel</title>
-    <link href="../../assests/css/tripit.css" rel="stylesheet">
+    <link href="../assests/css/tripit.css" rel="stylesheet">
     <style>
         .button {
             background-color: #4CAF50; /* Green */
@@ -97,16 +97,6 @@
         </tbody>
     </table>
 
-    <c:if test="${count > 0}">
-        <c:if test="${page > 1}">
-          <a href="<c:url value="hotels"><c:param name="page" value="${page - 1}"/><c:param name="field" value="${field}"/><c:param name="key" value="${key}"/></c:url>">&lt; Prev</a>&nbsp;
-        </c:if>
-        Showing records ${start} to ${end} of ${count}
-        <c:if test="${page < pageCount}">
-          &nbsp;<a href="<c:url value="hotels"><c:param name="page" value="${page + 1}"/><c:param name="field" value="${field}"/><c:param name="key"
-                                                                                                                                            value="${key}"/></c:url>">Next &gt;</a>
-        </c:if>
-      </c:if>
 </div>
 </body>
 </html>