diff --git a/build/classes/.gitignore b/build/classes/.gitignore index 0b6c10d..4e5d31f 100644 --- a/build/classes/.gitignore +++ b/build/classes/.gitignore @@ -1,3 +1,3 @@ -/controller/ /model/ /services/ +/controller/ diff --git a/build/classes/controller/BusController.class b/build/classes/controller/BusController.class index 59d8dfc..98c0e0f 100644 Binary files a/build/classes/controller/BusController.class and b/build/classes/controller/BusController.class differ diff --git a/build/classes/controller/FlightController.class b/build/classes/controller/FlightController.class index 4023961..6712d7c 100644 Binary files a/build/classes/controller/FlightController.class and b/build/classes/controller/FlightController.class differ diff --git a/build/classes/controller/HotelController.class b/build/classes/controller/HotelController.class index 9738d37..be4ceee 100644 Binary files a/build/classes/controller/HotelController.class and b/build/classes/controller/HotelController.class differ diff --git a/src/controller/BusController.java b/src/controller/BusController.java index fc1a32f..aa0bb93 100644 --- a/src/controller/BusController.java +++ b/src/controller/BusController.java @@ -9,6 +9,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import model.Bus; +import services.FareCalculator; /** @@ -32,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")); String bustype=request.getParameter("bustype"); @@ -76,6 +78,6 @@ else if(bustype.equals("nonacsemisleeper")) { request.setAttribute("busfare", rate); RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/busView.jsp"); dispatcher.forward(request, response); -*/ } + } } diff --git a/src/controller/FlightController.java b/src/controller/FlightController.java index 7760e3c..9a5f5b3 100644 --- a/src/controller/FlightController.java +++ b/src/controller/FlightController.java @@ -9,6 +9,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import model.Flight; +import services.FareCalculator; @@ -29,7 +31,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"); @@ -59,6 +61,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); - */} + } } diff --git a/src/controller/HotelController.java b/src/controller/HotelController.java index 0c39e3b..212b6d9 100644 --- a/src/controller/HotelController.java +++ b/src/controller/HotelController.java @@ -12,8 +12,8 @@ -/*import model.Hotel; -import services.FareCalculator;*/ +import model.Hotel; +import services.FareCalculator; @@ -33,7 +33,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 +67,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/hotelOutputView.jsp"); dispatcher.forward(request, response); -*/ } +} } diff --git a/src/model/Bus.java b/src/model/Bus.java index 430ca5d..a7494a9 100644 --- a/src/model/Bus.java +++ b/src/model/Bus.java @@ -1,3 +1,53 @@ package model; +import java.time.LocalDate; -// Type your code +//Type your code + + +public class Bus{ + + + private int noOfPersons; + private String busType; + private int rates; + private LocalDate date; + + + public Bus(int noOfPersons, int rates, String busType, LocalDate date) { + super(); + this.noOfPersons = noOfPersons; + this.busType = busType; + this.rates = rates; + this.date = date; + } + + + + 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; + } + + + +} \ No newline at end of file diff --git a/src/model/Flight.java b/src/model/Flight.java index 9ac54b5..72c996a 100644 --- a/src/model/Flight.java +++ b/src/model/Flight.java @@ -1,3 +1,70 @@ package model; +import java.time.LocalDate; -//Type your code \ No newline at end of file +//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 Flight(int noOfPersons, int rates, String classType, LocalDate from, LocalDate to, String triptype) + { + super(); + this.noOfPersons = noOfPersons; + this.classType = classType; + this.rates = rates; + this.from = from; + this.to = to; + this.triptype = 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; + } + + + + +} \ No newline at end of file diff --git a/src/model/Hotel.java b/src/model/Hotel.java index b21180d..e378a09 100644 --- a/src/model/Hotel.java +++ b/src/model/Hotel.java @@ -1,2 +1,65 @@ package model; -// Type your code \ No newline at end of file +import java.time.LocalDate; + +//Type your code + +public class Hotel{ + private int noOfPersons; + private String roomType; + private int rates; + private String occupancy; + private LocalDate fromdate; + private LocalDate todate; + + public Hotel(int noOfPersons, String roomType, int rates, String occupancy, LocalDate fromdate, LocalDate todate) { + super(); + this.noOfPersons = noOfPersons; + this.roomType = roomType; + this.rates = rates; + this.occupancy = occupancy; + this.fromdate = fromdate; + this.todate = 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; + } + + + +} \ No newline at end of file diff --git a/src/model/Train.java b/src/model/Train.java index b21180d..7308507 100644 --- a/src/model/Train.java +++ b/src/model/Train.java @@ -1,2 +1,52 @@ package model; -// Type your code \ No newline at end of file +import java.time.LocalDate; + +//Type your code + +public class Train{ + private int noOfPersons; + private String berth; + private int rates; + private LocalDate date; + + + public Train(int noOfPersons, int rates, String berth, LocalDate date) + { + super(); + this.noOfPersons = noOfPersons; + this.berth = berth; + this.rates = rates; + this.date = date; + } + + + + public int getNoOfPersons() { + return noOfPersons; + } + public void setNoOfPersons(int noOfPersons) { + this.noOfPersons = noOfPersons; + } + public String getBerth() { + return berth; + } + public void setBerth(String berth) { + this.berth = berth; + } + 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; + } + + + + +} \ No newline at end of file diff --git a/src/services/Booking.java b/src/services/Booking.java index fe2c822..3101164 100644 --- a/src/services/Booking.java +++ b/src/services/Booking.java @@ -2,3 +2,16 @@ // Type your code +public class Booking{ + + + public double booking(int noOfPersons,int rates) + { + + double d=(double)noOfPersons*rates; + return d; + +} + + +} \ No newline at end of file diff --git a/src/services/FareCalculator.java b/src/services/FareCalculator.java index 6d38ab5..482f59a 100644 --- a/src/services/FareCalculator.java +++ b/src/services/FareCalculator.java @@ -1,3 +1,96 @@ package services; +import java.time.LocalDate; -// Type your code \ No newline at end of file +import model.Bus; +import model.Flight; +import model.Hotel; +import model.Train; + +// Type your code + + + +public class FareCalculator extends Booking +{ + Booking b=new Booking(); + + + public double book(Hotel hotel) + { + int noOfPersons=hotel.getNoOfPersons(); + String roomType =hotel.getRoomType(); + int rates=hotel.getRates(); + String occupancy=hotel.getOccupancy(); + LocalDate fromdate=hotel.getFromdate(); + LocalDate todate=hotel.getTodate(); + double d=0; + if(todate.isAfter(fromdate)) + { + + Double data1; + + data1 = b.booking(noOfPersons, rates); + return data1; + } + else + + + return d; + + } + + + + + //method flight + public double book(Flight flight) { + int noOfPersons=flight.getNoOfPersons(); + String classType=flight.getClassType(); + int rates=flight.getRates(); + LocalDate from=flight.getFrom(); + LocalDate to=flight.getTo(); + String triptype=flight.getTriptype(); + + double data=0; + + //condition check + if(triptype=="One-way") + { + data =b.booking(noOfPersons, rates); + } + else + { + if(to.isAfter(from)) + data=b.booking(noOfPersons, rates); + } + + return data ; + + } + + //method train + public double book(Train train) + { + int noOfPersons=train.getNoOfPersons(); + String berth=train.getBerth(); + int rates=train.getRates(); + LocalDate date=train.getDate(); + double data =b.booking(noOfPersons, rates); + + return data ; + + } + + + public double book(Bus bus) + { + int noOfPersons=bus.getNoOfPersons(); + String busType=bus.getBusType(); + int rates=bus.getRates(); + LocalDate date=bus.getDate(); + double data =b.booking(noOfPersons, rates); + + return data ; + } + + } \ No newline at end of file