[elvystrac] r1739 - * check bug, update styles in list of reports
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Mon, 15 Feb 2010 23:28:45 +0100
Author: JirkaM
Date: 2010-02-15 23:28:45 +0100 (Mon, 15 Feb 2010)
New Revision: 1739
Added:
trunk/server/webServer2/WebContent/secured/reportrel/reportResultEmpty.xhtml
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/ReportBean.java
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/secured/reportrel/reportResult.xhtml
trunk/server/webServer2/WebContent/styles/reportrel/report.css
Log:
* check bug, update styles in list of reports
modified webServer2/JavaSource/cz/elvys/webServer/beans/ReportBean.java
modified
webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
modified
webServer2/SpringSource/cz/elvys/webServer/toSpring/report/ReportCTRLImpl.java
modified webServer2/WebContent/secured/reportrel/reportResult.xhtml
added webServer2/WebContent/secured/reportrel/reportResultEmpty.xhtml
modified webServer2/WebContent/styles/reportrel/report.css
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/ReportBean.java
===================================================================
--- trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/ReportBean.java
2010-02-15 18:59:31 UTC (rev 1738)
+++ trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/ReportBean.java
2010-02-15 22:28:45 UTC (rev 1739)
@@ -100,6 +100,10 @@
this.dateToUnix = this.dateTo.getTime() / 1000;
this.reports = ctrl.getReports();
+
+ if(this.reports.size()==0){
+ return "showReportResultEmpty";
+ }
} catch (Exception e) {
String message = UNABLE_PREPARE;
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-15 18:59:31 UTC (rev 1738)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
2010-02-15 22:28:45 UTC (rev 1739)
@@ -431,9 +431,9 @@
report.filter.date.from=Od
report.filter.date.to=Do
report.filter.name=N\u00E1zev
-report.filter.documentsAll=V\u0161echny dokumenty
+report.filter.documentsAll=Vyberte dokumenty
report.filter.documentsSelected=Vybran\u00E9 dokumenty
-report.filter.elvysAll=V\u0161echny kisoky
+report.filter.elvysAll=Vyberte kisoky
report.filter.elvysSelected=Vybran\u00E9 kiosky
report.filter.title=V\u00FDb\u011Br kiosk\u016F a dokument\u016F pro report
@@ -457,4 +457,6 @@
report.result.position=Pozice
report.result.lessThenMinute=m\u00E9n\u011B ne\u017E minuta
report.result.didntShow=nevystaven
-report.result.noShowTitle=Seznam nezobrazen\u00FDch polo\u017Eek
\ No newline at end of file
+report.result.noShowTitle=Seznam nezobrazen\u00FDch polo\u017Eek
+report.result.emptyResult=Litujeme, ale pro zobrazen\u00ED report\u016F je
nutn\u00E9 vybrat dokumenty a kiosky
+report.result.emptyResultLink=P\u0159ej\u00EDt na filtr pro zobrazen\u00ED
reportu
\ No newline at end of file
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-15 18:59:31 UTC (rev 1738)
+++
trunk/server/webServer2/SpringSource/cz/elvys/webServer/toSpring/report/ReportCTRLImpl.java
2010-02-15 22:28:45 UTC (rev 1739)
@@ -214,6 +214,7 @@
this.dateTo = to;
if(to == null || (to.compareTo(dateTo) > 0)) {
this.dateTo = dateTo;
+ to = this.dateTo;
}
this.xFrom = 0;
this.xTo = 0;
Modified:
trunk/server/webServer2/WebContent/secured/reportrel/reportResult.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/secured/reportrel/reportResult.xhtml
2010-02-15 18:59:31 UTC (rev 1738)
+++ trunk/server/webServer2/WebContent/secured/reportrel/reportResult.xhtml
2010-02-15 22:28:45 UTC (rev 1739)
@@ -149,12 +149,13 @@
<h:panelGrid>
<ui:repeat id="report"
value="#{reportBean.reports}" var="report">
<div class="reportContent">
- <rich:separator
styleClass="separatorReport"/>
+ <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)" />
<div id="#{report.id}"
class="reportDocumentDetail">
<ui:repeat id="reportItem"
value="#{report.reportItems}" var="reportItem">
+ <div
class="reportItemContent">
<h:outputText
value="#{reportItem.name}" class="reportDocumentHeader" />
<rich:separator
styleClass="separator"/>
@@ -195,7 +196,7 @@
<h:form>
<rich:dataTable value="#{reportItem.dateRanges}" var="dateRange"
width="900px" columnClasses="center" rows="40"
reRender="ds"
-
style="text-align:center;width:80%;margin:30px;">
+
style="text-align:center;width:80%;margin:5px;">
<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>
@@ -247,13 +248,13 @@
</h:form>
</div>
</div>
+ </div>
</ui:repeat>
- <h:outputText
value="#{lbl['report.result.noShowTitle']}:"
rendered="#{report.reportEmptyItemsSize > 0}"/>
-
+ <h:outputText
value="#{lbl['report.result.noShowTitle']}:"
rendered="#{report.reportEmptyItemsSize > 0}"/><br/>
<ui:repeat id="reportItemEmpty"
value="#{report.reportEmptyItems}" var="reportItem">
- #{reportItem.name}<br/>
+ #{reportItem.name},
</ui:repeat>
</div>
Added:
trunk/server/webServer2/WebContent/secured/reportrel/reportResultEmpty.xhtml
===================================================================
---
trunk/server/webServer2/WebContent/secured/reportrel/reportResultEmpty.xhtml
(rev 0)
+++
trunk/server/webServer2/WebContent/secured/reportrel/reportResultEmpty.xhtml
2010-02-15 22:28:45 UTC (rev 1739)
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml";
+ xmlns:h="http://java.sun.com/jsf/html";
+ xmlns:f="http://java.sun.com/jsf/core";
+ xmlns:ui="http://java.sun.com/jsf/facelets";
+ xmlns:a4j="http://richfaces.org/a4j";
+ xmlns:rich="http://richfaces.org/rich";>
+<ui:composition template="/template/elvys-template.xhtml">
+
+ <ui:define name="contentSubTitle"></ui:define>
+
+ <ui:define name="contentBody">
+ <rich:panel styleClass="reportPanel">
+ <f:facet
name="header">#{lbl['report.result.emptyResult']}</f:facet>
+ <h:form class="formButton">
+ <h:commandLink
value="#{lbl['report.result.emptyResultLink']}"
+
action="#{reportBean.prepareReportFilter}">
+ </h:commandLink>
+ </h:form>
+ </rich:panel>
+ </ui:define>
+</ui:composition>
+
+</html>
+
Modified: trunk/server/webServer2/WebContent/styles/reportrel/report.css
===================================================================
--- trunk/server/webServer2/WebContent/styles/reportrel/report.css
2010-02-15 18:59:31 UTC (rev 1738)
+++ trunk/server/webServer2/WebContent/styles/reportrel/report.css
2010-02-15 22:28:45 UTC (rev 1739)
@@ -45,6 +45,10 @@
margin-top:10px;
}
+div.reportDocumentDetail table {
+ margin:5px;
+ }
+
div.reportDocumentDetailContent {
margin-left:10px;
margin-top:10px;
@@ -76,7 +80,7 @@
margin-top:10px;
margin-bottom:10px;
padding:5px;
-
+ padding-top:30px;
}
div.reportItemDetail {
@@ -87,6 +91,7 @@
div.showDocumentDetail {
margin-top:0px;
+ margin-bottom:0px;
}
img.showImagePiece {
@@ -114,8 +119,15 @@
div.separatorReport {
margin-left:0px;
width:920px;
+ background-image:none;
+ height:2px;
+ background-color:#000000;
}
+div.reportItemContent {
+ margin-bottom:30px;
+ }
+
.headerSelected {
color:red;
margin:0px;
@@ -126,4 +138,10 @@
margin:0px;
left:3%;
width:950px;
+}
+
+form.formButton a {
+ text-align:center;
+ font-size:14px;
+ font-weight:bold;
}
\ No newline at end of file
Other related posts:
- » [elvystrac] r1739 - * check bug, update styles in list of reports - elvys
