From 00d9153990419ba1ed6305c7e3b8167ff322359e Mon Sep 17 00:00:00 2001 From: NARNEHARIPRIYA <61201057+NARNEHARIPRIYA@users.noreply.github.com> Date: Thu, 5 Mar 2020 11:27:54 +0530 Subject: [PATCH] modified --- build/classes/.gitignore | 2 +- build/classes/controller/BusController.class | Bin 1471 -> 3098 bytes .../classes/controller/FlightController.class | Bin 1313 -> 2923 bytes .../classes/controller/HotelController.class | Bin 1315 -> 3103 bytes src/controller/BusController.java | 6 +- src/controller/FlightController.java | 6 +- src/controller/HotelController.java | 8 +- src/model/Bus.java | 52 +++++++++- src/model/Flight.java | 69 ++++++++++++- src/model/Hotel.java | 65 +++++++++++- src/model/Train.java | 52 +++++++++- src/services/Booking.java | 13 +++ src/services/FareCalculator.java | 95 +++++++++++++++++- 13 files changed, 354 insertions(+), 14 deletions(-) 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 59d8dfce65f070de37220d74d77d3703cb9ee8bc..98c0e0fcecc9e26f6754c2ece0c7263c0ac06664 100644 GIT binary patch literal 3098 zcma)8TW}o36+JEO?u4CAMW=mb|iu0Cs}baj^A(g|#HKMz(PtjCNbn$h$Mk z%&aUYCIm=$V_pf5gf~?210O(@Y(o`Q{89Pim&zAke2{#lDwV1fmD97M)k?Ael|9{a zr~BS>?>T*Y|NiaAp8~iE?`UWf*i!P`(Dy18>05{D!BF!}LqcHNyuDyAT7mQzDl)X@ z!mwuD#z(PX5V(||9J?|l{lM|uyYj;V;&y>9`UyhY4X5l%T_zb%{Rx58e#dpf0|M=R z{Zj&oA+IbAv}2PA1Dyhw6dYHM)vMFeKVnZ;q(Hjhl^DQg7{15GL^$UJ0zHL|(B}k_ zW$#uQ3QYDDzB`Lad2d|?VeWgE1vO?Ra|*aIvRIO}kU0k$u3T5BxIWEA8ZrWxDHxXH zS^4qihYtJ*TQ&Tcm5jbtYNhOS_uWv4bTW zaYK^e&i0nQ-dPzMxEj}LxTYmw%N`TgVW)srQ*J6QJvYi@H6n+~5i``$PiZsdteD%PIPgxhn=8ihow2`3+%lZf;D8U z+m`FZPjI7#8w9qm#;|UwNwM!`$}^sS%J$0wx2#n}OxFfNXnt+sU-KKH5!kr~>Dn{0 z>{LMaWy6EOS^(=e#j&Wga!aXptO>R*SL!}h_9na_)WK7x)p#(eQAOA-CJy3|fJqi6 zY~QX*%0}S24XeLO5(b7bs$oQ+dqt>uDsNW$CT_)T%&%tqfuwB%QRQ{8HE7fIAUs`@ zIto0aY!ZH?*fAx{adw2hyi(ttbZ3_WX%nM?BJR>~Wc3+|lxkuMN0~Couq$i`tHeA$ zJugdPuK#Ww$JvsUyQ&jZq-0TaoDk@sY5Db60-dhsF2~gI8-|Mw&0Pj;lr&5)AFa@- zN-OG5!vt!g3^uG}R0aX7wXj2TwqI0|aZ79 zUq0X1(|SrT>ZN~5ZLFB6s%mZuWH{!H&rCFApgwsfYU-2DPm@F)1tNukY6}L9jD3Xs zsI_$y3php2XjU1rCB#Xs!QMZm;k3Y&ybTtdk_@a-+m}OjrBtujp+^Q6u}MA7n79wW zC(F~Gcare>3e9|T{lltr{XyyA0i}asrGtmq04W%y-#?jn7>`iD1amMX{nK@YXlHAg z*%wv+YN^$-2JAALET*AGfGp#F=0{h8>`rQ zpXL3tra=FLmpz6c_l0s2s=Pd)vp2cAc+)5jc;wx zX{7?u$)`!njT{BXVSbKa}MFEqBKjO;?ryT7DT@#J`n= zPSd}REp7i&7QMUu>wT$A@;vSt)IPz?@vWOvnM6iAhq*yLqZ7-?jJ`Rw1UI8AME7#g zmJoh|#pCDj+rf@ZM@C=5?`}2-b&Iit`?Ki>Gx`Pmu^rj;qg#ygcszc2CMx`(nK4^R z-ws9YbGU}jousUf)b+FYyZDxcg#ng&4=*qaqqrVs=WFKJ!AJfxkytzK7w=Zx9zC;0E;V{0z82-x+ z*^UWe;?9Wr_ed>CTc)0~n0n3{)SE&O{qv;$3j7DR;>l0*zqd+bpbE(l)R67@DN_2Fu!0i2vbUgNhmypA_GZlZYKUE|IWe}_W%F@ delta 147 zcmbOwv7ejk)W2Q(7#J8#7@Rk9-D952%5jiYjDdwgV)AK@SY8LU21X$1&maIK6(Ev8JwiYpP#J?6gE?59k->t&5~zcT Z!4@da#9#+DiVrB~0K|^b42;DLP5|pi5mx{J diff --git a/build/classes/controller/FlightController.class b/build/classes/controller/FlightController.class index 40239610fbc678ebaf66d6731c462039ac68a017..6712d7c49f059a23692ca3450043c7cca861e345 100644 GIT binary patch literal 2923 zcma)8*;f-+9R6+y%#aKqQL0mm)*XyGwxX@Xx`Ajaf`VePi=BiEjD}1)GeNYw-Rx@j z(?04;AKI6`pw@GGdivPmhxSjJb5T^Ny`@3_S? z*_<>yvM(jda*3+c=5dsbSoT3x#7pUv#91)23xMMPbIy4(dASuw&?-b=g zc`7Hp({`>P1ycQPo(621;dA9M9!xsEKzsi~0>}u|kGV%>ATZR?|L{PDDiF;HX)pzrD>p31wX%bAFLbOHSY@3(a(H`opwF6i z{vV;7j^aOTCKv)I4IAIM3 zo>QF2bk+pD;94e$4cMe%qrlqvJ}eM5uo+tfv~kzFWP4)*2Wye9z_JA3b8o9~*1U)u zfh{$j)~4fqr2@JqBMkzz4lKM>u|-D5s-Rj|V{AdJ%&&$q_oV9wI(9PV5^I3Dpa^@? zz%FzN7-Zq3?b%Z@Q0Q-768(9EB(MihYj{eaHB6U~tZXrm6VfxV7u}4nWP85knLyiO zO0zolG5zxe+xK;_+~VV&JEh~GKrC=|9OenxFX>>xHp&^9F9*&vE3ps9G#q7JKd>C7 ziGeIw*bU^uF0l0GnH|hskoh3fc`ku|3}`rUKhpzeN?Kt7_u7FpFo=_MD|BAKs`k8R z()NZG(ZxK=E5zQKe>%XPV-zagDuGittvbgUf#Hs9Ho8`w+>0uD$YJ%}&Jm^m ztbyk+D$wl9V89(5KN-RAu>8{U_y!4Q~b26!4X)=UOesOrEm4wp6sy;`EtPy zTrYu1G^>w-fhiQ}dCqk&GP^qZtHI24_Ub5+;_+}2s61x6`CyKzAPxmgm|Qtv5L>E= zs{~O6{rzkh(J{@UiqwtMr37YhMZ@KJ>DB9&+1Cxciq{zYw3-)#;|i$WN*08aL{b?Y zZ?Nmv^vcM<2>YgLn4BTSaDG%#C9=%&uo!}ng;bTd75_<}Dv0QPy{BkY;0Cs*YHZPr z;SiHWQqVjfMpbMKR>16Ef)I9&xU#@m$?|I&4($BJ6Lu+_Z5pn#QOs|%OSLS5JM5Od zyzFz-q-?7l;X9NX`Y}{4svH_|e1}jUDi+Io+!>J& zT9M*Y9LuqS5^dZ!aD4=;LS;EBkMk^*PCa@DkHs*sJ-zJ?*4N>I=H}3?b~IuQwXF@c zZ;ftMwDUeX&>31xVJp(K(8%9y*dFTNv6$^xD??MB-b<&fJ9r|7+t|H7oyvs!?sz)& zOth;{rw&BBhIHyswA0LZs%I8QzDKgPy?>AX1N7GA*Y@aU{cRlYZZsRzlDLagqwQ_F z88;ivgsI)aaCg#7w$Eb3Ot$H>IA4=*eB_8Qu%0MyAle)GC1Mki+01W>o!HM^ z4^iqPKF48U2s<%~C)rDOu|0I*3U=dd&a7*A3fDQGzC#8#un#}t8G^JQzvBS@#K91~ zn-PX{Ox&Ae;$DRb1Ha)-yhSD+!7TM&C3lbGC+fM%MB9p+)O3|u(M3D&aHr9?I=ssp zI=y?lvKyjT@8Ny2I!Yfu;4VRb&!a>ylf2o55AhMBy}`IX#wTc^mx(X~TJR~6*nrqS r3|QA7G_-5@j7#6#AMls@b{xa!6pi5ve95($3H25KzkVLV$2b21>pJh| delta 152 zcmaDYwvbEU)W2Q(7#J8#7);q2m>3zPCtj4^sIARB`5gN}R#65P2Jy*LI6^t488{ha z7z7z)Cx7Dbh-a_|>R<+9#*ILNiGd$TvN13MNjnAsAgKV61gaMT@_@=1G#E6&@{9~x g4B9{)Obq%!aV7=>216jt2b41cV&iBA#$pB&0QX-K_W%F@ diff --git a/build/classes/controller/HotelController.class b/build/classes/controller/HotelController.class index 9738d37c44afeebfb6bb8132bcc489e94f3b93ae..be4ceeea4e0b50ba1260581f20056bc725fe127a 100644 GIT binary patch literal 3103 zcma)8+jARN8UGzw_DZX@U8_l(4N23qO=3k&mNsc z)!ic};no77g+dE%xs^MGf#IpZgOku1242fE!wWMEZw&bt7~pqyWkr&0z?VH|&pF?B zzVG+@F8kiUe)~HB$MG`*34z@e-&28KtI5DQ=POwoYrPvt3fydA@5%DfC_-T9gn$d>&IFK~Gc-~hYZJ#(ZqG48BZ<(1H>dJFRE(Mw@HgT2^i;68x^|Cb9E?#F(C9ZOO* zohnwtx~nS7G7xwy2EwVi-jXw;f~vPv$aOirNvx2;gE(N|A%T6JHf%a-;UEqP7>j;z z#SIn&PIn{Ugk>ARTf1#I8$nEtz@aWnyQ6VKsX!`_u?B%|12zja?;@iMZBXs+x@?oL zjIX{0f65P43h$@Sb*2DgK@;|H*i;^(&!)D7X1!FOq{^u20kD#6opGf zR>@OxNd^|4zzF@TyFn3Y7~5bMO~}Q6qs;nzfx(`U9WO2h11Nu#lT-l z;fz2+`6h}OH*j_%LRED|I#J#gT_r6%g>%fN=u!cv{l>9nH<-}`c@?HbgqhPRT}Xii zAu&2;qKpXxPqS#;@hc8O3zL{4o>b)4nAaUnP0nAE6;;SRm&P<^4a{^ZxE3n8V&PdZ zCwu&ch9owFX*R_OSG+>HD+LoD!E**KZ1~u@ZQ*%*RI{ihY98?!F6HL5%*XZCC%SCf z$elR@u0UpmRjd{lP!ktX(Z!6>KQmm4O=-`!Eta-~ZOcV%(nTy9Va?Gt&8Z}q>fr$nN^y8X^PvTRAb>8Twzab3UJ(Y&aewOC?u#<61G?#Q{@9`SF3?K(otE+X1A`Yx*Z( zm$zYr*Ce$l%_vfOM!A*CPrLP~uNwFPt5j!=->zP=T+aB7pd!bsx=Ziq`g%C3wa|>| zhNpd)tATB;f$b zI7ny@5x8M~$L3Jr>w}`vlBJOsRI17Kp*YI@`cMtwVt!t$E ze*BTT*BFEc`u(c|c_h8Vs6Xc}4~;25q1YCI)?=I1_^bgCUUS1Iifzv2ip5V=;pX02we0 AQ~&?~ 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