You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/09/30 17:17:28 UTC
svn commit: r700497 - in /ofbiz/trunk/framework:
service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java
webtools/webapp/webtools/tempexpr/tempExprMacros.ftl
webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
Author: adrianc
Date: Tue Sep 30 08:17:28 2008
New Revision: 700497
URL: http://svn.apache.org/viewvc?rev=700497&view=rev
Log:
Temporal Expression UI fixups.
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java
ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java?rev=700497&r1=700496&r2=700497&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java Tue Sep 30 08:17:28 2008
@@ -27,7 +27,6 @@
import java.util.Map;
import java.util.Set;
-import javolution.util.FastList;
import javolution.util.FastSet;
import org.ofbiz.base.util.UtilMisc;
@@ -35,9 +34,6 @@
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
-import org.ofbiz.entity.condition.EntityExpr;
-import org.ofbiz.entity.condition.EntityOperator;
-import org.ofbiz.entity.util.EntityUtil;
/** TemporalExpression UI artifacts worker. */
public class ExpressionUiHelper {
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl?rev=700497&r1=700496&r2=700497&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl Tue Sep 30 08:17:28 2008
@@ -45,23 +45,23 @@
</tr>
</#macro>
-<#macro DayInMonth fieldValue=0>
+<#macro DayInMonth occurrence=0 day=1>
<tr>
<td class="label">${uiLabelMap.TemporalExpressionOccurrence}</td>
<td>
<select name="integer2">
<#list 1..5 as i>
- <option value="${i}"<#if i == fieldValue> selected="selected"</#if>>${i}</option>
+ <option value="${i}"<#if i == occurrence> selected="selected"</#if>>${i}</option>
</#list>
<#list -1..-5 as i>
- <option value="${i}"<#if i == fieldValue> selected="selected"</#if>>${i}</option>
+ <option value="${i}"<#if i == occurrence> selected="selected"</#if>>${i}</option>
</#list>
</select>
</td>
</tr>
<tr>
<td class="label">${uiLabelMap.CommonDay}</td>
- <td><@DayOfWeekField fieldName="integer1" fieldValue=(temporalExpression.integer1)?default(1)/></td>
+ <td><@DayOfWeekField fieldName="integer1" fieldValue=day/></td>
</tr>
</#macro>
@@ -91,7 +91,7 @@
<tr>
<td class="label">${uiLabelMap.CommonFrom}</td>
<td>
- <@DateField formName=formName fieldName="date1" fieldValue=(temporalExpression.date1)?default("")/>
+ <@DateField formName=formName fieldName="date1" fieldValue=fromDate/>
</td>
</tr>
<tr>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl?rev=700497&r1=700496&r2=700497&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl Tue Sep 30 08:17:28 2008
@@ -37,7 +37,7 @@
<#if temporalExpression.tempExprTypeId == "DATE_RANGE">
<@DateRange formName="updateExpression" fromDate=temporalExpression.date1 toDate=temporalExpression.date2/>
<#elseif temporalExpression.tempExprTypeId == "DAY_IN_MONTH">
- <@DayInMonth/>
+ <@DayInMonth occurrence=temporalExpression.integer2 day=temporalExpression.integer1/>
<#elseif temporalExpression.tempExprTypeId == "DAY_OF_MONTH_RANGE">
<@DayOfMonthRange fromDay=temporalExpression.integer1 toDay=temporalExpression.integer2/>
<#elseif temporalExpression.tempExprTypeId == "DAY_OF_WEEK_RANGE">