Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

191 scenario#2 #780

Merged
merged 3 commits into from
Jan 20, 2022
Merged

191 scenario#2 #780

merged 3 commits into from
Jan 20, 2022

Conversation

perepichai
Copy link
Contributor

the task: ita-social-projects/OoS-Backend#191
Is implemented from scenario#2: "AND approval pop-up appears".

image

@perepichai perepichai closed this Jan 19, 2022
@perepichai perepichai deleted the 191-scenario#2 branch January 19, 2022 10:21
@perepichai perepichai restored the 191-scenario#2 branch January 19, 2022 10:22
@perepichai perepichai reopened this Jan 19, 2022
@perepichai perepichai changed the base branch from main to develop January 19, 2022 10:26
@@ -104,7 +104,7 @@ export class ApplicationsComponent extends CabinetDataComponent implements OnIni
* @param Application event
*/
onReject(application: Application): void {
const applicationUpdate = new ApplicationUpdate(application.id, this.applicationStatus.Rejected);
const applicationUpdate = new ApplicationUpdate(application.id, this.applicationStatus.Rejected, application?.rejectionMessage );
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw same changes in another pr. be ready for conflicts

@perepichai perepichai changed the base branch from develop to 191-scenario#1-part2 January 20, 2022 12:07
@perepichai perepichai merged commit 14f2216 into 191-scenario#1-part2 Jan 20, 2022
@perepichai perepichai deleted the 191-scenario#2 branch January 20, 2022 12:10
perepichai added a commit that referenced this pull request Jan 21, 2022
* feat: add reject modal window component

* feat: add reject reason field

* feat: add textarea to reject modal component

* feat: update onReject method

* feat: update element styles

* feat: add rejection message property

* feat: display rejection message

* feat: add third argument to onReject method

* feat: update onReject method

* feat: small component updates

* feat: fixing test

* feat: add types to arguments

* feat: remove onReject method

* feat: update declaration section

* feat: update indentations

* feat: test experiment

* feat: test experiment

* feat: test experiment

* fix: `Не вказано` is removed

* fix: add red border class if textarea is empty

* fix: update test

* fix: update test

* fix: update test final

* fix: remove wrapper and update disabled state

* fix: remove line

* feat: disable button where necessary

* fix: code improvements

* feat: replace formgroup with formcontrol

* fix: remove formcontrolname

* feat: hide instead of disable

* 191 scenario#2 (#780)

* feat: add props for popup when approve or reject

* feat: display popup when confirm application

Co-authored-by: Dmitry <dmitryy90@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants