Add packing of workshops

planning.tjp

@@ -20,6 +20,7 @@ task milestones "Milestones" {}
 task robot_lab "Robotics Lab" { }
 task teaching_lab "Teaching Lab" { }
 task servers "Servers & Software" { }
+task various "Various tasks" { }
 task robots "Robots" {
   # Do not start until robotlab is ready
   depends robot_lab.safety_kc_assembly
@@ -30,6 +31,7 @@ include "resources.tji"
 include "robot_lab.tji" { taskprefix robot_lab }
 include "teaching_lab.tji" { taskprefix teaching_lab }
 include "servers.tji" { taskprefix servers }
+include "various.tji" { taskprefix various }
 include "robots/ALL.tji" { taskprefix robots }
 include "milestones.tji" { taskprefix milestones }
 include "report.tji"
\ No newline at end of file

report.tji

@@ -32,7 +32,7 @@ taskreport overview "" {
           name,
           start,
           end,
-          chart { scale quarter width 800 ${TaskTip} }
+          chart { scale quarter width 1200 ${TaskTip} }
 
   timeformat "%Y-%m-%d"
   loadunit shortauto
@@ -52,11 +52,12 @@ macro YearlyOverview [
             name,
             start,
             end,
-            chart { scale week width 800 ${TaskTip} }
+            chart { scale week width 1200 ${TaskTip} }
 
     timeformat "%Y-%m-%d"
     loadunit days
     hideresource @all
+    hidetask ((plan.end < ${1}-01-01) | (%{${1}-01-01 + 1y} < plan.start))
     sorttasks tree
   }
 ]
@@ -66,7 +67,7 @@ resourcereport resources "" {
   headline "Resource Allocation"
   columns no,
           name,
-          quarterly { width 800 ${TaskTip} }
+          quarterly { width 1600 ${TaskTip} }
 
   loadunit shortauto
   # We only like to show leaf tasks for leaf resources.
@@ -80,7 +81,7 @@ macro YearlyResorces [
     period ${1}-01-01 + 1y
     columns no,
             name,
-            weekly { width 1200 ${TaskTip} }
+            weekly { width 1600 ${TaskTip} }
 
     loadunit days
     # We only like to show leaf tasks for leaf resources.

resources.tji

 resource andersb "Anders Blomdell" {
   vacation 2019-12-09 - 2020-01-11
+  vacation 2020-02-07 - 2020-02-10
+  vacation 2020-05-07 - 2020-05-08
+  vacation 2020-06-22 - 2020-07-24
+
+}
+resource andersn "Anders Nilsson" {
+  vacation 2020-03-05 - 2020-03-23
+}
+resource pontusa "Pontus Andersson" {
+  vacation 2020-02-24 - 2020-02-25
+  vacation 2020-04-01 - 2020-12-31
 }
-resource andersn "Anders Nilsson" {}
-resource pontusa "Pontus Andersson" {}
 resource manuel "Manuel Korell" {}
 resource zz_3d_printer "3D printer" {}
 resource zz_3d_printer_mmu "3D printer w MMU" {}

robot_lab.tji

@@ -59,3 +59,9 @@ task l2_safety_assembly "L2 safety assembly" {
   effort 1 m
   allocate manuel
 }
+
+task cleanup_robotlab "Cleanup robotlab" {
+  start 2020-02-01
+  effort 1 m
+  limits { weeklymax 12 h } allocate _nobody
+}
\ No newline at end of file

servers.tji

-task pam_python "Porting pam_python to python3" {
-  depends milestones.kc_general_access
+task move_users "Move users to fay servers" {
+  start 2020-03-02
   effort 3w
+  limits { dailymax 2h } allocate andersb
+}
+
+task pam_python "Porting pam_python to python3" {
+  start 2020-02-17
+  effort 2w
   allocate andersb
+  priority 999
 }
 
 task prepare_fedora32 "Prepare Fedora-32" {
@@ -13,7 +20,7 @@ task prepare_fedora32 "Prepare Fedora-32" {
 task lab_fedora32 "Update lab to Fedora-32" {
   depends !pam_python
   depends !prepare_fedora32
-  end 2020-08-20
+//  end 2020-08-20
   effort 1w
   allocate andersb
 }

teaching_lab.tji

@@ -3,19 +3,21 @@ task cabling "Assemble Cabling" {
   allocate andersb
 }
 
-task connector_boxes "Connector Boxes" {
-  depends milestones.kc_build_access
-  duration 2w
+task connector_boxes "Print Connector Boxes" {
+  start 2020-01-29
+  duration 4w
   allocate zz_3d_printer_mmu
 }
 
-task mount_cabling "Mount Cabling" {
+task mount_cabling "Mount Cabling Teaching lab" {
   depends milestones.kc_build_access
-  effort 3d
+  depends milestones.kc_general_access
+  effort 5d
   allocate andersb
 }
 
 task prepare_packing "Buy and prepare crates" {
+  start 2020-04-01
   effort 5d
   allocate andersb
 }
@@ -31,3 +33,10 @@ task move_processes "Move Processes" {
   depends !pack_processes
   duration 2w
 }
+
+task unpack_processes "Unpack Processes" {
+  depends !move_processes
+  depends milestones.end_of_vt2020
+  effort 3d
+  allocate andersb
+}

various.tji

+task pack_workshop "Pack workshop" {
+  depends milestones.end_of_vt2020,  teaching_lab.pack_processes
+  effort 2w
+  limits { dailymax 4h } allocate andersb
+}
+
+task pack_electronics "Pack electronics workshop" {
+  depends milestones.end_of_vt2020,  teaching_lab.pack_processes
+  effort 2w
+  limits { dailymax 4h } allocate andersb
+}