[OFBiz] SVN: r5973 - in trunk/applications/workeffort:
webapp/workeffort/WEB-INF webapp/workeffort/calendar widget
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Mon Oct 17 19:46:36 EDT 2005
Author: jonesde
Date: 2005-10-17 18:46:04 -0500 (Mon, 17 Oct 2005)
New Revision: 5973
Modified:
trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
trunk/applications/workeffort/widget/WorkEffortForms.xml
Log:
Fixed a few issues in WorkEffort pages, misc bugs like bad links and missing data
Modified: trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-10-17 23:45:03 UTC (rev 5972)
+++ trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml 2005-10-17 23:46:04 UTC (rev 5973)
@@ -90,7 +90,7 @@
<!-- Request Mappings -->
<request-map uri="view">
- <security https="false" auth="false"/>
+ <security https="true" auth="true"/>
<response name="success" type="view" value="main"/>
<response name="error" type="view" value="error"/>
</request-map>
@@ -102,7 +102,7 @@
</request-map>
<request-map uri="main">
- <security https="false" auth="true"/>
+ <security https="true" auth="true"/>
<response name="success" type="view" value="mytasks"/>
</request-map>
Modified: trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl 2005-10-17 23:45:03 UTC (rev 5972)
+++ trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl 2005-10-17 23:46:04 UTC (rev 5973)
@@ -61,7 +61,7 @@
<#list periods as period>
<tr>
<td valign="top" nowrap width="1%" class="monthweekheader" height="36"><span class="monthweeknumber">${period.start?time?string.short}</span><br/>
- <a href="<@ofbizUrl>WorkEffortSummary?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a></td>
+ <a href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a></td>
<#list period.calendarEntries as calEntry>
<#if calEntry.startOfPeriod>
<td class="calendarentry" rowspan="${calEntry.periodSpan}" colspan="1" width="${entryWidth?string("#")}%" valign="top">
Modified: trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl 2005-10-17 23:45:03 UTC (rev 5972)
+++ trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl 2005-10-17 23:46:04 UTC (rev 5973)
@@ -62,7 +62,7 @@
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td nowrap class="monthdaynumber"><a href='<@ofbizUrl>day?start=${period.start.time?string("#")}</@ofbizUrl>' class="monthdaynumber">${period.start?date?string("d")?cap_first}</a></td>
- <td align="right"><a href='<@ofbizUrl>WorkEffortSummary?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}</@ofbizUrl>' class="add">${uiLabelMap.CommonAddNew}</a> </td>
+ <td align="right"><a href='<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}</@ofbizUrl>' class="add">${uiLabelMap.CommonAddNew}</a> </td>
</tr>
</table>
<#list period.calendarEntries as calEntry>
Modified: trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl 2005-10-17 23:45:03 UTC (rev 5972)
+++ trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl 2005-10-17 23:46:04 UTC (rev 5973)
@@ -60,7 +60,7 @@
<#list periods as period>
<tr>
<td valign="top" nowrap width="1%" class="monthweekheader" height="36"><a href="<@ofbizUrl>day?start=${period.start.time?string("#")}</@ofbizUrl>" class="monthweeknumber">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string("d/M")?cap_first}</a><br/>
- <a href="<@ofbizUrl>WorkEffortSummary?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+ <a href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
</td>
<#list period.calendarEntries as calEntry>
<#if calEntry.startOfPeriod>
Modified: trunk/applications/workeffort/widget/WorkEffortForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortForms.xml 2005-10-17 23:45:03 UTC (rev 5972)
+++ trunk/applications/workeffort/widget/WorkEffortForms.xml 2005-10-17 23:46:04 UTC (rev 5973)
@@ -185,7 +185,7 @@
<field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
<field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
<field name="scopeEnumId">
- <drop-down>
+ <drop-down allow-empty="true">
<entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
<entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
</entity-options>
@@ -288,8 +288,8 @@
<form name="ListWorkEfforts" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext" target="ListWorkEfforts" title="" type="list" list-iterator-name="listIt">
<actions>
<service result-map-list-iterator-name="listIt" result-map-name="result" service-name="performFind">
- <field-map env-name="parameters" field-name="inputFields"/>
- <field-map env-name="entityName" field-name="entityName"/>
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName" value="WorkEffort"/>
</service>
</actions>
<field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">
More information about the Svn
mailing list