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

Koushica - Schedule Blue Square Reason - Start Week Confirmation Modal #3022

Open
wants to merge 2 commits into
base: development
Choose a base branch
from

Conversation

CodewithKoushica
Copy link
Contributor

Description

Screenshot 2025-01-07 at 10 53 36 PM

Related PRS (if any):

No related PRs.

Main changes explained:

  • Updated src/components/UserProfile/ScheduleReasonModal/ScheduleReasonModal.jsx file.
  • added a modal to ask for confirmation when scheduling for next week.

How to test:

  1. check into current branch
  2. do npm install and ... to run this PR locally
  3. Clear site data/cache
  4. log as admin user
  5. go to User Profile → Schedule Blue Square Reason
  6. input the Start date to be next week
  7. Check if you are prompted to confirm the Start of the Week

Screenshots or videos of changes:

Before:

before.mov

After:

after.mov

Note:

Try different Sundays:

  • Previous Sunday: It should not allow you to schedule for previous week
  • Current week Sunday: It should continue the flow and let you schedule a Blue Square Reason
  • Next week Sunday: It will prompt you to confirm the correct Sunday.

Please verify in both Light and dark modes

Copy link

netlify bot commented Jan 8, 2025

Deploy Preview for highestgoodnetwork-dev ready!

Name Link
🔨 Latest commit f0c8986
🔍 Latest deploy log https://app.netlify.com/sites/highestgoodnetwork-dev/deploys/6785d9644c9a64000823f16f
😎 Deploy Preview https://deploy-preview-3022--highestgoodnetwork-dev.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link

@srikanthpusthem srikanthpusthem left a comment

Choose a reason for hiding this comment

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

  1. The modal is supposed to be popped up for next and future weeks off, as specified in the requirements, but modal is just popped up for next week sunday off,
image 2. And in case modal being popped up, it should be dismissed from the screen after choose the 2 options provided, but it is still on the screen.
pr3022_Cp.mov

jindaxz
jindaxz previously approved these changes Jan 11, 2025
Copy link

@jindaxz jindaxz left a comment

Choose a reason for hiding this comment

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

ok
image

Copy link

@srikanthpusthem srikanthpusthem left a comment

Choose a reason for hiding this comment

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

  1. The modal is supposed to be popped up for next and future weeks off, as specified in the requirements, but modal is just popped up for next week sunday off,
image
  1. And in case modal being popped up, it should be dismissed from the screen after choosing the 2 options provided, but it is still on the screen.
pr3022_Cp.mov

@CodewithKoushica
Copy link
Contributor Author

  1. The modal is supposed to be popped up for next and future weeks off, as specified in the requirements, but modal is just popped up for next week sunday off,
image 2. And in case modal being popped up, it should be dismissed from the screen after choosing the 2 options provided, but it is still on the screen.

pr3022_Cp.mov

Hello @srikanthpusthem,
Thank you for your suggestions.

  1. This is the expected behavior as per the requirements. The modal is designed to be triggered only for the immediate next week's Sunday and its combinations with future Sundays. For example, if the current Sunday is 01/05/2025, the modal will prompt only if 01/12/2025 is part of the start week.
  2. The issue with the modal not dismissing after confirming has been resolved.

Copy link

@srikanthpusthem srikanthpusthem left a comment

Choose a reason for hiding this comment

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

image image if that is the case the changes are looking good, well done thank you

@wander2ec
Copy link

working fine
3022

Copy link
Contributor

@nikhilgiri0226 nikhilgiri0226 left a comment

Choose a reason for hiding this comment

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

I have tested the PR in both light and dark mode and everything works as expected.
The new modal to confirm the week start was triggered only for the immediate next week's Sunday. For the rest other week not before the current week, it was working as before. Thank you for your work.

User.Profile-.NikhilG.Admin.-.Google.Chrome.2025-01-17.22-13-22.mp4

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.

5 participants