Added Support for weekend shifts and fixed the night shift bug