From e4ccf821544e35b724f00cd48416678f9c783ff2 Mon Sep 17 00:00:00 2001 From: Anders Blomdell <anders.blomdell@control.lth.se> Date: Mon, 2 Nov 2020 16:31:29 +0100 Subject: [PATCH] Cleanup vacation stuff --- andersb.vacation | 3 ++- andersn.vacation | 3 +++ gen_includes | 6 ++++-- planning.tjp | 5 +++-- resources.tji | 21 --------------------- 5 files changed, 12 insertions(+), 26 deletions(-) create mode 100644 andersn.vacation delete mode 100644 resources.tji diff --git a/andersb.vacation b/andersb.vacation index e44a576..e0f63a0 100644 --- a/andersb.vacation +++ b/andersb.vacation @@ -1 +1,2 @@ -vacation 2020-12-17 - 2020-12-30 +vacation 2020-12-03 - 2020-12-17 # Kompledigt +vacation 2020-12-17 - 2020-12-31 diff --git a/andersn.vacation b/andersn.vacation new file mode 100644 index 0000000..5afd80f --- /dev/null +++ b/andersn.vacation @@ -0,0 +1,3 @@ +vacation 2020-12-21 - 2020-12-30 +vacation 2021-01-04 - 2021-01-08 +vacation 2021-02-22 - 2021-02-26 diff --git a/gen_includes b/gen_includes index f417363..a4a0647 100755 --- a/gen_includes +++ b/gen_includes @@ -26,8 +26,10 @@ if __name__ == '__main__': user_tasks += vf.read() pass user_tasks += '}\n' - user_tasks += f'task {name} "{full_name}" {{ }}' - user_tasks += f'include "../{name}.planning.tji" {{ taskprefix {name} }}' + user_tasks += f'task {name} "{full_name}" {{ }}\n' + user_tasks += f'include "../{name}.planning.tji" {{\n' + user_tasks += f' taskprefix {name}\n' + user_tasks += f'}}\n' pass with open("generated/planning.auto.tji", "w") as f: diff --git a/planning.tjp b/planning.tjp index 71316af..8e7f58f 100644 --- a/planning.tjp +++ b/planning.tjp @@ -11,8 +11,9 @@ project planning "Planning" 2020-10-18 - 2027-09-11 { workinghours sat,sun off } -leaves holiday "Christmas" 2020-12-24+2d -leaves holiday "New Year" 2020-12-31+2d +leaves holiday "Jul" 2020-12-24 - %{2020-12-26 +24h} +leaves holiday "NyƄr" 2020-12-31 - 2021-01-02 +leaves holiday "Trettondagen" 2021-01-06 # Top level container tasks task milestones "Milestones" {} diff --git a/resources.tji b/resources.tji deleted file mode 100644 index 0311ac6..0000000 --- a/resources.tji +++ /dev/null @@ -1,21 +0,0 @@ -resource _nobody "Nobody" { - # Slowly progressing communal effort - efficiency 0.1 -} - -resource andersb "Anders Blomdell" { - vacation 2020-12-10 - 2020-12-30 -} - -resource andersn "Anders Nilsson" { - vacation 2020-12-21 - 2020-12-30 - vacation 2021-01-04 - 2021-01-08 - vacation 2021-02-22 - 2021-02-26 -} - -resource alexander "Alexander Pisarevskiy" { -} - -resource teachers "Teachers" { -} - -- GitLab