diff --git a/example.png b/example.png
index a531dbe..39d3dad 100644
Binary files a/example.png and b/example.png differ
diff --git a/src/app/schedule/components/action-panel/action-panel.component.html b/src/app/schedule/components/action-panel/action-panel.component.html
index 7ab19a9..c8e4121 100644
--- a/src/app/schedule/components/action-panel/action-panel.component.html
+++ b/src/app/schedule/components/action-panel/action-panel.component.html
@@ -8,7 +8,7 @@
@for (employee of employees;track employee;let i = $index) {
-
- {{ employee.name }}
+ {{ employee.name }}
}
diff --git a/src/app/schedule/components/schedule/schedule.component.html b/src/app/schedule/components/schedule/schedule.component.html
index 40c0dbe..53e4c81 100644
--- a/src/app/schedule/components/schedule/schedule.component.html
+++ b/src/app/schedule/components/schedule/schedule.component.html
@@ -1,37 +1,39 @@
-
-
-
-
- @for (column of viewModel?.columns; track column) {
-
- {{ column.id | date : 'EE' }}
- {{ column.id | date : 'd' }}
-
- }
-
-
-
-
- @for (row of viewModel?.rows; track row) {
-
-
-
{{ row.id | date : 'HH:mm' }}
-
- @for (cell of row.cells; track cell) {
-
- @for (item of cell.items; track item) {
-
-
-
+
+
+
+
+ @for (column of viewModel?.columns;track column) {
+
+
+
{{ column.id | date : 'EE' }}
+
{{ column.id | date : 'd' }}
+
+
}
-
+
+
+
+
+ @for (row of viewModel?.rows;track row) {
+
+
+
{{ row.id | date : 'HH:mm' }}
+
+ @for (cell of row.cells;track cell) {
+
+ @for (item of cell.items;track item) {
+
+
+
+ }
+
+ }
+
}
-
- }
-
+
diff --git a/src/app/schedule/components/schedule/schedule.component.scss b/src/app/schedule/components/schedule/schedule.component.scss
index 9d18afa..eb7c2ea 100644
--- a/src/app/schedule/components/schedule/schedule.component.scss
+++ b/src/app/schedule/components/schedule/schedule.component.scss
@@ -32,6 +32,19 @@ $border-color: #f5f5f5;
font-weight: 500;
font-size: 16px;
+ .date-container {
+ padding: 4px;
+ border-radius: 50%;
+ width: 48px;
+ height: 48px;
+ margin: auto;
+
+ &.today {
+ color: white;
+ background-color: #2196F3;
+ }
+ }
+
.day-of-week {
font-size: 12px;
font-weight: 400;
diff --git a/src/app/schedule/domain/schedule/generate-schedule/generate-schedule.handler.ts b/src/app/schedule/domain/schedule/generate-schedule/generate-schedule.handler.ts
index 7dfe3a6..765223c 100644
--- a/src/app/schedule/domain/schedule/generate-schedule/generate-schedule.handler.ts
+++ b/src/app/schedule/domain/schedule/generate-schedule/generate-schedule.handler.ts
@@ -18,9 +18,9 @@ import { EmployeeService } from '../../../employee.service';
export class GenerateScheduleHandler implements IHandler {
constructor(
- private clientService: ClientService,
- private serviceService: ServiceService,
- private employeeService: EmployeeService
+ private clientService: ClientService,
+ private serviceService: ServiceService,
+ private employeeService: EmployeeService
) {
}
@@ -43,12 +43,18 @@ export class GenerateScheduleHandler implements IHandler