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

feat: add active task confirmation popup #2957

Merged

Conversation

CREDO23
Copy link
Contributor

@CREDO23 CREDO23 commented Aug 26, 2024

Description

This PR fixes #2944

If the user wants to start working on tasks from 'Today's plan', if the selected task on the home page is not part of the Today's plan, the system should suggest the user to CHANGE the selected task (on home page) to a task from Today's plan.

Popup:
'You are about to start working on Today's plan 'task #', but still have active 'Task #' '
(radio buttons below - only one option can be selected)

  • Change to planned default task (on the Home page, select default task from planned popup)
  • Add the task as default to the plan (on the Home page no need to select, continue on the selected task)
  • Add the task AND work in the default task (on the Home page, select default task from planned popup)

Button 'Cancel'
Button 'Start working'

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings

Current status

When the selected task on the home page is part of the Today's plan:
Loom

When the selected task is not part of the Today's plan
loom

@CREDO23 CREDO23 self-assigned this Aug 26, 2024
@CREDO23 CREDO23 marked this pull request as draft August 26, 2024 21:31
@CREDO23 CREDO23 force-pushed the 2944-task-planned--add-confirmation-popup-change-task branch 4 times, most recently from 3e7c387 to 77c904e Compare August 29, 2024 08:39
@CREDO23 CREDO23 marked this pull request as ready for review August 29, 2024 09:10
@CREDO23 CREDO23 requested review from evereq and Cedric921 August 29, 2024 09:10
@CREDO23 CREDO23 force-pushed the 2944-task-planned--add-confirmation-popup-change-task branch from eca29ff to 01887af Compare August 29, 2024 10:22
Base automatically changed from 2942-feature-planned--button-stat-working-on-the-popup to develop September 1, 2024 19:28
@evereq
Copy link
Member

evereq commented Sep 1, 2024

@CREDO23 can you rebase and fix merge conflicts? (important: rebase on top of latest from develop please!)

@CREDO23 CREDO23 linked an issue Sep 1, 2024 that may be closed by this pull request
@evereq
Copy link
Member

evereq commented Sep 2, 2024

@CREDO23 / @Cedric921 I don't understand what's going on with this PR history, but it goes back 2 weeks ago etc. I afraid it contains commits that we ALREADY merged to develop? Can you double check all changes in https://github.com/ever-co/ever-teams/pull/2957/files that none of them already merged to develop branch before!?

@CREDO23 CREDO23 force-pushed the 2944-task-planned--add-confirmation-popup-change-task branch from e8b5c64 to 37bef63 Compare September 4, 2024 08:54
@CREDO23
Copy link
Contributor Author

CREDO23 commented Sep 4, 2024

@Cedric921 / @evereq, I have just fixed the history problem !

@evereq evereq merged commit fa84bdc into develop Sep 4, 2024
12 checks passed
@evereq evereq deleted the 2944-task-planned--add-confirmation-popup-change-task branch September 4, 2024 21:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Task] 'Planned' | add confirmation popup 'Change task'
3 participants