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

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

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

Modified Files:
	header.ftl report.ftl 
Log Message:
refatorando e fazendo integração de código

Index: report.ftl
===================================================================
RCS file: /cvsroot/tail/Tail/src/templates/report.ftl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** report.ftl	20 Aug 2007 22:25:40 -0000	1.11
--- report.ftl	20 Aug 2007 22:31:54 -0000	1.12
***************
*** 7,11 ****
  		<th>Date</th>
  		<th>Strategy</th>
! 		<th>${report.criterion.class.simpleName.split("Criterion")[0]}</th>
  		<#list criterions as criterion>
  			<th>${criterion.class.simpleName.split("Criterion")[0]}</th>			
--- 7,11 ----
  		<th>Date</th>
  		<th>Strategy</th>
! 		<th>${report.applyedCriterion.class.simpleName.split("Criterion")[0]}</th>
  		<#list criterions as criterion>
  			<th>${criterion.class.simpleName.split("Criterion")[0]}</th>			
***************
*** 34,38 ****
  		<td class="date">${decision.series.period}</td>
  		<td class="strategy">${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>			
--- 34,38 ----
  		<td class="date">${decision.series.period}</td>
  		<td class="strategy">${decision.strategy.name}</td>
! 		<td>${report.applyedCriterion.calculate(decision.series, decision.trades)}</td>
  		<#list criterions as criterion>
  			<td>${criterion.calculate(decision.series, decision.trades)}</td>			
***************
*** 44,48 ****
  		<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>			
--- 44,48 ----
  		<td>${report.slicer.series.period}</td>
  		<td>-</td>
! 		<td>${report.applyedCriterion.summarize(report.slicer.series, report.decisions)}</td>
  		<#list criterions as criterion>
  			<td>${criterion.summarize(report.slicer.series, report.decisions)}</td>			

Index: header.ftl
===================================================================
RCS file: /cvsroot/tail/Tail/src/templates/header.ftl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** header.ftl	20 Aug 2007 22:25:40 -0000	1.5
--- header.ftl	20 Aug 2007 22:31:54 -0000	1.6
***************
*** 13,15 ****
  <h3><span class="settingsFixed">Slicer:</span><span class="settings">${report.slicer.name} </span>
  <span class="settingsFixed">Strategy: </span> <span class="settings">${report.decisions[0].strategy.class.simpleName}</span> 
! <span class="settingsFixed">Criteria: </span> <span class="settings">${report.criterion.class.simpleName}</span></h3>
\ No newline at end of file
--- 13,15 ----
  <h3><span class="settingsFixed">Slicer:</span><span class="settings">${report.slicer.name} </span>
  <span class="settingsFixed">Strategy: </span> <span class="settings">${report.decisions[0].strategy.class.simpleName}</span> 
! <span class="settingsFixed">Criteria: </span> <span class="settings">${report.applyedCriterion.class.simpleName}</span></h3>
\ No newline at end of file