From 1e605c1009002ee8a481842236aff4ea810614ff Mon Sep 17 00:00:00 2001
From: Viltskaa <andrewstyou@gmail.com>
Date: Sat, 6 May 2023 11:31:38 +0400
Subject: [PATCH] complete lab

---
 pom.xml                                       |  7 ++
 .../java/com/example/sybd/Random/random.java  | 54 +++++++++++++++
 .../controllers/ServiceGroupController.java   | 42 -----------
 .../sybd/controllers/UserController.java      |  4 --
 .../sybd/controllers/WorkerController.java    | 60 +++++++++++++---
 .../sybd/controllers/genController.java       | 69 +++++++++++++++++++
 .../example/sybd/controllers/testCont.java    | 15 ----
 .../java/com/example/sybd/models/Client.java  |  2 +-
 .../java/com/example/sybd/models/Post.java    |  2 +-
 .../java/com/example/sybd/models/Service.java |  2 +-
 .../com/example/sybd/models/ServiceGroup.java |  2 +-
 .../java/com/example/sybd/models/Visit.java   |  2 +-
 .../java/com/example/sybd/models/Worker.java  |  8 ++-
 .../sybd/repository/WorkerRepository.java     |  4 ++
 .../example/sybd/services/VisitService.java   |  4 +-
 .../example/sybd/services/WorkerService.java  |  5 ++
 src/main/resources/application.properties     |  2 +-
 src/main/resources/templates/welcome.html     | 24 -------
 .../resources/templates/workerCreate.html     | 21 +++---
 src/main/resources/templates/workerMain.html  | 13 ++--
 src/main/resources/templates/workerPost.html  | 43 ++++++++++++
 .../templates/workerServiceGroup.html         | 40 +++++++++++
 .../resources/templates/workerServices.html   | 43 ++++++++++++
 src/main/resources/templates/workerUsers.html | 46 +++++++++++++
 src/main/resources/templates/workers.html     | 52 ++++++++++++++
 25 files changed, 446 insertions(+), 120 deletions(-)
 create mode 100644 src/main/java/com/example/sybd/Random/random.java
 delete mode 100644 src/main/java/com/example/sybd/controllers/ServiceGroupController.java
 delete mode 100644 src/main/java/com/example/sybd/controllers/UserController.java
 create mode 100644 src/main/java/com/example/sybd/controllers/genController.java
 delete mode 100644 src/main/java/com/example/sybd/controllers/testCont.java
 delete mode 100644 src/main/resources/templates/welcome.html
 create mode 100644 src/main/resources/templates/workerPost.html
 create mode 100644 src/main/resources/templates/workerServiceGroup.html
 create mode 100644 src/main/resources/templates/workerServices.html
 create mode 100644 src/main/resources/templates/workerUsers.html
 create mode 100644 src/main/resources/templates/workers.html

diff --git a/pom.xml b/pom.xml
index 9285568..3f576fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,13 @@
             <artifactId>bootstrap</artifactId>
             <version>5.2.3</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/net.datafaker/datafaker -->
+        <dependency>
+            <groupId>net.datafaker</groupId>
+            <artifactId>datafaker</artifactId>
+            <version>1.9.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/example/sybd/Random/random.java b/src/main/java/com/example/sybd/Random/random.java
new file mode 100644
index 0000000..659ffb9
--- /dev/null
+++ b/src/main/java/com/example/sybd/Random/random.java
@@ -0,0 +1,54 @@
+package com.example.sybd.Random;
+
+import com.example.sybd.models.*;
+import net.datafaker.Faker;
+
+import java.sql.Date;
+import java.sql.Time;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.List;
+
+public class random {
+	private static final Faker faker = new Faker();
+
+	public static Client getPerson() {
+		String tel = faker.phoneNumber()
+				.phoneNumberInternational()
+				.replace("-", "")
+				.replace(" ", "")
+				.substring(0, 11);
+		String address = faker.address().streetAddress();
+		Client client = new Client();
+		client.setName(faker.name().firstName());
+		client.setSecondName(faker.name().lastName());
+		client.setLastName("-");
+		client.setTelephone(tel);
+		client.setAddress(address);
+		return client;
+	}
+
+	public static Integer getNumber(Integer min, Integer max) {
+		return faker.number().numberBetween(min, max);
+	}
+
+	public static Visit getVisit(List<Client> clientList,
+	                             List<Worker> workerList,
+	                             List<Service> serviceList) {
+		Service service = serviceList.get(faker.number().numberBetween(0, serviceList.size()));
+		var workers = workerList.stream()
+				.filter((elem) -> elem.getPost().getGroup() == service.getGroup()).toList();
+		Worker worker = workers.get(faker.number().numberBetween(0, workers.size() - 1));
+		Client client = clientList.get(faker.number().numberBetween(0, clientList.size()));
+		Visit visit = new Visit();
+		visit.setClient(client);
+		visit.setService(service);
+		visit.setWorker(worker);
+		visit.setDateVisit(Date.valueOf(LocalDate.now().minusDays(faker.number().numberBetween(0, 30))));
+		visit.setTime(Time.valueOf(LocalTime.now()
+				.minusHours(faker.number().numberBetween(0, 6))
+				.minusMinutes(faker.number().numberBetween(0, 5) * 10L)
+		));
+		return visit;
+	}
+}
diff --git a/src/main/java/com/example/sybd/controllers/ServiceGroupController.java b/src/main/java/com/example/sybd/controllers/ServiceGroupController.java
deleted file mode 100644
index 41349f1..0000000
--- a/src/main/java/com/example/sybd/controllers/ServiceGroupController.java
+++ /dev/null
@@ -1,42 +0,0 @@
-//package com.example.sybd.controllers;
-//
-//import com.example.sybd.models.Service;
-//import com.example.sybd.models.ServiceGroup;
-//import com.example.sybd.repository.ServiceGroupRepository;
-//import com.example.sybd.repository.ServiceRepository;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.stream.StreamSupport;
-//
-//@RestController
-//@RequestMapping("/serv")
-//public class ServiceGroupController {
-//	@Autowired
-//	private ServiceGroupRepository serviceGroupRepository;
-//	@Autowired
-//	private ServiceRepository serviceRepository;
-//
-//	@GetMapping("/all")
-//	public List<List<String>> all() {
-//		List<String> list1 = new ArrayList<>();
-//		for (ServiceGroup serviceGroup : serviceGroupRepository.findAll()) {
-//			String name = serviceGroup.getName();
-//			list1.add(name);
-//		}
-//		List<String> list2 = new ArrayList<>();
-//		for (Service service : serviceRepository.findAll()) {
-//			String name = service.getName();
-//			list2.add(name);
-//		}
-//		ArrayList<List<String>> out = new ArrayList<>();
-//		out.add(list1);
-//		out.add(list2);
-//		return out;
-//	}
-//}
diff --git a/src/main/java/com/example/sybd/controllers/UserController.java b/src/main/java/com/example/sybd/controllers/UserController.java
deleted file mode 100644
index d4758fd..0000000
--- a/src/main/java/com/example/sybd/controllers/UserController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.example.sybd.controllers;
-
-public class UserController {
-}
diff --git a/src/main/java/com/example/sybd/controllers/WorkerController.java b/src/main/java/com/example/sybd/controllers/WorkerController.java
index 0ad5fee..f5566f2 100644
--- a/src/main/java/com/example/sybd/controllers/WorkerController.java
+++ b/src/main/java/com/example/sybd/controllers/WorkerController.java
@@ -1,38 +1,40 @@
 package com.example.sybd.controllers;
 
-import com.example.sybd.models.Visit;
-import com.example.sybd.services.ClientService;
-import com.example.sybd.services.ServicesService;
-import com.example.sybd.services.VisitService;
-import com.example.sybd.services.WorkerService;
+import com.example.sybd.services.*;
 import com.example.sybd.utils.mappingUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 @Controller
-@RequestMapping("/worker")
+@RequestMapping("/")
 public class WorkerController {
 	private final VisitService visitService;
 	private final WorkerService workerService;
 	private final ClientService clientService;
 	private final ServicesService servicesService;
+	private final GroupServiceService groupServiceService;
+	private final PostService postService;
+
+	private final Integer pageSize = 10;
 
 	public WorkerController(VisitService visitService,
 	                        WorkerService workerService,
 	                        ClientService clientService,
-	                        ServicesService servicesService) {
+	                        ServicesService servicesService,
+	                        GroupServiceService groupServiceService,
+	                        PostService postService) {
 		this.visitService = visitService;
 		this.workerService = workerService;
 		this.clientService = clientService;
 		this.servicesService = servicesService;
+		this.groupServiceService = groupServiceService;
+		this.postService = postService;
 	}
 
 	@GetMapping("/")
 	public String main(Model model) {
 		model.addAttribute("visits", visitService.all());
-		model.addAttribute("workers", workerService.all());
-		model.addAttribute("create", "worker/create");
 		return "workerMain";
 	}
 
@@ -54,13 +56,49 @@ public class WorkerController {
 		model.addAttribute("visits", visitService.all());
 		model.addAttribute("workers", workerService.all());
 		model.addAttribute("services", servicesService.all());
-		Visit visit = visitService.create(
+		visitService.create(
 				client,
 				service,
 				worker,
 				mappingUtils.strToDate(date),
-				mappingUtils.strToTime(time)
+				mappingUtils.strToTime(time),
+				false
 		);
 		return "workerMain";
 	}
+
+	@GetMapping("/service")
+	public String services(Model model) {
+		model.addAttribute("services", servicesService.all());
+		return "workerServices";
+	}
+
+	@PostMapping("/services")
+	public String servicesSubmit() {
+		return "workerServices";
+	}
+
+	@GetMapping("/serviceGroup")
+	public String serviceGroups(Model model) {
+		model.addAttribute("serviceGroups", groupServiceService.all());
+		return "workerServiceGroup";
+	}
+
+	@GetMapping("/users")
+	public String users(Model model) {
+		model.addAttribute("users", clientService.all());
+		return "workerUsers";
+	}
+
+	@GetMapping("/workers")
+	public String workers(Model model) {
+		model.addAttribute("workers", workerService.all());
+		return "workers";
+	}
+
+	@GetMapping("/posts")
+	public String posts(Model model) {
+		model.addAttribute("posts", postService.all());
+		return "workerPost";
+	}
 }
diff --git a/src/main/java/com/example/sybd/controllers/genController.java b/src/main/java/com/example/sybd/controllers/genController.java
new file mode 100644
index 0000000..5ca6d5d
--- /dev/null
+++ b/src/main/java/com/example/sybd/controllers/genController.java
@@ -0,0 +1,69 @@
+package com.example.sybd.controllers;
+
+import com.example.sybd.Random.random;
+import com.example.sybd.models.Client;
+import com.example.sybd.models.Visit;
+import com.example.sybd.services.ClientService;
+import com.example.sybd.services.ServicesService;
+import com.example.sybd.services.VisitService;
+import com.example.sybd.services.WorkerService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("/g")
+@RestController
+public class genController {
+	private final ClientService clientService;
+	private final WorkerService workerService;
+	private final ServicesService servicesService;
+	private final VisitService visitService;
+
+	public genController(ClientService clientService,
+	                     WorkerService workerService,
+	                     ServicesService servicesService,
+	                     VisitService visitService) {
+		this.clientService = clientService;
+		this.workerService = workerService;
+		this.servicesService = servicesService;
+		this.visitService = visitService;
+	}
+
+	@GetMapping("/")
+	public void generateBd() {
+		for (int i = 0; i < 10; i++) {
+			Client client = random.getPerson();
+			clientService.create(
+					client.getName(),
+					client.getSecondName(),
+					client.getLastName(),
+					client.getTelephone(),
+					client.getAddress()
+			);
+			Client worker = random.getPerson();
+			workerService.create(
+					worker.getName(),
+					worker.getSecondName(),
+					worker.getLastName(),
+					worker.getTelephone(),
+					worker.getAddress(),
+					Long.valueOf(random.getNumber(1, 8))
+			);
+		}
+		for (int i = 0; i < 100; i++) {
+			Visit visit = random.getVisit(
+					clientService.all(),
+					workerService.all(),
+					servicesService.all()
+			);
+			visitService.create(
+					visit.getClient().getId(),
+					visit.getService().getId(),
+					visit.getWorker().getId(),
+					visit.getDateVisit(),
+					visit.getTime(),
+					random.getNumber(0, 3) == 2
+			);
+		}
+	}
+}
diff --git a/src/main/java/com/example/sybd/controllers/testCont.java b/src/main/java/com/example/sybd/controllers/testCont.java
deleted file mode 100644
index 8f38391..0000000
--- a/src/main/java/com/example/sybd/controllers/testCont.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.example.sybd.controllers;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-public class testCont {
-	@GetMapping("/")
-	public String main(Model model) {
-		model.addAttribute("message", "hello world");
-		return "welcome";
-	}
-}
diff --git a/src/main/java/com/example/sybd/models/Client.java b/src/main/java/com/example/sybd/models/Client.java
index ec169ca..066d0e6 100644
--- a/src/main/java/com/example/sybd/models/Client.java
+++ b/src/main/java/com/example/sybd/models/Client.java
@@ -14,7 +14,7 @@ import java.util.Collection;
 @Table( name = "client" )
 public class Client {
 	@Id
-	@GeneratedValue( strategy = GenerationType.IDENTITY )
+	@GeneratedValue( strategy = GenerationType.AUTO )
 	@Column( name = "id", nullable = false )
 	private Long id;
 
diff --git a/src/main/java/com/example/sybd/models/Post.java b/src/main/java/com/example/sybd/models/Post.java
index c023e77..9a0dae0 100644
--- a/src/main/java/com/example/sybd/models/Post.java
+++ b/src/main/java/com/example/sybd/models/Post.java
@@ -10,7 +10,7 @@ import lombok.Setter;
 @Table( name = "post" )
 public class Post {
 	@Id
-	@GeneratedValue( strategy = GenerationType.IDENTITY )
+	@GeneratedValue( strategy = GenerationType.AUTO )
 	@Column( name = "id", nullable = false )
 	private Long id;
 
diff --git a/src/main/java/com/example/sybd/models/Service.java b/src/main/java/com/example/sybd/models/Service.java
index fdf9903..a769d57 100644
--- a/src/main/java/com/example/sybd/models/Service.java
+++ b/src/main/java/com/example/sybd/models/Service.java
@@ -12,7 +12,7 @@ import java.util.Collection;
 @Table( name = "services" )
 public class Service {
 	@Id
-	@GeneratedValue( strategy = GenerationType.IDENTITY )
+	@GeneratedValue( strategy = GenerationType.AUTO )
 	@Column( name = "id", nullable = false )
 	private Long id;
 
diff --git a/src/main/java/com/example/sybd/models/ServiceGroup.java b/src/main/java/com/example/sybd/models/ServiceGroup.java
index c4a9459..774ec4e 100644
--- a/src/main/java/com/example/sybd/models/ServiceGroup.java
+++ b/src/main/java/com/example/sybd/models/ServiceGroup.java
@@ -13,7 +13,7 @@ import lombok.Setter;
 @Inheritance( strategy = InheritanceType.SINGLE_TABLE )
 public class ServiceGroup {
 	@Id
-	@GeneratedValue( strategy = GenerationType.IDENTITY )
+	@GeneratedValue( strategy = GenerationType.AUTO )
 	@Column( name = "id", nullable = false )
 	private Long id;
 
diff --git a/src/main/java/com/example/sybd/models/Visit.java b/src/main/java/com/example/sybd/models/Visit.java
index dbd6469..4776a9a 100644
--- a/src/main/java/com/example/sybd/models/Visit.java
+++ b/src/main/java/com/example/sybd/models/Visit.java
@@ -13,7 +13,7 @@ import java.sql.Time;
 @Table( name = "visit" )
 public class Visit {
 	@Id
-	@GeneratedValue( strategy = GenerationType.IDENTITY )
+	@GeneratedValue( strategy = GenerationType.AUTO )
 	@Column( name = "id", nullable = false )
 	private Long id;
 
diff --git a/src/main/java/com/example/sybd/models/Worker.java b/src/main/java/com/example/sybd/models/Worker.java
index c04a9e7..7dab48c 100644
--- a/src/main/java/com/example/sybd/models/Worker.java
+++ b/src/main/java/com/example/sybd/models/Worker.java
@@ -13,7 +13,7 @@ import java.util.Collection;
 @Table( name = "worker" )
 public class Worker {
 	@Id
-	@GeneratedValue( strategy = GenerationType.IDENTITY )
+	@GeneratedValue( strategy = GenerationType.AUTO )
 	@Column( name = "id", nullable = false )
 	private Long id;
 
@@ -33,4 +33,10 @@ public class Worker {
 	public String getFio() {
 		return MessageFormat.format("{0} {1} {2}", secondName, name, lastName);
 	}
+	public Integer getMoney() {
+		return visits
+				.stream()
+				.filter(Visit::isEnded)
+				.reduce(0, (cost, element) -> cost + element.getService().getCost(), Integer::sum);
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/sybd/repository/WorkerRepository.java b/src/main/java/com/example/sybd/repository/WorkerRepository.java
index 434c5b2..33b9acd 100644
--- a/src/main/java/com/example/sybd/repository/WorkerRepository.java
+++ b/src/main/java/com/example/sybd/repository/WorkerRepository.java
@@ -3,5 +3,9 @@ package com.example.sybd.repository;
 import com.example.sybd.models.Worker;
 import org.springframework.data.repository.CrudRepository;
 
+import java.util.List;
+import java.util.Optional;
+
 public interface WorkerRepository extends CrudRepository<Worker, Long> {
+	List<Worker> findAllByPostId(Long id);
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/sybd/services/VisitService.java b/src/main/java/com/example/sybd/services/VisitService.java
index 9d1f966..caf3c2f 100644
--- a/src/main/java/com/example/sybd/services/VisitService.java
+++ b/src/main/java/com/example/sybd/services/VisitService.java
@@ -35,7 +35,8 @@ public class VisitService implements IService<Visit, Long> {
 	                    @NotNull Long service_id,
 	                    @NotNull Long worker_id,
 	                    @NotNull Date date,
-	                    @NotNull Time time) {
+	                    @NotNull Time time,
+	                    @NotNull Boolean isEnd) {
 		Client client = clientService.get(client_id);
 		if (client == null)
 			return null;
@@ -51,6 +52,7 @@ public class VisitService implements IService<Visit, Long> {
 		visit.setWorker(worker);
 		visit.setDateVisit(date);
 		visit.setTime(time);
+		visit.setEnded(isEnd);
 
 		return visitRepository.save(visit);
 	}
diff --git a/src/main/java/com/example/sybd/services/WorkerService.java b/src/main/java/com/example/sybd/services/WorkerService.java
index 2c2eb92..9c8189b 100644
--- a/src/main/java/com/example/sybd/services/WorkerService.java
+++ b/src/main/java/com/example/sybd/services/WorkerService.java
@@ -35,6 +35,7 @@ public class WorkerService implements IService<Worker, Long> {
 		out.setLastName(lastName);
 		out.setTelephone(telephone);
 		out.setAddress(address);
+		out.setPost(post);
 		return workerRepository.save(out);
 	}
 
@@ -57,4 +58,8 @@ public class WorkerService implements IService<Worker, Long> {
 	public @Nullable Worker update(Worker other) {
 		return null;
 	}
+
+	public @Nullable List<Worker> getByPostId(Long id) {
+		return workerRepository.findAllByPostId(id);
+	}
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4ee530c..9e281c2 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -14,5 +14,5 @@ spring.datasource.password=w12344321
 
 spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
 spring.datasource.driver-class-name=org.postgresql.Driver
-spring.jpa.hibernate.ddl-auto=validate
+spring.jpa.hibernate.ddl-auto=update
 spring.jpa.properties.hibernate.globally_quoted_identifiers=true
\ No newline at end of file
diff --git a/src/main/resources/templates/welcome.html b/src/main/resources/templates/welcome.html
deleted file mode 100644
index e6c87bd..0000000
--- a/src/main/resources/templates/welcome.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <title>Spring Boot Thymeleaf Hello World Example</title>
-
-    <link rel="stylesheet" th:href="@{webjars/bootstrap/4.2.1/css/bootstrap.min.css}"/>
-    <link rel="stylesheet" th:href="@{/css/main.css}"/>
-
-</head>
-<body>
-    <main role="main" class="container">
-        <div class="starter-template">
-            <h1>Spring Boot Web Thymeleaf Example</h1>
-            <h2>
-                <span th:text="'Hello, ' + ${message}"></span>
-            </h2>
-        </div>
-    </main>
-<script type="text/javascript" th:src="@{webjars/bootstrap/4.2.1/js/bootstrap.min.js}"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/workerCreate.html b/src/main/resources/templates/workerCreate.html
index 32f0c13..4f8fb9b 100644
--- a/src/main/resources/templates/workerCreate.html
+++ b/src/main/resources/templates/workerCreate.html
@@ -9,22 +9,23 @@
 </head>
 <body>
 <nav class="nav nav-pills flex-row p-2">
-  <a class="flex-fill text-sm-center nav-link" aria-current="page" href="/new">Новый сотрудник</a>
-  <a class="flex-fill text-sm-center nav-link" href="/visit">Создать визит</a>
-  <a class="flex-fill text-sm-center nav-link" href="/services">Услуги</a>
-  <select class="form-select form-select-sm w-25" aria-label="Сотдрудник">
-    <option th:each="worker : ${workers}" th:value="${worker.getId()}" th:text="${worker.getName()}"></option>
-  </select>
+  <a class="flex-fill text-sm-center nav-link" href="/">Посещения</a>
+  <a class="flex-fill text-sm-center nav-link" href="/create">Создать визит</a>
+  <a class="flex-fill text-sm-center nav-link" href="/service">Услуги</a>
+  <a class="flex-fill text-sm-center nav-link" href="/serviceGroup">Группа услуг</a>
+  <a class="flex-fill text-sm-center nav-link" href="/users">Пользователи</a>
+  <a class="flex-fill text-sm-center nav-link" href="/workers">Сотрудники</a>
+  <a class="flex-fill text-sm-center nav-link" href="/posts">Должности</a>
 </nav>
 <main class="mt-5 p-2">
-  <form action="#" th:action="@{/worker/create}" method="post">
-    <select class="form-select form-select-sm w-25" aria-label="Сотдрудник" th:name="worker">
+  <form action="#" th:action="@{/create}" method="post">
+    <select class="form-select form-select-sm w-100" aria-label="Сотдрудник" th:name="worker">
       <option th:each="worker : ${workers}" th:value="${worker.getId()}" th:text="${worker.getName()}"></option>
     </select>
-    <select class="form-select form-select-sm w-25" aria-label="Клиент" th:name="client">
+    <select class="form-select form-select-sm w-100" aria-label="Клиент" th:name="client">
       <option th:each="client : ${clients}" th:value="${client.getId()}" th:text="${client.getName()}"></option>
     </select>
-    <select class="form-select form-select-sm w-25" aria-label="Услуга" th:name="service">
+    <select class="form-select form-select-sm w-100" aria-label="Услуга" th:name="service">
       <option th:each="service : ${services}" th:value="${service.getId()}" th:text="${service.getInfo()}"></option>
     </select>
     <div class="mb-3">
diff --git a/src/main/resources/templates/workerMain.html b/src/main/resources/templates/workerMain.html
index d6b1876..efe2ec9 100644
--- a/src/main/resources/templates/workerMain.html
+++ b/src/main/resources/templates/workerMain.html
@@ -10,12 +10,13 @@
 </head>
 <body>
     <nav class="nav nav-pills flex-row p-2">
-        <a class="flex-fill text-sm-center nav-link" aria-current="page" href="/new">Новый сотрудник</a>
-        <a class="flex-fill text-sm-center nav-link" href="/visit">Создать визит</a>
-        <a class="flex-fill text-sm-center nav-link" href="/services">Услуги</a>
-        <select class="form-select form-select-sm w-25" aria-label="Сотдрудник">
-            <option th:each="worker : ${workers}" th:value="${worker.getId()}" th:text="${worker.getName()}"></option>
-        </select>
+        <a class="flex-fill text-sm-center nav-link" href="/">Посещения</a>
+        <a class="flex-fill text-sm-center nav-link" href="/create">Создать визит</a>
+        <a class="flex-fill text-sm-center nav-link" href="/service">Услуги</a>
+        <a class="flex-fill text-sm-center nav-link" href="/serviceGroup">Группа услуг</a>
+        <a class="flex-fill text-sm-center nav-link" href="/users">Пользователи</a>
+        <a class="flex-fill text-sm-center nav-link" href="/workers">Сотрудники</a>
+        <a class="flex-fill text-sm-center nav-link" href="/posts">Должности</a>
     </nav>
     <main class="mt-5 p-2">
         <ul class="list-group">
diff --git a/src/main/resources/templates/workerPost.html b/src/main/resources/templates/workerPost.html
new file mode 100644
index 0000000..9c5e547
--- /dev/null
+++ b/src/main/resources/templates/workerPost.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Title</title>
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css"
+        rel="stylesheet"
+        integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
+        crossorigin="anonymous">
+</head>
+<body>
+<nav class="nav nav-pills flex-row p-2">
+  <a class="flex-fill text-sm-center nav-link" href="/">Посещения</a>
+  <a class="flex-fill text-sm-center nav-link" href="/create">Создать визит</a>
+  <a class="flex-fill text-sm-center nav-link" href="/service">Услуги</a>
+  <a class="flex-fill text-sm-center nav-link" href="/serviceGroup">Группа услуг</a>
+  <a class="flex-fill text-sm-center nav-link" href="/users">Пользователи</a>
+  <a class="flex-fill text-sm-center nav-link" href="/workers">Сотрудники</a>
+  <a class="flex-fill text-sm-center nav-link" href="/posts">Должности</a>
+</nav>
+<main class="mt-5 p-2">
+  <ul class="list-group">
+    <li th:each="post : ${posts}" class="list-group-item">
+      <div class="card border-0">
+        <div class="card-header">
+          <h5>
+            Должность #<span th:text="${post.getId().toString()}"></span>
+          </h5>
+        </div>
+        <div class="card-body">
+          <h6 class="card-text">
+            <b>Название:</b> <span th:text="${post.getName()}"></span>
+          </h6>
+          <h6 class="card-text">
+            <b>Группа услуг:</b> <span th:text="${post.getGroup().getName()}"></span>
+          </h6>
+        </div>
+      </div>
+    </li>
+  </ul>
+</main>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/workerServiceGroup.html b/src/main/resources/templates/workerServiceGroup.html
new file mode 100644
index 0000000..e85f1dd
--- /dev/null
+++ b/src/main/resources/templates/workerServiceGroup.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css"
+          rel="stylesheet"
+          integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
+          crossorigin="anonymous">
+</head>
+<body>
+<nav class="nav nav-pills flex-row p-2">
+    <a class="flex-fill text-sm-center nav-link" href="/">Посещения</a>
+    <a class="flex-fill text-sm-center nav-link" href="/create">Создать визит</a>
+    <a class="flex-fill text-sm-center nav-link" href="/service">Услуги</a>
+    <a class="flex-fill text-sm-center nav-link" href="/serviceGroup">Группа услуг</a>
+    <a class="flex-fill text-sm-center nav-link" href="/users">Пользователи</a>
+    <a class="flex-fill text-sm-center nav-link" href="/workers">Сотрудники</a>
+    <a class="flex-fill text-sm-center nav-link" href="/posts">Должности</a>
+</nav>
+<main class="mt-5 p-2">
+    <ul class="list-group">
+        <li th:each="serviceGroup : ${serviceGroups}" class="list-group-item">
+            <div class="card border-0">
+                <div class="card-header">
+                    <h5>
+                        Группа услуг #<span th:text="${serviceGroup.getId().toString()}"></span>
+                    </h5>
+                </div>
+                <div class="card-body">
+                    <h6 class="card-text">
+                        <b>Название:</b> <span th:text="${serviceGroup.getName()}"></span>
+                    </h6>
+                </div>
+            </div>
+        </li>
+    </ul>
+</main>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/workerServices.html b/src/main/resources/templates/workerServices.html
new file mode 100644
index 0000000..f259d3d
--- /dev/null
+++ b/src/main/resources/templates/workerServices.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css"
+          rel="stylesheet"
+          integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
+          crossorigin="anonymous">
+</head>
+<body>
+<nav class="nav nav-pills flex-row p-2">
+    <a class="flex-fill text-sm-center nav-link" href="/">Посещения</a>
+    <a class="flex-fill text-sm-center nav-link" href="/create">Создать визит</a>
+    <a class="flex-fill text-sm-center nav-link" href="/service">Услуги</a>
+    <a class="flex-fill text-sm-center nav-link" href="/serviceGroup">Группа услуг</a>
+    <a class="flex-fill text-sm-center nav-link" href="/users">Пользователи</a>
+    <a class="flex-fill text-sm-center nav-link" href="/workers">Сотрудники</a>
+    <a class="flex-fill text-sm-center nav-link" href="/posts">Должности</a>
+</nav>
+<main class="mt-5 p-2">
+    <ul class="list-group">
+        <li th:each="service : ${services}" class="list-group-item">
+            <div class="card border-0">
+                <div class="card-header">
+                    <h5>
+                        Услуга #<span th:text="${service.getId().toString()}"></span>
+                    </h5>
+                </div>
+                <div class="card-body">
+                    <h6 class="card-text">
+                        <b>Название:</b> <span th:text="${service.getName()}"></span>
+                    </h6>
+                </div>
+                <div class="card-footer">
+                    <h6>Цена: <span th:text="${service.getCost()}"></span>руб.</h6>
+                </div>
+            </div>
+        </li>
+    </ul>
+</main>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/workerUsers.html b/src/main/resources/templates/workerUsers.html
new file mode 100644
index 0000000..f177a31
--- /dev/null
+++ b/src/main/resources/templates/workerUsers.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Title</title>
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css"
+        rel="stylesheet"
+        integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
+        crossorigin="anonymous">
+</head>
+<body>
+<nav class="nav nav-pills flex-row p-2">
+  <a class="flex-fill text-sm-center nav-link" href="/">Посещения</a>
+  <a class="flex-fill text-sm-center nav-link" href="/create">Создать визит</a>
+  <a class="flex-fill text-sm-center nav-link" href="/service">Услуги</a>
+  <a class="flex-fill text-sm-center nav-link" href="/serviceGroup">Группа услуг</a>
+  <a class="flex-fill text-sm-center nav-link" href="/users">Пользователи</a>
+  <a class="flex-fill text-sm-center nav-link" href="/workers">Сотрудники</a>
+  <a class="flex-fill text-sm-center nav-link" href="/posts">Должности</a>
+</nav>
+<main class="mt-5 p-2">
+  <ul class="list-group">
+    <li th:each="user : ${users}" class="list-group-item">
+      <div class="card border-0">
+        <div class="card-header">
+          <h5>
+            Пользователь #<span th:text="${user.getId().toString()}"></span>
+          </h5>
+        </div>
+        <div class="card-body">
+          <h6 class="card-text">
+            <b>ФИО:</b> <span th:text="${user.getFio()}"></span>
+          </h6>
+          <h6 class="card-text">
+            <b>Телефон:</b> <span th:text="${user.getTelephone()}"></span>
+          </h6>
+          <h6 class="card-text">
+            <b>Адрес:</b> <span th:text="${user.getAddress()}"></span>
+          </h6>
+        </div>
+      </div>
+    </li>
+  </ul>
+</main>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/workers.html b/src/main/resources/templates/workers.html
new file mode 100644
index 0000000..4252392
--- /dev/null
+++ b/src/main/resources/templates/workers.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Title</title>
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css"
+        rel="stylesheet"
+        integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
+        crossorigin="anonymous">
+</head>
+<body>
+<nav class="nav nav-pills flex-row p-2">
+  <a class="flex-fill text-sm-center nav-link" href="/">Посещения</a>
+  <a class="flex-fill text-sm-center nav-link" href="/create">Создать визит</a>
+  <a class="flex-fill text-sm-center nav-link" href="/service">Услуги</a>
+  <a class="flex-fill text-sm-center nav-link" href="/serviceGroup">Группа услуг</a>
+  <a class="flex-fill text-sm-center nav-link" href="/users">Пользователи</a>
+  <a class="flex-fill text-sm-center nav-link" href="/workers">Сотрудники</a>
+  <a class="flex-fill text-sm-center nav-link" href="/posts">Должности</a>
+</nav>
+<main class="mt-5 p-2">
+  <ul class="list-group">
+    <li th:each="worker : ${workers}" class="list-group-item">
+      <div class="card border-0">
+        <div class="card-header">
+          <h5>
+            Сотдрудник #<span th:text="${worker.getId().toString()}"></span>
+          </h5>
+        </div>
+        <div class="card-body">
+          <h6 class="card-text">
+            <b>ФИО:</b> <span th:text="${worker.getFio()}"></span>
+          </h6>
+          <h6 class="card-text">
+            <b>Должность:</b> <span th:text="${worker.getPost().getName()}"></span>
+          </h6>
+          <h6 class="card-text">
+            <b>Телефон:</b> <span th:text="${worker.getTelephone()}"></span>
+          </h6>
+          <h6 class="card-text">
+            <b>Адрес:</b> <span th:text="${worker.getAddress()}"></span>
+          </h6>
+        </div>
+        <div class="card-footer">
+          <h6>Заработал: <span th:text="${worker.getMoney()}"></span>руб.</h6>
+        </div>
+      </div>
+    </li>
+  </ul>
+</main>
+</body>
+</html>
\ No newline at end of file