diff --git a/regolith/builders/activitylogbuilder.py b/regolith/builders/activitylogbuilder.py index 54e1fa8a7..3a0759240 100644 --- a/regolith/builders/activitylogbuilder.py +++ b/regolith/builders/activitylogbuilder.py @@ -160,7 +160,7 @@ def latex(self): # current and pending ######### pi = fuzzy_retrieval( - self.gtx["people"], ["aka", "name"], group["pi_name"] + self.gtx["people"], ["_id", "aka", "name"], build_target ) pinames = pi["name"].split() piinitialslist = [i[0] for i in pinames] @@ -477,4 +477,4 @@ def latex(self): licenses=licenses, hindex=hindex, ) - self.pdf("billinge-ann-report") + self.pdf(f"{pi['_id']}-ann-report.tex") diff --git a/regolith/builders/appraisalbuilder.py b/regolith/builders/appraisalbuilder.py index 12c027f36..b22b4d85f 100644 --- a/regolith/builders/appraisalbuilder.py +++ b/regolith/builders/appraisalbuilder.py @@ -342,10 +342,10 @@ def latex(self): ######################### # render ######################### - # "C:/Users/simon/scratch/billinge-ann-report.tex", + # "C:/Users/simon/scratch/sbillinge-ann-report.tex", self.render( "columbia_annual_report.tex", - "billinge-ann-report.tex", + "sbillinge-ann-report.tex", pi=pi, p=me, projects=projs, diff --git a/regolith/schemas.py b/regolith/schemas.py index 185ce2df2..f59eb2ff2 100644 --- a/regolith/schemas.py +++ b/regolith/schemas.py @@ -1377,7 +1377,7 @@ "teaching": [ { "course": 'MSAE-3010: Introduction to Materials Science', - "courseid": "f17-3010", + "courseid": "f16-3010", "description": "This course is an introduction to nuclear " "physics.", "enrollment": 18, "evaluation": { @@ -1431,7 +1431,7 @@ }, { "course": 'MSAE-3010: Introduction to Materials Science', - "courseid": "s17-3010", + "courseid": "s18-3010", "description": "This course is an introduction to nuclear " "physics.", "enrollment": 18, "evaluation": { @@ -1485,7 +1485,7 @@ }, { "course": 'MSAE-3010: Introduction to Materials Science', - "courseid": "s17-3010", + "courseid": "s19-3010", "description": "This course is an introduction to nuclear " "physics.", "enrollment": 18, "month": "Jan", @@ -1501,20 +1501,6 @@ "courseid": "f18-3010", "description": "This course is an introduction to nuclear " "physics.", "enrollment": 18, - "evaluation": { - "response_rate": 58.33, - "amount_learned": 4.57, - "appropriateness_workload": 4.29, - "fairness_grading": 4.57, - "course_overall": 4.43, - "organization": 4.0, - "classroom_delivery": 4.29, - "approachability": 4.86, - "instructor_overall": 4.43, - "comments": [ - "Great teacher but disorganized", - "Wears pink pants. Why?", - ]}, "month": "August", "organization": "Columbia University", "position": "professor", diff --git a/regolith/templates/columbia_annual_report.tex b/regolith/templates/columbia_annual_report.tex index ce0126534..d61a1f958 100644 --- a/regolith/templates/columbia_annual_report.tex +++ b/regolith/templates/columbia_annual_report.tex @@ -510,10 +510,11 @@ \subsection*{Spring {{p["begin_period"][-4:]}} } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \resheading{ Courses taught in {{ p["begin_period"][-4:] }} - {{ p["end_period"][-4:]}}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection*{Fall {{p["begin_period"][-4:]}} } \begin{itemize}[label=$-$] {% for c in p['teaching'] %} - {% if c['year'] >= p["begin_period"][-4:]|int and c['semester'] == 'Fall' %} - \item {\bf Fall {{c["year"]}}: {{latex_safe(c['course'])-}} }\\ + {% if c['year'] == p["begin_period"][-4:]|int and c['semester'] == 'Fall' %} + \item {\bf {{latex_safe(c['course'])-}} }\\ {% if 'none' not in c['courseid'] %} Enrollment: {{ latex_safe(c['enrollment']|string) }} \\ {% if c.get('evaluation')%} @@ -525,12 +526,11 @@ \subsection*{Spring {{p["begin_period"][-4:]}} } {% endif %} {%endfor%} \end{itemize} +\subsection*{Spring {{p["end_period"][-4:]}} } \begin{itemize}[label=$-$] - {% set itemcount = 0 %} {% for c in p['teaching'] %} - {% if c['year'] <= p["end_period"][4:]|int and c['semester'] == 'Spring' %} - {% set itemcount = itemcount + 1 %} - \item {\bf Spring {{c["year"]}}: {{latex_safe(c['course'])-}} }\\ + {% if c['year'] == p["end_period"][-4:]|int and c['semester'] == 'Spring' %} + \item {\bf {{latex_safe(c['course'])-}} }\\ {%- if 'none' not in c['courseid'] -%} Enrollment: {{ latex_safe(c['enrollment']|string) }} \\ {%- if c.get('evaluation')-%} @@ -541,8 +541,6 @@ \subsection*{Spring {{p["begin_period"][-4:]}} } {%- endif-%}{%-endif-%} {%- endif -%} {%endfor%} - {%-if itemcount == 0-%} - \item See Below {%- endif %} \end{itemize} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \resheading{ Courses expected to teach in {{ p["end_period"][-4:] }} to {{ p["post_end_period"][-4:]}}} diff --git a/tests/outputs/annual-activity/sbillinge-ann-report.tex b/tests/outputs/annual-activity/sbillinge-ann-report.tex new file mode 100644 index 000000000..b377835d8 --- /dev/null +++ b/tests/outputs/annual-activity/sbillinge-ann-report.tex @@ -0,0 +1,514 @@ +% (c) 2002 Matthew Boedicker (original author) +% http://mboedick.org +% (c) 2003-2007 David J. Grant http://www.davidgrant.ca +% (c) 2008 Nathaniel Johnston +% http://www.nathanieljohnston.com +% +% This work is licensed under the Creative Commons Attribution-Noncommercial-Share +% Alike 2.5 License. To view a copy of this license, visit +% http://creativecommons.org/licenses/by-nc-sa/2.5/ or send a letter to Creative +% Commons, 543 Howard Street, 5th Floor, San Francisco, California, 94105, USA. + +\documentclass[letterpaper,11pt]{article} +\newlength{\outerbordwidth} +\pagestyle{empty} +\raggedbottom +\raggedright +\usepackage[svgnames]{xcolor} +\usepackage{framed, array} +\usepackage{tocloft} +\usepackage[backend=bibtex,maxnames=99]{biblatex} +\usepackage{hyperref} +\usepackage{times} +\usepackage{enumitem} +\usepackage[utf8]{inputenc} +\setlist{nosep} % or \setlist{noitemsep} to leave space around whole list + +%----------------------------------------------------------- +% Hyperlink setup +\hypersetup{ + colorlinks=true, % false: boxed links; true: colored links + linkcolor=gray, % color of internal links + citecolor=green, % color of links to bibliography + filecolor=magenta, % color of file links + urlcolor=gray % color of external links +} + +%----------------------------------------------------------- +%Edit these values as you see fit + +% Width of border outside of title bars +\setlength{\outerbordwidth}{3pt} +% Outer background color of title bars (0 = black, 1 = white) +\definecolor{shadecolor}{gray}{0.75} +% Inner background color of title bars +\definecolor{shadecolorB}{gray}{0.93} + + +%----------------------------------------------------------- +%Margin setup + +\setlength{\evensidemargin}{-0.25in} +\setlength{\headheight}{0in} +\setlength{\headsep}{0in} +\setlength{\oddsidemargin}{-0.25in} +\setlength{\paperheight}{11in} +\setlength{\paperwidth}{8.5in} +\setlength{\tabcolsep}{0in} +\setlength{\textheight}{9.5in} +\setlength{\textwidth}{7in} +\setlength{\topmargin}{-0.3in} +\setlength{\topskip}{0in} +\setlength{\voffset}{0.1in} + + +%----------------------------------------------------------- +%Custom commands +\newcommand{\resitem}[1]{\item #1 \vspace{-2pt}} +\newcommand{\resheading}[1]{\vspace{8pt} + \parbox{\textwidth}{\setlength{\fboxsep}{\outerbordwidth} + \begin{shaded} + \setlength{\fboxsep}{0pt}\framebox[\textwidth][l]{\setlength{\fboxsep}{4pt}\fcolorbox{shadecolorB}{shadecolorB}{\textbf{\sffamily{\mbox{~}\makebox[6.762in][l]{\large #1} \vphantom{p\^{E}}}}}} + \end{shaded} + }\vspace{-5pt} +} + +\newcommand{\ressubheadingshort}[3]{ + \begin{center} + \begin{tabular*}{6.5in}{l@{\extracolsep{\fill}}r} + \multicolumn{2}{c}{\textbf{#1} \cftdotfill{\cftdotsep} #2} \\ + \textit{#3} & \\ + \vphantom{E} + \end{tabular*} + \end{center} + \vspace{-24pt} +} + +\newcommand{\ressubheading}[4]{ + \begin{center} + \begin{tabular*}{6.5in}{l@{\extracolsep{\fill}}r} + \multicolumn{2}{c}{\textbf{#1} \cftdotfill{\cftdotsep} #2} \\ + \multicolumn{2}{c}{\textit{#3} \cftdotfill{\cftdotsep} \textit{#4}} \\ + \vphantom{E} + \end{tabular*} + \end{center} + \vspace{-24pt} +} + +\newcommand{\ressubheadingitems}[5]{ + \begin{center} + \begin{tabular*}{6.5in}{l@{\extracolsep{\fill}}r} + \multicolumn{2}{c}{\textbf{#1} \cftdotfill{\cftdotsep} #2} \\ + \multicolumn{2}{p{6.5in}}{\textit{#3} \cftdotfill{\cftdotsep} \textit{#4}} \\ + \vphantom{E} + \end{tabular*} + \end{center} + \vspace{-32pt} + \begin{itemize}[label=$-$]\renewcommand{\labelitemi}{} + \item\begin{itemize}[label=$-$] + #5 + \end{itemize} + \end{itemize} +} + +\newcommand{\wideitem}[1]{\ \ \ \textemdash\ \ \ #1\par} +%----------------------------------------------------------- + + +% Bibliography +%\bibliography{sbillinge}{} +%\bibliographystyle{nsf_simon} +\addbibresource{sbillinge} +\begin{document} + + +\begin{tabular*}{7in}{l@{\extracolsep{\fill}}r} +\textbf{\Large Dr. Simon J. L. Billinge} & \textbf{\today} \\ +% & sb2896@columbia.edu \\ +% & \\ +\end{tabular*} +\\ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{Highlights from the period from 04/01/2017 to 03/31/2018} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Major research focus area(s) and current projects.} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection*{Research Focus Areas} +\begin{itemize}[label=$-$] + +\item software applied to materials engineering and life + +\end{itemize} + +%\subsection*{Current Projects} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Current and Pending grants and declined proposals in this period} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\vskip 14pt + + +\vskip 14pt + + +\vskip 14pt + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Invited, key and plenary talks in the period from 04/01/2017 to 03/31/2018} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection*{Key Presentations (Award, Plenary or Keynote)} + +None + +\subsection*{Invited Talks} + +None + + +\subsection*{Seminars and Colloquia} + +None + + +\subsection*{Declined Invitations} + +None + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Honors and awards in the period from 04/01/2017 to 03/31/2018} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + None + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Publications in journals in the period from 04/01/2017 to 03/31/2018} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + None + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Publications in peer reviewed conferences in the period from 04/01/2017 to 03/31/2018} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + None + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Other published material in the period from 04/01/2017 to 03/31/2018} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + None + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Patents (appeared, granted, submitted) in the period from + 04/01/2017 to 03/31/2018 } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\textbf{Active Patents} + + None + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Open source tools in the period from 04/01/2017 to 03/31/2018 } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Technology transfer, licensing, startups in the period from 04/01/2017 to 03/31/2018} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\textbf{License Distributions} + + None + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Key metrics or mechanisms to assess impact} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\textbf{ Metrics:} + + \begin{itemize}[label=$-$] + + \item publications(quality, quantity) + \item invite talks + \item funding + \item citations + \end{itemize} +\textbf{ h-index:} + \begin{itemize}[label=$-$] + \item h = 65 +(since = 1991, total citations = 17890)\\ +h-last five years = 43 +(since = 2014, total citations = 8817)\\ +pulled: May/12/2019\\ +Google Scholar profile URL: \url{https://scholar.google.com/citations?user=dRm8f}\\ + \end{itemize} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Courses taught in 2016 - 2017 } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection*{Fall 2016 } +\begin{itemize}[label=$-$] + +\item {\bf MSAE-3010: Introduction to Materials Science}\\ + Enrollment: 18 \\ + + Course overall evaluation score: 4.43\\ + Instructor overall evaluation score: 4.43\\ + Selected student comment: + \begin{itemize}[label=$-$]\item Great teacher but disorganized\end{itemize} + + +\end{itemize} + + +\subsection*{Spring 2017 } +\begin{itemize}[label=$-$] + + + + + \item {\bf MSAE-3010: Introduction to Materials Science}\\ + + Enrollment: 18 \\ + + Course overall evaluation score: 4.43\\ + Instructor overall evaluation score: 4.43\\ + Selected student comment: + \begin{itemize}[label=$-$]\item Great teacher but disorganized\end{itemize} + + + + + + + + + + + + + +\end{itemize} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Courses taught in 2017 - 2018} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection*{Fall 2017 } +\begin{itemize}[label=$-$] + + + + + + + \item {\bf MSAE-3010: Introduction to Materials Science}\\ + + Enrollment: 18 \\ + + Course overall evaluation score: 4.43\\ + Instructor overall evaluation score: 4.43\\ + Selected student comment: + \begin{itemize}[label=$-$]\item Great teacher but disorganized\end{itemize} + +\end{itemize} + +\subsection*{Spring 2018 } + +\begin{itemize}[label=$-$] + + \item {\bf MSAE-3010: Introduction to Materials Science}\\Enrollment: 18 \\Course overall evaluation score: 4.43\\ + Instructor overall evaluation score: 4.43\\ + Selected student comment: + \begin{itemize}[label=$-$]\item Great teacher but disorganized\end{itemize} + + +\end{itemize} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Courses expected to teach in 2018 to 2019} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection*{Fall 2018 } +\begin{itemize}[label=$-$] + +\item {\bf MSAE-3010: Introduction to Materials Science}\\ + \end{itemize} +\subsection*{Spring 2019 } +\begin{itemize}[label=$-$] + +\item {\bf MSAE-3010: Introduction to Materials Science}\\ + + + + +\end{itemize} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Current undergraduate advising } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + None + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Current MS advising } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + None + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Graduate and Postgraduate advising} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection*{ Primarily advised Ph.D. students who graduated in the past 5 years } + + None + +\subsection*{ Primarily advised Ph.D. students with dissertations in progress } + + None + +\subsection*{ Other (examination committees, GSAS, CUMC advising etc.) } + PhD defense committees:\\ + \begin{itemize}[label=$-$] + \item PhD defense for Same Old (Materials Science)\\ + \end{itemize} + +\subsection*{ Postdoctoral researchers and research scientists supported on grants} + + None + +\subsection*{ Self-funded visitors contributing to research} + + None + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Activities for developing and improving curriculum, teaching materials and methodologies} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + \begin{itemize}[label=$-$] + + + \item course development\\ Developed a new course for Materials Science + + \end{itemize} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Service to the Department in the period from 04/01/2017 to 03/31/2018} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + \begin{itemize}[label=$-$] + + + \item Applied Physics program committee\\ + + + \end{itemize} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Service to the School or University in the period from 04/01/2017 to 03/31/2018} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + \begin{itemize}[label=$-$] + + + \item Ad hoc tenure committee + + + \end{itemize} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Service to the profession in the period from 04/01/2017 to 03/31/2018} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + \begin{itemize}[label=$-$] + + + \item Master of Ceremonies and Organizer Brown University "Chemistry: Believe it or Not" public chemistry demonstration + \item Co-organizer JUAMI\\ {\it co-organizer } + \begin{itemize}[label=$-$] + \item great way to meet people + \end{itemize} + \item Reviewed 2 funding proposals for national agencies this period + \item Reviewed 1 manuscripts for peer reviewed journals this period + + \end{itemize} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Outreach to communities in the period from 04/01/2017 to 03/31/2018} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + None + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Laboratory space I currently utilize to conduct research} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + \begin{itemize}[label=$-$] + + + \item I don't have one + + \end{itemize} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Shared laboratory space I currently utilize to conduct research} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + None + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Other resources utilized in the Department, School and University } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + \begin{itemize}[label=$-$] + + + \item Shared {Habanero} compute cluster + + \end{itemize} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Additional resources and enhancements that would have a large impact on research} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + \begin{itemize}[label=$-$] + + + \item Shared access to wet lab + + \end{itemize} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Resources utilized for teaching } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + \begin{itemize}[label=$-$] + + + \item Courseworks2 + + \end{itemize} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Additional resources and enhancements that would have a large impact on teaching} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + \begin{itemize}[label=$-$] + + + \item nothing right now + + \end{itemize} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\resheading{ Additional activities or Information } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + None + + +\end{document} + + + + +\end{document} diff --git a/tests/outputs/annual-activity/sbillinge.bib b/tests/outputs/annual-activity/sbillinge.bib new file mode 100644 index 000000000..e69de29bb diff --git a/tests/test_builders.py b/tests/test_builders.py index 724f70443..1d1e03f8e 100644 --- a/tests/test_builders.py +++ b/tests/test_builders.py @@ -13,7 +13,7 @@ builder_map = [ "cv", "review-prop", -# "annual-activity", + "annual-activity", "beamplan", # "current-pending", "figure",