rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Resolve "Rider optimization improvements" #1430

Open
korina.cordero wants to merge 7 commits from 534-rider-optimization-improvements into master
pull from: 534-rider-optimization-improvements
merge into: rgutierrez:master
Conversation 8 Commits 7 Files changed 9 +1007 -94
korina.cordero commented 2021-01-26 08:25:47 +00:00 (Migrated from gitlab.com)
Copy link

Closes #534

Closes #534
korina.cordero commented 2021-01-27 05:50:00 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 5a69899c - Modify the solver script to take in the number of shifts and the hour shifts as argument. #534

Compare with previous version

added 1 commit <ul><li>5a69899c - Modify the solver script to take in the number of shifts and the hour shifts as argument. #534</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/619/diffs?diff_id=138735081&start_sha=bba9060548f6c8fe0c010a58d28f53bc8fde75ad)
korina.cordero commented 2021-01-27 09:36:39 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>1125020d - Add ShiftSchedule entity and routes. #534</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/619/diffs?diff_id=138782171&start_sha=5a69899c284fea450a1dab7b1d230eff293cbf50)
korina.cordero commented 2021-01-28 08:54:58 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 316ab545 - Add forms for shift schedule. Add saving of shift schedule. #534

Compare with previous version

added 1 commit <ul><li>316ab545 - Add forms for shift schedule. Add saving of shift schedule. #534</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/619/diffs?diff_id=139109565&start_sha=1125020d6f296ea68e63117c59240b202327dce8)
korina.cordero commented 2021-01-28 10:39:38 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>ba5d7d36 - Add update of shift schedule. #534</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/619/diffs?diff_id=139141832&start_sha=316ab545e5610ad64b1967697f13fa057312a5c0)
korina.cordero commented 2021-01-28 10:44:10 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>d07a9461 - Delete swap file. #534</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/619/diffs?diff_id=139143253&start_sha=ba5d7d364d2706a669c200a46b7aaf258b457886)
korina.cordero commented 2021-02-01 03:20:36 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>4e23c725 - Add delete for shift schedule. #534</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/619/diffs?diff_id=139713752&start_sha=d07a9461fb7e24e212e65869af443418666d8f57)
korina.cordero commented 2021-02-01 09:33:33 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • e306b593 - Modify the hours_shift arguments for the script. Populate the hours shift...

Compare with previous version

added 1 commit <ul><li>e306b593 - Modify the hours_shift arguments for the script. Populate the hours shift...</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/619/diffs?diff_id=139767905&start_sha=4e23c725ef08181335fc406246e466e2bbc65ef2)
korina.cordero commented 2021-02-01 09:33:50 +00:00 (Migrated from gitlab.com)
Copy link

marked this merge request as ready

marked this merge request as **ready**
This pull request has changes conflicting with the target branch.
  • config/menu.yaml
  • src/Controller/AnalyticsController.php
  • utils/schedule_solver/solver.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 534-rider-optimization-improvements:534-rider-optimization-improvements
git checkout 534-rider-optimization-improvements

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff 534-rider-optimization-improvements
git checkout 534-rider-optimization-improvements
git rebase master
git checkout master
git merge --ff-only 534-rider-optimization-improvements
git checkout 534-rider-optimization-improvements
git rebase master
git checkout master
git merge --no-ff 534-rider-optimization-improvements
git checkout master
git merge --squash 534-rider-optimization-improvements
git checkout master
git merge --ff-only 534-rider-optimization-improvements
git checkout master
git merge 534-rider-optimization-improvements
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
API

   
AU

Marshall Battery Feature

  
Bug

Bug

  
CRM Enhancements

   
Mobile API

   
Nice to have

   
Phase 2

Local Phase 2

No labels
API
AU
Bug
CRM Enhancements
Mobile API
Nice to have
Phase 2
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: rgutierrez/resq#1430
No description provided.
Delete branch "534-rider-optimization-improvements"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?