Merge pull request #145 from lsst-dm/u/womullan/fixtrackgin

tracking now picked up properly
lsst-dm · Mar 28, 2024 · 380ed2b · 380ed2b
2 parents cd818df + 50fe08f
commit 380ed2b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/data/pmcs/202403-ME.xls b/data/pmcs/202403-ME.xls
diff --git a/milestones/celeb.py b/milestones/celeb.py
@@ -286,7 +286,10 @@ def generate_doc(args, milestones):
                 get_pmcs_path_months(args.pmcs_data, months), args.local_data
             )
 
-    milestones = [ms for ms in milestones if ms.milestone_tracking]
+    for m in milestones:
+        if m.milestone_tracking == "Y":
+            print(f"Track='{m.milestone_tracking}'", m.code, m.name, m.completed)
+    milestones = [ms for ms in milestones if ms.milestone_tracking == "Y"]
 
     milestones = sorted(milestones, key=lambda ms: ms.fdue)
 

diff --git a/milestones/excel.py b/milestones/excel.py
@@ -132,6 +132,11 @@ def extract_task_details(task_sheet, load_tasks):
         celebrate = fetcher(
             "actv_code_celebratory_achievements_id", task_sheet.row(rownum)
         )
+        milestone_tracking = ""
+        if "actv_code_milestone_tracking_id" in fetcher._hdr:
+            milestone_tracking = fetcher(
+                "actv_code_milestone_tracking_id", task_sheet.row(rownum)
+            )
         summarychart = fetcher("actv_code_summary_chart_id", task_sheet.row(rownum))
 
         milestones.append(
@@ -146,6 +151,7 @@ def extract_task_details(task_sheet, load_tasks):
                 start,
                 completed,
                 celebrate,
+                milestone_tracking,
                 summarychart,
             )
         )