FSJ0320A021

build/classes/.gitignore

@@ -1,3 +1,4 @@
 /controller/
 /model/
 /services/
+/testing/

src/controller/BusController.java

@@ -1,6 +1,7 @@
 package controller;
 
 import java.io.IOException;
+
 import java.time.LocalDate;
 
 import javax.servlet.RequestDispatcher;
@@ -10,6 +11,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Bus;
+import services.*;
+
 @WebServlet(urlPatterns= {"/bus"})
 public class BusController extends HttpServlet {
 	private static final long serialVersionUID = 1L;
@@ -28,9 +32,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*
 
-			int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String bustype=request.getParameter("bustype");
 		String date=request.getParameter("start");
 		System.out.println(numberOfPersons);
@@ -58,7 +61,7 @@ else if(bustype.equals("nonacsemisleeper")) {
 
 		LocalDate start=LocalDate.parse(date);				
 
-		Bus bus=new Bus(numberOfPersons,rates,bustype,start);
+		Bus bus=new Bus(numberOfPersons,bustype,rates,start);
 		bus.setNoOfPersons(numberOfPersons);
 		bus.setRates(rates);
 		bus.setBusType(bustype);
@@ -72,6 +75,6 @@ else if(bustype.equals("nonacsemisleeper")) {
 		request.setAttribute("busfare", rate);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/busView.jsp");
 		dispatcher.forward(request, response);
-*/	}
+	}
 
 }

src/controller/FlightController.java

@@ -10,6 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Flight;
+import services.FareCalculator;
+
 
 
 @WebServlet("/flight")
@@ -29,7 +32,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 	}
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String classtype=request.getParameter("class");
 		String from=request.getParameter("from");
 		String to=request.getParameter("to");
@@ -45,7 +48,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		LocalDate start=LocalDate.parse(from);		
 		LocalDate end=LocalDate.parse(to);
 
-		Flight flight=new Flight(numberOfPersons,rates,classtype,start,end,triptype);
+		Flight flight=new Flight(numberOfPersons,classtype,rates,start,end,triptype);
 		flight.setNoOfPersons(numberOfPersons);
 		flight.setRates(rates);
 		flight.setClassType(classtype);
@@ -59,6 +62,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		request.setAttribute("flightfare", rate);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/flightView.jsp");
 		dispatcher.forward(request, response);
-	*/}
+	}
 
 }

src/controller/HotelController.java

@@ -10,6 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Hotel;
+import services.FareCalculator;
+
 
 
 /*import model.Hotel;
@@ -33,7 +36,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 	}
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String roomtype=request.getParameter("roomtype");
 		String occupancy=request.getParameter("occupancy");
 		String from=request.getParameter("from");
@@ -67,6 +70,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/hotelOutputView.jsp");
 		dispatcher.forward(request, response);
 
-*/	}
+	}
 
 }

src/controller/TrainController.java

@@ -10,6 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Train;
+import services.FareCalculator;
+
 
 /**
  * Servlet implementation class TrainController
@@ -31,7 +34,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String berth=request.getParameter("berth");
 		String date=request.getParameter("to");
 		System.out.println(numberOfPersons);
@@ -55,7 +58,7 @@ else if(berth.equals("nonac")) {
 		}
 		LocalDate start=LocalDate.parse(date);				
 
-		Train train=new Train(numberOfPersons,rates,berth,start);
+		Train train=new Train(numberOfPersons,berth,rates,start);
 		train.setNoOfPersons(numberOfPersons);
 		train.setRates(rates);
 		train.setBerth(berth);;
@@ -68,6 +71,6 @@ else if(berth.equals("nonac")) {
 		request.setAttribute("trainfare", trainfare);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/trainView.jsp");
 		dispatcher.forward(request, response);
-	*/}
+	}
 
 }

src/model/Bus.java

@@ -1,3 +1,48 @@
 package model;
 
+import java.time.LocalDate;
+
 // Type your code
+
+public class Bus{
+	private int noOfPersons;
+	private String busType;
+	private int rates;
+	private LocalDate date;
+
+
+	//Getter-Setter
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+	public String getBusType() {
+		return busType;
+	}
+	public void setBusType(String busType) {
+		this.busType = busType;
+	}
+	public int getRates() {
+		return rates;
+	}
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+	public LocalDate getDate() {
+		return date;
+	}
+	public void setDate(LocalDate date) {
+		this.date = date;
+	}
+
+	//CONSTRUCTOR
+	public Bus(int noOfPersons, String busType, int rates, LocalDate date) {
+		this.noOfPersons = noOfPersons;
+		this.busType = busType;
+		this.rates = rates;
+		this.date = date;
+	}
+
+}

src/model/Flight.java

@@ -1,3 +1,98 @@
 package model;
 
-//Type your code 
+import java.time.LocalDate;
+
+//Type your code
+
+public class Flight{
+	private int noOfPersons;
+	private String classType;
+	private int rates;
+	private LocalDate from;
+	private LocalDate to;
+	private String triptype;
+
+
+
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+
+
+
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+
+
+
+	public String getClassType() {
+		return classType;
+	}
+
+
+
+	public void setClassType(String classType) {
+		this.classType = classType;
+	}
+
+
+
+	public int getRates() {
+		return rates;
+	}
+
+
+
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+
+
+
+	public LocalDate getFrom() {
+		return from;
+	}
+
+
+
+	public void setFrom(LocalDate from) {
+		this.from = from;
+	}
+
+
+
+	public LocalDate getTo() {
+		return to;
+	}
+
+
+
+	public void setTo(LocalDate to) {
+		this.to = to;
+	}
+
+
+
+	public String getTriptype() {
+		return triptype;
+	}
+
+
+
+	public void setTriptype(String triptype) {
+		this.triptype = triptype;
+	}
+
+
+
+	public Flight(int noOfPersons, String classType, int rates, LocalDate from, LocalDate to, String triptype) {
+		this.noOfPersons = noOfPersons;
+		this.classType = classType;
+		this.rates = rates;
+		this.from = from;
+		this.to = to;
+		this.triptype = triptype;
+	}
+
+}

src/model/Hotel.java

@@ -1,2 +1,59 @@
 package model;
-// Type your code
+// Type your code
+
+import java.time.LocalDate;
+
+public class Hotel{
+	private int noOfPersons;
+	private String roomType;
+	private int rates;
+	private String occupancy;
+	private LocalDate fromdate;
+	private LocalDate todate;
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+	public String getRoomType() {
+		return roomType;
+	}
+	public void setRoomType(String roomType) {
+		this.roomType = roomType;
+	}
+	public int getRates() {
+		return rates;
+	}
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+	public String getOccupancy() {
+		return occupancy;
+	}
+	public void setOccupancy(String occupancy) {
+		this.occupancy = occupancy;
+	}
+	public LocalDate getFromdate() {
+		return fromdate;
+	}
+	public void setFromdate(LocalDate fromdate) {
+		this.fromdate = fromdate;
+	}
+	public LocalDate getTodate() {
+		return todate;
+	}
+	public void setTodate(LocalDate todate) {
+		this.todate = todate;
+	}
+
+	public Hotel(int noOfPersons, String roomType, int rates, String occupancy, LocalDate fromdate, LocalDate todate) {
+		this.noOfPersons = noOfPersons;
+		this.roomType = roomType;
+		this.rates = rates;
+		this.occupancy = occupancy;
+		this.fromdate = fromdate;
+		this.todate = todate;
+	}
+
+}