[Getan-commits] [PATCH 15 of 16] Allow to render only projects with entries in templates
Wald Commits
scm-commit at wald.intevation.org
Mon Mar 3 15:00:46 CET 2014
# HG changeset patch
# User Björn Ricks <bjoern.ricks at intevation.de>
# Date 1393855182 -3600
# Node ID 1b190fa274826c790b6503da4c8f58b941383c5b
# Parent 5df363bba5cbe0e53907c6a8a933e719bb750dc8
Allow to render only projects with entries in templates
diff -r 5df363bba5cb -r 1b190fa27482 getan/contrib/getan-eval.py
--- a/getan/contrib/getan-eval.py Mon Mar 03 14:42:43 2014 +0100
+++ b/getan/contrib/getan-eval.py Mon Mar 03 14:59:42 2014 +0100
@@ -27,6 +27,9 @@
parser.add_option("-c", "--lastweek", dest="lastweek",
help="entries of last working week",
action="store_true")
+ parser.add_option("-m", "--empty", dest="empty",
+ help="show projects without an entries",
+ action="store_true")
(options, args) = parser.parse_args()
@@ -41,7 +44,7 @@
print render(database=options.database, user=options.user,
template=template_name, year=year, week=week,
- project=options.project)
+ project=options.project, empty_projects=options.empty)
if __name__ == '__main__':
diff -r 5df363bba5cb -r 1b190fa27482 getan/contrib/zeiterfassung.py
--- a/getan/contrib/zeiterfassung.py Mon Mar 03 14:42:43 2014 +0100
+++ b/getan/contrib/zeiterfassung.py Mon Mar 03 14:59:42 2014 +0100
@@ -91,7 +91,7 @@
sys.stdout = Writer(sys.stdout)
print render(user=user, database=database, week=week, year=year,
- template=template, project=project)
+ template=template, project=project, empty_projects=empty_proj)
if __name__ == '__main__':
diff -r 5df363bba5cb -r 1b190fa27482 getan/template.py
--- a/getan/template.py Mon Mar 03 14:42:43 2014 +0100
+++ b/getan/template.py Mon Mar 03 14:59:42 2014 +0100
@@ -58,7 +58,7 @@
def render(template, database=None, year=None, week=None, project=None,
- user=None):
+ user=None, empty_projects=True):
if not user:
user = os.getenv("USER")
@@ -108,6 +108,9 @@
for project in projects:
project.load_entries(year, u_week)
+ if not empty_projects:
+ projects = [project for project in projects if project.entries]
+
context = dict()
context["project"] = project
context["projects"] = projects
More information about the Getan-commits
mailing list