From 716e475056f6fdf5ecd94e432f130bcc29cd071f Mon Sep 17 00:00:00 2001 From: miker Date: Tue, 27 Dec 2005 22:52:57 +0000 Subject: [PATCH] added template name to "manage" section git-svn-id: svn://svn.open-ils.org/ILS/trunk@2541 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/reporter/templates/dashboard.ttk | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/reporter/templates/dashboard.ttk b/Open-ILS/src/reporter/templates/dashboard.ttk index 6cc2233653..361e535251 100644 --- a/Open-ILS/src/reporter/templates/dashboard.ttk +++ b/Open-ILS/src/reporter/templates/dashboard.ttk @@ -18,7 +18,7 @@ SWITCH pagetype; INCLUDE header.ttk title="Reporter Dashboard -- Scheduled Reports"; INCLUDE navbar.ttk + my_scheduled_reports; CASE 'mycompletereports'; - INCLUDE header.ttk title="Reporter Dashboard -- Completed Reports"; + INCLUDE header.ttk title="Reporter Dashboard -- Active Reports"; INCLUDE navbar.ttk + my_completed_reports; CASE 'report_template_tree'; INCLUDE header.ttk title="Reporter Dashboard -- Schedule a report"; @@ -47,7 +47,7 @@ BLOCK summary; END; WRAPPER html/row; INCLUDE html/cell - content=link(content='Completed reports',href='bradboard?detail=mycompletereports') + content=link(content='Active reports',href='bradboard?detail=mycompletereports') align='center' style='border-bottom:1px solid black'; END; @@ -182,15 +182,24 @@ BLOCK show_reports; run = s.execute(rid); WRAPPER html/row; + + tid = report.stage2; + template = templates.$tid; + p = utils.JSON2perl( report.params ); + t = utils.JSON2perl( template.params ); + rtime = report.runtime.chunk(19).0; IF report.disable; rtime = rtime _ '
(Disabled)'; END; + name_link = link(content=p.reportname,href="stage3?id=$rid"); + name_link = t.templatename _ ' :: ' _ name_link; + INCLUDE html/cell content=(report.pub ? 'Y' : 'N') col=bg style='border:solid gray 1px;' align='center'; - INCLUDE html/cell content=link(content=p.reportname,href="stage3?id=$rid") col=bg style='border:solid gray 1px;'; + INCLUDE html/cell content=name_link col=bg style='border:solid gray 1px;'; INCLUDE html/cell nowrap='nowrap' content=report.create_date.chunk(19).0 col=bg style='border:solid gray 1px;'; INCLUDE html/cell nowrap='nowrap' -- 2.43.2