RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #1151] Fixed layout problems in report "Hours worked by resource in a month"

Browse source 
FEA: ItEr75S04BugFixing
This commit is contained in:
Cristina Alvarino 2011-09-23 10:16:00 +02:00 • committed by Manuel Rego Casasnovas
parent a359014fbe
commit 75ee56c53d
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="hoursWorkedPerWorkerInAMonth" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="hoursWorkedPerWorkerInAMonth" scriptletClass="org.navalplanner.web.reports.HoursWorkedPerWorkerInAMonthScriptlet">
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="hoursWorkedPerWorkerInAMonth" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" resourceBundle="hoursWorkedPerWorkerInAMonth" scriptletClass="org.navalplanner.web.reports.HoursWorkedPerWorkerInAMonthScriptlet">
<reportFont name="FreeSans" isDefault="true" fontName="FreeSans" size="9"/>
<parameter name="showNote" class="java.lang.Boolean"/>
<parameter name="year" class="java.lang.String"/>

2
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth.properties
View file

@ -1,6 +1,6 @@
# Locale for hoursWorkedPerWorkerReport.jrxml
title = Work report
subtitle = Worked hours per worker in a month
subtitle = Worked hours per resource in a month
parameters.year = Year:
parameters.month = Month:
headers.column1 = Code

2
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_en_US.properties
View file

@ -1,6 +1,6 @@
# Locale for hoursWorkedPerWorkerReportInAMonth.jrxml
title = Work report
subtitle = Worked hours per worker in a month
subtitle = Worked hours per resource in a month
parameters.year = Year:
parameters.month = Month:
headers.column1 = Name

2
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_es_ES.properties
View file

@ -1,6 +1,6 @@
# Locale for hoursWorkedPerWorkerInAMonthReport.jrxml
title = Informe de trabajo
subtitle = Horas trabajadas por trabajador en un mes
subtitle = Horas trabajadas por recurso en un mes
parameters.year = Año:
parameters.month = Mes:
headers.column1 = Nombre

2
navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_gl_ES.properties
View file

@ -1,6 +1,6 @@
# Locale for hoursWorkedPerWorkerInAMonthReport.jrxml
title = Informe de traballo
subtitle = Horas traballadas por traballador nun mes
subtitle = Horas traballadas por recurso nun mes
parameters.year = Ano:
parameters.month = Mes:
headers.column1 = Nome

2
navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
View file

@ -331,7 +331,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
topItem(_("Reports"), "/reports/hoursWorkedPerWorkerReport.zul", "",
subItem(_("Work Report Lines"), "/workreports/workReportQuery.zul", "09-partes.html#id4"),
subItem(_("Hours Worked Per Resource"),"/reports/hoursWorkedPerWorkerReport.zul","15-1-report-hours-worked-by-resource.html"),
subItem(_("Hours Worked Per Resource In A Month"),"/reports/hoursWorkedPerWorkerInAMonthReport.zul","15-2-total-hours-by-resource-month.html"),
subItem(_("Total Worked Hours By Resource In A Month"),"/reports/hoursWorkedPerWorkerInAMonthReport.zul","15-2-total-hours-by-resource-month.html"),
subItem(_("Work And Progress Per Project"),"/reports/schedulingProgressPerOrderReport.zul", "15-3-work-progress-per-project.html"),
subItem(_("Work And Progress Per Task"),"/reports/workingProgressPerTaskReport.zul", "15-informes.html"),
subItem(_("Estimated/Planned Hours Per Task"),"/reports/completedEstimatedHoursPerTask.zul", "15-informes.html"),

2
navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul
View file

@ -34,7 +34,7 @@
<window self="@{define(content)}"
apply="org.navalplanner.web.reports.HoursWorkedPerWorkerInAMonthController"
title="${i18n:_('Hours Worked Per Resource In A Month')}"
title="${i18n:_('Total Worked Hours By Resource In A Month')}"
border="normal" >
<!-- Select workers -->