diff --git a/pom.xml b/pom.xml index 8f7cf6b7d..7ce9dadcd 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,8 @@ mysql mysql-connector-java - 8.0.22 + + 8.0.33 javax.servlet @@ -31,6 +32,11 @@ 4.0.1 provided + + jstl + jstl + 1.2 + diff --git a/src/main/java/mate/controller/IndexController.java b/src/main/java/mate/controller/IndexController.java index 27bcd4faa..33b6c2295 100644 --- a/src/main/java/mate/controller/IndexController.java +++ b/src/main/java/mate/controller/IndexController.java @@ -2,10 +2,12 @@ import java.io.IOException; import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +@WebServlet("/index") public class IndexController extends HttpServlet { @Override public void doGet(HttpServletRequest req, HttpServletResponse resp) diff --git a/src/main/java/mate/controller/car/AddDriverToCarController.java b/src/main/java/mate/controller/car/AddDriverToCarController.java new file mode 100644 index 000000000..f19bf44cb --- /dev/null +++ b/src/main/java/mate/controller/car/AddDriverToCarController.java @@ -0,0 +1,34 @@ +package mate.controller.car; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Car; +import mate.model.Driver; +import mate.service.CarService; +import mate.service.DriverService; + +@WebServlet("/cars/drivers/add") +public class AddDriverToCarController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final CarService carService = (CarService) injector.getInstance(CarService.class); + private final DriverService driverService = + (DriverService) injector.getInstance(DriverService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + req.getRequestDispatcher("/WEB-INF/views/cars/addingDriverToCar.jsp").forward(req, resp); + } + + public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { + Car car = carService.get(Long.valueOf(req.getParameter("carId"))); + Driver driver = driverService.get(Long.valueOf(req.getParameter("driverId"))); + carService.addDriverToCar(driver, car); + resp.sendRedirect(req.getContextPath() + "/cars"); + } +} diff --git a/src/main/java/mate/controller/car/CreateCarController.java b/src/main/java/mate/controller/car/CreateCarController.java new file mode 100644 index 000000000..8a871a31b --- /dev/null +++ b/src/main/java/mate/controller/car/CreateCarController.java @@ -0,0 +1,38 @@ +package mate.controller.car; + +import java.io.IOException; +import java.util.ArrayList; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Car; +import mate.service.CarService; +import mate.service.ManufacturerService; + +@WebServlet("/cars/add") +public class CreateCarController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final ManufacturerService manufacturerService = + (ManufacturerService) injector.getInstance(ManufacturerService.class); + private final CarService carService = (CarService) injector.getInstance(CarService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + req.getRequestDispatcher("/WEB-INF/views/cars/carCreation.jsp").forward(req, resp); + } + + @Override + public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { + Car car = new Car(); + car.setModel(req.getParameter("model")); + car.setManufacturer(manufacturerService.get( + Long.valueOf(req.getParameter("manufacturerId")))); + car.setDrivers(new ArrayList<>()); + carService.create(car); + resp.sendRedirect(req.getContextPath() + "/cars"); + } +} diff --git a/src/main/java/mate/controller/car/DeleteCarController.java b/src/main/java/mate/controller/car/DeleteCarController.java new file mode 100644 index 000000000..361b7b446 --- /dev/null +++ b/src/main/java/mate/controller/car/DeleteCarController.java @@ -0,0 +1,23 @@ +package mate.controller.car; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.service.CarService; + +@WebServlet("/cars/delete") +public class DeleteCarController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final CarService carService = (CarService) injector.getInstance(CarService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + carService.delete(Long.valueOf(req.getParameter("id"))); + resp.sendRedirect(req.getContextPath() + "/cars"); + } +} diff --git a/src/main/java/mate/controller/car/GetAllCarsController.java b/src/main/java/mate/controller/car/GetAllCarsController.java new file mode 100644 index 000000000..260d4db6f --- /dev/null +++ b/src/main/java/mate/controller/car/GetAllCarsController.java @@ -0,0 +1,29 @@ +package mate.controller.car; + +import java.io.IOException; +import java.util.List; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Car; +import mate.service.CarService; +import mate.service.ManufacturerService; + +@WebServlet("/cars") +public class GetAllCarsController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final ManufacturerService manufacturerService = + (ManufacturerService) injector.getInstance(ManufacturerService.class); + private final CarService carService = (CarService) injector.getInstance(CarService.class); + + @Override + public void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + List carList = carService.getAll(); + req.setAttribute("cars", carList); + req.getRequestDispatcher("/WEB-INF/views/cars/allCars.jsp").forward(req, resp); + } +} diff --git a/src/main/java/mate/controller/driver/CreateDriverController.java b/src/main/java/mate/controller/driver/CreateDriverController.java new file mode 100644 index 000000000..8e24af885 --- /dev/null +++ b/src/main/java/mate/controller/driver/CreateDriverController.java @@ -0,0 +1,33 @@ +package mate.controller.driver; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Driver; +import mate.service.DriverService; + +@WebServlet("/drivers/add") +public class CreateDriverController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final DriverService driverService = + (DriverService) injector.getInstance(DriverService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + req.getRequestDispatcher("/WEB-INF/views/drivers/driverCreation.jsp").forward(req, resp); + } + + @Override + public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { + Driver driver = new Driver(); + driver.setName(req.getParameter("name")); + driver.setLicenseNumber(req.getParameter("licenseNumber")); + driverService.create(driver); + resp.sendRedirect(req.getContextPath() + "/drivers"); + } +} diff --git a/src/main/java/mate/controller/driver/DeleteDriverController.java b/src/main/java/mate/controller/driver/DeleteDriverController.java new file mode 100644 index 000000000..a929e76e5 --- /dev/null +++ b/src/main/java/mate/controller/driver/DeleteDriverController.java @@ -0,0 +1,24 @@ +package mate.controller.driver; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.service.DriverService; + +@WebServlet("/drivers/delete") +public class DeleteDriverController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final DriverService driverService = + (DriverService) injector.getInstance(DriverService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + driverService.delete(Long.valueOf(req.getParameter("id"))); + resp.sendRedirect(req.getContextPath() + "/drivers"); + } +} diff --git a/src/main/java/mate/controller/driver/GetAllDriversController.java b/src/main/java/mate/controller/driver/GetAllDriversController.java new file mode 100644 index 000000000..78fcfbf5d --- /dev/null +++ b/src/main/java/mate/controller/driver/GetAllDriversController.java @@ -0,0 +1,27 @@ +package mate.controller.driver; + +import java.io.IOException; +import java.util.List; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Driver; +import mate.service.DriverService; + +@WebServlet("/drivers") +public class GetAllDriversController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final DriverService driverService = + (DriverService) injector.getInstance(DriverService.class); + + @Override + public void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + List driverList = driverService.getAll(); + req.setAttribute("drivers", driverList); + req.getRequestDispatcher("/WEB-INF/views/drivers/allDrivers.jsp").forward(req, resp); + } +} diff --git a/src/main/java/mate/controller/manufacturer/CreateManufacturerController.java b/src/main/java/mate/controller/manufacturer/CreateManufacturerController.java new file mode 100644 index 000000000..10ed148b4 --- /dev/null +++ b/src/main/java/mate/controller/manufacturer/CreateManufacturerController.java @@ -0,0 +1,34 @@ +package mate.controller.manufacturer; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Manufacturer; +import mate.service.ManufacturerService; + +@WebServlet("/manufacturers/add") +public class CreateManufacturerController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final ManufacturerService manufacturerService = + (ManufacturerService) injector.getInstance(ManufacturerService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + req.getRequestDispatcher("/WEB-INF/views/manufacturers/manufacturerCreation.jsp") + .forward(req, resp); + } + + @Override + public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { + Manufacturer manufacturer = new Manufacturer(); + manufacturer.setName(req.getParameter("name")); + manufacturer.setCountry(req.getParameter("country")); + manufacturerService.create(manufacturer); + resp.sendRedirect(req.getContextPath() + "/manufacturers"); + } +} diff --git a/src/main/java/mate/controller/manufacturer/DeleteManufacturerController.java b/src/main/java/mate/controller/manufacturer/DeleteManufacturerController.java new file mode 100644 index 000000000..018af0307 --- /dev/null +++ b/src/main/java/mate/controller/manufacturer/DeleteManufacturerController.java @@ -0,0 +1,24 @@ +package mate.controller.manufacturer; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.service.ManufacturerService; + +@WebServlet("/manufacturers/delete") +public class DeleteManufacturerController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final ManufacturerService manufacturerService = + (ManufacturerService) injector.getInstance(ManufacturerService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + manufacturerService.delete(Long.valueOf(req.getParameter("id"))); + resp.sendRedirect(req.getContextPath() + "/manufacturers"); + } +} diff --git a/src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java b/src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java new file mode 100644 index 000000000..1ebcc100d --- /dev/null +++ b/src/main/java/mate/controller/manufacturer/GetAllManufacturersController.java @@ -0,0 +1,28 @@ +package mate.controller.manufacturer; + +import java.io.IOException; +import java.util.List; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import mate.lib.Injector; +import mate.model.Manufacturer; +import mate.service.ManufacturerService; + +@WebServlet("/manufacturers") +public class GetAllManufacturersController extends HttpServlet { + private static final Injector injector = Injector.getInstance("mate"); + private final ManufacturerService manufacturerService = + (ManufacturerService) injector.getInstance(ManufacturerService.class); + + @Override + public void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + List manufacturerList = manufacturerService.getAll(); + req.setAttribute("manufacturers", manufacturerList); + req.getRequestDispatcher("/WEB-INF/views/manufacturers/allManufacturers.jsp") + .forward(req, resp); + } +} diff --git a/src/main/java/mate/dao/CarDaoImpl.java b/src/main/java/mate/dao/CarDaoImpl.java index 4af37e958..45b52993b 100644 --- a/src/main/java/mate/dao/CarDaoImpl.java +++ b/src/main/java/mate/dao/CarDaoImpl.java @@ -134,7 +134,7 @@ public List getAllByDriver(Long driverId) { + "m.country AS manufacturer_country " + "FROM cars c" + " JOIN manufacturers m ON c.manufacturer_id = m.id" - + " JOIN cars_drivers cd ON c.id = cd.car_id" + + " JOIN drivers_cars cd ON c.id = cd.car_id" + " JOIN drivers d ON cd.driver_id = d.id" + " WHERE c.is_deleted = FALSE and driver_id = ?" + " AND d.is_deleted = FALSE"; @@ -160,7 +160,7 @@ private void insertAllDrivers(Car car) { if (drivers.size() == 0) { return; } - String query = "INSERT INTO cars_drivers (car_id, driver_id) VALUES (?, ?)"; + String query = "INSERT INTO drivers_cars (car_id, driver_id) VALUES (?, ?)"; try (Connection connection = ConnectionUtil.getConnection(); PreparedStatement statement = connection.prepareStatement(query)) { @@ -176,7 +176,7 @@ private void insertAllDrivers(Car car) { private void deleteAllDriversExceptList(Car car) { Long carId = car.getId(); - String query = "DELETE FROM cars_drivers WHERE car_id = ?"; + String query = "DELETE FROM drivers_cars WHERE car_id = ?"; try (Connection connection = ConnectionUtil.getConnection(); PreparedStatement statement = connection.prepareStatement(query)) { @@ -188,7 +188,7 @@ private void deleteAllDriversExceptList(Car car) { } private List getAllDriversByCarId(Long carId) { - String query = "SELECT id, name, license_number FROM cars_drivers cd " + String query = "SELECT id, name, license_number FROM drivers_cars cd " + "JOIN drivers d on cd.driver_id = d.id " + "where car_id = ? AND is_deleted = FALSE"; try (Connection connection = ConnectionUtil.getConnection(); diff --git a/src/main/java/mate/util/ConnectionUtil.java b/src/main/java/mate/util/ConnectionUtil.java index a9249b004..f2ab716e3 100644 --- a/src/main/java/mate/util/ConnectionUtil.java +++ b/src/main/java/mate/util/ConnectionUtil.java @@ -6,10 +6,10 @@ import java.util.Properties; public class ConnectionUtil { - private static final String URL = "YOUR DATABASE URL"; - private static final String USERNAME = "YOUR USERNAME"; - private static final String PASSWORD = "YOUR PASSWORD"; - private static final String JDBC_DRIVER = "YOUR DRIVER"; + private static final String URL = "jdbc:mysql://localhost:3306/taxi_service_db"; + private static final String USERNAME = "root"; + private static final String PASSWORD = "Password"; + private static final String JDBC_DRIVER = "com.mysql.cj.jdbc.Driver"; static { try { diff --git a/src/main/resources/init_db.sql b/src/main/resources/init_db.sql index 2acabb883..c64533b80 100644 --- a/src/main/resources/init_db.sql +++ b/src/main/resources/init_db.sql @@ -37,20 +37,19 @@ CREATE TABLE `cars` ( `manufacturer_id` BIGINT(0) UNSIGNED NOT NULL, `is_deleted` BIT(1) NOT NULL DEFAULT b'0', PRIMARY KEY (`id`) USING BTREE, - INDEX `FK_manufacturer_id`(`manufacturer_id`) USING BTREE, - CONSTRAINT `FK_manufacturer_id` FOREIGN KEY (`manufacturer_id`) REFERENCES `manufacturers` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT + INDEX `car_manufacturer_fk`(`manufacturer_id`) USING BTREE, + CONSTRAINT `car_manufacturers_fk` FOREIGN KEY (`manufacturer_id`) REFERENCES `manufacturers` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Table structure for cars_drivers -- ---------------------------- -DROP TABLE IF EXISTS `cars_drivers`; -CREATE TABLE `cars_drivers` ( +DROP TABLE IF EXISTS `drivers_cars`; +CREATE TABLE `drivers_cars` ( `car_id` BIGINT(0) UNSIGNED NOT NULL, `driver_id` BIGINT(0) UNSIGNED NOT NULL, - PRIMARY KEY (`car_id`, `driver_id`) USING BTREE, - INDEX `driver_id`(`driver_id`) USING BTREE, - INDEX `car_id`(`car_id`) USING BTREE, + KEY `drivers_cars_car_fk` (`car_id`), + KEY `drivers_cars_driver_fk` (`driver_id`), CONSTRAINT `car_id` FOREIGN KEY (`car_id`) REFERENCES `cars` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT, CONSTRAINT `driver_id` FOREIGN KEY (`driver_id`) REFERENCES `drivers` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; diff --git a/src/main/webapp/WEB-INF/views/cars/addingDriverToCar.jsp b/src/main/webapp/WEB-INF/views/cars/addingDriverToCar.jsp new file mode 100644 index 000000000..d0be867de --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cars/addingDriverToCar.jsp @@ -0,0 +1,15 @@ +<%@ page contentType="text/html;charset=UTF-8" %> + + + Driver adding + + +

Adding driver to car

+
+ Car ID
+ Driver ID
+ +
+

Back

+ + diff --git a/src/main/webapp/WEB-INF/views/cars/allCars.jsp b/src/main/webapp/WEB-INF/views/cars/allCars.jsp new file mode 100644 index 000000000..364bda56f --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cars/allCars.jsp @@ -0,0 +1,38 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html;charset=UTF-8" %> + + + Taxi cars + + +

Cars list

+ + + + + + + + + + + + + + + + + + + + + +
IDModelManufacturerList of driversAdd carAdd driverDelete car
+ + + + + (+)(+)(-)
+

Back

+ + diff --git a/src/main/webapp/WEB-INF/views/cars/carCreation.jsp b/src/main/webapp/WEB-INF/views/cars/carCreation.jsp new file mode 100644 index 000000000..f8d993eec --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cars/carCreation.jsp @@ -0,0 +1,15 @@ +<%@ page contentType="text/html;charset=UTF-8" %> + + + Car creation + + +

Car creating

+
+ Car model
+ Car manufacturer ID
+ +
+

Back

+ + diff --git a/src/main/webapp/WEB-INF/views/css/table_dark.css b/src/main/webapp/WEB-INF/views/css/table_dark.css new file mode 100644 index 000000000..11a147b92 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/css/table_dark.css @@ -0,0 +1,32 @@ +.table_dark { + font-family: "Lucida Sans Unicode", "Lucida Grande", Sans-Serif; + width: 70%; + color: #7C5FAB; + font-size: 40px; + text-align: center; + border-collapse: collapse; + background: #FEF4AB; + margin: auto; +} +.table_dark th { + color: #7C5FAB; + border-bottom: 1px solid #98E2CA; + padding: 12px 17px; + font-size: 14px; +} +.table_dark td { + color: #7C5FAB; + border-bottom: 1px solid #98E2CA; + border-right: 1px solid #98E2CA; + padding: 7px 17px; + font-size: 14px; +} +.table_dark tr:last-child td { + border-bottom: none; +} +.table_dark td:last-child { + border-right: none; +} +.table_dark tr:hover td { + text-decoration: underline; +} diff --git a/src/main/webapp/WEB-INF/views/drivers/allDrivers.jsp b/src/main/webapp/WEB-INF/views/drivers/allDrivers.jsp new file mode 100644 index 000000000..f309a5e9c --- /dev/null +++ b/src/main/webapp/WEB-INF/views/drivers/allDrivers.jsp @@ -0,0 +1,29 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html;charset=UTF-8" %> + + + Taxi drivers + + +

Drivers list

+ + + + + + + + + + + + + + + + + +
IDNameLicense_numberAdd driverDelete driver
(+)(-)
+

Back

+ + diff --git a/src/main/webapp/WEB-INF/views/drivers/driverCreation.jsp b/src/main/webapp/WEB-INF/views/drivers/driverCreation.jsp new file mode 100644 index 000000000..05bee8f21 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/drivers/driverCreation.jsp @@ -0,0 +1,15 @@ +<%@ page contentType="text/html;charset=UTF-8" %> + + + Driver creation + + +

Driver creating

+
+ Name
+ License number
+ +
+

Back

+ + diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index 0fbc5292a..cad5e6227 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -1,9 +1,12 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ page contentType="text/html;charset=UTF-8" %> My team

Hello, mates!

+

Drivers list

+

Manufacturers list

+

Cars list

diff --git a/src/main/webapp/WEB-INF/views/manufacturers/allManufacturers.jsp b/src/main/webapp/WEB-INF/views/manufacturers/allManufacturers.jsp new file mode 100644 index 000000000..481bf3a7e --- /dev/null +++ b/src/main/webapp/WEB-INF/views/manufacturers/allManufacturers.jsp @@ -0,0 +1,29 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html;charset=UTF-8" %> + + + Taxi manufacturers + + +

Manufacturers list

+ + + + + + + + + + + + + + + + + +
IDNameCountryAdd manufacturerDelete manufacturer
(+)(-)
+

Back

+ + diff --git a/src/main/webapp/WEB-INF/views/manufacturers/manufacturerCreation.jsp b/src/main/webapp/WEB-INF/views/manufacturers/manufacturerCreation.jsp new file mode 100644 index 000000000..ec4291e5e --- /dev/null +++ b/src/main/webapp/WEB-INF/views/manufacturers/manufacturerCreation.jsp @@ -0,0 +1,15 @@ +<%@ page contentType="text/html;charset=UTF-8" %> + + + Manufacturer creation + + +

Manufacturer creating

+
+ Name
+ Country
+ +
+

Back

+ + diff --git a/src/main/webapp/web.xml b/src/main/webapp/web.xml index 00afaeb93..f69dec813 100644 --- a/src/main/webapp/web.xml +++ b/src/main/webapp/web.xml @@ -3,12 +3,5 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd" version="4.0"> - - index - mate.controller.IndexController - - - index - /index - +