Research/LaTeX-proposal
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

making tasks cancelable, updating the strep, so that it has canceled tasks and deliverables

Browse Source
This commit is contained in:
Michael Kohlhase 2017-09-23 15:04:53 +02:00
parent fdc5fa0292
commit cec3eb9303
10 changed files with 56 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/pdata.sty
View File

@ -126,6 +126,8 @@
\wa@ref3{person}\@p{personaltitle}~\wa@ref3{person}\@p{name}\hfill}}
\def\@dmp#1{\ifkeys\marginpar{#1}\fi}
\renewcommand\euro{\officialeuro\xspace}
\endinput
%%
%% End of file `pdata.sty'.

2
base/proposal.cls
View File

@ -36,6 +36,8 @@
\ProcessOptions
\LoadClass[a4paper,twoside]{\proposal@class}
\RequirePackage{proposal}
\endinput
%%
%% End of file `proposal.cls'.

9
base/proposal.dtx
View File

@ -1347,6 +1347,8 @@
\define@key{task}{partners}{\def\task@partners{#1}}
\define@key{task}{PM}{\def\task@PM{#1}}
\define@key{task}{issue}{\def\task@issue{#1}}
\define@key{task}{status}{\def\task@status{#1}}
\def\@@status@canceled{canceled}
\def\task@set#1{\edef\task@id{task\thetask@all}
\def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}\def\task@PM{}\def\task@title{}
\setkeys{task}{#1}}
@ -1374,9 +1376,10 @@
\newenvironment{task}[1][]%
{\stepcounter{alltasks}%
\@task{#1}%
\ifx\task@status\@@status@canceled\color{lightgray}\fi
\item[\pdata@target{task}{\taskin\task@id\wp@id}%
{\ifwork@areas\task@label\thewa\thewp\thetask@wp\else\task@label\thewp\thetask@wp\fi}]%
\ifx\task@title\@empty\else\textbf\task@title\fi\task@post@title@space%
\textbf\task@title\task@post@title@space%
% \end{macrocode}
% now we decode and show the work phases on the task, if they have been specified.
% \begin{macrocode}
@ -1586,6 +1589,9 @@
\@ifundefined{deliv@short}
{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{short}{#2}}
{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{short}{\deliv@short}}
% \end{macrocode}
% and now the error messages
% \begin{macrocode}
\@ifundefined{deliv@nature}
{\protect\G@refundefinedtrue\@latex@warning{key 'nature' for Deliv \wpg@id undefined}}
{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{nature}{\deliv@nature}}
@ -1603,7 +1609,6 @@
% Then we iterate over the due dates and generate an entry for teach of them in the
% |*.deliverables| file; but only if the status is not |canceled|.
% \begin{macrocode}
\def\@@status@canceled{canceled}
\ifx\deliv@status\@@status@canceled\else
\@ifundefined{deliv@due}{}{%
\@for\@I:=\deliv@due\do{\protected@write\wpg@delivs{}{\string\deliverable%

BIN
base/proposal.pdf
View File

Binary file not shown.

17
base/proposal.sty
View File

@ -316,6 +316,8 @@
\define@key{task}{partners}{\def\task@partners{#1}}
\define@key{task}{PM}{\def\task@PM{#1}}
\define@key{task}{issue}{\def\task@issue{#1}}
\define@key{task}{status}{\def\task@status{#1}}
\def\@@status@canceled{canceled}
\def\task@set#1{\edef\task@id{task\thetask@all}
\def\task@wphases{0-0}\def\task@partners{}\def\task@lead{}\def\task@PM{}\def\task@title{}
\setkeys{task}{#1}}
@ -327,9 +329,10 @@
\newenvironment{task}[1][]%
{\stepcounter{alltasks}%
\@task{#1}%
\ifx\task@status\@@status@canceled\color{lightgray}\fi
\item[\pdata@target{task}{\taskin\task@id\wp@id}%
{\ifwork@areas\task@label\thewa\thewp\thetask@wp\else\task@label\thewp\thetask@wp\fi}]%
\ifx\task@title\@empty\else\textbf\task@title\fi\task@post@title@space%
\textbf\task@title\task@post@title@space%
\def\@initial{0-0}%
\ifx\task@wphases\@initial\else%
\let\@@sep=\relax\@for\@I:=\task@wphases%
@ -455,6 +458,7 @@
\@ifundefined{deliv@issue}{}{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{issue}{\deliv@issue}}
\@ifundefined{deliv@status}{}{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{status}{\deliv@status}}
\@ifundefined{deliv@blog}{}{\pdata@def{deliv}{\taskin\deliv@id\wpg@id}{blog}{\deliv@blog}}
\ifx\deliv@status\@@status@canceled\else
\@ifundefined{deliv@due}{}{%
\@for\@I:=\deliv@due\do{\protected@write\wpg@delivs{}{\string\deliverable%
{\ifnum\@I<10 0\@I\else\@I\fi}% sort key
@ -465,7 +469,10 @@
{\@ifundefined{deliv@nature}{??}{\deliv@nature}}% nature
{#2}
{\ifx\@type\@wp{WP\ifwork@areas\thewa.\fi\thewp}\else{WA\thewa}\fi}%WP
{\@ifundefined{deliv@lead}{??}{\string\site{\deliv@lead}}}}}}% lead
{\@ifundefined{deliv@lead}{??}{\string\site{\deliv@lead}}}}}% lead
}%deliv@due defined
\fi% status != canceled
{\ifx\deliv@status\@@status@canceled\color{lightgray}\fi
\item[\current@label\ (%
\delivs@legend@due: \@ifundefined{deliv@due}{??}{\deliv@due},
\delivs@legend@nature: \@ifundefined{deliv@nature}{??}{\deliv@nature},
@ -482,7 +489,9 @@
\expandafter\ifx\csname\@I delivs\endcsname\relax% Check that the miles@delivs is empty
{\expandafter\xdef\csname\@I delivs\endcsname{\wpg@id @\deliv@id}}% if so, skip the separator
\else\expandafter\xdef\csname\@I delivs\endcsname%if not add it
{\csname\@I delivs\endcsname\d@sep\wpg@id @\deliv@id}\fi}}}
{\csname\@I delivs\endcsname\d@sep\wpg@id @\deliv@id}\fi}}%
}% end gray color
}
\newenvironment{wadeliv}[2][]{\ifdelivs\wpg@deliv{#1}{#2}{wa}\else\deliv@error\fi}{}
\newenvironment{wpdeliv}[2][]{\ifdelivs\wpg@deliv{#1}{#2}{wp}\else\deliv@error\fi}{}
\newcommand\milestone@label[1]{M{#1}}
@ -1060,6 +1069,8 @@ joint&\multicolumn{\the@site}{l|}{\jpub $\hat=$ publication, \jpro $\hat=$ proje
\iftoggle{bbx:url}
{\usebibmacro{url+urldate}}
{}}
\endinput
%%
%% End of file `proposal.sty'.

2
base/reporting.cls
View File

@ -62,6 +62,8 @@
\end{center}
\setcounter{tocdepth}{2}\tableofcontents\newpage\setcounter{page}{1}}
{}
\endinput
%%
%% End of file `reporting.cls'.

BIN
eu/examples/strep/propB.pdf
View File

Binary file not shown.

2
eu/examples/strep/propB.tex
View File

@ -55,7 +55,7 @@
\end{proposal}
\end{document}
%%% Local pVariables:
%%% Local Variables:
%%% mode: LaTeX
%%% TeX-master: t
%%% End:

30
eu/examples/strep/wp-management.tex
View File

@ -1,6 +1,6 @@
\begin{workpackage}[id=management,type=MGT,wphases=0-24!.2,
title=Project Management,short=Management,
jacuRM=2,barRM=2,efoRM=2,bazRM=2]
jacuRM=2,barRM=2,efoRM=2,bazRM=2,lead=jacu]
We can state the state of the art and similar things before the summary in the boxes
here.
\wpheadertable
@ -23,16 +23,32 @@ here.
project management will\ldots we can even reference deliverables:
\delivref{management}{report2} and even the variant with a title:
\delivtref{management}{report2}
\begin{tasklist}
\begin{task}
To perform the administrative, scientific/technical, and financial management of the
project
\end{task}
\begin{task}
To co-ordinate the contacts with the EU
\end{task}
\begin{task}
To control quality and timing of project results and to resolve conflicts
\end{task}
\begin{task}[status=canceled]
To set up inter-project communication rules and mechanisms
\end{task}
\end{tasklist}
\end{wpdescription}
\begin{wpdelivs}
\begin{wpdeliv}[due=1,id=mailing,nature=O,dissem=PP,miles=kickoff,]
\begin{wpdeliv}[due=1,id=mailing,nature=O,dissem=PP,miles=kickoff,lead=jacu]
{Project-internal mailing lists}
\end{wpdeliv}
\begin{wpdeliv}[due=3,id=handbook,nature=R,dissem=PU,miles=consensus]
\begin{wpdeliv}[due=3,id=handbook,nature=R,dissem=PU,miles=consensus,lead=jacu]
{Project management handbook}
\end{wpdeliv}
\begin{wpdeliv}[due=44,id=worldpeace,nature=R,dissem=PU,miles=consensus,status=canceled]
\begin{wpdeliv}[due=44,id=worldpeace,nature=R,dissem=PU,status=canceled,lead=jacu]
{Plan to save the world}
\end{wpdeliv}
\begin{wpdeliv}[due={6,12,18,24,30,36,42,48},id=report2,nature=R,dissem=public,miles={consensus,final}]
@ -42,13 +58,13 @@ here.
Commission. Financial reporting is mainly done in months 18 and 36.\Ednote{how about
these numbers?}
\end{wpdeliv}
\begin{wpdeliv}[due=6,id=helpdesk,dissem=PU,nature=O,miles=kickoff]
\begin{wpdeliv}[due=6,id=helpdesk,dissem=PU,nature=O,miles=kickoff,lead=jacu]
{{\pn} Helpdesk}
\end{wpdeliv}
\begin{wpdeliv}[due=36,id=report6,nature=R,dissem=PU,miles=final]
\begin{wpdeliv}[due=36,id=report6,nature=R,dissem=PU,miles=final,lead=jacu]
{Final plan for using and disseminating the knowledge}
\end{wpdeliv}
\begin{wpdeliv}[due=48,id=report7,nature=R,dissem=PU,miles=final]
\begin{wpdeliv}[due=48,id=report7,nature=R,dissem=PU,miles=final,lead=jacu]
{Final management report}
\end{wpdeliv}
\end{wpdelivs}

10
eu/examples/strep/wp-temple.tex
View File

@ -14,19 +14,19 @@ here.
\end{wpdescription}
\begin{wpdelivs}
\begin{wpdeliv}[due=6,id=req,nature=R,dissem=PP,miles=kickoff]
\begin{wpdeliv}[due=6,id=req,nature=R,dissem=PP,miles=kickoff,lead=bar]
{Requirements analysis}
\end{wpdeliv}
\begin{wpdeliv}[due=12,id=spec,nature=R,dissem=PU,miles=consensus]
\begin{wpdeliv}[due=12,id=spec,nature=R,dissem=PU,miles=consensus,lead=baz]
{{\pn} Specification }
\end{wpdeliv}
\begin{wpdeliv}[due=18,id=demonstrator,nature=D,dissem=PU,miles={consensus,final}]
\begin{wpdeliv}[due=18,id=demonstrator,nature=D,dissem=PU,miles={consensus,final},lead=bar]
{First demonstrator ({\tt{article.cls}} really)}
\end{wpdeliv}
\begin{wpdeliv}[due=24,id=proto,nature=P,dissem=PU,miles=final]
\begin{wpdeliv}[due=24,id=proto,nature=P,dissem=PU,miles=final,lead=baz]
{First prototype}
\end{wpdeliv}
\begin{wpdeliv}[due=36,id=release,nature=P,dissem=PU,miles=final]
\begin{wpdeliv}[due=36,id=release,nature=P,dissem=PU,miles=final,lead=bar]
{Final Template, ready for release}
\end{wpdeliv}
\end{wpdelivs}