feat: cv and resume now differentiate current and past projects (#1228)

* feat: cv and resume now differentiate current and past projects

* news

* fix: reinstate TEMPLATE.rst

* prettier news

news/current-projects.rst

@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* CV and resume now differentiates current and past projects.
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>

src/regolith/builders/cvbuilder.py

@@ -77,7 +77,9 @@ def latex(self):
             for t in teach:
                 t["position"] = t.get("position").title()
 
-            projs = filter_projects(all_docs_from_collection(rc.client, "projects"), names)
+            current_projects = filter_projects(all_docs_from_collection(rc.client, "projects"), names, active=True)
+            past_projects = filter_projects(all_docs_from_collection(rc.client, "projects"), names, active=False)
+            projs = current_projects + past_projects
             for proj in projs:
                 for member in proj.get("team", []):
                     member.get("role", "").replace("pi", "PI")
@@ -168,7 +170,8 @@ def latex(self):
                 presentations=presentations,
                 sentencecase=sentencecase,
                 monthstyle=month_fullnames,
-                projects=projs,
+                current_projects=current_projects,
+                past_projects=past_projects,
                 pi_grants=pi_grants,
                 pi_amount=pi_amount,
                 coi_grants=coi_grants,

src/regolith/builders/resumebuilder.py

@@ -59,7 +59,8 @@ def latex(self):
             emp.sort(key=ene_date_key, reverse=True)
             edu = p.get("education", [])
             edu.sort(key=ene_date_key, reverse=True)
-            projs = filter_projects(all_docs_from_collection(rc.client, "projects"), names)
+            current_projects = filter_projects(all_docs_from_collection(rc.client, "projects"), names, active=True)
+            past_projects = filter_projects(all_docs_from_collection(rc.client, "projects"), names, active=False)
             grants = list(all_docs_from_collection(rc.client, "grants"))
             proposals = list(all_docs_from_collection(rc.client, "proposals"))
             grants = merge_collections_superior(proposals, grants, "proposal_id")
@@ -77,7 +78,8 @@ def latex(self):
                 bibfile=bibfile,
                 education=edu,
                 employment=emp,
-                projects=projs,
+                current_projects=current_projects,
+                past_projects=past_projects,
                 pi_grants=pi_grants,
                 pi_amount=pi_amount,
                 coi_grants=coi_grants,

src/regolith/exemplars.json

@@ -1816,6 +1816,7 @@
     "projects": {
         "_id": "Cyclus",
         "name": "Cyclus",
+        "active": true,
         "description": "Agent-Based Nuclear Fuel Cycle Simulator",
         "group": "ergs",
         "highlights": [

src/regolith/templates/cv.tex

@@ -211,11 +211,35 @@ \subsection*{Research Focus Areas}
 \end{itemize}
 {% endif %}
 
-{% if len(projects) > 0 %}
+{% if len(current_projects) > 0 %}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\resheading{Projects}
+\resheading{Current Projects}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{% for proj in projects %}
+{% for proj in current_projects %}
+{% set me = proj['team'][0] %}
+\ressubheadingitemslongtitle{ {{-proj['name']-}} }
+    { {{-me['position']-}} }
+    { {{-proj['description']-}} }
+    { {{-month_and_year(me.get('begin_month'), me.get('begin_year'))}} -
+      {{month_and_year(me.get('end_month'), me.get('end_year'))-}} }
+    {
+      {% for o in proj['other'] %}
+        \resitem{ {{-latex_safe(o)-}} }
+      {% endfor %}
+      {% if proj['website'] and len(proj['website']) > 0 %}
+      \resitem{Website: \url{ {{-latex_safe(proj['website'], url_check=False)-}} } }
+      {% endif %}
+      }
+\vspace{0.5em}
+{% endfor %}
+{% endif %}
+
+
+{% if len(past_projects) > 0 %}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\resheading{Past Projects}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+{% for proj in past_projects %}
 {% set me = proj['team'][0] %}
 \ressubheadingitemslongtitle{ {{-proj['name']-}} }
     { {{-me['position']-}} }

src/regolith/templates/resume.tex

@@ -198,11 +198,34 @@
 \end{center}\vspace*{-16pt}
 {% endif %}
 
-{% if len(projects) > 0 %}
+{% if len(current_projects) > 0 %}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\resheading{Projects}
+\resheading{Current Projects}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{% for proj in projects %}
+{% for proj in current_projects %}
+{% set me = proj['team'][0] %}
+\ressubheadingitemslongtitle{ {{-proj['name']-}} }
+    { {{-me['position']-}} }
+    { {{-proj['description']-}} }
+    { {{-month_and_year(me.get('begin_month'), me.get('begin_year'))}} -
+      {{month_and_year(me.get('end_month'), me.get('end_year'))-}} }
+    {
+      {% for o in proj['other'] %}
+        \resitem{ {{-latex_safe(o)-}} }
+      {% endfor %}
+      {% if proj['website'] and len(proj['website']) > 0 %}
+      \resitem{Website: \url{ {{-latex_safe(proj['website'], url_check=False)-}} } }
+      {% endif %}
+      }
+\vspace{0.5em}
+{% endfor %}
+{% endif %}
+
+{% if len(past_projects) > 0 %}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\resheading{Past Projects}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+{% for proj in past_projects %}
 {% set me = proj['team'][0] %}
 \ressubheadingitemslongtitle{ {{-proj['name']-}} }
     { {{-me['position']-}} }

src/regolith/tools.py

@@ -226,7 +226,7 @@ def filter_publications(
     return pubs
 
 
-def filter_projects(projects, people, reverse=False, active_only=False, group=None, ptype=None):
+def filter_projects(projects, people, reverse=False, active=True, group=None, ptype=None):
     """Filter projects by the author(s)
 
     Parameters
@@ -243,9 +243,10 @@ def filter_projects(projects, people, reverse=False, active_only=False, group=No
     before : date, optional
         The date before which a highlight must be for a project to be returned,
         defaults to None
-    active_only : bool, optional
-        Only active projects will be returned if True,
-        defaults to False
+    active : bool, optional
+        Only active projects will be returned if True. Only non-active projects
+        will be returned if False.  Run twice with trae and false to get all
+        projects.  defaults to True
     group : str, optional
         Only projects from this group will be returned if specified, otherwise
         projects from all groups will be returned, defaults to None
@@ -259,9 +260,12 @@ def filter_projects(projects, people, reverse=False, active_only=False, group=No
         team_names = set(gets(proj["team"], "name"))
         if len(team_names & people) == 0:
             continue
-        if active_only:
+        if active:
             if not proj.get("active"):
                 continue
+        else:
+            if proj.get("active"):
+                continue
         if group:
             if proj.get("group") != group:
                 continue

tests/outputs/cv/scopatz.tex

@@ -285,7 +285,7 @@ \subsection*{Research Focus Areas}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\resheading{Projects}
+\resheading{Current Projects}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 

tests/outputs/resume/scopatz.tex

@@ -271,7 +271,7 @@
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\resheading{Projects}
+\resheading{Current Projects}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%