From b509485a5d7e4ea23c7cbb2b8c047acd001b0e0c Mon Sep 17 00:00:00 2001 From: Olya Date: Tue, 19 Apr 2022 20:08:38 +0200 Subject: [PATCH 01/17] fix --- .../workshop-about.component.html | 21 +++++++++ .../workshop-about.component.scss | 44 ++++++++++++++++++- .../workshop-about.component.ts | 3 ++ 3 files changed, 66 insertions(+), 2 deletions(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index f7b1e8c3e4..b54ed24ac4 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -6,4 +6,25 @@
Вартість

{{ workshop.price }} грн/ {{ workshop.isPerMonth ? 'місяць' : 'заняття' }}

Наявність ресурсу для надання освіти для осіб з ООП та осіб з інвалідністю

{{ workshop.withDisabilityOptions ? workshop.disabilityOptionsDesc : 'Відсутні' }}

+ +
Дні/Години
+
+
+
+ {{day.value}} +
+ {{workshop.dateTimeRanges[0].workdays}} +
+ +
+

Від

+

{{workshop.dateTimeRanges[0].startTime}}

+

До

+

{{workshop.dateTimeRanges[0].endTime}}

+
+ +
+ diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss b/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss index 9f5415cf3c..750da9317e 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss @@ -1,3 +1,43 @@ .wrapper{ - margin-top: 2rem; -} \ No newline at end of file + margin: 2rem 0; +} + +.toggle { + height: 40px; + padding: 5px; + margin-top: 10px; + flex-grow: 1; + box-sizing: border-box; + border: 1px solid #EBEBEB; + background: #FFFFFF; + &-selected{ + background: rgba(56, 73, 249, 0.07); + border: 1px solid #3849F9; + } + &:first-child{ + border-top-left-radius: 25px; + border-bottom-left-radius: 25px; + } + &:last-child{ + border-top-right-radius: 25px; + border-bottom-right-radius: 25px; + } +} + +.text{ + font-family: Open Sans; + font-weight: 700; + color: #AAAAAA; + padding: 5px; +} + +.input { + border: 1px solid #E3E3E3; + box-sizing: border-box; + border-radius: 21px; + padding: 0.5rem 3rem; + max-width: max-content; + height: 40px; + align-items: center; + text-align: center; +} diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts b/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts index 7ac2292445..9725c5c153 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts @@ -1,4 +1,6 @@ import { Component, Input } from '@angular/core'; +import { WorkingDaysValues } from 'src/app/shared/constants/constants'; +import { WorkingDaysToggleValue } from 'src/app/shared/models/workingHours.model'; import { Workshop } from 'src/app/shared/models/workshop.model'; @Component({ @@ -9,6 +11,7 @@ import { Workshop } from 'src/app/shared/models/workshop.model'; export class WorkshopAboutComponent { @Input() workshop: Workshop; + days: WorkingDaysToggleValue[] = WorkingDaysValues.map((value: WorkingDaysToggleValue) => Object.assign({}, value)); workshopDetailsMock = { description: 'Бальні танці — різновид парних танців, упорядкованих та кодифікованих для спортивних змагань.', From 96588c3a8416353a22ebad8bdf5ce3c077268cf8 Mon Sep 17 00:00:00 2001 From: Olya Date: Tue, 19 Apr 2022 20:09:21 +0200 Subject: [PATCH 02/17] fix --- .../workshop-about/workshop-about.component.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index b54ed24ac4..322f8b7d78 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -16,15 +16,12 @@
Дні/Години
{{day.value}} {{workshop.dateTimeRanges[0].workdays}} - - +

Від

{{workshop.dateTimeRanges[0].startTime}}

До

{{workshop.dateTimeRanges[0].endTime}}

- - From a0bc290b581d39ab865d3123eb76e0fb1a2a1903 Mon Sep 17 00:00:00 2001 From: Olya Date: Wed, 20 Apr 2022 11:37:24 +0200 Subject: [PATCH 03/17] fix --- .../workshop-about.component.html | 7 ++-- .../workshop-about.component.scss | 35 ++++++++++--------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index 322f8b7d78..3bc409efca 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -11,11 +11,11 @@
Дні/Години
-
+
{{day.value}}
- {{workshop.dateTimeRanges[0].workdays}}

Від

@@ -24,4 +24,5 @@
Дні/Години

{{workshop.dateTimeRanges[0].endTime}}

+ {{workshop.dateTimeRanges | json}}
diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss b/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss index 750da9317e..7028cece30 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss @@ -6,22 +6,22 @@ height: 40px; padding: 5px; margin-top: 10px; - flex-grow: 1; - box-sizing: border-box; - border: 1px solid #EBEBEB; - background: #FFFFFF; - &-selected{ - background: rgba(56, 73, 249, 0.07); - border: 1px solid #3849F9; - } - &:first-child{ - border-top-left-radius: 25px; - border-bottom-left-radius: 25px; - } - &:last-child{ - border-top-right-radius: 25px; - border-bottom-right-radius: 25px; - } + flex-grow: 1; + box-sizing: border-box; + border: 1px solid #EBEBEB; + background: #FFFFFF; + &-selected{ + background: rgba(56, 73, 249, 0.07); + border: 1px solid #3849F9; + } + &:first-child{ + border-top-left-radius: 25px; + border-bottom-left-radius: 25px; + } + &:last-child{ + border-top-right-radius: 25px; + border-bottom-right-radius: 25px; + } } .text{ @@ -32,10 +32,11 @@ } .input { + font-family: Open Sans; border: 1px solid #E3E3E3; box-sizing: border-box; border-radius: 21px; - padding: 0.5rem 3rem; + padding: 0.5rem 2rem; max-width: max-content; height: 40px; align-items: center; From 6b68872f1b0b3511c3ffa72b574cbe86c40d9d5d Mon Sep 17 00:00:00 2001 From: Olya Date: Wed, 20 Apr 2022 11:48:46 +0200 Subject: [PATCH 04/17] fix --- .../workshop-about/workshop-about.component.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index 3bc409efca..c23766416c 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -13,8 +13,10 @@
Дні/Години
- {{day.value}} + [ngClass]="workshop.dateTimeRanges[0].workdays == 'Monday' + ? 'toggle-selected' + : 'toggle'"> + {{day.value}}
From d1a5086b9b93d1492a5b8e7bd5cf7688ac562c4f Mon Sep 17 00:00:00 2001 From: Olya Date: Wed, 20 Apr 2022 16:55:13 +0200 Subject: [PATCH 05/17] fix --- .../workshop-about.component.html | 31 ++++++++++++++----- .../workshop-about.component.scss | 2 +- .../workshop-about.component.ts | 9 ++---- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index c23766416c..16ed900f2f 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -7,23 +7,40 @@
Вартість
Наявність ресурсу для надання освіти для осіб з ООП та осіб з інвалідністю

{{ workshop.withDisabilityOptions ? workshop.disabilityOptionsDesc : 'Відсутні' }}

-
Дні/Години
+ + +
Дні/Години
+
+
+
+ {{workingDays[day | lowercase]}}

Від

-

{{workshop.dateTimeRanges[0].startTime}}

+

{{workshop.dateTimeRanges[0].startTime}}

До

-

{{workshop.dateTimeRanges[0].endTime}}

+

{{workshop.dateTimeRanges[0].endTime}}

{{workshop.dateTimeRanges | json}} diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss b/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss index 7028cece30..3483c674ae 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss @@ -31,7 +31,7 @@ padding: 5px; } -.input { +.time { font-family: Open Sans; border: 1px solid #E3E3E3; box-sizing: border-box; diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts b/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts index 9725c5c153..9460b0be04 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts @@ -1,5 +1,6 @@ import { Component, Input } from '@angular/core'; import { WorkingDaysValues } from 'src/app/shared/constants/constants'; +import { WorkingDays } from 'src/app/shared/enum/enumUA/working-hours'; import { WorkingDaysToggleValue } from 'src/app/shared/models/workingHours.model'; import { Workshop } from 'src/app/shared/models/workshop.model'; @@ -10,14 +11,8 @@ import { Workshop } from 'src/app/shared/models/workshop.model'; }) export class WorkshopAboutComponent { + readonly workingDays = WorkingDays; @Input() workshop: Workshop; days: WorkingDaysToggleValue[] = WorkingDaysValues.map((value: WorkingDaysToggleValue) => Object.assign({}, value)); - workshopDetailsMock = { - description: 'Бальні танці — різновид парних танців, упорядкованих та кодифікованих для спортивних змагань.', - programm: 'Інформація про програму має бути тут', - groupe: 'Молодша група (7-10 років)', - schedule: 'Пн, Ср 12-14 год Вт, Чт 18-20 год', - duration: '2 години', - }; } From 6ac0fe86f30d0a4d66efc65d57da18bb31767f7c Mon Sep 17 00:00:00 2001 From: Olya Date: Wed, 20 Apr 2022 19:49:24 +0200 Subject: [PATCH 06/17] fix --- .../workshop-about.component.html | 35 +++++++------------ .../workshop-about.component.ts | 8 +++-- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index 16ed900f2f..27b07e1e7e 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -7,15 +7,20 @@
Вартість
Наявність ресурсу для надання освіти для осіб з ООП та осіб з інвалідністю

{{ workshop.withDisabilityOptions ? workshop.disabilityOptionsDesc : 'Відсутні' }}

-
+ fxLayoutAlign='center center' + [ngClass]="day.value == workingDays[workshop.dateTimeRanges[0].workdays[0] | lowercase] + ? 'toggle-selected' : ''"> {{day.value}}
@@ -25,23 +30,7 @@
Наявність ресурсу для надання освіти для

До

{{workshop.dateTimeRanges[0].endTime}}

- --> + {{ workingDays[workshop.dateTimeRanges[0].workdays[0] | lowercase] }} + -
Дні/Години
-
-
-
- {{workingDays[day | lowercase]}} -
-
-
-

Від

-

{{workshop.dateTimeRanges[0].startTime}}

-

До

-

{{workshop.dateTimeRanges[0].endTime}}

-
-
- {{workshop.dateTimeRanges | json}} diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts b/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts index 9460b0be04..b4eb106335 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts @@ -12,7 +12,11 @@ import { Workshop } from 'src/app/shared/models/workshop.model'; export class WorkshopAboutComponent { readonly workingDays = WorkingDays; - @Input() workshop: Workshop; + @Input() workshop!: Workshop; days: WorkingDaysToggleValue[] = WorkingDaysValues.map((value: WorkingDaysToggleValue) => Object.assign({}, value)); - + + isSelected() { + let i = this.workshop.dateTimeRanges[0].workdays.map(el => this.workingDays[el.toLowerCase()]); + console.log(i); + } } From 283b43fb719bf6553a21c2d16f42e12bff6fcf72 Mon Sep 17 00:00:00 2001 From: Olya Date: Thu, 21 Apr 2022 13:47:04 +0200 Subject: [PATCH 07/17] fix --- .../workshop-about.component.html | 18 +++++------------- .../workshop-about.component.scss | 4 ++++ .../workshop-about/workshop-about.component.ts | 11 +++++------ 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index 27b07e1e7e..1bea52e332 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -11,17 +11,11 @@
Дні/Години
-
- {{day.value}} + fxLayoutAlign='center center' + > + {{day.value}}
@@ -29,8 +23,6 @@
Дні/Години

{{workshop.dateTimeRanges[0].startTime}}

До

{{workshop.dateTimeRanges[0].endTime}}

-
- {{ workingDays[workshop.dateTimeRanges[0].workdays[0] | lowercase] }} +
- diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss b/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss index 3483c674ae..517738c5ff 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss @@ -24,6 +24,10 @@ } } +.selected { + background: rgba(56, 73, 249, 0.07); +} + .text{ font-family: Open Sans; font-weight: 700; diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts b/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts index b4eb106335..5f6e770a5d 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { WorkingDaysValues } from 'src/app/shared/constants/constants'; -import { WorkingDays } from 'src/app/shared/enum/enumUA/working-hours'; +import { WorkingDays, WorkingDaysReverse } from 'src/app/shared/enum/enumUA/working-hours'; import { WorkingDaysToggleValue } from 'src/app/shared/models/workingHours.model'; import { Workshop } from 'src/app/shared/models/workshop.model'; @@ -12,11 +12,10 @@ import { Workshop } from 'src/app/shared/models/workshop.model'; export class WorkshopAboutComponent { readonly workingDays = WorkingDays; + readonly workingDaysReverse = WorkingDaysReverse; @Input() workshop!: Workshop; - days: WorkingDaysToggleValue[] = WorkingDaysValues.map((value: WorkingDaysToggleValue) => Object.assign({}, value)); + days: WorkingDaysToggleValue[] = WorkingDaysValues + .map((value: WorkingDaysToggleValue) => Object.assign({}, value)); - isSelected() { - let i = this.workshop.dateTimeRanges[0].workdays.map(el => this.workingDays[el.toLowerCase()]); - console.log(i); - } + } From b773b70066c3d81d062c5fa9f02e075bfd0bc2df Mon Sep 17 00:00:00 2001 From: Olya Date: Mon, 25 Apr 2022 12:38:00 +0200 Subject: [PATCH 08/17] fix --- .../workshop-about/workshop-about.component.html | 12 ++++++------ .../workshop-about/workshop-about.component.scss | 6 +----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index 1bea52e332..ad90f8e96d 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -12,17 +12,17 @@
Дні/Години
fxLayout.xs="column" fxLayoutAlign.xs="center start">
- {{day.value}} + fxLayoutAlign='center center' + [ngClass]="workshop.dateTimeRanges[0].workdays.includes(workingDaysReverse[day.value] | titlecase) + ? 'toggle-selected' : ''"> + {{day.value}}

Від

-

{{workshop.dateTimeRanges[0].startTime}}

+

{{workshop.dateTimeRanges[0].startTime}}

До

-

{{workshop.dateTimeRanges[0].endTime}}

+

{{workshop.dateTimeRanges[0].endTime}}

diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss b/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss index 517738c5ff..7028cece30 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss @@ -24,10 +24,6 @@ } } -.selected { - background: rgba(56, 73, 249, 0.07); -} - .text{ font-family: Open Sans; font-weight: 700; @@ -35,7 +31,7 @@ padding: 5px; } -.time { +.input { font-family: Open Sans; border: 1px solid #E3E3E3; box-sizing: border-box; From 6224454bf2803c0db532d510eb93b6991ff3a627 Mon Sep 17 00:00:00 2001 From: Olya Date: Mon, 25 Apr 2022 12:46:48 +0200 Subject: [PATCH 09/17] fix --- src/app/shared/styles/working-hours.scss | 40 +++++++++++++++++ .../workshop-about.component.scss | 43 +------------------ .../workshop-about.component.ts | 2 - 3 files changed, 42 insertions(+), 43 deletions(-) create mode 100644 src/app/shared/styles/working-hours.scss diff --git a/src/app/shared/styles/working-hours.scss b/src/app/shared/styles/working-hours.scss new file mode 100644 index 0000000000..64e6a35f9f --- /dev/null +++ b/src/app/shared/styles/working-hours.scss @@ -0,0 +1,40 @@ +.toggle { + height: 40px; + padding: 5px; + margin-top: 10px; + flex-grow: 1; + box-sizing: border-box; + border: 1px solid #EBEBEB; + background: #FFFFFF; + &-selected{ + background: rgba(56, 73, 249, 0.07); + border: 1px solid #3849F9; + } + &:first-child{ + border-top-left-radius: 25px; + border-bottom-left-radius: 25px; + } + &:last-child{ + border-top-right-radius: 25px; + border-bottom-right-radius: 25px; + } +} + +.text{ + font-family: Open Sans; + font-weight: 700; + color: #AAAAAA; + padding: 5px; +} + +.input { + font-family: Open Sans; + border: 1px solid #E3E3E3; + box-sizing: border-box; + border-radius: 21px; + padding: 0.5rem 2rem; + max-width: max-content; + height: 40px; + align-items: center; + text-align: center; +} \ No newline at end of file diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss b/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss index 7028cece30..99311dc3f0 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.scss @@ -1,44 +1,5 @@ +@import "src/app/shared/styles/working-hours.scss"; + .wrapper{ margin: 2rem 0; } - -.toggle { - height: 40px; - padding: 5px; - margin-top: 10px; - flex-grow: 1; - box-sizing: border-box; - border: 1px solid #EBEBEB; - background: #FFFFFF; - &-selected{ - background: rgba(56, 73, 249, 0.07); - border: 1px solid #3849F9; - } - &:first-child{ - border-top-left-radius: 25px; - border-bottom-left-radius: 25px; - } - &:last-child{ - border-top-right-radius: 25px; - border-bottom-right-radius: 25px; - } -} - -.text{ - font-family: Open Sans; - font-weight: 700; - color: #AAAAAA; - padding: 5px; -} - -.input { - font-family: Open Sans; - border: 1px solid #E3E3E3; - box-sizing: border-box; - border-radius: 21px; - padding: 0.5rem 2rem; - max-width: max-content; - height: 40px; - align-items: center; - text-align: center; -} diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts b/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts index 5f6e770a5d..9c44e9a301 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.ts @@ -16,6 +16,4 @@ export class WorkshopAboutComponent { @Input() workshop!: Workshop; days: WorkingDaysToggleValue[] = WorkingDaysValues .map((value: WorkingDaysToggleValue) => Object.assign({}, value)); - - } From 5058930d0b88d574147d2689f4ce0d9ed7a10148 Mon Sep 17 00:00:00 2001 From: Olya Date: Mon, 25 Apr 2022 13:05:34 +0200 Subject: [PATCH 10/17] fix --- .../workshop-about/workshop-about.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index ad90f8e96d..e8a1128fa9 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -13,7 +13,7 @@
Дні/Години
{{day.value}}
From 47c7581c261dd6f61fe95ae433bfd9f8ada5e855 Mon Sep 17 00:00:00 2001 From: Olya Date: Mon, 25 Apr 2022 13:37:16 +0200 Subject: [PATCH 11/17] fix --- .../workshop-about.component.html | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index e8a1128fa9..67b47eb9af 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -8,21 +8,24 @@
Наявність ресурсу для надання освіти для

{{ workshop.withDisabilityOptions ? workshop.disabilityOptionsDesc : 'Відсутні' }}

Дні/Години
-
+
-
-
- {{day.value}} + +
+
+ {{day.value}} +
-
-
-

Від

-

{{workshop.dateTimeRanges[0].startTime}}

-

До

-

{{workshop.dateTimeRanges[0].endTime}}

-
-
+
+

Від

{{workshop.dateTimeRanges[i].startTime}}

+

До

{{workshop.dateTimeRanges[i].endTime}}

+
+
+
+
From d4fcdf23fb6e0ae5acda4beaa47dcee603c4e67c Mon Sep 17 00:00:00 2001 From: Olya Date: Mon, 25 Apr 2022 13:47:03 +0200 Subject: [PATCH 12/17] fix --- .../workshop-about/workshop-about.component.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index 67b47eb9af..58a6f3079e 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -9,7 +9,7 @@
Наявність ресурсу для надання освіти для
Дні/Години
-
+
@@ -17,7 +17,8 @@
Дні/Години
+ ? 'toggle-selected' : ''" + > {{day.value}}
From aadeb80196b88847728f04b9cd5a1f45e1e0f00b Mon Sep 17 00:00:00 2001 From: Olya Date: Mon, 25 Apr 2022 13:51:25 +0200 Subject: [PATCH 13/17] fix --- .../workshop-about/workshop-about.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index 58a6f3079e..ff0e44bc17 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -9,22 +9,22 @@
Наявність ресурсу для надання освіти для
Дні/Години
-
+
{{day.value}}
-

Від

{{workshop.dateTimeRanges[i].startTime}}

-

До

{{workshop.dateTimeRanges[i].endTime}}

+

Від

{{timeRange.startTime}}

+

До

{{timeRange.endTime}}

From 4d9378082d07d0ca99983124f654ad8c65fe6c8a Mon Sep 17 00:00:00 2001 From: Olya Date: Mon, 25 Apr 2022 14:03:22 +0200 Subject: [PATCH 14/17] fix --- .../working-hours-form.component.scss | 37 ++----------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/src/app/shared/components/working-hours-form/working-hours-form.component.scss b/src/app/shared/components/working-hours-form/working-hours-form.component.scss index b7a93616fd..56f02711e0 100644 --- a/src/app/shared/components/working-hours-form/working-hours-form.component.scss +++ b/src/app/shared/components/working-hours-form/working-hours-form.component.scss @@ -1,5 +1,6 @@ @import "src/app/shared/styles/validation-form.scss"; @import "src/app/shared/styles/buttons.scss"; +@import "src/app/shared/styles/working-hours.scss"; .days-toggle{ min-width: 200px; @@ -9,45 +10,13 @@ border: 1px solid #C72A21; } } -.toggle{ - height: 40px; - flex-grow: 1; - box-sizing: border-box; - border: 1px solid #EBEBEB; - background: #FFFFFF; - &-selected{ - background: rgba(56, 73, 249, 0.07); - border: 1px solid #3849F9; - } - &:first-child{ - border-top-left-radius: 25px; - border-bottom-left-radius: 25px; - } - &:last-child{ - border-top-right-radius: 25px; - border-bottom-right-radius: 25px; - } +.toggle{ &:hover{ cursor: pointer; opacity: 0.8; } } -.input{ - border: 1px solid #E3E3E3; - box-sizing: border-box; - border-radius: 21px; - padding:0.5rem; - max-width: max-content; - height: 40px; - align-items: center; - text-align: center; -} -.text{ - font-family: Open Sans; - font-weight: 700; - color: #AAAAAA; - padding: 5px; -} + .mat-icon-delete{ color:#3849F9; &:hover{ From 7a6426502a1bc88f89c604d1fba6db3bdb97f841 Mon Sep 17 00:00:00 2001 From: Olya Date: Mon, 25 Apr 2022 17:33:01 +0200 Subject: [PATCH 15/17] fix --- .../working-hours-form/working-hours-form.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/components/working-hours-form/working-hours-form.component.html b/src/app/shared/components/working-hours-form/working-hours-form.component.html index 75d3702975..dc03b560d8 100644 --- a/src/app/shared/components/working-hours-form/working-hours-form.component.html +++ b/src/app/shared/components/working-hours-form/working-hours-form.component.html @@ -1,4 +1,4 @@ -
Date: Mon, 25 Apr 2022 17:45:38 +0200 Subject: [PATCH 16/17] fix --- .../workshop-about/workshop-about.component.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index ff0e44bc17..2556e682db 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -16,9 +16,7 @@
Дні/Години
+ [ngClass]="{ 'toggle-selected' : timeRange.workdays.includes(workingDaysReverse[day.value] | titlecase) }"> {{day.value}}
From dcc014c230b855cae6fbee2ec497eefe36431676 Mon Sep 17 00:00:00 2001 From: Olya Date: Mon, 25 Apr 2022 17:47:36 +0200 Subject: [PATCH 17/17] fix --- .../workshop-about/workshop-about.component.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html index 2556e682db..d2e8bc9fbe 100644 --- a/src/app/shell/details/information-page/workshop-about/workshop-about.component.html +++ b/src/app/shell/details/information-page/workshop-about/workshop-about.component.html @@ -8,11 +8,9 @@
Наявність ресурсу для надання освіти для

{{ workshop.withDisabilityOptions ? workshop.disabilityOptionsDesc : 'Відсутні' }}

Дні/Години
-
-