[elvystrac] r1793 - * repair bugs in report
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Fri, 19 Feb 2010 15:10:17 +0100
Author: JirkaM
Date: 2010-02-19 15:10:16 +0100 (Fri, 19 Feb 2010)
New Revision: 1793
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
trunk/server/webServer2/SpringSource/cz/elvys/webServer/toSpring/report/ReportCTRLImpl.java
trunk/server/webServer2/WebContent/images/icons/minus_.gif
trunk/server/webServer2/WebContent/secured/reportrel/reportFilter.xhtml
trunk/server/webServer2/WebContent/secured/reportrel/reportResult.xhtml
trunk/server/webServer2/WebContent/styles/reportrel/report.css
Log:
* repair bugs in report
modified JavaSource/cz/elvys/webServer/messages/labels_cs.properties
modified SpringSource/cz/elvys/webServer/toSpring/report/ReportCTRLImpl.java
modified WebContent/images/icons/minus_.gif
modified WebContent/secured/reportrel/reportFilter.xhtml
modified WebContent/secured/reportrel/reportResult.xhtml
modified WebContent/styles/reportrel/report.css
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
2010-02-19 12:16:42 UTC (rev 1792)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
2010-02-19 14:10:16 UTC (rev 1793)
@@ -457,7 +457,7 @@
report.filter.name=N\u00E1zev
report.filter.documentsAll=Vyberte dokumenty
report.filter.documentsSelected=Vybran\u00E9 dokumenty
-report.filter.elvysAll=Vyberte kisoky
+report.filter.elvysAll=Vyberte kiosky
report.filter.elvysSelected=Vybran\u00E9 kiosky
report.filter.title=V\u00FDb\u011Br kiosk\u016F a dokument\u016F pro report
Modified:
trunk/server/webServer2/SpringSource/cz/elvys/webServer/toSpring/report/ReportCTRLImpl.java
===================================================================
---
trunk/server/webServer2/SpringSource/cz/elvys/webServer/toSpring/report/ReportCTRLImpl.java
2010-02-19 12:16:42 UTC (rev 1792)
+++
trunk/server/webServer2/SpringSource/cz/elvys/webServer/toSpring/report/ReportCTRLImpl.java
2010-02-19 14:10:16 UTC (rev 1793)
@@ -20,6 +20,7 @@
import cz.elvys.webServer.beans.user.UserLoginBean;
import cz.elvys.webServer.db.InitSessionFactory;
import cz.elvys.webServer.utils.faces.BeanManager;
+import cz.elvys.webServer.utils.faces.MessageUtils;
import elvys.server.bl.Fact;
import elvys.server.bl.file.FileManagerBL;
@@ -218,13 +219,13 @@
}
this.xFrom = 0;
this.xTo = 0;
+
+ this.dateFromS = convertDate(this.dateFrom, "dd.MM.yyyy
HH:mm:ss");
+ this.dateToS = convertDate(this.dateTo, "dd.MM.yyyy
HH:mm:ss");
- this.dateFromS = convertDate(from, "dd.MM.yyyy
HH:mm:ss");
- this.dateToS = convertDate(to, "dd.MM.yyyy HH:mm:ss");
+ this.dateFromUnix = this.dateFrom.getTime()/1000;
+ this.dateToUnix = this.dateTo.getTime()/1000;
- this.dateFromUnix = from.getTime()/1000;
- this.dateToUnix = to.getTime()/1000;
-
}
public void setxRanges(Date dateFrom, Date dateTo, int xSize) {
@@ -553,7 +554,7 @@
// we have finished time range, set only hours
this.dateFrom = new Date(this.dateFrom.getTime() -
(this.dateFrom.getTime() % (60 * 60 * 1000)));
- this.dateTo = new Date(this.dateTo.getTime() -
(this.dateTo.getTime() % (60 * 60 * 1000))+(60 * 60 * 1000));
+ this.dateTo = new Date(this.dateTo.getTime() -
(this.dateTo.getTime() % (60 * 60 * 1000)));
}
@@ -707,13 +708,13 @@
// convert to string in day, hour, minute
totalTimeLong = totalTimeLong/1000; // now is time in seconds
- if(totalTimeLong == 0){
- return BeanManager.getLabel("report.result.didntShow");
+ if(totalTimeLong == 0){
+ return MessageUtils.getLabel("report.result.didntShow");
}
// we have time less than one minute
if(totalTimeLong < 60){
- return
BeanManager.getLabel("report.result.lessThenMinute");
+ return
MessageUtils.getLabel("report.result.lessThenMinute");
}
day = (int) (totalTimeLong / (24*60*60));
Modified: trunk/server/webServer2/WebContent/images/icons/minus_.gif
===================================================================
(Binary files differ)
Modified:
trunk/server/webServer2/WebContent/secured/reportrel/reportFilter.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/secured/reportrel/reportFilter.xhtml
2010-02-19 12:16:42 UTC (rev 1792)
+++ trunk/server/webServer2/WebContent/secured/reportrel/reportFilter.xhtml
2010-02-19 14:10:16 UTC (rev 1793)
@@ -52,7 +52,7 @@
<h:panelGrid class="reportFilter" columns="6"
columnClasses="all,button,choice,choice,button,all" id="filterPanel">
<rich:extendedDataTable
value="#{reportBean.files}"
var="file" id="tableFiles"
height="310px" rows="10" width="240px;"
-
selection="#{reportBean.selectionFiles}" selectionMode="multi"
+
selection="#{reportBean.selectionFiles}" selectionMode="multi"
noDataLabel="#{lbl['list.empty']}"
enableContextMenu="false">
<f:facet name="header">
@@ -88,7 +88,7 @@
<rich:extendedDataTable
value="#{reportBean.filesSelected}"
var="file"
id="tableFilesChoice" height="310px" rows="10" width="150px;"
-
selection="#{reportBean.selectionChoiceFiles}" selectionMode="multi"
+
selection="#{reportBean.selectionChoiceFiles}" selectionMode="multi"
noDataLabel="#{lbl['list.empty']}"
enableContextMenu="false">
<rich:column width="152px">
@@ -106,7 +106,7 @@
<rich:extendedDataTable
value="#{reportBean.elvysesSelected}"
var="elvys"
id="tableElvysChoice" height="310px" rows="10" width="150px;"
-
selection="#{reportBean.selectionChoiceElvyses}" selectionMode="multi"
+
selection="#{reportBean.selectionChoiceElvyses}" selectionMode="multi"
noDataLabel="#{lbl['list.empty']}"
enableContextMenu="false">
<rich:column width="152px">
@@ -132,7 +132,7 @@
<rich:extendedDataTable
value="#{reportBean.elvyses}"
var="elvys" id="tableElvys"
height="310px" rows="10" width="240px;"
-
selection="#{reportBean.selectionElvyses}" selectionMode="multi"
+
selection="#{reportBean.selectionElvyses}" selectionMode="multi"
noDataLabel="#{lbl['list.empty']}"
enableContextMenu="false">
<f:facet name="header">
Modified:
trunk/server/webServer2/WebContent/secured/reportrel/reportResult.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/secured/reportrel/reportResult.xhtml
2010-02-19 12:16:42 UTC (rev 1792)
+++ trunk/server/webServer2/WebContent/secured/reportrel/reportResult.xhtml
2010-02-19 14:10:16 UTC (rev 1793)
@@ -151,9 +151,9 @@
<div class="reportContent">
<div class="separatorReport"></div>
<h:outputText value="#{report.name}"
class="reportElvys"/>
- <h:graphicImage class="reportElvys"
url="/images/icons/minus_.gif" onclick="showDocuments('#{report.id}',this)" />
+ <h:graphicImage class="reportElvys"
url="/images/icons/minus_.gif"
onclick="showDocuments('detail#{report.id}',this)" />
- <div id="#{report.id}"
class="reportDocumentDetail">
+ <div id="detail#{report.id}"
class="reportDocumentDetail">
<ui:repeat id="reportItem"
value="#{report.reportItems}" var="reportItem">
<div
class="reportItemContent">
<h:outputText
value="#{reportItem.name}" class="reportDocumentHeader" />
@@ -196,7 +196,8 @@
<h:form>
<rich:dataTable value="#{reportItem.dateRanges}" var="dateRange"
width="900px" columnClasses="center" rows="40"
reRender="ds"
-
style="text-align:center;width:80%;margin:5px;">
+
style="text-align:center;width:80%;margin:5px;"
+
noDataLabel="#{lbl['list.empty']}" >
<f:facet name="header">
<h:outputText value="#{report.name} -
#{reportItem.name} - #{lbl['report.result.date.from']}
#{reportBean.dateFromString} #{lbl['report.result.date.to']}
#{reportBean.dateToString}" />
</f:facet>
Modified: trunk/server/webServer2/WebContent/styles/reportrel/report.css
===================================================================
--- trunk/server/webServer2/WebContent/styles/reportrel/report.css
2010-02-19 12:16:42 UTC (rev 1792)
+++ trunk/server/webServer2/WebContent/styles/reportrel/report.css
2010-02-19 14:10:16 UTC (rev 1793)
@@ -80,7 +80,7 @@
margin-top:10px;
margin-bottom:10px;
padding:5px;
- padding-top:30px;
+ padding-top:5px;
}
div.reportItemDetail {
Other related posts:
- » [elvystrac] r1793 - * repair bugs in report - elvys
