Skip to content
Snippets Groups Projects
Select Git revision
  • alpha
  • combo
  • front
  • main default protected
  • ugh
5 results
You can move around the graph by using the arrow keys.
Created with Raphaël 2.2.028Mar27262523222120191817161514131211109863227Feb23211716111013Janoops forgot to save a fileMerge remote-tracking branch 'origin/main' into mainadded error checks, something is still weird with the server properties pathnamechanged add employee and fixed gui inconsistenciesMerge remote-tracking branch 'origin/main' into mainfixed bugs in payroll and edit employeeUpdate SchedularApp.batUpload New FileUpload New FileServer/Client property filesCleaned up unnecessary comment.Merge remote-tracking branch 'origin/main' into mainrequests and pickups doneMoved property fileMerge branch 'main' of https://git.cs.usask.ca/esc568/cmpt-370-group-project into mainAdded working properties filerequests and pickups donepaystub donepaystub done,Merge branch 'main' of https://git.cs.usask.ca/esc568/cmpt-370-group-project into maincommitadd time off should workadd time off should workworking on availability / time offadd/view shift position worksfixed some issues on add/remove positionsrefactored removePosition to only take positionpopulate position box worksrooting out bugs, check however the positions box is getting the positionscommented out pickupviewbrokenughughFixed bug that wouldn't add positions, because it was trying to convert a float to an int.pickups added...need testing which I shall do when add shift is doneedit employee done...maybe, add/remove position half??Merge branch 'main' of https://git.cs.usask.ca/esc568/cmpt-370-group-project into maincommitbug fix if avaiability start == endUpload New FileAdded a deprecated tag to old method. Added a check to add and edit shift that sees if there are any conflicts with an approved time off. Added the same checks from add shift to edit shift. Added methods for addShiftIgnore and editShiftIgnore.Changed the startDate and endDate to LocalDate for easier evaluation and integration. Added a conflictsWithTimeOff method that checks if a date conflicts with a time off, note this doesn't check if it's been approved though.