Re: svn commit: r935387 - in /ofbiz/trunk: applications/accounting/data/ applications/party/data/ applications/workeffort/data/ framework/service/data/ framework/service/entitydef/ framework/webtools/webapp/webtools/tempexpr/ framework/webtools/widget/

[Adrian Crum-2]

Bilgin,

Thank you for working on this. It would be better to make the descriptions more like plain English. Instead of "Day of Week Range 1" just have "Sunday", etc. Maybe spend some time constructing a few temporal expressions to help find a balance between plain English and selecting the correct expression.

-Adrian

--- On Sun, 4/18/10, [hidden email] <[hidden email]> wrote:

> From: [hidden email] <[hidden email]>
> Subject: svn commit: r935387 - in /ofbiz/trunk: applications/accounting/data/ applications/party/data/ applications/workeffort/data/ framework/service/data/ framework/service/entitydef/ framework/webtools/webapp/webtools/tempexpr/ framework/webtools/widget/
> To: [hidden email]
> Date: Sunday, April 18, 2010, 11:41 AM
> Author: bibryam
> Date: Sun Apr 18 18:41:20 2010
> New Revision: 935387
>
> URL: http://svn.apache.org/viewvc?rev=935387&view=rev
> Log:
> Added description field to TemporalExpression entity and
> related data plus forms. Part of https://issues.apache.org/jira/browse/OFBIZ-3521
>
> Modified:
>    
> ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
>    
> ofbiz/trunk/applications/party/data/ScheduledJobs.xml
>    
> ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml
>    
> ofbiz/trunk/framework/service/data/ScheduledServices.xml
>    
> ofbiz/trunk/framework/service/data/ServiceDemoData.xml
>    
> ofbiz/trunk/framework/service/entitydef/entitymodel.xml
>    
> ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
>    
> ofbiz/trunk/framework/webtools/widget/tempExprForms.xml
>
> Modified:
> ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=935387&r1=935386&r2=935387&view=diff
> ==============================================================================
> ---
> ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
> (original)
> +++
> ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
> Sun Apr 18 18:41:20 2010
> @@ -190,7 +190,7 @@ under the License.
>  
>      <!-- The following three
> elements set up a regularly scheduled job that will
> automatically create
>          fixed asset
> maintenances from ProductMaint time intervals. -->
> -    <TemporalExpression
> tempExprId="FAM_AUTO_CREATE" tempExprTypeId="FREQUENCY"
> integer1="12" integer2="60"/>
> +    <TemporalExpression
> tempExprId="FAM_AUTO_CREATE" tempExprTypeId="FREQUENCY"
> description="Every Hour" integer1="12" integer2="60"/>
>      <JobSandbox
> jobId="FAM_AUTO_CREATE" jobName="Auto-create Fixed Asset
> Maintenances" runTime="2000-01-01 00:00:00.000"
> serviceName="createMaintsFromTimeInterval" poolId="pool"
> runAsUser="system" tempExprId="FAM_AUTO_CREATE"
> maxRecurrenceCount="-1"/>
>  
>      <!-- Fixed Asset Maintenance
> party roles -->
>
> Modified:
> ofbiz/trunk/applications/party/data/ScheduledJobs.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/ScheduledJobs.xml?rev=935387&r1=935386&r2=935387&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/data/ScheduledJobs.xml
> (original)
> +++ ofbiz/trunk/applications/party/data/ScheduledJobs.xml
> Sun Apr 18 18:41:20 2010
> @@ -21,6 +21,6 @@
>  <!-- This is a recurring job with will check for
> communication events which need to be send as emails.
> -->
>  <entity-engine-xml>
>      <!-- create recurring job to
> check email communication events with the status
> COM_IN_PROGRESS to send these emails.. -->
> -    <TemporalExpression
> tempExprId="SENDEMAIL" tempExprTypeId="FREQUENCY"
> integer1="12" integer2="15"/>
> +    <TemporalExpression
> tempExprId="SENDEMAIL" tempExprTypeId="FREQUENCY"
> description="Every 15 Minutes" integer1="12"
> integer2="15"/>
>      <JobSandbox jobId="SENDEMAIL"
> jobName="Send Email" runTime="2000-01-01 00:00:00.000"
> serviceName="sendEmailDated" poolId="pool"
> runAsUser="system" tempExprId="SENDEMAIL"
> maxRecurrenceCount="-1"/>
>  </entity-engine-xml>
>
> Modified:
> ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml?rev=935387&r1=935386&r2=935387&view=diff
> ==============================================================================
> ---
> ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml
> (original)
> +++
> ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml
> Sun Apr 18 18:41:20 2010
> @@ -19,7 +19,7 @@ under the License.
>  -->
>  <entity-engine-xml>
>      <!-- Recurring calendar event
> demo - set up a staff meeting on the first Monday of each
> month -->
> -    <TemporalExpression
> tempExprId="STAFF_MTG" tempExprTypeId="INTERSECTION"/>
> +    <TemporalExpression
> tempExprId="STAFF_MTG" tempExprTypeId="INTERSECTION"
> description="First Monday of Each Month"/>
>      <TemporalExpressionAssoc
> fromTempExprId="STAFF_MTG"
> toTempExprId="1ST_MONDAY_IN_MONTH"/>
>      <TemporalExpressionAssoc
> fromTempExprId="STAFF_MTG" toTempExprId="MINUTE_00"/>
>      <TemporalExpressionAssoc
> fromTempExprId="STAFF_MTG" toTempExprId="HOUR_10"/>
>
> Modified:
> ofbiz/trunk/framework/service/data/ScheduledServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/data/ScheduledServices.xml?rev=935387&r1=935386&r2=935387&view=diff
> ==============================================================================
> ---
> ofbiz/trunk/framework/service/data/ScheduledServices.xml
> (original)
> +++
> ofbiz/trunk/framework/service/data/ScheduledServices.xml Sun
> Apr 18 18:41:20 2010
> @@ -18,6 +18,6 @@ specific language governing permissions
>  under the License.
>  -->
>  <entity-engine-xml>
> -    <TemporalExpression
> tempExprId="MIDNIGHT_DAILY" tempExprTypeId="FREQUENCY"
> date1="2000-01-01 00:00:00.000" integer1="5"
> integer2="1"/>
> +    <TemporalExpression
> tempExprId="MIDNIGHT_DAILY" tempExprTypeId="FREQUENCY"
> description="Daily Midnight" date1="2000-01-01 00:00:00.000"
> integer1="5" integer2="1"/>
>      <JobSandbox
> jobId="PURGE_OLD_JOBS" jobName="Purge Old Jobs"
> runTime="2000-01-01 00:00:00.000" serviceName="purgeOldJobs"
> poolId="pool" runAsUser="system" tempExprId="MIDNIGHT_DAILY"
> maxRecurrenceCount="-1"/>
>  </entity-engine-xml>
>
> Modified:
> ofbiz/trunk/framework/service/data/ServiceDemoData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/data/ServiceDemoData.xml?rev=935387&r1=935386&r2=935387&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/service/data/ServiceDemoData.xml
> (original)
> +++ ofbiz/trunk/framework/service/data/ServiceDemoData.xml
> Sun Apr 18 18:41:20 2010
> @@ -22,232 +22,232 @@ under the License.
>      <!-- Temporal Expression demo
> data -->
>  
>      <!-- Pre-define all 60 minutes
> -->
> -    <TemporalExpression
> tempExprId="MINUTE_00" tempExprTypeId="MINUTE_RANGE"
> integer1="0" integer2="0"/>
> -    <TemporalExpression
> tempExprId="MINUTE_01" tempExprTypeId="MINUTE_RANGE"
> integer1="1" integer2="1"/>
> -    <TemporalExpression
> tempExprId="MINUTE_02" tempExprTypeId="MINUTE_RANGE"
> integer1="2" integer2="2"/>
> -    <TemporalExpression
> tempExprId="MINUTE_03" tempExprTypeId="MINUTE_RANGE"
> integer1="3" integer2="3"/>
> -    <TemporalExpression
> tempExprId="MINUTE_04" tempExprTypeId="MINUTE_RANGE"
> integer1="4" integer2="4"/>
> -    <TemporalExpression
> tempExprId="MINUTE_05" tempExprTypeId="MINUTE_RANGE"
> integer1="5" integer2="5"/>
> -    <TemporalExpression
> tempExprId="MINUTE_06" tempExprTypeId="MINUTE_RANGE"
> integer1="6" integer2="6"/>
> -    <TemporalExpression
> tempExprId="MINUTE_07" tempExprTypeId="MINUTE_RANGE"
> integer1="7" integer2="7"/>
> -    <TemporalExpression
> tempExprId="MINUTE_08" tempExprTypeId="MINUTE_RANGE"
> integer1="8" integer2="8"/>
> -    <TemporalExpression
> tempExprId="MINUTE_09" tempExprTypeId="MINUTE_RANGE"
> integer1="9" integer2="9"/>
> -    <TemporalExpression
> tempExprId="MINUTE_10" tempExprTypeId="MINUTE_RANGE"
> integer1="10" integer2="10"/>
> -    <TemporalExpression
> tempExprId="MINUTE_11" tempExprTypeId="MINUTE_RANGE"
> integer1="11" integer2="11"/>
> -    <TemporalExpression
> tempExprId="MINUTE_12" tempExprTypeId="MINUTE_RANGE"
> integer1="12" integer2="12"/>
> -    <TemporalExpression
> tempExprId="MINUTE_13" tempExprTypeId="MINUTE_RANGE"
> integer1="13" integer2="13"/>
> -    <TemporalExpression
> tempExprId="MINUTE_14" tempExprTypeId="MINUTE_RANGE"
> integer1="14" integer2="14"/>
> -    <TemporalExpression
> tempExprId="MINUTE_15" tempExprTypeId="MINUTE_RANGE"
> integer1="15" integer2="15"/>
> -    <TemporalExpression
> tempExprId="MINUTE_16" tempExprTypeId="MINUTE_RANGE"
> integer1="16" integer2="16"/>
> -    <TemporalExpression
> tempExprId="MINUTE_17" tempExprTypeId="MINUTE_RANGE"
> integer1="17" integer2="17"/>
> -    <TemporalExpression
> tempExprId="MINUTE_18" tempExprTypeId="MINUTE_RANGE"
> integer1="18" integer2="18"/>
> -    <TemporalExpression
> tempExprId="MINUTE_19" tempExprTypeId="MINUTE_RANGE"
> integer1="19" integer2="19"/>
> -    <TemporalExpression
> tempExprId="MINUTE_20" tempExprTypeId="MINUTE_RANGE"
> integer1="20" integer2="20"/>
> -    <TemporalExpression
> tempExprId="MINUTE_21" tempExprTypeId="MINUTE_RANGE"
> integer1="21" integer2="21"/>
> -    <TemporalExpression
> tempExprId="MINUTE_22" tempExprTypeId="MINUTE_RANGE"
> integer1="22" integer2="22"/>
> -    <TemporalExpression
> tempExprId="MINUTE_23" tempExprTypeId="MINUTE_RANGE"
> integer1="23" integer2="23"/>
> -    <TemporalExpression
> tempExprId="MINUTE_24" tempExprTypeId="MINUTE_RANGE"
> integer1="24" integer2="24"/>
> -    <TemporalExpression
> tempExprId="MINUTE_25" tempExprTypeId="MINUTE_RANGE"
> integer1="25" integer2="25"/>
> -    <TemporalExpression
> tempExprId="MINUTE_26" tempExprTypeId="MINUTE_RANGE"
> integer1="26" integer2="26"/>
> -    <TemporalExpression
> tempExprId="MINUTE_27" tempExprTypeId="MINUTE_RANGE"
> integer1="27" integer2="27"/>
> -    <TemporalExpression
> tempExprId="MINUTE_28" tempExprTypeId="MINUTE_RANGE"
> integer1="28" integer2="28"/>
> -    <TemporalExpression
> tempExprId="MINUTE_29" tempExprTypeId="MINUTE_RANGE"
> integer1="29" integer2="29"/>
> -    <TemporalExpression
> tempExprId="MINUTE_30" tempExprTypeId="MINUTE_RANGE"
> integer1="30" integer2="30"/>
> -    <TemporalExpression
> tempExprId="MINUTE_31" tempExprTypeId="MINUTE_RANGE"
> integer1="31" integer2="31"/>
> -    <TemporalExpression
> tempExprId="MINUTE_32" tempExprTypeId="MINUTE_RANGE"
> integer1="32" integer2="32"/>
> -    <TemporalExpression
> tempExprId="MINUTE_33" tempExprTypeId="MINUTE_RANGE"
> integer1="33" integer2="33"/>
> -    <TemporalExpression
> tempExprId="MINUTE_34" tempExprTypeId="MINUTE_RANGE"
> integer1="34" integer2="34"/>
> -    <TemporalExpression
> tempExprId="MINUTE_35" tempExprTypeId="MINUTE_RANGE"
> integer1="35" integer2="35"/>
> -    <TemporalExpression
> tempExprId="MINUTE_36" tempExprTypeId="MINUTE_RANGE"
> integer1="36" integer2="36"/>
> -    <TemporalExpression
> tempExprId="MINUTE_37" tempExprTypeId="MINUTE_RANGE"
> integer1="37" integer2="37"/>
> -    <TemporalExpression
> tempExprId="MINUTE_38" tempExprTypeId="MINUTE_RANGE"
> integer1="38" integer2="38"/>
> -    <TemporalExpression
> tempExprId="MINUTE_39" tempExprTypeId="MINUTE_RANGE"
> integer1="39" integer2="39"/>
> -    <TemporalExpression
> tempExprId="MINUTE_40" tempExprTypeId="MINUTE_RANGE"
> integer1="40" integer2="40"/>
> -    <TemporalExpression
> tempExprId="MINUTE_41" tempExprTypeId="MINUTE_RANGE"
> integer1="41" integer2="41"/>
> -    <TemporalExpression
> tempExprId="MINUTE_42" tempExprTypeId="MINUTE_RANGE"
> integer1="42" integer2="42"/>
> -    <TemporalExpression
> tempExprId="MINUTE_43" tempExprTypeId="MINUTE_RANGE"
> integer1="43" integer2="43"/>
> -    <TemporalExpression
> tempExprId="MINUTE_44" tempExprTypeId="MINUTE_RANGE"
> integer1="44" integer2="44"/>
> -    <TemporalExpression
> tempExprId="MINUTE_45" tempExprTypeId="MINUTE_RANGE"
> integer1="45" integer2="45"/>
> -    <TemporalExpression
> tempExprId="MINUTE_46" tempExprTypeId="MINUTE_RANGE"
> integer1="46" integer2="46"/>
> -    <TemporalExpression
> tempExprId="MINUTE_47" tempExprTypeId="MINUTE_RANGE"
> integer1="47" integer2="47"/>
> -    <TemporalExpression
> tempExprId="MINUTE_48" tempExprTypeId="MINUTE_RANGE"
> integer1="48" integer2="48"/>
> -    <TemporalExpression
> tempExprId="MINUTE_49" tempExprTypeId="MINUTE_RANGE"
> integer1="49" integer2="49"/>
> -    <TemporalExpression
> tempExprId="MINUTE_50" tempExprTypeId="MINUTE_RANGE"
> integer1="50" integer2="50"/>
> -    <TemporalExpression
> tempExprId="MINUTE_51" tempExprTypeId="MINUTE_RANGE"
> integer1="51" integer2="51"/>
> -    <TemporalExpression
> tempExprId="MINUTE_52" tempExprTypeId="MINUTE_RANGE"
> integer1="52" integer2="52"/>
> -    <TemporalExpression
> tempExprId="MINUTE_53" tempExprTypeId="MINUTE_RANGE"
> integer1="53" integer2="53"/>
> -    <TemporalExpression
> tempExprId="MINUTE_54" tempExprTypeId="MINUTE_RANGE"
> integer1="54" integer2="54"/>
> -    <TemporalExpression
> tempExprId="MINUTE_55" tempExprTypeId="MINUTE_RANGE"
> integer1="55" integer2="55"/>
> -    <TemporalExpression
> tempExprId="MINUTE_56" tempExprTypeId="MINUTE_RANGE"
> integer1="56" integer2="56"/>
> -    <TemporalExpression
> tempExprId="MINUTE_57" tempExprTypeId="MINUTE_RANGE"
> integer1="57" integer2="57"/>
> -    <TemporalExpression
> tempExprId="MINUTE_58" tempExprTypeId="MINUTE_RANGE"
> integer1="58" integer2="58"/>
> -    <TemporalExpression
> tempExprId="MINUTE_59" tempExprTypeId="MINUTE_RANGE"
> integer1="59" integer2="59"/>
> +    <TemporalExpression
> tempExprId="MINUTE_00" tempExprTypeId="MINUTE_RANGE"
> description="Minute 0" integer1="0" integer2="0"/>
> +    <TemporalExpression
> tempExprId="MINUTE_01" tempExprTypeId="MINUTE_RANGE"
> description="Minute 1" integer1="1" integer2="1"/>
> +    <TemporalExpression
> tempExprId="MINUTE_02" tempExprTypeId="MINUTE_RANGE"
> description="Minute 2" integer1="2" integer2="2"/>
> +    <TemporalExpression
> tempExprId="MINUTE_03" tempExprTypeId="MINUTE_RANGE"
> description="Minute 3" integer1="3" integer2="3"/>
> +    <TemporalExpression
> tempExprId="MINUTE_04" tempExprTypeId="MINUTE_RANGE"
> description="Minute 4" integer1="4" integer2="4"/>
> +    <TemporalExpression
> tempExprId="MINUTE_05" tempExprTypeId="MINUTE_RANGE"
> description="Minute 5" integer1="5" integer2="5"/>
> +    <TemporalExpression
> tempExprId="MINUTE_06" tempExprTypeId="MINUTE_RANGE"
> description="Minute 6" integer1="6" integer2="6"/>
> +    <TemporalExpression
> tempExprId="MINUTE_07" tempExprTypeId="MINUTE_RANGE"
> description="Minute 7" integer1="7" integer2="7"/>
> +    <TemporalExpression
> tempExprId="MINUTE_08" tempExprTypeId="MINUTE_RANGE"
> description="Minute 8" integer1="8" integer2="8"/>
> +    <TemporalExpression
> tempExprId="MINUTE_09" tempExprTypeId="MINUTE_RANGE"
> description="Minute 9" integer1="9" integer2="9"/>
> +    <TemporalExpression
> tempExprId="MINUTE_10" tempExprTypeId="MINUTE_RANGE"
> description="Minute 10" integer1="10" integer2="10"/>
> +    <TemporalExpression
> tempExprId="MINUTE_11" tempExprTypeId="MINUTE_RANGE"
> description="Minute 11" integer1="11" integer2="11"/>
> +    <TemporalExpression
> tempExprId="MINUTE_12" tempExprTypeId="MINUTE_RANGE"
> description="Minute 12" integer1="12" integer2="12"/>
> +    <TemporalExpression
> tempExprId="MINUTE_13" tempExprTypeId="MINUTE_RANGE"
> description="Minute 13" integer1="13" integer2="13"/>
> +    <TemporalExpression
> tempExprId="MINUTE_14" tempExprTypeId="MINUTE_RANGE"
> description="Minute 14" integer1="14" integer2="14"/>
> +    <TemporalExpression
> tempExprId="MINUTE_15" tempExprTypeId="MINUTE_RANGE"
> description="Minute 15" integer1="15" integer2="15"/>
> +    <TemporalExpression
> tempExprId="MINUTE_16" tempExprTypeId="MINUTE_RANGE"
> description="Minute 16" integer1="16" integer2="16"/>
> +    <TemporalExpression
> tempExprId="MINUTE_17" tempExprTypeId="MINUTE_RANGE"
> description="Minute 17" integer1="17" integer2="17"/>
> +    <TemporalExpression
> tempExprId="MINUTE_18" tempExprTypeId="MINUTE_RANGE"
> description="Minute 18" integer1="18" integer2="18"/>
> +    <TemporalExpression
> tempExprId="MINUTE_19" tempExprTypeId="MINUTE_RANGE"
> description="Minute 19" integer1="19" integer2="19"/>
> +    <TemporalExpression
> tempExprId="MINUTE_20" tempExprTypeId="MINUTE_RANGE"
> description="Minute 20" integer1="20" integer2="20"/>
> +    <TemporalExpression
> tempExprId="MINUTE_21" tempExprTypeId="MINUTE_RANGE"
> description="Minute 21" integer1="21" integer2="21"/>
> +    <TemporalExpression
> tempExprId="MINUTE_22" tempExprTypeId="MINUTE_RANGE"
> description="Minute 22" integer1="22" integer2="22"/>
> +    <TemporalExpression
> tempExprId="MINUTE_23" tempExprTypeId="MINUTE_RANGE"
> description="Minute 23" integer1="23" integer2="23"/>
> +    <TemporalExpression
> tempExprId="MINUTE_24" tempExprTypeId="MINUTE_RANGE"
> description="Minute 24" integer1="24" integer2="24"/>
> +    <TemporalExpression
> tempExprId="MINUTE_25" tempExprTypeId="MINUTE_RANGE"
> description="Minute 25" integer1="25" integer2="25"/>
> +    <TemporalExpression
> tempExprId="MINUTE_26" tempExprTypeId="MINUTE_RANGE"
> description="Minute 26" integer1="26" integer2="26"/>
> +    <TemporalExpression
> tempExprId="MINUTE_27" tempExprTypeId="MINUTE_RANGE"
> description="Minute 27" integer1="27" integer2="27"/>
> +    <TemporalExpression
> tempExprId="MINUTE_28" tempExprTypeId="MINUTE_RANGE"
> description="Minute 28" integer1="28" integer2="28"/>
> +    <TemporalExpression
> tempExprId="MINUTE_29" tempExprTypeId="MINUTE_RANGE"
> description="Minute 29" integer1="29" integer2="29"/>
> +    <TemporalExpression
> tempExprId="MINUTE_30" tempExprTypeId="MINUTE_RANGE"
> description="Minute 30" integer1="30" integer2="30"/>
> +    <TemporalExpression
> tempExprId="MINUTE_31" tempExprTypeId="MINUTE_RANGE"
> description="Minute 31" integer1="31" integer2="31"/>
> +    <TemporalExpression
> tempExprId="MINUTE_32" tempExprTypeId="MINUTE_RANGE"
> description="Minute 32" integer1="32" integer2="32"/>
> +    <TemporalExpression
> tempExprId="MINUTE_33" tempExprTypeId="MINUTE_RANGE"
> description="Minute 33" integer1="33" integer2="33"/>
> +    <TemporalExpression
> tempExprId="MINUTE_34" tempExprTypeId="MINUTE_RANGE"
> description="Minute 34" integer1="34" integer2="34"/>
> +    <TemporalExpression
> tempExprId="MINUTE_35" tempExprTypeId="MINUTE_RANGE"
> description="Minute 35" integer1="35" integer2="35"/>
> +    <TemporalExpression
> tempExprId="MINUTE_36" tempExprTypeId="MINUTE_RANGE"
> description="Minute 36" integer1="36" integer2="36"/>
> +    <TemporalExpression
> tempExprId="MINUTE_37" tempExprTypeId="MINUTE_RANGE"
> description="Minute 37" integer1="37" integer2="37"/>
> +    <TemporalExpression
> tempExprId="MINUTE_38" tempExprTypeId="MINUTE_RANGE"
> description="Minute 38" integer1="38" integer2="38"/>
> +    <TemporalExpression
> tempExprId="MINUTE_39" tempExprTypeId="MINUTE_RANGE"
> description="Minute 39" integer1="39" integer2="39"/>
> +    <TemporalExpression
> tempExprId="MINUTE_40" tempExprTypeId="MINUTE_RANGE"
> description="Minute 40" integer1="40" integer2="40"/>
> +    <TemporalExpression
> tempExprId="MINUTE_41" tempExprTypeId="MINUTE_RANGE"
> description="Minute 41" integer1="41" integer2="41"/>
> +    <TemporalExpression
> tempExprId="MINUTE_42" tempExprTypeId="MINUTE_RANGE"
> description="Minute 42" integer1="42" integer2="42"/>
> +    <TemporalExpression
> tempExprId="MINUTE_43" tempExprTypeId="MINUTE_RANGE"
> description="Minute 43" integer1="43" integer2="43"/>
> +    <TemporalExpression
> tempExprId="MINUTE_44" tempExprTypeId="MINUTE_RANGE"
> description="Minute 44" integer1="44" integer2="44"/>
> +    <TemporalExpression
> tempExprId="MINUTE_45" tempExprTypeId="MINUTE_RANGE"
> description="Minute 45" integer1="45" integer2="45"/>
> +    <TemporalExpression
> tempExprId="MINUTE_46" tempExprTypeId="MINUTE_RANGE"
> description="Minute 46" integer1="46" integer2="46"/>
> +    <TemporalExpression
> tempExprId="MINUTE_47" tempExprTypeId="MINUTE_RANGE"
> description="Minute 47" integer1="47" integer2="47"/>
> +    <TemporalExpression
> tempExprId="MINUTE_48" tempExprTypeId="MINUTE_RANGE"
> description="Minute 48" integer1="48" integer2="48"/>
> +    <TemporalExpression
> tempExprId="MINUTE_49" tempExprTypeId="MINUTE_RANGE"
> description="Minute 49" integer1="49" integer2="49"/>
> +    <TemporalExpression
> tempExprId="MINUTE_50" tempExprTypeId="MINUTE_RANGE"
> description="Minute 50" integer1="50" integer2="50"/>
> +    <TemporalExpression
> tempExprId="MINUTE_51" tempExprTypeId="MINUTE_RANGE"
> description="Minute 51" integer1="51" integer2="51"/>
> +    <TemporalExpression
> tempExprId="MINUTE_52" tempExprTypeId="MINUTE_RANGE"
> description="Minute 52" integer1="52" integer2="52"/>
> +    <TemporalExpression
> tempExprId="MINUTE_53" tempExprTypeId="MINUTE_RANGE"
> description="Minute 53" integer1="53" integer2="53"/>
> +    <TemporalExpression
> tempExprId="MINUTE_54" tempExprTypeId="MINUTE_RANGE"
> description="Minute 54" integer1="54" integer2="54"/>
> +    <TemporalExpression
> tempExprId="MINUTE_55" tempExprTypeId="MINUTE_RANGE"
> description="Minute 55" integer1="55" integer2="55"/>
> +    <TemporalExpression
> tempExprId="MINUTE_56" tempExprTypeId="MINUTE_RANGE"
> description="Minute 56" integer1="56" integer2="56"/>
> +    <TemporalExpression
> tempExprId="MINUTE_57" tempExprTypeId="MINUTE_RANGE"
> description="Minute 57" integer1="57" integer2="57"/>
> +    <TemporalExpression
> tempExprId="MINUTE_58" tempExprTypeId="MINUTE_RANGE"
> description="Minute 58" integer1="58" integer2="58"/>
> +    <TemporalExpression
> tempExprId="MINUTE_59" tempExprTypeId="MINUTE_RANGE"
> description="Minute 59" integer1="59" integer2="59"/>
>  
>      <!-- Pre-define all 24 hours of
> the day -->
> -    <TemporalExpression tempExprId="HOUR_00"
> tempExprTypeId="HOUR_RANGE" integer1="0" integer2="0"/>
> -    <TemporalExpression tempExprId="HOUR_01"
> tempExprTypeId="HOUR_RANGE" integer1="1" integer2="1"/>
> -    <TemporalExpression tempExprId="HOUR_02"
> tempExprTypeId="HOUR_RANGE" integer1="2" integer2="2"/>
> -    <TemporalExpression tempExprId="HOUR_03"
> tempExprTypeId="HOUR_RANGE" integer1="3" integer2="3"/>
> -    <TemporalExpression tempExprId="HOUR_04"
> tempExprTypeId="HOUR_RANGE" integer1="4" integer2="4"/>
> -    <TemporalExpression tempExprId="HOUR_05"
> tempExprTypeId="HOUR_RANGE" integer1="5" integer2="5"/>
> -    <TemporalExpression tempExprId="HOUR_06"
> tempExprTypeId="HOUR_RANGE" integer1="6" integer2="6"/>
> -    <TemporalExpression tempExprId="HOUR_07"
> tempExprTypeId="HOUR_RANGE" integer1="7" integer2="7"/>
> -    <TemporalExpression tempExprId="HOUR_08"
> tempExprTypeId="HOUR_RANGE" integer1="8" integer2="8"/>
> -    <TemporalExpression tempExprId="HOUR_09"
> tempExprTypeId="HOUR_RANGE" integer1="9" integer2="9"/>
> -    <TemporalExpression tempExprId="HOUR_10"
> tempExprTypeId="HOUR_RANGE" integer1="10"
> integer2="10"/>
> -    <TemporalExpression tempExprId="HOUR_11"
> tempExprTypeId="HOUR_RANGE" integer1="11"
> integer2="11"/>
> -    <TemporalExpression tempExprId="HOUR_12"
> tempExprTypeId="HOUR_RANGE" integer1="12"
> integer2="12"/>
> -    <TemporalExpression tempExprId="HOUR_13"
> tempExprTypeId="HOUR_RANGE" integer1="13"
> integer2="13"/>
> -    <TemporalExpression tempExprId="HOUR_14"
> tempExprTypeId="HOUR_RANGE" integer1="14"
> integer2="14"/>
> -    <TemporalExpression tempExprId="HOUR_15"
> tempExprTypeId="HOUR_RANGE" integer1="15"
> integer2="15"/>
> -    <TemporalExpression tempExprId="HOUR_16"
> tempExprTypeId="HOUR_RANGE" integer1="16"
> integer2="16"/>
> -    <TemporalExpression tempExprId="HOUR_17"
> tempExprTypeId="HOUR_RANGE" integer1="17"
> integer2="17"/>
> -    <TemporalExpression tempExprId="HOUR_18"
> tempExprTypeId="HOUR_RANGE" integer1="18"
> integer2="18"/>
> -    <TemporalExpression tempExprId="HOUR_19"
> tempExprTypeId="HOUR_RANGE" integer1="19"
> integer2="19"/>
> -    <TemporalExpression tempExprId="HOUR_20"
> tempExprTypeId="HOUR_RANGE" integer1="20"
> integer2="20"/>
> -    <TemporalExpression tempExprId="HOUR_21"
> tempExprTypeId="HOUR_RANGE" integer1="21"
> integer2="21"/>
> -    <TemporalExpression tempExprId="HOUR_22"
> tempExprTypeId="HOUR_RANGE" integer1="22"
> integer2="22"/>
> -    <TemporalExpression tempExprId="HOUR_23"
> tempExprTypeId="HOUR_RANGE" integer1="23"
> integer2="23"/>
> +    <TemporalExpression tempExprId="HOUR_00"
> tempExprTypeId="HOUR_RANGE" description="Hour 0"
> integer1="0" integer2="0"/>
> +    <TemporalExpression tempExprId="HOUR_01"
> tempExprTypeId="HOUR_RANGE" description="Hour 1"
> integer1="1" integer2="1"/>
> +    <TemporalExpression tempExprId="HOUR_02"
> tempExprTypeId="HOUR_RANGE" description="Hour 2"
> integer1="2" integer2="2"/>
> +    <TemporalExpression tempExprId="HOUR_03"
> tempExprTypeId="HOUR_RANGE" description="Hour 3"
> integer1="3" integer2="3"/>
> +    <TemporalExpression tempExprId="HOUR_04"
> tempExprTypeId="HOUR_RANGE" description="Hour 4"
> integer1="4" integer2="4"/>
> +    <TemporalExpression tempExprId="HOUR_05"
> tempExprTypeId="HOUR_RANGE" description="Hour 5"
> integer1="5" integer2="5"/>
> +    <TemporalExpression tempExprId="HOUR_06"
> tempExprTypeId="HOUR_RANGE" description="Hour 6"
> integer1="6" integer2="6"/>
> +    <TemporalExpression tempExprId="HOUR_07"
> tempExprTypeId="HOUR_RANGE" description="Hour 7"
> integer1="7" integer2="7"/>
> +    <TemporalExpression tempExprId="HOUR_08"
> tempExprTypeId="HOUR_RANGE" description="Hour 8"
> integer1="8" integer2="8"/>
> +    <TemporalExpression tempExprId="HOUR_09"
> tempExprTypeId="HOUR_RANGE" description="Hour 9"
> integer1="9" integer2="9"/>
> +    <TemporalExpression tempExprId="HOUR_10"
> tempExprTypeId="HOUR_RANGE" description="Hour 10"
> integer1="10" integer2="10"/>
> +    <TemporalExpression tempExprId="HOUR_11"
> tempExprTypeId="HOUR_RANGE" description="Hour 11"
> integer1="11" integer2="11"/>
> +    <TemporalExpression tempExprId="HOUR_12"
> tempExprTypeId="HOUR_RANGE" description="Hour 12"
> integer1="12" integer2="12"/>
> +    <TemporalExpression tempExprId="HOUR_13"
> tempExprTypeId="HOUR_RANGE" description="Hour 13"
> integer1="13" integer2="13"/>
> +    <TemporalExpression tempExprId="HOUR_14"
> tempExprTypeId="HOUR_RANGE" description="Hour 14"
> integer1="14" integer2="14"/>
> +    <TemporalExpression tempExprId="HOUR_15"
> tempExprTypeId="HOUR_RANGE" description="Hour 15"
> integer1="15" integer2="15"/>
> +    <TemporalExpression tempExprId="HOUR_16"
> tempExprTypeId="HOUR_RANGE" description="Hour 16"
> integer1="16" integer2="16"/>
> +    <TemporalExpression tempExprId="HOUR_17"
> tempExprTypeId="HOUR_RANGE" description="Hour 17"
> integer1="17" integer2="17"/>
> +    <TemporalExpression tempExprId="HOUR_18"
> tempExprTypeId="HOUR_RANGE" description="Hour 18"
> integer1="18" integer2="18"/>
> +    <TemporalExpression tempExprId="HOUR_19"
> tempExprTypeId="HOUR_RANGE" description="Hour 19"
> integer1="19" integer2="19"/>
> +    <TemporalExpression tempExprId="HOUR_20"
> tempExprTypeId="HOUR_RANGE" description="Hour 20"
> integer1="20" integer2="20"/>
> +    <TemporalExpression tempExprId="HOUR_21"
> tempExprTypeId="HOUR_RANGE" description="Hour 21"
> integer1="21" integer2="21"/>
> +    <TemporalExpression tempExprId="HOUR_22"
> tempExprTypeId="HOUR_RANGE" description="Hour 22"
> integer1="22" integer2="22"/>
> +    <TemporalExpression tempExprId="HOUR_23"
> tempExprTypeId="HOUR_RANGE" description="Hour 23"
> integer1="23" integer2="23"/>
>  
>      <!-- Pre-define all days of the
> week (Sunday -> Saturday) -->
> -    <TemporalExpression
> tempExprId="DAYOFWEEK_01" tempExprTypeId="DAY_OF_WEEK_RANGE"
> integer1="1" integer2="1"/>
> -    <TemporalExpression
> tempExprId="DAYOFWEEK_02" tempExprTypeId="DAY_OF_WEEK_RANGE"
> integer1="2" integer2="2"/>
> -    <TemporalExpression
> tempExprId="DAYOFWEEK_03" tempExprTypeId="DAY_OF_WEEK_RANGE"
> integer1="3" integer2="3"/>
> -    <TemporalExpression
> tempExprId="DAYOFWEEK_04" tempExprTypeId="DAY_OF_WEEK_RANGE"
> integer1="4" integer2="4"/>
> -    <TemporalExpression
> tempExprId="DAYOFWEEK_05" tempExprTypeId="DAY_OF_WEEK_RANGE"
> integer1="5" integer2="5"/>
> -    <TemporalExpression
> tempExprId="DAYOFWEEK_06" tempExprTypeId="DAY_OF_WEEK_RANGE"
> integer1="6" integer2="6"/>
> -    <TemporalExpression
> tempExprId="DAYOFWEEK_07" tempExprTypeId="DAY_OF_WEEK_RANGE"
> integer1="7" integer2="7"/>
> +    <TemporalExpression
> tempExprId="DAYOFWEEK_01" tempExprTypeId="DAY_OF_WEEK_RANGE"
> description="Day of Week Range 1" integer1="1"
> integer2="1"/>
> +    <TemporalExpression
> tempExprId="DAYOFWEEK_02" tempExprTypeId="DAY_OF_WEEK_RANGE"
> description="Day of Week Range 2" integer1="2"
> integer2="2"/>
> +    <TemporalExpression
> tempExprId="DAYOFWEEK_03" tempExprTypeId="DAY_OF_WEEK_RANGE"
> description="Day of Week Range 3" integer1="3"
> integer2="3"/>
> +    <TemporalExpression
> tempExprId="DAYOFWEEK_04" tempExprTypeId="DAY_OF_WEEK_RANGE"
> description="Day of Week Range 4" integer1="4"
> integer2="4"/>
> +    <TemporalExpression
> tempExprId="DAYOFWEEK_05" tempExprTypeId="DAY_OF_WEEK_RANGE"
> description="Day of Week Range 5" integer1="5"
> integer2="5"/>
> +    <TemporalExpression
> tempExprId="DAYOFWEEK_06" tempExprTypeId="DAY_OF_WEEK_RANGE"
> description="Day of Week Range 6" integer1="6"
> integer2="6"/>
> +    <TemporalExpression
> tempExprId="DAYOFWEEK_07" tempExprTypeId="DAY_OF_WEEK_RANGE"
> description="Day of Week Range 7" integer1="7"
> integer2="7"/>
>  
>      <!-- Pre-define some day of the
> week ranges -->
> -    <TemporalExpression
> tempExprId="MON_TO_FRI" tempExprTypeId="DAY_OF_WEEK_RANGE"
> integer1="2" integer2="6"/>
> -    <TemporalExpression
> tempExprId="SAT_TO_SUN" tempExprTypeId="DAY_OF_WEEK_RANGE"
> integer1="7" integer2="1"/>
> +    <TemporalExpression
> tempExprId="MON_TO_FRI" tempExprTypeId="DAY_OF_WEEK_RANGE"
> description="Monday to Friday" integer1="2"
> integer2="6"/>
> +    <TemporalExpression
> tempExprId="SAT_TO_SUN" tempExprTypeId="DAY_OF_WEEK_RANGE"
> description="Saturday to Sunday" integer1="7"
> integer2="1"/>
>  
>      <!-- Pre-define all 13 months
> (January -> Undecimber) -->
> -    <TemporalExpression
> tempExprId="MONTH_RANGE_01" tempExprTypeId="MONTH_RANGE"
> integer1="0" integer2="0"/>
> -    <TemporalExpression
> tempExprId="MONTH_RANGE_02" tempExprTypeId="MONTH_RANGE"
> integer1="1" integer2="1"/>
> -    <TemporalExpression
> tempExprId="MONTH_RANGE_03" tempExprTypeId="MONTH_RANGE"
> integer1="2" integer2="2"/>
> -    <TemporalExpression
> tempExprId="MONTH_RANGE_04" tempExprTypeId="MONTH_RANGE"
> integer1="3" integer2="3"/>
> -    <TemporalExpression
> tempExprId="MONTH_RANGE_05" tempExprTypeId="MONTH_RANGE"
> integer1="4" integer2="4"/>
> -    <TemporalExpression
> tempExprId="MONTH_RANGE_06" tempExprTypeId="MONTH_RANGE"
> integer1="5" integer2="5"/>
> -    <TemporalExpression
> tempExprId="MONTH_RANGE_07" tempExprTypeId="MONTH_RANGE"
> integer1="6" integer2="6"/>
> -    <TemporalExpression
> tempExprId="MONTH_RANGE_08" tempExprTypeId="MONTH_RANGE"
> integer1="7" integer2="7"/>
> -    <TemporalExpression
> tempExprId="MONTH_RANGE_09" tempExprTypeId="MONTH_RANGE"
> integer1="8" integer2="8"/>
> -    <TemporalExpression
> tempExprId="MONTH_RANGE_10" tempExprTypeId="MONTH_RANGE"
> integer1="9" integer2="9"/>
> -    <TemporalExpression
> tempExprId="MONTH_RANGE_11" tempExprTypeId="MONTH_RANGE"
> integer1="10" integer2="10"/>
> -    <TemporalExpression
> tempExprId="MONTH_RANGE_12" tempExprTypeId="MONTH_RANGE"
> integer1="11" integer2="11"/>
> -    <TemporalExpression
> tempExprId="MONTH_RANGE_13" tempExprTypeId="MONTH_RANGE"
> integer1="12" integer2="12"/>
> +    <TemporalExpression
> tempExprId="MONTH_RANGE_01" tempExprTypeId="MONTH_RANGE"
> description="Month Range 0" integer1="0" integer2="0"/>
> +    <TemporalExpression
> tempExprId="MONTH_RANGE_02" tempExprTypeId="MONTH_RANGE"
> description="Month Range 1" integer1="1" integer2="1"/>
> +    <TemporalExpression
> tempExprId="MONTH_RANGE_03" tempExprTypeId="MONTH_RANGE"
> description="Month Range 2" integer1="2" integer2="2"/>
> +    <TemporalExpression
> tempExprId="MONTH_RANGE_04" tempExprTypeId="MONTH_RANGE"
> description="Month Range 3" integer1="3" integer2="3"/>
> +    <TemporalExpression
> tempExprId="MONTH_RANGE_05" tempExprTypeId="MONTH_RANGE"
> description="Month Range 4" integer1="4" integer2="4"/>
> +    <TemporalExpression
> tempExprId="MONTH_RANGE_06" tempExprTypeId="MONTH_RANGE"
> description="Month Range 5" integer1="5" integer2="5"/>
> +    <TemporalExpression
> tempExprId="MONTH_RANGE_07" tempExprTypeId="MONTH_RANGE"
> description="Month Range 6" integer1="6" integer2="6"/>
> +    <TemporalExpression
> tempExprId="MONTH_RANGE_08" tempExprTypeId="MONTH_RANGE"
> description="Month Range 7" integer1="7" integer2="7"/>
> +    <TemporalExpression
> tempExprId="MONTH_RANGE_09" tempExprTypeId="MONTH_RANGE"
> description="Month Range 8" integer1="8" integer2="8"/>
> +    <TemporalExpression
> tempExprId="MONTH_RANGE_10" tempExprTypeId="MONTH_RANGE"
> description="Month Range 9" integer1="9" integer2="9"/>
> +    <TemporalExpression
> tempExprId="MONTH_RANGE_11" tempExprTypeId="MONTH_RANGE"
> description="Month Range 10" integer1="10"
> integer2="10"/>
> +    <TemporalExpression
> tempExprId="MONTH_RANGE_12" tempExprTypeId="MONTH_RANGE"
> description="Month Range 11" integer1="11"
> integer2="11"/>
> +    <TemporalExpression
> tempExprId="MONTH_RANGE_13" tempExprTypeId="MONTH_RANGE"
> description="Month Range 12" integer1="12"
> integer2="12"/>
>  
>      <!-- Pre-define all 31 days of
> the month -->
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_01"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="1"
> integer2="1"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_02"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="2"
> integer2="2"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_03"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="3"
> integer2="3"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_04"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="4"
> integer2="4"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_05"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="5"
> integer2="5"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_06"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="6"
> integer2="6"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_07"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="7"
> integer2="7"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_08"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="8"
> integer2="8"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_09"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="9"
> integer2="9"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_10"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="10"
> integer2="10"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_11"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="11"
> integer2="11"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_12"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="12"
> integer2="12"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_13"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="13"
> integer2="13"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_14"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="14"
> integer2="14"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_15"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="15"
> integer2="15"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_16"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="16"
> integer2="16"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_17"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="17"
> integer2="17"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_18"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="18"
> integer2="18"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_19"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="19"
> integer2="19"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_20"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="20"
> integer2="20"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_21"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="21"
> integer2="21"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_22"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="22"
> integer2="22"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_23"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="23"
> integer2="23"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_24"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="24"
> integer2="24"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_25"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="25"
> integer2="25"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_26"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="26"
> integer2="26"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_27"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="27"
> integer2="27"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_28"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="28"
> integer2="28"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_29"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="29"
> integer2="29"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_30"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="30"
> integer2="30"/>
> -    <TemporalExpression
> tempExprId="DAYOFMONTH_31"
> tempExprTypeId="DAY_OF_MONTH_RANGE" integer1="31"
> integer2="31"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_01"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 1" integer1="1" integer2="1"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_02"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 2" integer1="2" integer2="2"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_03"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 3" integer1="3" integer2="3"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_04"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 4" integer1="4" integer2="4"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_05"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 5" integer1="5" integer2="5"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_06"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 6" integer1="6" integer2="6"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_07"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 7" integer1="7" integer2="7"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_08"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 8" integer1="8" integer2="8"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_09"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 9" integer1="9" integer2="9"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_10"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 10" integer1="10" integer2="10"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_11"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 11" integer1="11" integer2="11"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_12"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 12" integer1="12" integer2="12"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_13"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 13" integer1="13" integer2="13"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_14"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 14" integer1="14" integer2="14"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_15"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 15" integer1="15" integer2="15"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_16"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 16" integer1="16" integer2="16"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_17"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 17" integer1="17" integer2="17"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_18"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 18" integer1="18" integer2="18"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_19"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 19" integer1="19" integer2="19"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_20"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 20" integer1="20" integer2="20"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_21"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 21" integer1="21" integer2="21"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_22"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 22" integer1="22" integer2="22"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_23"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 23" integer1="23" integer2="23"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_24"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 24" integer1="24" integer2="24"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_25"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 25" integer1="25" integer2="25"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_26"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 26" integer1="26" integer2="26"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_27"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 27" integer1="27" integer2="27"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_28"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 28" integer1="28" integer2="28"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_29"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 29" integer1="29" integer2="29"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_30"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 30" integer1="30" integer2="30"/>
> +    <TemporalExpression
> tempExprId="DAYOFMONTH_31"
> tempExprTypeId="DAY_OF_MONTH_RANGE" description="Day of
> Month 31" integer1="31" integer2="31"/>
>  
>      <!-- Pre-define nth Monday of
> the month - many US observances occur on a Monday -->
> -    <TemporalExpression
> tempExprId="1ST_MONDAY_IN_MONTH"
> tempExprTypeId="DAY_IN_MONTH" integer1="2"
> integer2="1"/>
> -    <TemporalExpression
> tempExprId="2ND_MONDAY_IN_MONTH"
> tempExprTypeId="DAY_IN_MONTH" integer1="2"
> integer2="2"/>
> -    <TemporalExpression
> tempExprId="3RD_MONDAY_IN_MONTH"
> tempExprTypeId="DAY_IN_MONTH" integer1="2"
> integer2="3"/>
> -    <TemporalExpression
> tempExprId="4TH_MONDAY_IN_MONTH"
> tempExprTypeId="DAY_IN_MONTH" integer1="2"
> integer2="4"/>
> -    <TemporalExpression
> tempExprId="LAST_MONDAY_IN_MONTH"
> tempExprTypeId="DAY_IN_MONTH" integer1="2"
> integer2="-1"/>
> +    <TemporalExpression
> tempExprId="1ST_MONDAY_IN_MONTH"
> tempExprTypeId="DAY_IN_MONTH" description="First Monday in
> Month" integer1="2" integer2="1"/>
> +    <TemporalExpression
> tempExprId="2ND_MONDAY_IN_MONTH"
> tempExprTypeId="DAY_IN_MONTH" description="Second Monday in
> Month" integer1="2" integer2="2"/>
> +    <TemporalExpression
> tempExprId="3RD_MONDAY_IN_MONTH"
> tempExprTypeId="DAY_IN_MONTH" description="Third Monday in
> Month" integer1="2" integer2="3"/>
> +    <TemporalExpression
> tempExprId="4TH_MONDAY_IN_MONTH"
> tempExprTypeId="DAY_IN_MONTH" description="Fourth Monday in
> Month" integer1="2" integer2="4"/>
> +    <TemporalExpression
> tempExprId="LAST_MONDAY_IN_MONTH"
> tempExprTypeId="DAY_IN_MONTH" description="Last Monday in
> Month" integer1="2" integer2="-1"/>
>  
>      <!-- A US federal holiday
> schedule -->
> -    <TemporalExpression
> tempExprId="US_FED_HOLIDAYS" tempExprTypeId="UNION"/>
> +    <TemporalExpression
> tempExprId="US_FED_HOLIDAYS" tempExprTypeId="UNION"
> description="US Federal Holidays"/>
>      <!-- New Years Day -->
> -    <TemporalExpression
> tempExprId="JANUARY_FIRST"
> tempExprTypeId="INTERSECTION"/>
> +    <TemporalExpression
> tempExprId="JANUARY_FIRST" tempExprTypeId="INTERSECTION"
> description="January First"/>
>      <TemporalExpressionAssoc
> fromTempExprId="JANUARY_FIRST"
> toTempExprId="MONTH_RANGE_01"/>
>      <TemporalExpressionAssoc
> fromTempExprId="JANUARY_FIRST"
> toTempExprId="DAYOFMONTH_01"/>
>      <TemporalExpressionAssoc
> fromTempExprId="US_FED_HOLIDAYS"
> toTempExprId="JANUARY_FIRST"/>
>      <!-- Martin Luther King Day
> -->
> -    <TemporalExpression tempExprId="MLK_DAY"
> tempExprTypeId="INTERSECTION"/>
> +    <TemporalExpression tempExprId="MLK_DAY"
> tempExprTypeId="INTERSECTION" description="Martin Luther
> King Day"/>
>      <TemporalExpressionAssoc
> fromTempExprId="MLK_DAY" toTempExprId="MONTH_RANGE_01"/>
>      <TemporalExpressionAssoc
> fromTempExprId="MLK_DAY"
> toTempExprId="3RD_MONDAY_IN_MONTH"/>
>      <TemporalExpressionAssoc
> fromTempExprId="US_FED_HOLIDAYS"
> toTempExprId="MLK_DAY"/>
>      <!-- Presidents Day -->
> -    <TemporalExpression
> tempExprId="PRESIDENTS_DAY"
> tempExprTypeId="INTERSECTION"/>
> +    <TemporalExpression
> tempExprId="PRESIDENTS_DAY" tempExprTypeId="INTERSECTION"
> description="Presidents Day"/>
>      <TemporalExpressionAssoc
> fromTempExprId="PRESIDENTS_DAY"
> toTempExprId="MONTH_RANGE_02"/>
>      <TemporalExpressionAssoc
> fromTempExprId="PRESIDENTS_DAY"
> toTempExprId="3RD_MONDAY_IN_MONTH"/>
>      <TemporalExpressionAssoc
> fromTempExprId="US_FED_HOLIDAYS"
> toTempExprId="PRESIDENTS_DAY"/>
>      <!-- Memorial Day -->
> -    <TemporalExpression
> tempExprId="MEMORIAL_DAY"
> tempExprTypeId="INTERSECTION"/>
> +    <TemporalExpression
> tempExprId="MEMORIAL_DAY" tempExprTypeId="INTERSECTION"
> description="Memorial Day"/>
>      <TemporalExpressionAssoc
> fromTempExprId="MEMORIAL_DAY"
> toTempExprId="MONTH_RANGE_05"/>
>      <TemporalExpressionAssoc
> fromTempExprId="MEMORIAL_DAY"
> toTempExprId="LAST_MONDAY_IN_MONTH"/>
>      <TemporalExpressionAssoc
> fromTempExprId="US_FED_HOLIDAYS"
> toTempExprId="MEMORIAL_DAY"/>
>      <!-- Independence Day -->
> -    <TemporalExpression
> tempExprId="INDEPENDENCE_DAY"
> tempExprTypeId="INTERSECTION"/>
> +    <TemporalExpression
> tempExprId="INDEPENDENCE_DAY" tempExprTypeId="INTERSECTION"
> description="Independence Day"/>
>      <TemporalExpressionAssoc
> fromTempExprId="INDEPENDENCE_DAY"
> toTempExprId="MONTH_RANGE_07"/>
>      <TemporalExpressionAssoc
> fromTempExprId="INDEPENDENCE_DAY"
> toTempExprId="DAYOFMONTH_04"/>
>      <TemporalExpressionAssoc
> fromTempExprId="US_FED_HOLIDAYS"
> toTempExprId="INDEPENDENCE_DAY"/>
>      <!-- Labor Day -->
> -    <TemporalExpression
> tempExprId="LABOR_DAY" tempExprTypeId="INTERSECTION"/>
> +    <TemporalExpression
> tempExprId="LABOR_DAY" tempExprTypeId="INTERSECTION"
> description="Labor Day"/>
>      <TemporalExpressionAssoc
> fromTempExprId="LABOR_DAY"
> toTempExprId="MONTH_RANGE_09"/>
>      <TemporalExpressionAssoc
> fromTempExprId="LABOR_DAY"
> toTempExprId="1ST_MONDAY_IN_MONTH"/>
>      <TemporalExpressionAssoc
> fromTempExprId="US_FED_HOLIDAYS"
> toTempExprId="LABOR_DAY"/>
>      <!-- Columbus Day -->
> -    <TemporalExpression
> tempExprId="COLUMBUS_DAY"
> tempExprTypeId="INTERSECTION"/>
> +    <TemporalExpression
> tempExprId="COLUMBUS_DAY" tempExprTypeId="INTERSECTION"
> description="Columbus Day"/>
>      <TemporalExpressionAssoc
> fromTempExprId="COLUMBUS_DAY"
> toTempExprId="MONTH_RANGE_10"/>
>      <TemporalExpressionAssoc
> fromTempExprId="COLUMBUS_DAY"
> toTempExprId="2ND_MONDAY_IN_MONTH"/>
>      <TemporalExpressionAssoc
> fromTempExprId="US_FED_HOLIDAYS"
> toTempExprId="COLUMBUS_DAY"/>
>      <!-- Veterans Day -->
> -    <TemporalExpression
> tempExprId="VETERANS_DAY"
> tempExprTypeId="INTERSECTION"/>
> +    <TemporalExpression
> tempExprId="VETERANS_DAY" tempExprTypeId="INTERSECTION"
> description="Veterans Day"/>
>      <TemporalExpressionAssoc
> fromTempExprId="VETERANS_DAY"
> toTempExprId="MONTH_RANGE_11"/>
>      <TemporalExpressionAssoc
> fromTempExprId="VETERANS_DAY"
> toTempExprId="DAYOFMONTH_11"/>
>      <TemporalExpressionAssoc
> fromTempExprId="US_FED_HOLIDAYS"
> toTempExprId="VETERANS_DAY"/>
>      <!-- Thanksgiving Day -->
> -    <TemporalExpression
> tempExprId="THANKSGIVING_DAY"
> tempExprTypeId="INTERSECTION"/>
> -    <TemporalExpression
> tempExprId="4TH_THURS_IN_MONTH"
> tempExprTypeId="DAY_IN_MONTH" integer1="5"
> integer2="4"/>
> +    <TemporalExpression
> tempExprId="THANKSGIVING_DAY" tempExprTypeId="INTERSECTION"
> description="Thanksgiving Day"/>
> +    <TemporalExpression
> tempExprId="4TH_THURS_IN_MONTH"
> tempExprTypeId="DAY_IN_MONTH" description="Fourth Thursday
> in Month" integer1="5" integer2="4"/>
>      <TemporalExpressionAssoc
> fromTempExprId="THANKSGIVING_DAY"
> toTempExprId="MONTH_RANGE_11"/>
>      <TemporalExpressionAssoc
> fromTempExprId="THANKSGIVING_DAY"
> toTempExprId="4TH_THURS_IN_MONTH"/>
>      <TemporalExpressionAssoc
> fromTempExprId="US_FED_HOLIDAYS"
> toTempExprId="THANKSGIVING_DAY"/>
>      <!-- Christmas Day -->
> -    <TemporalExpression
> tempExprId="CHRISTMAS_DAY"
> tempExprTypeId="INTERSECTION"/>
> +    <TemporalExpression
> tempExprId="CHRISTMAS_DAY" tempExprTypeId="INTERSECTION"
> description="Christmas Day"/>
>      <TemporalExpressionAssoc
> fromTempExprId="CHRISTMAS_DAY"
> toTempExprId="MONTH_RANGE_12"/>
>      <TemporalExpressionAssoc
> fromTempExprId="CHRISTMAS_DAY"
> toTempExprId="DAYOFMONTH_25"/>
>      <TemporalExpressionAssoc
> fromTempExprId="US_FED_HOLIDAYS"
> toTempExprId="CHRISTMAS_DAY"/>
>  
>      <!-- A semi-monthly expression
> -> 1st and 15th of the month -->
> -    <TemporalExpression
> tempExprId="1ST_AND_15TH_MONTH" tempExprTypeId="UNION"/>
> +    <TemporalExpression
> tempExprId="1ST_AND_15TH_MONTH" tempExprTypeId="UNION"
> description="First and Fifteenth of the month"/>
>      <TemporalExpressionAssoc
> fromTempExprId="1ST_AND_15TH_MONTH"
> toTempExprId="DAYOFMONTH_01"/>
>      <TemporalExpressionAssoc
> fromTempExprId="1ST_AND_15TH_MONTH"
> toTempExprId="DAYOFMONTH_15"/>
>  
>      <!-- A Mon-Fri expression that
> excludes US federal holidays -->
> -    <TemporalExpression
> tempExprId="GOVT_WORK_SCHED"
> tempExprTypeId="DIFFERENCE"/>
> +    <TemporalExpression
> tempExprId="GOVT_WORK_SCHED" tempExprTypeId="DIFFERENCE"
> description="Monday to Friday without US Federal
> Holidays"/>
>      <TemporalExpressionAssoc
> fromTempExprId="GOVT_WORK_SCHED" toTempExprId="MON_TO_FRI"
> exprAssocType="INCLUDE"/>
>      <TemporalExpressionAssoc
> fromTempExprId="GOVT_WORK_SCHED"
> toTempExprId="US_FED_HOLIDAYS" exprAssocType="EXCLUDE"/>
>  
>      <!-- An 8am Mon-Fri expression
> that excludes US federal holidays -->
> -    <TemporalExpression
> tempExprId="DAILY_GRIND" tempExprTypeId="INTERSECTION"/>
> +    <TemporalExpression
> tempExprId="DAILY_GRIND" tempExprTypeId="INTERSECTION"
> description="Monday to Friday at 8am without US Federal
> Holidays"/>
>      <TemporalExpressionAssoc
> fromTempExprId="DAILY_GRIND" toTempExprId="HOUR_08"/>
>      <TemporalExpressionAssoc
> fromTempExprId="DAILY_GRIND"
> toTempExprId="GOVT_WORK_SCHED"/>
>  
>      <!-- An every-other-Monday at
> 5pm expression -->
> -    <TemporalExpression
> tempExprId="5PM_BIMONDAY" tempExprTypeId="FREQUENCY"
> date1="2000-01-03 17:00:00.000" integer1="5"
> integer2="14"/>
> +    <TemporalExpression
> tempExprId="5PM_BIMONDAY" tempExprTypeId="FREQUENCY"
> description="Every Other Monday at 5pm" date1="2000-01-03
> 17:00:00.000" integer1="5" integer2="14"/>
>  
>      <!-- TemporalExpression field
> details... -->
>  
>
> Modified:
> ofbiz/trunk/framework/service/entitydef/entitymodel.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/entitydef/entitymodel.xml?rev=935387&r1=935386&r2=935387&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/service/entitydef/entitymodel.xml
> (original)
> +++ ofbiz/trunk/framework/service/entitydef/entitymodel.xml
> Sun Apr 18 18:41:20 2010
> @@ -142,6 +142,7 @@ under the License.
>          
>    title="Temporal Expression">
>        <field name="tempExprId"
> type="id-ne"></field>
>        <field
> name="tempExprTypeId" type="id-ne"></field>
> +      <field name="description"
> type="description"></field>
>        <field name="date1"
> type="date-time"></field>
>        <field name="date2"
> type="date-time"></field>
>        <field name="integer1"
> type="numeric"></field>
>
> 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=935387&r1=935386&r2=935387&view=diff
> ==============================================================================
> ---
> ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
> (original)
> +++
> ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
> Sun Apr 18 18:41:20 2010
> @@ -34,6 +34,17 @@ under the License.
>        <td
> class="label">${uiLabelMap.TemporalExpressionType}</td>
>    
>    <td>${uiLabelMap.get("TemporalExpression_"
> + temporalExpression.tempExprTypeId)}</td>
>      </tr>
> +  <#if
> !"INTERSECTION.UNION.DIFFERENCE.SUBSTITUTION"?contains(temporalExpression.tempExprTypeId)>
> +    <tr>
> +      <td
> class="label">${uiLabelMap.CommonDescription}</td>
> +      <td><input type="text"
> name="description"
> value="${temporalExpression.description?if_exists}"
> maxlength="60" size="20"/></td>
> +    </tr>
> +  <#else>
> +    <tr>
> +      <td
> class="label">${uiLabelMap.CommonDescription}</td>
> +     
> <td>${temporalExpression.get("description",locale)?if_exists}</td>
> +    </tr>
> +  </#if>
>      <#if
> temporalExpression.tempExprTypeId == "DATE_RANGE">
>        <@DateRange
> formName="updateExpression"
> fromDate=temporalExpression.date1
> toDate=temporalExpression.date2/>
>      <#elseif
> temporalExpression.tempExprTypeId == "DAY_IN_MONTH">
> @@ -144,6 +155,10 @@ under the License.
>          <td
> class="label">${uiLabelMap.TemporalExpressionId}</td>
>          <td><input
> name="tempExprId" type="text" maxlength="20"
> size="20"/><span
> class="tooltip">${uiLabelMap.CommonAutoAssignedId}</span></td>
>        </tr>
> +      <tr>
> +        <td
> class="label">${uiLabelMap.CommonDescription}</td>
> +        <td><input
> name="description" type="text" maxlength="60"
> size="20"/></td>
> +      </tr>
>        <@formContents/>
>        <tr>
>      
>    <td>&nbsp;</td>
>
> Modified:
> ofbiz/trunk/framework/webtools/widget/tempExprForms.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/tempExprForms.xml?rev=935387&r1=935386&r2=935387&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/webtools/widget/tempExprForms.xml
> (original)
> +++ ofbiz/trunk/framework/webtools/widget/tempExprForms.xml
> Sun Apr 18 18:41:20 2010
> @@ -27,6 +27,7 @@ under the License.
>          
>    <set field="expressionTypeList"
> value="${bsh:org.ofbiz.service.calendar.ExpressionUiHelper.getExpressionTypeList(uiLabelMap);}"
> type="List"/>
>          </actions>
>          <field
> name="tempExprId"
> title="${uiLabelMap.TemporalExpressionId}"><text-find/></field>
> +        <field name="description"
> title="${uiLabelMap.CommonDescription}"><text-find/></field>
>  <!--        <field
> name="tempExprTypeId"
> title="${uiLabelMap.TemporalExpressionType}">
>          
>    <drop-down allow-empty="true">
>              
>    <list-options
> list-name="expressionTypeList" key-name="value"
> description="description"/>
> @@ -44,6 +45,7 @@ under the License.
>          
>    </hyperlink>
>          </field>
>          <field
> name="tempExprTypeId"
> title="${uiLabelMap.TemporalExpressionType}"><display/></field>
> +        <field
> name="description"><display/></field>
>          <field
> name="date1"><display/></field>
>          <field
> name="date2"><display/></field>
>          <field
> name="integer1"><display/></field>
>
>
>

[Bilgin Ibryam-2]

Adrian Crum wrote:
> Bilgin,
>
> Thank you for working on this. It would be better to make the descriptions more like plain English. Instead of "Day of Week Range 1" just have "Sunday", etc. Maybe spend some time constructing a few temporal expressions to help find a balance between plain English and selecting the correct expression.
>
> -Adrian
>
>  
Thanks for the suggestions Adrian. Updated some of the descriptions in
rev 935695
Feel free to change them if you think that are not appropriate.

Bilgin

[Adrian Crum]

It looks great - thanks!

-Adrian

Bilgin Ibryam wrote:

> Adrian Crum wrote:
>> Bilgin,
>>
>> Thank you for working on this. It would be better to make the
>> descriptions more like plain English. Instead of "Day of Week Range 1"
>> just have "Sunday", etc. Maybe spend some time constructing a few
>> temporal expressions to help find a balance between plain English and
>> selecting the correct expression.
>>
>> -Adrian
>>
>>  
> Thanks for the suggestions Adrian. Updated some of the descriptions in
> rev 935695
> Feel free to change them if you think that are not appropriate.
>
> Bilgin
>