[Tail-cvs] Tail/src/templates report.ftl,1.6

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/templates
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18250/src/templates

Modified Files:
	report.ftl 
Log Message:
criada assinatura summarize e implementado o método em todos os critérios

Index: report.ftl
===================================================================
RCS file: /cvsroot/tail/Tail/src/templates/report.ftl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** report.ftl	8 Aug 2007 22:03:28 -0000	1.5
--- report.ftl	9 Aug 2007 15:21:26 -0000	1.6
***************
*** 9,24 ****
  <table>
  	<tr>
  		<td>Period</td>
  		<td>Strategy Used</td>
  		<#list criterions as criterion>
  			<td>${criterion.class.simpleName}</td>			
  		</#list>
  	</tr>
  
  	<#list report.decisions as decision>
  	<tr>
  		<td>${decision.series.period}</td>
  		<td>${decision.strategy.name}</td>
! 
  		<#list criterions as criterion>
  			<td>${criterion.calculate(decision.series, decision.trades)}</td>			
--- 9,36 ----
  <table>
  	<tr>
+ 		<td></td>
  		<td>Period</td>
  		<td>Strategy Used</td>
+ 		<td>Applyed Criterion</td>
  		<#list criterions as criterion>
  			<td>${criterion.class.simpleName}</td>			
  		</#list>
  	</tr>
+ 	<tr>
+ 		<td></td>
+ 		<td>${report.slicer.slice(0).period}</td>
+ 		<td>-</td>
+ 		<td>-</td>
+ 		<#list criterions as criterion>
+ 			<td>-</td>			
+ 		</#list>
+ 	</tr>
  
  	<#list report.decisions as decision>
  	<tr>
+ 		<td></td>
  		<td>${decision.series.period}</td>
  		<td>${decision.strategy.name}</td>
! 		<td>${report.criterion.calculate(decision.series, decision.trades)}</td>
  		<#list criterions as criterion>
  			<td>${criterion.calculate(decision.series, decision.trades)}</td>			
***************
*** 26,29 ****
--- 38,51 ----
  	</tr>
  	</#list>
+ 	<tr>
+ 		<td>Total</td>
+ 		<td>${report.slicer.series.period}</td>
+ 		<td>-</td>
+ 		<td>${report.criterion.summarize(report.slicer.series, report.decisions)}</td>
+ 		<#list criterions as criterion>
+ 			<td>${criterion.summarize(report.slicer.series, report.decisions)}</td>			
+ 		</#list>
+ 	</tr>
+ 	
  </table>