Oi#663 Create dropdown payType #1408
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
litvinets
reviewed
Jul 4, 2022
|
add here a value |
|
can you additionally fix the allocation of the price? display it in the center please |
litvinets
requested changes
Jul 4, 2022
src/app/shared/enum/provider.ts
Outdated
| @@ -7,7 +7,7 @@ export enum ProviderType { | |||
| Other, | |||
| } | |||
|
|
|||
| export enum ProviderTypeUkr { | |||
| export enum ProviderTypeUkr { | |||
src/app/shared/enum/provider.ts
Outdated
Comment on lines
73
to
80
| export enum PayRateTypeUkr { | ||
| Classes = 'Заняття', | ||
| Month = 'Місяць', | ||
| Day = 'День', | ||
| Year = 'Рік', | ||
| Hour = 'Година', | ||
| Course = 'Курс', | ||
| AllPeriod = 'Увесь період' |
There was a problem hiding this comment.
move this enum to the ukr folder (we store all Ukrainians values in the separate folder)
src/app/shared/enum/provider.ts
Outdated
Comment on lines
63
to
80
| export enum PayRateType { | ||
| Classes, | ||
| Month, | ||
| Day, | ||
| Year, | ||
| Hour, | ||
| Course, | ||
| AllPeriod | ||
| } | ||
|
|
||
| export enum PayRateTypeUkr { | ||
| Classes = 'Заняття', | ||
| Month = 'Місяць', | ||
| Day = 'День', | ||
| Year = 'Рік', | ||
| Hour = 'Година', | ||
| Course = 'Курс', | ||
| AllPeriod = 'Увесь період' |
There was a problem hiding this comment.
move out from provider.ts because the payment does not relate to the provider, create a separate enum
| @@ -23,6 +24,7 @@ import { AppState } from 'src/app/shared/store/app.state'; | |||
| }) | |||
| export class ActionsComponent implements OnInit, OnDestroy { | |||
| readonly Role: typeof Role = Role; | |||
| readonly PayRateTypeUkr = PayRateTypeUkr; | |||
| [max]="validationConstants.MAX_PRICE"> | ||
| </mat-radio-button> | ||
| <p class="step-text">грн за</p> | ||
| <div fxLayout='row' fxLayoutAlign="space-between center" > |
There was a problem hiding this comment.
use double quotes in the html (it is a good practice for the future, the single quotes usually are used only in ts file, double - in HTML). if you see such problems in other places (even if it is not your code) - please fix it
src/app/shared/enum/provider.ts
Outdated
Comment on lines
63
to
71
| export enum PayRateType { | ||
| Classes, | ||
| Month, | ||
| Day, | ||
| Year, | ||
| Hour, | ||
| Course, | ||
| AllPeriod | ||
| } |
| @@ -13,6 +14,7 @@ import { Workshop } from 'src/app/shared/models/workshop.model'; | |||
| export class WorkshopAboutComponent { | |||
| readonly workingDays = WorkingDays; | |||
| readonly workingDaysReverse = WorkingDaysReverse; | |||
| readonly PayRateTypeUkr = PayRateTypeUkr; | |||
| }else{ | ||
| this.setPriceControlValue(); | ||
| this.AboutFormGroup.get('payRate').reset(); | ||
| this.AboutFormGroup.get('payRate')['disable']({emitEvent : true}); |
There was a problem hiding this comment.
save please the previous logic, revret this change. Your functionality is handled by setPriceControlValue function
litvinets
approved these changes
Jul 7, 2022
| @@ -107,7 +107,7 @@ export class WorkshopSectionItem extends SectionItem { | |||
| export interface WorkshopCard { | |||
| address: Address; | |||
| directionId: number; | |||
| isPerMonth: boolean; | |||
| payRate: string; | |||
Comment on lines
140
to
142
|
|
||
|
|
||
|
|
Comment on lines
135
to
138
| <app-validation-hint | ||
| [validationFormControl]="AboutFormGroup.get('payRate')" | ||
| [isTouched]="AboutFormGroup.get('payRate').touched"> | ||
| </app-validation-hint> |
| @@ -3,7 +3,15 @@ | |||
| @import "src/app/shared/styles/dropdown.scss"; | |||
| @import "src/app/shared/styles/toggle-button.scss"; | |||
|
|
|||
| .pay-type{ | |||
| flex-grow: 1; | |||
| @@ -113,6 +129,7 @@ export class CreateAboutFormComponent implements OnInit, OnDestroy { | |||
| if(this.workshop.price){ | |||
| this.priceRadioBtn.setValue(true, { emitEvent: false }); | |||
| this.setPriceControlValue(this.workshop.price, 'enable', false); | |||
| this.AboutFormGroup.get('payRate').setValue(this.workshop.payRate, {emitEvent : false}); | |||
| @@ -77,7 +80,7 @@ export class CreateAboutFormComponent implements OnInit, OnDestroy { | |||
| /** | |||
| * This method makes input enable if radiobutton value is true and sets the value to teh formgroup | |||
| */ | |||
| private onPriceCtrlInit(): void { | |||
| private onPriceCtrlInit(): void { | |||
Comment on lines
136
to
137
| [validationFormControl]="AboutFormGroup.get('payRate')" | ||
| [isTouched]="AboutFormGroup.get('payRate').touched"> |
| <div fxLayout='row' fxLayoutAlign='start center'> | ||
| <div fxLayout="row" fxLayoutAlign="start"> | ||
| <div fxLayout="column" fxLayoutAlign="start start"> | ||
| <div fxLayout="row "fxLayoutAlign="start center"> |
| </div> | ||
| </form> | ||
|
|
|
Fixed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow the link: ita-social-projects/OoS-Backend#663