# # ChangeLog for / # # Generated by Trac 1.6 # 11/14/24 18:56:06 Fri, 22 Sep 2023 01:39:54 GMT DenicaKj [608fba87] * src/main/java/com/example/moviezone/model/views/CustomerCinemaReport.java (added) * src/main/java/com/example/moviezone/model/views/CustomerCinemaReportId.java (added) * src/main/java/com/example/moviezone/model/views/FilmReport.java (added) * src/main/java/com/example/moviezone/repository/CustomerCinemaReportRepository.java (added) * src/main/java/com/example/moviezone/repository/FilmReportRepository.java (added) * src/main/java/com/example/moviezone/repository/MonthlyCinemaReportRepository.java (added) * src/main/resources/templates/customerCinemaReport.html (added) * src/main/resources/templates/filmReport.html (added) * src/main/resources/templates/monthlyCinemaReport.html (added) added reports Thu, 24 Aug 2023 13:29:09 GMT DenicaKj [4173acf] * src/main/java/com/example/moviezone/service/Impl/SeatServiceImpl.java (modified) fix Thu, 24 Aug 2023 10:25:25 GMT milamihajlovska [4158cac] * src/main/resources/templates/events.html (modified) * src/main/resources/templates/films.html (modified) * src/main/resources/templates/projections.html (modified) Changes in html Thu, 24 Aug 2023 01:31:06 GMT DenicaKj [bcb4acc] * src/main/java/com/example/moviezone/service/Impl/SeatServiceImpl.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/events.html (modified) * src/main/resources/templates/films.html (modified) * src/main/resources/templates/projections.html (modified) filter for genre Thu, 24 Aug 2023 00:28:14 GMT DenicaKj [1e7126f] * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) * src/main/java/com/example/moviezone/model/Discount.java (modified) * src/main/java/com/example/moviezone/model/Projection.java (modified) * src/main/java/com/example/moviezone/model/Role.java (modified) * src/main/java/com/example/moviezone/model/Worker.java (modified) * src/main/java/com/example/moviezone/model/enums/GenreEnum.java (modified) * src/main/java/com/example/moviezone/model/manytomany/ProjectionIsPlayedInRoom.java (modified) * src/main/java/com/example/moviezone/model/procedures/TicketsCancelClass.java (modified) * src/main/java/com/example/moviezone/repository/DiscountRepository.java (modified) * src/main/java/com/example/moviezone/repository/ProjectionRepository.java (modified) * src/main/java/com/example/moviezone/service/CustomerService.java (modified) * src/main/java/com/example/moviezone/service/DiscountService.java (modified) * src/main/java/com/example/moviezone/service/Impl/DiscountServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/ProjectionServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/SeatServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/TicketServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/ProjectionService.java (modified) * src/main/java/com/example/moviezone/service/SeatService.java (modified) * src/main/java/com/example/moviezone/service/TicketService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/addDiscount.html (modified) * src/main/resources/templates/addProjection.html (modified) * src/main/resources/templates/films.html (modified) * src/main/resources/templates/fragments/header.html (modified) * src/main/resources/templates/myTickets.html (modified) fix Thu, 24 Aug 2023 00:24:43 GMT DenicaKj [40935d3] * src/main/java/com/example/moviezone/model/enums/GenreEnum.java (added) * src/main/java/com/example/moviezone/model/procedures/TicketsCancelClass.java (added) * src/main/java/com/example/moviezone/service/DiscountService.java (added) * src/main/java/com/example/moviezone/service/Impl/DiscountServiceImpl.java (added) * src/main/resources/templates/addDiscount.html (added) fix Mon, 06 Mar 2023 18:58:20 GMT DenicaKj [8a18cf5] * src/main/java/com/example/moviezone/service/Impl/SeatServiceImpl.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/film.html (modified) fixes Tue, 28 Feb 2023 12:36:36 GMT DenicaKj [7215773] * src/main/java/com/example/moviezone/web/HomeController.java (modified) Update HomeController.java Tue, 28 Feb 2023 12:26:09 GMT DenicaKj [1fcb086] * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) Update WebSecurityConfig.java Tue, 28 Feb 2023 12:25:25 GMT DenicaKj [f214198] * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) Update WebSecurityConfig.java Tue, 28 Feb 2023 12:12:44 GMT milamihajlovska [1b0bd1e] * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) * src/main/java/com/example/moviezone/model/Customer.java (modified) update configure Tue, 28 Feb 2023 11:28:21 GMT milamihajlovska [11d7b36] * src/main/resources/templates/fragments/footer.html (modified) update footer.html Fri, 10 Feb 2023 18:30:53 GMT DenicaKj [a8b6e6a] * src/main/java/com/example/moviezone/web/HomeController.java (modified) Update HomeController.java Fri, 10 Feb 2023 13:52:47 GMT DenicaKj [633b371] * src/main/resources/templates/events.html (modified) * src/main/resources/templates/film.html (modified) * src/main/resources/templates/films.html (modified) * src/main/resources/templates/projections.html (modified) * src/main/resources/templates/register.html (modified) * src/main/resources/templates/registerWorker.html (modified) design changes Fri, 10 Feb 2023 10:35:17 GMT DenicaKj [04153a9] * src/main/resources/templates/event.html (modified) * src/main/resources/templates/projectionsForFilm.html (modified) Authorization Fri, 10 Feb 2023 10:18:48 GMT DenicaKj [ef84238] * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) * src/main/java/com/example/moviezone/model/manytomany/CustomerIsInterestedInEvent.java (modified) * src/main/java/com/example/moviezone/model/manytomany/CustomerIsInterestedInEventId.java (modified) * src/main/java/com/example/moviezone/repository/CustomerIsInterestedInEventRepository.java (modified) * src/main/java/com/example/moviezone/repository/EventRepository.java (modified) * src/main/java/com/example/moviezone/service/CustomerIsInterestedInEventService.java (added) * src/main/java/com/example/moviezone/service/EventService.java (modified) * src/main/java/com/example/moviezone/service/Impl/CustomerIsInterestedInEventImpl.java (added) * src/main/java/com/example/moviezone/service/Impl/EventServiceImpl.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/event.html (modified) * src/main/resources/templates/profileUser.html (modified) * src/main/resources/templates/profileWorker.html (modified) Interested in event Fri, 10 Feb 2023 00:52:11 GMT DenicaKj [7926d68] * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) * src/main/java/com/example/moviezone/repository/WorkerRepository.java (modified) * src/main/java/com/example/moviezone/service/Impl/WorkerServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/WorkerService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/fragments/header.html (modified) * src/main/resources/templates/profileUser.html (added) * src/main/resources/templates/profileWorker.html (added) Profiles for user and worker Fri, 10 Feb 2023 00:18:53 GMT DenicaKj [73f0dbc] * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) * src/main/java/com/example/moviezone/model/manytomany/CustomerRatesFilm.java (modified) * src/main/java/com/example/moviezone/repository/CustomerRatesFilmRepository.java (modified) * src/main/java/com/example/moviezone/service/CustomerRatesFilmService.java (modified) * src/main/java/com/example/moviezone/service/Impl/CustomerRatesFilmImpl.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/film.html (modified) * src/main/resources/templates/myTickets.html (modified) added rating Thu, 09 Feb 2023 23:10:41 GMT DenicaKj [01a1ca6] * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) * src/main/java/com/example/moviezone/repository/CustomerRepository.java (modified) * src/main/java/com/example/moviezone/service/CustomerService.java (modified) * src/main/java/com/example/moviezone/service/Impl/CustomerServiceImpl.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/myTickets.html (modified) added authorization Thu, 09 Feb 2023 15:05:47 GMT milamihajlovska [5444409] * src/main/java/com/example/moviezone/config/CustomUsernamePasswordAuthenticationProvider.java (modified) * src/main/java/com/example/moviezone/model/Worker.java (modified) * src/main/java/com/example/moviezone/service/CinemaService.java (modified) * src/main/java/com/example/moviezone/service/Impl/CinemaServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/UserServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/UserService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/login.html (modified) * src/main/resources/templates/register.html (modified) * src/main/resources/templates/registerWorker.html (added) update register and registerWorker Thu, 09 Feb 2023 14:02:44 GMT milamihajlovska [17a2fda] * src/main/resources/templates/fragments/header.html (modified) update header.html authorities Thu, 09 Feb 2023 13:57:39 GMT milamihajlovska [cc88ec2] * src/main/java/com/example/moviezone/config/CustomUsernamePasswordAuthenticationProvider.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) updates to login Thu, 09 Feb 2023 13:44:57 GMT DenicaKj [ff75720] * src/main/java/com/example/moviezone/model/exceptions/UserNotFoundException.java (modified) Merge branch 'master' of https://github.com/DenicaKj/MovieZone Thu, 09 Feb 2023 13:44:40 GMT DenicaKj [8204d83] * src/main/resources/templates/login.html (modified) Update login.html Thu, 09 Feb 2023 13:37:33 GMT milamihajlovska [4bfcc04] * src/main/resources/templates/fragments/header.html (modified) * src/main/resources/templates/workers.html (modified) Merge branch 'master' of https://github.com/DenicaKj/MovieZone Thu, 09 Feb 2023 13:37:25 GMT milamihajlovska [6a9006d] * src/main/java/com/example/moviezone/model/exceptions/UserNotFoundException.java (modified) update userNotFoundException Thu, 09 Feb 2023 13:32:28 GMT DenicaKj [a9ffccd] * src/main/resources/templates/fragments/header.html (modified) * src/main/resources/templates/workers.html (modified) Login Header Thu, 09 Feb 2023 13:06:45 GMT DenicaKj [00fa72f] * src/main/java/com/example/moviezone/model/Category.java (modified) * src/main/java/com/example/moviezone/model/Ticket.java (modified) * src/main/java/com/example/moviezone/repository/CategoryRepository.java (modified) * src/main/java/com/example/moviezone/repository/Projection_RoomRepository.java (modified) * src/main/java/com/example/moviezone/repository/SeatRepository.java (modified) * src/main/java/com/example/moviezone/repository/TicketRepository.java (modified) * src/main/java/com/example/moviezone/service/CategoryService.java (modified) * src/main/java/com/example/moviezone/service/CustomerService.java (modified) * src/main/java/com/example/moviezone/service/Impl/CategoryServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/CustomerServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/Projection_RoomServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/SeatServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/TicketServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Projection_RoomService.java (modified) * src/main/java/com/example/moviezone/service/SeatService.java (modified) * src/main/java/com/example/moviezone/service/TicketService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/projectionsForFilm.html (modified) * src/main/resources/templates/seats.html (added) Reservation Implemented Wed, 08 Feb 2023 15:31:52 GMT DenicaKj [0ba5d1a] * src/main/java/com/example/moviezone/model/Ticket.java (modified) * src/main/java/com/example/moviezone/service/CategoryService.java (added) * src/main/java/com/example/moviezone/service/Impl/CategoryServiceImpl.java (added) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/events.html (modified) * src/main/resources/templates/films.html (modified) * src/main/resources/templates/projections.html (modified) * src/main/resources/templates/projectionsForFilm.html (modified) First part of reservation Wed, 08 Feb 2023 14:48:54 GMT DenicaKj [2c7a732] * src/main/resources/templates/addEvent.html (modified) * src/main/resources/templates/addEventToCinema.html (modified) * src/main/resources/templates/addFilm.html (modified) * src/main/resources/templates/addFilmToCinema.html (modified) * src/main/resources/templates/addProjection.html (modified) * src/main/resources/templates/events.html (modified) * src/main/resources/templates/films.html (modified) * src/main/resources/templates/home.html (modified) * src/main/resources/templates/login.html (modified) * src/main/resources/templates/register.html (modified) Merge branch 'master' of https://github.com/DenicaKj/MovieZone Wed, 08 Feb 2023 14:48:51 GMT DenicaKj [5867520] * src/main/java/com/example/moviezone/model/manytomany/ProjectionIsPlayedInRoom.java (modified) * src/main/java/com/example/moviezone/model/manytomany/ProjectionIsPlayedInRoomId.java (modified) * src/main/java/com/example/moviezone/repository/ProjectionIsPlayedInRoomRepository.java (modified) * src/main/java/com/example/moviezone/repository/ProjectionRepository.java (modified) * src/main/java/com/example/moviezone/service/Impl/ProjectionServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/ProjectionService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/projections.html (modified) * src/main/resources/templates/projectionsForFilm.html (added) Projections Wed, 08 Feb 2023 13:41:27 GMT milamihajlovska [632e3d8] * src/main/java/com/example/moviezone/repository/EventRepository.java (modified) * src/main/java/com/example/moviezone/repository/FilmRepository.java (modified) * src/main/java/com/example/moviezone/service/EventService.java (modified) * src/main/java/com/example/moviezone/service/FilmService.java (modified) * src/main/java/com/example/moviezone/service/Impl/EventServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/event.html (added) * src/main/resources/templates/events.html (modified) * src/main/resources/templates/films.html (modified) * src/main/resources/templates/projections.html (modified) * src/main/resources/templates/workers.html (modified) Merge branch 'master' of https://github.com/DenicaKj/MovieZone Wed, 08 Feb 2023 13:41:02 GMT milamihajlovska [39a45e6] * src/main/resources/templates/addEvent.html (modified) * src/main/resources/templates/addEventToCinema.html (modified) * src/main/resources/templates/addFilm.html (modified) * src/main/resources/templates/addFilmToCinema.html (modified) * src/main/resources/templates/addProjection.html (modified) * src/main/resources/templates/events.html (modified) * src/main/resources/templates/films.html (modified) * src/main/resources/templates/home.html (modified) * src/main/resources/templates/login.html (modified) * src/main/resources/templates/register.html (modified) updates in html Wed, 08 Feb 2023 13:40:10 GMT DenicaKj [90317ea] * src/main/java/com/example/moviezone/repository/EventRepository.java (modified) * src/main/java/com/example/moviezone/repository/FilmRepository.java (modified) * src/main/java/com/example/moviezone/service/EventService.java (modified) * src/main/java/com/example/moviezone/service/FilmService.java (modified) * src/main/java/com/example/moviezone/service/Impl/EventServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/event.html (added) * src/main/resources/templates/events.html (modified) * src/main/resources/templates/films.html (modified) * src/main/resources/templates/projections.html (modified) * src/main/resources/templates/workers.html (modified) Events and Event Wed, 08 Feb 2023 12:58:18 GMT DenicaKj [61fed7c] * src/main/java/com/example/moviezone/repository/FilmRepository.java (modified) * src/main/java/com/example/moviezone/service/FilmService.java (modified) * src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) Procedure Returns Table Fix Wed, 08 Feb 2023 11:33:30 GMT DenicaKj [86e187f] * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/films.html (modified) style Wed, 08 Feb 2023 11:10:52 GMT milamihajlovska [2a98e34] * src/main/java/com/example/moviezone/model/procedures/FilmsReturnTable.java (modified) * src/main/java/com/example/moviezone/repository/FilmRepository.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) Merge branch 'master' of https://github.com/DenicaKj/MovieZone Wed, 08 Feb 2023 11:10:11 GMT milamihajlovska [c05cd97] * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/films.html (modified) update i homeController for getFilmPage1 method Wed, 08 Feb 2023 11:07:57 GMT DenicaKj [eb36f39] * src/main/java/com/example/moviezone/model/procedures/FilmsReturnTable.java (modified) * src/main/java/com/example/moviezone/repository/FilmRepository.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) fixes Wed, 08 Feb 2023 10:37:34 GMT milamihajlovska [afa6544] * src/main/java/com/example/moviezone/web/HomeController.java (modified) update homeController Wed, 08 Feb 2023 10:18:57 GMT milamihajlovska [89438a3] * src/main/java/com/example/moviezone/model/Seat.java (modified) * src/main/java/com/example/moviezone/model/procedures/FilmsReturnTable.java (modified) * src/main/java/com/example/moviezone/repository/FilmRepository.java (modified) * src/main/java/com/example/moviezone/repository/ProjectionIsPlayedInRoomRepository.java (modified) * src/main/java/com/example/moviezone/repository/SeatRepository.java (modified) * src/main/java/com/example/moviezone/service/FilmService.java (modified) * src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/ProjectionIsPlayedInRoomServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/SeatServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/ProjectionIsPlayedInRoomService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/films.html (modified) Merge branch 'master' of https://github.com/DenicaKj/MovieZone Wed, 08 Feb 2023 10:17:03 GMT milamihajlovska [93341f8] * src/main/java/com/example/moviezone/web/HomeController.java (modified) update homeController Tue, 07 Feb 2023 23:06:18 GMT DenicaKj [64ee7f4] * src/main/java/com/example/moviezone/model/Seat.java (modified) * src/main/java/com/example/moviezone/repository/ProjectionIsPlayedInRoomRepository.java (modified) * src/main/java/com/example/moviezone/repository/SeatRepository.java (modified) * src/main/java/com/example/moviezone/service/Impl/ProjectionIsPlayedInRoomServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/SeatServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/ProjectionIsPlayedInRoomService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) Fixes Tue, 07 Feb 2023 22:14:46 GMT DenicaKj [8d49568] * src/main/java/com/example/moviezone/model/procedures/FilmsReturnTable.java (modified) * src/main/java/com/example/moviezone/repository/FilmRepository.java (modified) * src/main/java/com/example/moviezone/service/FilmService.java (modified) * src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/films.html (modified) trying to call a function from database Tue, 07 Feb 2023 14:29:55 GMT milamihajlovska [cb5debb] * src/main/java/com/example/moviezone/model/procedures/FilmsReturnTable.java (added) * src/main/java/com/example/moviezone/repository/FilmRepository.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/films.html (modified) Merge branch 'master' of https://github.com/DenicaKj/MovieZone Tue, 07 Feb 2023 14:27:23 GMT milamihajlovska [9eba1fb] * src/main/java/com/example/moviezone/repository/ProjectionIsPlayedInRoomRepository.java (modified) * src/main/java/com/example/moviezone/service/Impl/ProjectionIsPlayedInRoomServiceImpl.java (added) * src/main/java/com/example/moviezone/service/Impl/ProjectionServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/ProjectionIsPlayedInRoomService.java (added) * src/main/java/com/example/moviezone/service/ProjectionService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/projectionDetails.html (added) reservation for projection started Tue, 07 Feb 2023 14:26:03 GMT milamihajlovska [fdc651c] * src/main/java/com/example/moviezone/repository/SeatRepository.java (modified) * src/main/java/com/example/moviezone/service/Impl/SeatServiceImpl.java (added) * src/main/java/com/example/moviezone/service/SeatService.java (added) seatService, seatServiceImpl Tue, 07 Feb 2023 13:48:59 GMT DenicaKj [3650316] * src/main/java/com/example/moviezone/model/procedures/FilmsReturnTable.java (added) * src/main/java/com/example/moviezone/repository/FilmRepository.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/films.html (modified) Trying To Call A procedure from databasee Tue, 07 Feb 2023 13:39:49 GMT milamihajlovska [3242ef4] * src/main/java/com/example/moviezone/model/Ticket.java (modified) * src/main/java/com/example/moviezone/service/Impl/TicketServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/TicketService.java (modified) ticket service save method Tue, 07 Feb 2023 13:30:24 GMT milamihajlovska [03fd098] * src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilm.java (modified) * src/main/java/com/example/moviezone/service/CinemaPlaysFilmService.java (added) * src/main/java/com/example/moviezone/service/Impl/CinemaPlaysFilmServiceImpl.java (added) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/addFilmToCinema.html (added) cinemaPlaysFilm implemented Tue, 07 Feb 2023 13:21:14 GMT milamihajlovska [fc448f5] * src/main/java/com/example/moviezone/model/manytomany/CinemaOrganizesEvent.java (modified) * src/main/java/com/example/moviezone/service/CinemaOrganizesEventService.java (added) * src/main/java/com/example/moviezone/service/Impl/CinemaOrganizesEventServiceImpl.java (added) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/addEventToCinema.html (added) cinemaOrganizesEvent implemented Tue, 07 Feb 2023 12:48:25 GMT milamihajlovska [d7f5da9] * src/main/java/com/example/moviezone/model/Customer.java (modified) * src/main/java/com/example/moviezone/model/Worker.java (modified) * src/main/java/com/example/moviezone/service/Impl/UserServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/UserService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) changes for login (not working) Tue, 07 Feb 2023 12:05:50 GMT milamihajlovska [f7b0906] * src/main/resources/templates/workers.html (modified) update workers.html Tue, 07 Feb 2023 12:04:18 GMT milamihajlovska [49263ae] * src/main/resources/templates/films.html (modified) * src/main/resources/templates/projections.html (modified) update in projections.html Tue, 07 Feb 2023 11:34:01 GMT milamihajlovska [d09caa7] * src/main/resources/templates/events.html (modified) update events.html Mon, 06 Feb 2023 19:10:28 GMT DenicaKj [0fb69cc] * src/main/java/com/example/moviezone/model/Event.java (modified) * src/main/java/com/example/moviezone/service/EventService.java (modified) * src/main/java/com/example/moviezone/service/Impl/EventServiceImpl.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/addEvent.html (modified) * src/main/resources/templates/addFilm.html (modified) * src/main/resources/templates/addProjection.html (modified) * src/main/resources/templates/films.html (modified) * src/main/resources/templates/fragments/header.html (modified) * src/main/resources/templates/home.html (modified) Adding Events To Home Page Mon, 06 Feb 2023 18:28:42 GMT DenicaKj [b5ce654] * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/addEvent.html (modified) * src/main/resources/templates/addFilm.html (modified) * src/main/resources/templates/addProjection.html (modified) * src/main/resources/templates/film.html (modified) Style updates Mon, 06 Feb 2023 17:12:03 GMT milamihajlovska [a69d48c] * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) * src/main/java/com/example/moviezone/service/Impl/UserServiceImpl.java (modified) * src/main/resources/templates/events.html (modified) * src/main/resources/templates/film.html (modified) * src/main/resources/templates/films.html (modified) * src/main/resources/templates/fragments/header.html (modified) changes in some htmls Mon, 06 Feb 2023 16:05:56 GMT milamihajlovska [f9cc555] * src/main/java/com/example/moviezone/model/exceptions/InvalidUsernameOrPasswordException.java (added) * src/main/java/com/example/moviezone/service/Impl/UserServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/UserService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/fragments/header.html (modified) * src/main/resources/templates/register.html (modified) changes to register Mon, 06 Feb 2023 14:13:02 GMT DenicaKj [43a1688] * src/main/java/com/example/moviezone/repository/CustomerRatesFilmRepository.java (modified) * src/main/java/com/example/moviezone/service/CustomerRatesFilmService.java (added) * src/main/java/com/example/moviezone/service/Impl/CustomerRatesFilmImpl.java (added) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/film.html (modified) I CALLED A PROCEDURE FROM SPRING Mon, 06 Feb 2023 03:03:40 GMT DenicaKj [f8ef9bd] * src/main/resources/templates/fragments/footer.html (modified) * src/main/resources/templates/login.html (modified) * src/main/resources/templates/master-template.html (modified) * src/main/resources/templates/register.html (modified) Merge branch 'master' of https://github.com/DenicaKj/MovieZone Mon, 06 Feb 2023 02:59:41 GMT DenicaKj [eb5426c] * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) * src/main/java/com/example/moviezone/model/Film.java (modified) * src/main/java/com/example/moviezone/model/Projection.java (modified) * src/main/java/com/example/moviezone/repository/FilmRepository.java (modified) * src/main/java/com/example/moviezone/repository/ProjectionRepository.java (modified) * src/main/java/com/example/moviezone/service/FilmService.java (modified) * src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/ProjectionServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/ProjectionService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/film.html (added) * src/main/resources/templates/fragments/header.html (modified) * src/main/resources/templates/home.html (added) * src/main/resources/templates/master-template.html (modified) Home Page Sun, 05 Feb 2023 21:11:59 GMT milamihajlovska [608fefef] * src/main/resources/templates/fragments/footer.html (modified) update footer.html Sun, 05 Feb 2023 21:04:58 GMT milamihajlovska [45e9a02] * src/main/resources/templates/master-template.html (modified) update master template html Sun, 05 Feb 2023 21:02:20 GMT milamihajlovska [533c366] * src/main/resources/templates/login.html (modified) * src/main/resources/templates/register.html (modified) login and register html Sat, 04 Feb 2023 20:37:57 GMT milamihajlovska [448bd84] * src/main/java/com/example/moviezone/service/FilmService.java (modified) * src/main/java/com/example/moviezone/service/Impl/WorkerServiceImpl.java (added) * src/main/java/com/example/moviezone/service/WorkerService.java (added) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/workers.html (added) added listing workers Sat, 04 Feb 2023 20:24:27 GMT milamihajlovska [a073dad] * src/main/java/com/example/moviezone/model/Event.java (modified) * src/main/java/com/example/moviezone/model/Film.java (modified) * src/main/resources/templates/addEvent.html (modified) * src/main/resources/templates/addFilm.html (modified) * src/main/resources/templates/addProjection.html (modified) html for addEvent, addFilm and addProjection Sat, 04 Feb 2023 20:01:16 GMT milamihajlovska [693f587] * src/main/resources/templates/fragments/header.html (modified) Merge branch 'master' of https://github.com/DenicaKj/MovieZone Sat, 04 Feb 2023 20:01:13 GMT milamihajlovska [302b233] * src/main/java/com/example/moviezone/model/Event.java (modified) * src/main/java/com/example/moviezone/model/Film.java (modified) * src/main/java/com/example/moviezone/model/Projection.java (modified) * src/main/java/com/example/moviezone/service/EventService.java (modified) * src/main/java/com/example/moviezone/service/FilmService.java (modified) * src/main/java/com/example/moviezone/service/Impl/EventServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/ProjectionServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/ProjectionService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/addEvent.html (added) * src/main/resources/templates/addFilm.html (added) * src/main/resources/templates/addProjection.html (added) * src/main/resources/templates/myTickets.html (added) * src/main/resources/templates/projections.html (added) home controller added mappings for add new film, event and projection Sat, 04 Feb 2023 19:25:42 GMT DenicaKj [ade54f6] * src/main/resources/templates/fragments/header.html (modified) Update header.html Sat, 04 Feb 2023 19:11:03 GMT DenicaKj [4ee640e] * src/main/resources/templates/fragments/header.html (modified) Update header.html Sat, 04 Feb 2023 18:55:16 GMT milamihajlovska [a554435] * src/main/java/com/example/moviezone/repository/ProjectionRepository.java (modified) * src/main/java/com/example/moviezone/service/Impl/ProjectionServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/ProjectionService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/events.html (moved) * src/main/resources/templates/films.html (moved) * src/main/resources/templates/login.html (added) * src/main/resources/templates/register.html (added) home controller added getMappings Sat, 04 Feb 2023 18:28:58 GMT milamihajlovska [e097c1c] * src/main/java/com/example/moviezone/model/exceptions/PasswordsDoNotMatchException.java (added) * src/main/java/com/example/moviezone/service/Impl/UserServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/UserService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) login and register in HomeController Sat, 04 Feb 2023 18:01:47 GMT milamihajlovska [6032d44] * src/main/java/com/example/moviezone/model/Customer.java (modified) * src/main/java/com/example/moviezone/model/Worker.java (modified) * src/main/java/com/example/moviezone/service/Impl/UserServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/UserService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (modified) * src/main/resources/templates/fragments/login.html (added) * src/main/resources/templates/fragments/register.html (added) login method Sat, 04 Feb 2023 17:48:07 GMT milamihajlovska [27adfc8] * src/main/java/com/example/moviezone/model/Customer.java (modified) * src/main/java/com/example/moviezone/model/User.java (modified) * src/main/java/com/example/moviezone/model/Worker.java (modified) * src/main/java/com/example/moviezone/service/Impl/UserServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/UserService.java (modified) register method Sat, 04 Feb 2023 17:45:35 GMT DenicaKj [adf250d] * src/main/java/com/example/moviezone/web/HomeController.java (modified) Update HomeController.java Sat, 04 Feb 2023 00:47:15 GMT DenicaKj [2269653] * pom.xml (modified) * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) * src/main/java/com/example/moviezone/model/Category.java (modified) * src/main/java/com/example/moviezone/model/Cinema.java (modified) * src/main/java/com/example/moviezone/model/Customer.java (modified) * src/main/java/com/example/moviezone/model/Discount.java (modified) * src/main/java/com/example/moviezone/model/Event.java (modified) * src/main/java/com/example/moviezone/model/Film.java (modified) * src/main/java/com/example/moviezone/model/Projection.java (modified) * src/main/java/com/example/moviezone/model/Projection_Room.java (modified) * src/main/java/com/example/moviezone/model/Salary.java (modified) * src/main/java/com/example/moviezone/model/Seat.java (modified) * src/main/java/com/example/moviezone/model/Ticket.java (modified) * src/main/java/com/example/moviezone/model/User.java (modified) * src/main/java/com/example/moviezone/model/Work_Hours_Weekly.java (modified) * src/main/java/com/example/moviezone/model/Worker.java (modified) * src/main/java/com/example/moviezone/model/manytomany/CinemaOrganizesEvent.java (modified) * src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilm.java (modified) * src/main/java/com/example/moviezone/model/manytomany/CustomerIsInterestedInEvent.java (modified) * src/main/java/com/example/moviezone/model/manytomany/CustomerRatesFilm.java (modified) * src/main/java/com/example/moviezone/model/manytomany/ProjectionIsPlayedInRoom.java (modified) First Run No error Fri, 03 Feb 2023 23:39:48 GMT DenicaKj [eb226b2] * pom.xml (modified) * src/main/java/com/example/moviezone/MovieZoneApplication.java (modified) * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (modified) * src/main/java/com/example/moviezone/model/Film.java (modified) * src/main/java/com/example/moviezone/model/Projection.java (modified) * src/main/java/com/example/moviezone/model/Projection_Room.java (modified) * src/main/java/com/example/moviezone/model/Salary.java (modified) * src/main/java/com/example/moviezone/model/Seat.java (modified) * src/main/java/com/example/moviezone/model/Ticket.java (modified) * src/main/java/com/example/moviezone/model/User.java (modified) * src/main/java/com/example/moviezone/model/Work_Hours_Weekly.java (modified) * src/main/java/com/example/moviezone/model/Worker.java (modified) * src/main/java/com/example/moviezone/model/manytomany/CustomerIsInterestedInEvent.java (modified) * src/main/java/com/example/moviezone/repository/CategoryRepository.java (modified) * src/main/java/com/example/moviezone/repository/CinemaOrganizesEventRepository.java (modified) * src/main/java/com/example/moviezone/repository/CinemaPlaysFilmRepository.java (modified) * src/main/java/com/example/moviezone/repository/CinemaRepository.java (modified) * src/main/java/com/example/moviezone/repository/CustomerIsInterestedInEventRepository.java (modified) * src/main/java/com/example/moviezone/repository/CustomerRatesFilmRepository.java (modified) * src/main/java/com/example/moviezone/repository/CustomerRepository.java (modified) * src/main/java/com/example/moviezone/repository/SeatRepository.java (modified) * src/main/java/com/example/moviezone/repository/TicketRepository.java (modified) * src/main/java/com/example/moviezone/repository/UserRepository.java (modified) * src/main/java/com/example/moviezone/repository/Work_Hours_WeeklyRepository.java (modified) * src/main/java/com/example/moviezone/repository/WorkerRepository.java (modified) * src/main/java/com/example/moviezone/service/CustomerService.java (modified) * src/main/resources/application.properties (modified) Fixing errors Fri, 03 Feb 2023 22:11:04 GMT DenicaKj [ac25203] * pom.xml (modified) * src/main/java/com/example/moviezone/config/CustomUsernamePasswordAuthenticationProvider.java (added) * src/main/java/com/example/moviezone/config/WebSecurityConfig.java (added) * src/main/java/com/example/moviezone/model/Customer.java (modified) * src/main/java/com/example/moviezone/model/Role.java (added) * src/main/java/com/example/moviezone/model/User.java (modified) * src/main/java/com/example/moviezone/model/Worker.java (modified) * src/main/java/com/example/moviezone/repository/UserRepository.java (modified) * src/main/java/com/example/moviezone/service/Impl/UserServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/UserService.java (modified) * src/main/java/com/example/moviezone/web/HomeController.java (added) * src/main/resources/templates/fragments/footer.html (added) * src/main/resources/templates/fragments/header.html (added) * src/main/resources/templates/master-template.html (added) Spring Security Thu, 02 Feb 2023 21:46:30 GMT milamihajlovska [1b248e4] * src/main/java/com/example/moviezone/model/exceptions/UserNotFoundException.java (added) * src/main/java/com/example/moviezone/repository/TicketRepository.java (modified) * src/main/java/com/example/moviezone/service/Impl/CinemaServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/CustomerServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/EventServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/ProjectionServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/Projection_RoomServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/TicketServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/Impl/UserServiceImpl.java (modified) * src/main/java/com/example/moviezone/service/TicketService.java (modified) * src/main/java/com/example/moviezone/service/UserService.java (modified) service impl changes Thu, 02 Feb 2023 21:25:55 GMT milamihajlovska [f60cb20] * pom.xml (modified) * src/main/java/com/example/moviezone/repository/CategoryRepository.java (modified) * src/main/java/com/example/moviezone/repository/CinemaOrganizesEventRepository.java (modified) * src/main/java/com/example/moviezone/repository/CinemaPlaysFilmRepository.java (modified) * src/main/java/com/example/moviezone/repository/CinemaRepository.java (modified) * src/main/java/com/example/moviezone/repository/CustomerIsInterestedInEventRepository.java (modified) * src/main/java/com/example/moviezone/repository/CustomerRatesFilmRepository.java (modified) * src/main/java/com/example/moviezone/repository/CustomerRepository.java (modified) * src/main/java/com/example/moviezone/repository/DiscountRepository.java (modified) * src/main/java/com/example/moviezone/repository/EventRepository.java (modified) * src/main/java/com/example/moviezone/repository/FilmRepository.java (modified) * src/main/java/com/example/moviezone/repository/ProjectionIsPlayedInRoomRepository.java (modified) * src/main/java/com/example/moviezone/repository/ProjectionRepository.java (modified) * src/main/java/com/example/moviezone/repository/Projection_RoomRepository.java (modified) * src/main/java/com/example/moviezone/repository/SalaryRepository.java (modified) * src/main/java/com/example/moviezone/repository/SeatRepository.java (modified) * src/main/java/com/example/moviezone/repository/TicketRepository.java (modified) * src/main/java/com/example/moviezone/repository/UserRepository.java (modified) * src/main/java/com/example/moviezone/repository/Work_Hours_WeeklyRepository.java (modified) * src/main/java/com/example/moviezone/repository/WorkerRepository.java (modified) * src/main/java/com/example/moviezone/service/Impl/CinemaServiceImpl.java (modified) changes in repository classes Thu, 02 Feb 2023 21:07:27 GMT milamihajlovska [11dea8f] * src/main/java/com/example/moviezone/service/Impl/CinemaServiceImpl.java (added) * src/main/java/com/example/moviezone/service/Impl/CustomerServiceImpl.java (added) * src/main/java/com/example/moviezone/service/Impl/EventServiceImpl.java (added) * src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java (added) * src/main/java/com/example/moviezone/service/Impl/ProjectionServiceImpl.java (added) * src/main/java/com/example/moviezone/service/Impl/Projection_RoomServiceImpl.java (added) * src/main/java/com/example/moviezone/service/Impl/TicketServiceImpl.java (added) * src/main/java/com/example/moviezone/service/Impl/UserServiceImpl.java (added) service impl classes Thu, 02 Feb 2023 21:01:42 GMT milamihajlovska [f17f34f] * src/main/java/com/example/moviezone/repository/CategoryRepository.java (added) * src/main/java/com/example/moviezone/repository/CinemaOrganizesEventRepository.java (added) * src/main/java/com/example/moviezone/repository/CinemaPlaysFilmRepository.java (added) * src/main/java/com/example/moviezone/repository/CinemaRepository.java (added) * src/main/java/com/example/moviezone/repository/CustomerIsInterestedInEventRepository.java (added) * src/main/java/com/example/moviezone/repository/CustomerRatesFilmRepository.java (added) * src/main/java/com/example/moviezone/repository/CustomerRepository.java (added) * src/main/java/com/example/moviezone/repository/DiscountRepository.java (added) * src/main/java/com/example/moviezone/repository/EventRepository.java (added) * src/main/java/com/example/moviezone/repository/FilmRepository.java (added) * src/main/java/com/example/moviezone/repository/ProjectionIsPlayedInRoomRepository.java (added) * src/main/java/com/example/moviezone/repository/ProjectionRepository.java (added) * src/main/java/com/example/moviezone/repository/Projection_RoomRepository.java (added) * src/main/java/com/example/moviezone/repository/SalaryRepository.java (added) * src/main/java/com/example/moviezone/repository/SeatRepository.java (added) * src/main/java/com/example/moviezone/repository/TicketRepository.java (added) * src/main/java/com/example/moviezone/repository/UserRepository.java (added) * src/main/java/com/example/moviezone/repository/Work_Hours_WeeklyRepository.java (added) * src/main/java/com/example/moviezone/repository/WorkerRepository.java (added) * src/main/java/com/example/moviezone/service/CinemaService.java (added) * src/main/java/com/example/moviezone/service/CustomerService.java (added) * src/main/java/com/example/moviezone/service/EventService.java (added) * src/main/java/com/example/moviezone/service/FilmService.java (added) * src/main/java/com/example/moviezone/service/ProjectionService.java (added) * src/main/java/com/example/moviezone/service/Projection_RoomService.java (added) * src/main/java/com/example/moviezone/service/TicketService.java (added) * src/main/java/com/example/moviezone/service/UserService.java (added) repository and service classes Thu, 02 Feb 2023 14:43:10 GMT milamihajlovska [625a56f] * src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilm.java (modified) * src/main/java/com/example/moviezone/model/manytomany/CustomerRatesFilm.java (added) customer rates film model Thu, 02 Feb 2023 14:40:55 GMT milamihajlovska [428c8a4] * src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilm.java (modified) cinema plays film update Thu, 02 Feb 2023 14:39:19 GMT milamihajlovska [d59ae27] * src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilm.java (modified) * src/main/java/com/example/moviezone/model/manytomany/CustomerIsInterestedInEventId.java (modified) * src/main/java/com/example/moviezone/model/manytomany/CustomerRatesFilmId.java (modified) * src/main/java/com/example/moviezone/model/manytomany/ProjectionIsPlayedInRoom.java (added) * src/main/java/com/example/moviezone/model/manytomany/ProjectionIsPlayedInRoomId.java (modified) many to many models Thu, 02 Feb 2023 14:36:16 GMT DenicaKj [e2ca67b] * src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilm.java (added) * src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilmId.java (modified) * src/main/java/com/example/moviezone/model/manytomany/CustomerIsInterestedInEvent.java (added) * src/main/java/com/example/moviezone/model/manytomany/CustomerIsInterestedInEventId.java (modified) CinemaPlaysFilm and CustomerInterestedInEvent Thu, 02 Feb 2023 14:31:01 GMT DenicaKj [bf30494] * src/main/java/com/example/moviezone/model/manytomany/CustomerIsInterestedInEventId.java (added) * src/main/java/com/example/moviezone/model/manytomany/CustomerRatesFilmId.java (added) * src/main/java/com/example/moviezone/model/manytomany/ProjectionIsPlayedInRoomId.java (added) Merge branch 'master' of https://github.com/DenicaKj/MovieZone Thu, 02 Feb 2023 14:30:52 GMT DenicaKj [fbec879] * src/main/java/com/example/moviezone/model/manytomany/CinemaOrganizesEvent.java (added) * src/main/java/com/example/moviezone/model/manytomany/CinemaOrganizesEventId.java (modified) * src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilmId.java (added) CinemaOrginaziesEvent Thu, 02 Feb 2023 14:30:46 GMT milamihajlovska [b10fc39] * src/main/java/com/example/moviezone/model/manytomany/CustomerIsInterestedInEventId.java (added) * src/main/java/com/example/moviezone/model/manytomany/CustomerRatesFilmId.java (added) * src/main/java/com/example/moviezone/model/manytomany/ProjectionIsPlayedInRoomId.java (added) many to many ids Thu, 02 Feb 2023 14:27:23 GMT DenicaKj [070cbf5] * src/main/java/com/example/moviezone/model/manytomany/CinemaOrganizesEventId.java (added) Create CinemaOrganizesEventId.java Thu, 02 Feb 2023 14:24:06 GMT milamihajlovska [ce32520] * src/main/java/com/example/moviezone/model/Projection.java (modified) * src/main/java/com/example/moviezone/model/Seat.java (added) Merge branch 'master' of https://github.com/DenicaKj/MovieZone Thu, 02 Feb 2023 14:23:52 GMT milamihajlovska [2c60cda] * src/main/java/com/example/moviezone/model/Category.java (modified) * src/main/java/com/example/moviezone/model/Projection.java (modified) * src/main/java/com/example/moviezone/model/Projection_Room.java (modified) update to models Thu, 02 Feb 2023 14:23:45 GMT DenicaKj [e68190f] * src/main/java/com/example/moviezone/model/Projection.java (modified) * src/main/java/com/example/moviezone/model/Seat.java (added) Update to Projection Thu, 02 Feb 2023 14:19:14 GMT milamihajlovska [69dc561] * src/main/java/com/example/moviezone/model/Category.java (modified) * src/main/java/com/example/moviezone/model/Projection.java (added) * src/main/java/com/example/moviezone/model/Projection_Room.java (added) Merge branch 'master' of https://github.com/DenicaKj/MovieZone Thu, 02 Feb 2023 14:19:01 GMT DenicaKj [fc165ab] * src/main/java/com/example/moviezone/model/Projection.java (added) * src/main/java/com/example/moviezone/model/Projection_Room.java (added) Projection and Rooms Thu, 02 Feb 2023 14:18:43 GMT milamihajlovska [caf3a07] * src/main/java/com/example/moviezone/model/Discount.java (added) * src/main/java/com/example/moviezone/model/Event.java (modified) * src/main/java/com/example/moviezone/model/Salary.java (added) added models Thu, 02 Feb 2023 14:13:02 GMT DenicaKj [d6f2228] * src/main/java/com/example/moviezone/model/Category.java (modified) Update Category.java Thu, 02 Feb 2023 14:12:16 GMT DenicaKj [013e0bc] * src/main/java/com/example/moviezone/model/Cinemas.java (deleted) Delete Cinemas.java Thu, 02 Feb 2023 14:11:38 GMT DenicaKj [d12020e] * src/main/java/com/example/moviezone/model/Category.java (moved) Update Category.java