search

McGill-ECSE321-Winter2021 / project-group-09

project-group-09 created by GitHub Classroom
2 stars 6 forks source link

Holidays: View & Delete #191

Closed sandyl289 closed 3 years ago

sandyl289 commented 3 years ago

Branch: viewModifyHolidays Issue: Business tab: View & Delete Holidays (Admin) #168

Fixed delete holidays (Controller/Service)

From BusinessController.java:

image

Implemented Frontend with Tyler's help + (code heavily inspired by Jacek's code) Thanks Tyler and Jacek for helping me to debug!

What will be displayed if there are no holidays:

image

Successful message when deleting a holiday:

image

JDziewonski98 commented 3 years ago

I'm confused why the PR shows so many files that should already be in main as changed lol. Like the login stuff. Do you maybe have some autoformatter that's reformatting those files by accident? Also it has merge conflicts so pls pull main and merge it into your branch

sandyl289 commented 3 years ago

I'm confused why the PR shows so many files that should already be in main as changed lol. Like the login stuff. Do you maybe have some autoformatter that's reformatting those files by accident? Also it has merge conflicts so pls pull main and merge it into your branch

Do you think it's because I merged main to my branch before creating a PR?

sandyl289 commented 3 years ago

I'm confused why the PR shows so many files that should already be in main as changed lol. Like the login stuff. Do you maybe have some autoformatter that's reformatting those files by accident? Also it has merge conflicts so pls pull main and merge it into your branch

I did merge main to my branch and resolve the merge conflicts... It seems like it didn't save? Not sure what happened... I'll merge main to my branch again image