From 1c039c6d130646c003e565da10556e22f672dd6f Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 18 Jan 2021 12:00:16 +0000 Subject: [PATCH] update previous --- test.py | 10 +++++- trainees.csv | 96 ++++++++++++++++++++++++++-------------------------- 2 files changed, 57 insertions(+), 49 deletions(-) diff --git a/test.py b/test.py index 8aa2131..79b48cd 100644 --- a/test.py +++ b/test.py @@ -200,7 +200,7 @@ else: for row in reader: n = n + 1 - name, site, grade, fte, nwd, end_date, oop, twi, twi_we, night, night_we, extra = row + name, site, grade, fte, nwd, end_date, oop, twi, twi_we, night, night_we, pw1, pw2, extra = row # Ignore trainees if fte == 0 (what are they doing here anyway) if int(fte) < 1: @@ -227,6 +227,14 @@ else: worked = night_we.split(" ")[0] allocated = night_we.split(" ")[1][1:-1] previous_shifts["night_weekend".format(site.lower())] = (worked, allocated) + if pw1: + worked = pw1.split(" ")[0] + allocated = pw1.split(" ")[1][1:-1] + previous_shifts["weekend_plymouth1"] = (worked, allocated) + if pw2: + worked = pw2.split(" ")[0] + allocated = pw2.split(" ")[1][1:-1] + previous_shifts["weekend_plymouth2"] = (worked, allocated) leave_requests = [] diff --git a/trainees.csv b/trainees.csv index 982948a..c257d06 100644 --- a/trainees.csv +++ b/trainees.csv @@ -1,48 +1,48 @@ -Name,Site,Grade,Full time equivalent,Non-working day,End Date,OOP,Twilight,Weekend twilight,Night,Weekend night, -Alex Wood,Exeter,ST2,100,,,,10 (11.05),9 (8.29),8 (7.65),6 (5.74), -Delilah Trimmer,Exeter,ST4,60,Mon/Tue,2021/07/28,2020/09/01-2020/11/13,3 (4.19),6 (3.14),4 (2.90),0 (2.18), -Gana Kugathasan,Exeter,ST5,0,,,,5 (2.82),0 (2.11),0 (1.95),3 (1.46), -Jin Virdi,Exeter,ST5,0,,2021/01/01,,4 (7.05),9 (5.28),8 (4.88),0 (3.66), -Madalina Drumea,Exeter,ST3,100,,,,10 (11.05),9 (8.29),8 (7.65),6 (5.74), -Michal Tomek,Exeter,ST2,80,Wed,,,15 (8.84),0 (6.63),8 (6.12),3 (4.59), -Paul Ward,Exeter,ST3,100,,,,10 (11.05),9 (8.29),8 (7.65),6 (5.74), -Rebecca Murphy,Exeter,ST4,100,,,,10 (11.05),9 (8.29),8 (7.65),6 (5.74), -Salma Aslam,Exeter,ST3,0,,,,3 (6.63),9 (4.97),8 (4.59),0 (3.44),Mat Leave -Sayed Alqarooni,Exeter,ST3,100,,,,10 (11.05),9 (8.29),8 (7.65),6 (5.74), -Tom Davies,Exeter,ST5,100,,,2020/09/01-2021/04/21,0 (0.43),0 (0.32),0 (0.29),0 (0.22), -Tom Welsh,Exeter,ST4,100,,,,10 (11.05),9 (8.29),8 (7.65),6 (5.74), -Wijhdan Abusrewil,Exeter,ST2,100,Mon/Tue,,,14 (7.71),0 (5.79),0 (5.34),9 (4.01), -Alexander Sanchez,Plymouth,ST2,100,,,,,,,, -Amina Odeh,Plymouth,ST3,100,,,,,,,, -George Edwards,Plymouth,ST3,100,,,,,,,, -Hannah Lewis,Plymouth,ST2,100,,,,,,,, -Huub Witt,Plymouth,ST5,100,,2021/05/15,,,,,, -Jean Sukumar,Plymouth,ST3,60,Thu/Fri,,2020/09/01-2021/03/29,,,,, -Jenn Fong,Plymouth,ST3,100,,,,,,,, -Karis McFeely,Plymouth,ST5,100,,,,,,,, -Khalil Madbak,Plymouth,ST4,100,,,,,,,, -Richard Chaytor,Plymouth,ST4,100,,,,,,,, -S Ghauri,Plymouth,ST4,100,Mon/Tue,,,,,,, -Seren Peters,Plymouth,ST2,100,,,,,,,, -Sophie McGlade,Plymouth,ST4,80,Fri,,,,,,, -Alan Eccles,Torquay,ST3,80,Fri,,,10 (8.49),6 (6.37),4 (6.12),6 (4.59), -Charles Finan,Torquay,ST3,100,,,,9 (10.61),9 (7.96),8 (7.65),6 (5.74), -Chong Ng,Torquay,ST3,100,,,,12 (10.61),6 (7.96),8 (7.65),6 (5.74), -Christian Greer,Torquay,ST2,100,,,,9 (10.61),9 (7.96),8 (7.65),6 (5.74), -Harriet Conley,Torquay,ST5,0,,,,,,,, -Jon Skinner,Torquay,ST5,100,,,,12 (10.61),6 (7.96),4 (7.65),9 (5.74), -Matthew Thorley,Torquay,ST3,100,,,,10 (10.61),9 (7.96),8 (7.65),6 (5.74), -Max Ireland,Torquay,ST2,100,,,,12 (10.61),6 (7.96),8 (7.65),6 (5.74), -Mo Babsail,Torquay,ST3,100,,,,9 (10.61),9 (7.96),8 (7.65),6 (5.74), -Neil McIntyre,Torquay,ST4,0,,,,12 (10.61),9 (7.96),4 (7.65),9 (5.74), -Paul Jenkins,Torquay,ST4,100,,,,9 (10.61),9 (7.96),8 (7.65),6 (5.74), -Amoolya Mannava,Truro,ST3,100,,,,13 (11.74),9 (8.80),8 (7.65),3 (5.74), -Chi Leung,Truro,ST3,100,,,,11 (11.74),9 (8.80),8 (7.65),6 (5.74), -Jack Looker,Truro,ST5,100,,,,13 (11.74),9 (8.80),8 (7.65),3 (5.74), -Jenna Millington,Truro,ST3,0,,,,6 (7.04),6 (5.28),8 (4.59),0 (3.44), -Natasha Hougham,Truro,ST4,100,,,,6 (7.04),6 (5.28),8 (4.59),0 (3.44), -Nicolas Dziad,Truro,ST2,100,,,,11 (11.74),9 (8.80),8 (7.65),6 (5.74), -Pete Abernethy,Truro,ST5,0,,,,10 (7.74),3 (5.81),0 (5.05),9 (3.79), -Ross Kruger,Truro,ST4,100,,,,12 (11.74),9 (8.80),4 (7.65),9 (5.74), -Sarath Vennam,Truro,ST3,100,,,,11 (11.74),9 (8.80),8 (7.65),6 (5.74), -Vilim Kalamar,Truro,ST2,100,,,,11 (11.74),9 (8.80),8 (7.65),6 (5.74), \ No newline at end of file +Name,Site,Grade,Full time equivalent,Non-working day,End Date,OOP,Twilight,Weekend twilight,Night,Weekend night,PW1,PW1, +Alex Wood,Exeter,ST2,100,,,,10 (11.05),9 (8.29),8 (7.65),6 (5.74),,, +Delilah Trimmer,Exeter,ST4,60,Mon/Tue,2021/07/28,2020/09/01-2020/11/13,3 (4.19),6 (3.14),4 (2.90),0 (2.18),,, +Gana Kugathasan,Exeter,ST5,0,,,,5 (2.82),0 (2.11),0 (1.95),3 (1.46),,, +Jin Virdi,Exeter,ST5,0,,2021/01/01,,4 (7.05),9 (5.28),8 (4.88),0 (3.66),,, +Madalina Drumea,Exeter,ST3,100,,,,10 (11.05),9 (8.29),8 (7.65),6 (5.74),,, +Michal Tomek,Exeter,ST2,80,Wed,,,15 (8.84),0 (6.63),8 (6.12),3 (4.59),,, +Paul Ward,Exeter,ST3,100,,,,10 (11.05),9 (8.29),8 (7.65),6 (5.74),,, +Rebecca Murphy,Exeter,ST4,100,,,,10 (11.05),9 (8.29),8 (7.65),6 (5.74),,, +Salma Aslam,Exeter,ST3,0,,,,3 (6.63),9 (4.97),8 (4.59),0 (3.44),,,Mat Leave +Sayed Alqarooni,Exeter,ST3,100,,,,10 (11.05),9 (8.29),8 (7.65),6 (5.74),,, +Tom Davies,Exeter,ST5,100,,,2020/09/01-2021/04/21,0 (0.43),0 (0.32),0 (0.29),0 (0.22),,, +Tom Welsh,Exeter,ST4,100,,,,10 (11.05),9 (8.29),8 (7.65),6 (5.74),,, +Wijhdan Abusrewil,Exeter,ST2,100,Mon/Tue,,,14 (7.71),0 (5.79),0 (5.34),9 (4.01),,, +Alexander Sanchez,Plymouth,ST2,100,,,,10 (10.24),,8 (7.65),6 (5.74),2 (4.10),6 (4.10), +Amina Odeh,Plymouth,ST3,100,,,,9 (10.24),,8 (7.65),6 (5.74),4 (4.10),4 (4.10), +George Edwards,Plymouth,ST3,100,,,,10 (10.24),,8 (7.65),6 (5.74),6 (4.10),4 (4.10), +Hannah Lewis,Plymouth,ST2,100,,,,10 (10.24),,8 (7.65),3 (5.74),4 (4.10),4 (4.10), +Huub Witt,Plymouth,ST5,100,,2021/05/15,,10 (10.24),,8 (7.65),6 (5.74),2 (4.10),4 (4.10), +Jean Sukumar,Plymouth,ST3,60,Thu/Fri,,2020/09/01-2021/03/29,0 (1.22),,0 (0.91),0 (0.68),0 (0.49),0 (0.49), +Jenn Fong,Plymouth,ST3,100,,,,9 (10.24),,8 (7.65),3 (5.74),6 (4.10),6 (4.10), +Karis McFeely,Plymouth,ST5,100,,,,10 (10.24),,8 (7.65),3 (5.74),2 (4.10),2 (4.10), +Khalil Madbak,Plymouth,ST4,100,,,,10 (10.24),,8 (7.65),9 (5.74),2 (4.10),6 (4.10), +Richard Chaytor,Plymouth,ST4,100,,,,10 (10.24),,8 (7.65),3 (5.74),2 (4.10),4 (4.10), +S Ghauri,Plymouth,ST4,100,Mon/Tue,,,10 (10.24),,8 (7.65),3 (5.74),6 (4.10),4 (4.10), +Seren Peters,Plymouth,ST2,100,,,,9 (10.24),,8 (7.65),3 (5.74),4 (4.10),6 (4.10), +Sophie McGlade,Plymouth,ST4,80,Fri,,,10 (10.24),,8 (7.65),3 (5.74),2 (4.10),6 (4.10), +Alan Eccles,Torquay,ST3,80,Fri,,,10 (8.49),6 (6.37),4 (6.12),6 (4.59),,, +Charles Finan,Torquay,ST3,100,,,,9 (10.61),9 (7.96),8 (7.65),6 (5.74),,, +Chong Ng,Torquay,ST3,100,,,,12 (10.61),6 (7.96),8 (7.65),6 (5.74),,, +Christian Greer,Torquay,ST2,100,,,,9 (10.61),9 (7.96),8 (7.65),6 (5.74),,, +Harriet Conley,Torquay,ST5,0,,,,,,,,,, +Jon Skinner,Torquay,ST5,100,,,,12 (10.61),6 (7.96),4 (7.65),9 (5.74),,, +Matthew Thorley,Torquay,ST3,100,,,,10 (10.61),9 (7.96),8 (7.65),6 (5.74),,, +Max Ireland,Torquay,ST2,100,,,,12 (10.61),6 (7.96),8 (7.65),6 (5.74),,, +Mo Babsail,Torquay,ST3,100,,,,9 (10.61),9 (7.96),8 (7.65),6 (5.74),,, +Neil McIntyre,Torquay,ST4,0,,,,12 (10.61),9 (7.96),4 (7.65),9 (5.74),,, +Paul Jenkins,Torquay,ST4,100,,,,9 (10.61),9 (7.96),8 (7.65),6 (5.74),,, +Amoolya Mannava,Truro,ST3,100,,,,13 (11.74),9 (8.80),8 (7.65),3 (5.74),,, +Chi Leung,Truro,ST3,100,,,,11 (11.74),9 (8.80),8 (7.65),6 (5.74),,, +Jack Looker,Truro,ST5,100,,,,13 (11.74),9 (8.80),8 (7.65),3 (5.74),,, +Jenna Millington,Truro,ST3,0,,,,6 (7.04),6 (5.28),8 (4.59),0 (3.44),,, +Natasha Hougham,Truro,ST4,100,,,,6 (7.04),6 (5.28),8 (4.59),0 (3.44),,, +Nicolas Dziad,Truro,ST2,100,,,,11 (11.74),9 (8.80),8 (7.65),6 (5.74),,, +Pete Abernethy,Truro,ST5,0,,,,10 (7.74),3 (5.81),0 (5.05),9 (3.79),,, +Ross Kruger,Truro,ST4,100,,,,12 (11.74),9 (8.80),4 (7.65),9 (5.74),,, +Sarath Vennam,Truro,ST3,100,,,,11 (11.74),9 (8.80),8 (7.65),6 (5.74),,, +Vilim Kalamar,Truro,ST2,100,,,,11 (11.74),9 (8.80),8 (7.65),6 (5.74),,,