OFBiz › OFBiz - Commits

svn commit: r577516 [1/2] - in /ofbiz/trunk: applications/workeffort/config/ applications/workeffort/script/org/ofbiz/workeffort/workeffort/ applications/workeffort/widget/ specialpurpose/projectmgr/config/ specialpurpose/projectmgr/webapp/projectmgr/W...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

apatel-2

svn commit: r577516 [1/2] - in /ofbiz/trunk: applications/workeffort/config/ applications/workeffort/script/org/ofbiz/workeffort/workeffort/ applications/workeffort/widget/ specialpurpose/projectmgr/config/ specialpurpose/projectmgr/webapp/projectmgr/W...

Author: apatel
Date: Wed Sep 19 19:45:29 2007
New Revision: 577516

URL: http://svn.apache.org/viewvc?rev=577516&view=rev
Log:
added Notes form/screen to Project/task/summary screens. Minor cleanups in code.

Added:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl
Modified:
ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editTimeSheet.ftl
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editphaseandassoc.ftl
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittask.ftl
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/listtasksbydaterange.ftl
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/projectinfo.ftl
ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml

Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties Wed Sep 19 19:45:29 2007
@@ -262,6 +262,7 @@
WorkEffortNoRequirementsCreated=No Requirements Created
WorkEffortNoTasksAssociatedRequirement=No Tasks currently associated with this Requirement
WorkEffortNotes=Notes
+WorkEffortNoteMissing=Note is missing
WorkEffortOrderHeaders=Orders
WorkEffortOrganizer=Organizer
WorkEffortOpenApplication=WorkEffortOpenApplication
@@ -449,5 +450,6 @@
FormFieldTitle_finishDateTime=Finish Date Time
FormFieldTitle_cancelDateTime=Cancel Date Time
PriorityFormatNotCorrect=Priority format is incorrect
+

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml Wed Sep 19 19:45:29 2007
@@ -87,4 +87,11 @@
<process field="fromDate"><copy/></process>
<process field="thruDate"><copy/></process>
</simple-map-processor>
+ <simple-map-processor name="createWorkEffortNoteMap">
+ <process field="workEffortId"><copy/></process>
+ <process field="internalNote"><copy/></process>
+ <process field="noteName"><copy/></process>
+ <process field="noteParty"><copy/></process>
+ <process field="noteInfo"><copy/><not-empty><fail-property resource="WorkEffortUiLabels" property="WorkEffortNoteMissing"/></not-empty></process>
+ </simple-map-processor>
</simple-map-processors>

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml Wed Sep 19 19:45:29 2007
@@ -56,4 +56,13 @@
<result-to-request result-name="workEffortId"/>
</call-service>
</simple-method>
+ <simple-method method-name="createWorkEffortNote" short-description="Creates WorkEffortNote">
+ <call-map-processor xml-resource="org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml"
+ processor-name="createWorkEffortNoteMap" in-map-name="parameters" out-map-name="context"/>
+ <check-errors/>
+ <call-service service-name="createWorkEffortNote" in-map-name="context">
+ <default-message>Note is successfully created.</default-message>
+ <result-to-request result-name="noteId"/>
+ </call-service>
+ </simple-method>
</simple-methods>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Wed Sep 19 19:45:29 2007
@@ -778,8 +778,8 @@
</field>
<field name="noteInfo" title="${uiLabelMap.CommonNote}" widget-style="tabletext"><display/></field>
<field name="noteParty" title="${uiLabelMap.CommonBy}" widget-style="tabletext"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field>
- <field name="isPritable" use-when="internalNote.equals("N")"><display description="${uiLabelMap.OrderPrintableNote}"/></field>
- <field name="isPritable" use-when="internalNote.equals("Y")"><display description="${uiLabelMap.OrderNotPrintableNote}"/></field>
+ <field name="isPrintable" use-when="internalNote.equals("N")"><display description="${uiLabelMap.OrderPrintableNote}"/></field>
+ <field name="isPrintable" use-when="internalNote.equals("Y")"><display description="${uiLabelMap.OrderNotPrintableNote}"/></field>
<field name="Private/Public" widget-style="buttontext" use-when="internalNote.equals("N")">
<hyperlink target="updateWorkEffortNote?workEffortId=${workEffortId}&noteId=${noteId}&internalNote=Y" description="${uiLabelMap.OrderNotesPrivate}" />
</field>

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Wed Sep 19 19:45:29 2007
@@ -25,10 +25,14 @@

PageTitleAddProject=Add Project
PageTitleAddPhase=Add Phase
+PageTitleAddProjectNotes=Add Project Notes
PageTitleAddSkill=Add Skill
PageTitleAddSubProject=Add Sub Project
PageTitleAddSubTask=Add Sub Task
PageTitleAddTask=Add Task
+PageTitleAddTaskNotes=Add Task Notes
+PageTitleListTaskNotes=List Task Notes
+PageTitleAddTimeEntry=Add Time Entry
PageTitleEditProject=Edit Project
PageTitleEditPhase=Edit Phase
PageTitleEditSkill=Edit Skill
@@ -43,6 +47,7 @@
PageTitleUnassignedTask=Unassigned Task
PageTitleAddPartyAssign=Add Party Assign
PageTitleListPartyAssigns=Party Assigns
+PageTitleListProjectNotes=List Project Notes
ProjectMgrActualHours=Actual Hours
ProjectMgrCompanyName=Ofbiz Company
ProjectMgrCompanySubtitle=Project
@@ -58,6 +63,7 @@
ProjectMgrNewSubProject=New Sub Project
ProjectMgrNewSubTask=New Sub Task
ProjectMgrNewTask=New Task
+ProjectMgrNotesCreateNew=Create New
ProjectMgrPartyList=List of Parties
ProjectMgrProjectName=Project Name
ProjectMgrProjectSummary=Project Summary
@@ -92,11 +98,15 @@
ProjectMgrWorkEffortIdFrom=Id From
ProjectMgrWorkEffortIdTo=Id To
ProjectMgrPartyRoleTypeId=Role Type Id
+ProjectMgrProjectNoNotes=No Notes for this Project
+ProjectMgrTaskNoNotes=No Notes for this Task
+ProjectMgrTaskSummary=Task Summary
ProjectMgrTaskNotAssignedPhase=Task not assigned to Phase/Iteration
ProjectMgrToFindTask=To Find Task Give Range
ProjectMgrToFindProject=To Find Project Give Range
ProjectMgrTimeEntries=Add/Edit Time Entries
PageTitleListTimeEntries=List Time Entries for
ProjectMgrQuickAssignPartyId=Quick Assign Party Id
+

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh Wed Sep 19 19:45:29 2007
@@ -26,12 +26,13 @@
import org.ofbiz.entity.util.EntityUtil;
import javolution.util.FastMap;

-workEffortIdFrom = parameters.get("workEffortIdFrom");
-workEffortAssocTypeId = parameters.get("workEffortAssocTypeId");
+if(workEffortIdFrom == null) {
+ workEffortIdFrom = parameters.get("workEffortIdFrom");
+}
workEffortTypeId = parameters.get("workEffortTypeId");

if(workEffortIdFrom != null) {
- List workEffortAssocs = delegator.findByAnd("WorkEffortAssocView", UtilMisc.toMap("workEffortIdFrom", workEffortIdFrom, "workEffortAssocTypeId",workEffortAssocTypeId));
+ List workEffortAssocs = delegator.findByAnd("WorkEffortAssocView", UtilMisc.toMap("workEffortIdFrom", workEffortIdFrom, "workEffortAssocTypeId","WORK_EFF_BREAKDOWN"));
if(workEffortAssoc != null) {
List childProjects = new LinkedList();
List childTasks = new LinkedList();
@@ -92,6 +93,7 @@
context.put("projects", projects);
}
}
+

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Wed Sep 19 19:45:29 2007
@@ -202,13 +202,13 @@
<response name="success" type="view" value="EditProjectSkills"/>
<response name="error" type="view" value="EditProjectSkills"/>
</request-map>
- <request-map uri="updateWorkEffortSkillStandard">
+ <request-map uri="updateProjectSkillStandard">
<security https="true" auth="true"/>
<event type="service" invoke="updateWorkEffortSkillStandard"/>
<response name="success" type="view" value="EditProjectSkills"/>
<response name="error" type="view" value="EditProjectSkills"/>
</request-map>
- <request-map uri="deleteWorkEffortSkillStandard">
+ <request-map uri="deleteProjectSkillStandard">
<security https="true" auth="true"/>
<event type="service" invoke="deleteWorkEffortSkillStandard"/>
<response name="success" type="view" value="EditProjectSkills"/>
@@ -291,6 +291,62 @@
<response name="success" type="view" value="FindTimeSheet"/>
<response name="error" type="view" value="FindTimeSheet"/>
</request-map>
+ <request-map uri="EditTaskNotes">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditTaskNotes"/>
+ <response name="error" type="view" value="EditTaskNotes"/>
+ </request-map>
+ <request-map uri="createTaskNote">
+ <security https="true" auth="true"/>
+ <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
+ <response name="success" type="view" value="EditTaskNotes"/>
+ <response name="error" type="view" value="EditTaskNotes"/>
+ </request-map>
+ <request-map uri="updateTaskNote">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateWorkEffortNote"/>
+ <response name="success" type="view" value="EditTaskNotes"/>
+ <response name="error" type="view" value="EditTaskNotes"/>
+ </request-map>
+ <request-map uri="updateTaskNoteSummary">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateWorkEffortNote"/>
+ <response name="success" type="view" value="taskView"/>
+ <response name="error" type="view" value="taskView"/>
+ </request-map>
+ <request-map uri="updateProjectNote">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateWorkEffortNote"/>
+ <response name="success" type="view" value="projectView"/>
+ <response name="error" type="view" value="projectView"/>
+ </request-map>
+ <request-map uri="taskView">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="taskView"/>
+ <response name="error" type="view" value="taskView"/>
+ </request-map>
+ <request-map uri="newNotesForProject">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="projectView"/>
+ <response name="error" type="view" value="projectView"/>
+ </request-map>
+ <request-map uri="createNewNotesForProject">
+ <security https="true" auth="true"/>
+ <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
+ <response name="success" type="view" value="projectView"/>
+ <response name="error" type="view" value="projectView"/>
+ </request-map>
+ <request-map uri="newNotesForTask">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="taskView"/>
+ <response name="error" type="view" value="taskView"/>
+ </request-map>
+ <request-map uri="createNewNotesForTask">
+ <security https="true" auth="true"/>
+ <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortNote"/>
+ <response name="success" type="view" value="taskView"/>
+ <response name="error" type="view" value="taskView"/>
+ </request-map>



@@ -325,5 +381,8 @@
<view-map name="EditTimeSheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#EditTimeSheet"/>
<view-map name="EditSkillTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditSkillTypes"/>
<view-map name="EditPartySkills" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartySkills"/>
+ <view-map name="EditWorkEffortNotes" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectNotes"/>
+ <view-map name="EditTaskNotes" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskNotes"/>
+ <view-map name="taskView" type="screen" page="component://projectmgr/widget/TaskScreens.xml#TaskSummary"/>

</site-conf>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editTimeSheet.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editTimeSheet.ftl?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editTimeSheet.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editTimeSheet.ftl Wed Sep 19 19:45:29 2007
@@ -37,11 +37,12 @@
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<#if timesheet?exists>
<td><input type="hidden" name="timesheetId" value="${timesheet.timesheetId?if_exists}"/></td>
+ <td><input type="hidden" name="partyId" value="${timesheet.partyId?if_exists}"/></td>
</#if>
<#if timesheet?exists>
<tr>
<td class="label">${uiLabelMap.TimesheetTimesheetId}</td>
- <td>${timesheet.timesheetId?if_exists}</td>
+ <td>${timesheet.timesheetId?if_exists}<span class="tooltip">${uiLabelMap.CommonNotModifRecreat}</span></td>
</tr>
</#if>
<tr>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editphaseandassoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editphaseandassoc.ftl?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editphaseandassoc.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editphaseandassoc.ftl Wed Sep 19 19:45:29 2007
@@ -47,9 +47,6 @@
</#if>
</tr>
<tr>
- <td class="label" >${uiLabelMap.ProjectMgrWorkEffortIdFrom}</td>
- <#assign workEffort=delegator.findByPrimaryKey("WorkEffort", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortId", workEffortIdFrom?if_exists ))>
- <td>${(workEffort.workEffortName)?if_exists} [${(workEffort.workEffortId)?if_exists}]<span class="tooltip">${uiLabelMap.CommonNotModifRecreat}</td>
<td><input type="hidden" name="workEffortIdFrom" value="${workEffortIdFrom?if_exists}"/></td>
<td><input type="hidden" name="workEffortParentId" value="${workEffortIdFrom?if_exists}"/></td>
<td><input type="hidden" name="workEffortAssocTypeId" value="WORK_EFF_BREAKDOWN"/>
@@ -86,10 +83,10 @@
<td>
<select name="currentStatusId" class="selectBox">
<#if phase?exists>
- <#assign currentStatusId = phase.currentStatusId?if_exists>
- <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatusId))>
+ <#assign currentStatus = phase.getRelatedOne("CurrentStatusItem")?if_exists>
+ <option value="${currentStatus.statusId}">${currentStatus.description}</option>
+ <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.statusId))>
<#list statusValidChangeToDetailList as statusValidChangeToDetail>
- <option SELECTED value="${currentStatusId}">${currentStatusId}</option>
<option value=${statusValidChangeToDetail.statusId}>[${uiLabelMap.WorkEffortGeneral}]${statusValidChangeToDetail.description}</option>
</#list>
<#else>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl Wed Sep 19 19:45:29 2007
@@ -100,9 +100,9 @@
<td class="label" >${uiLabelMap.CommonStatus}</td>
<td>
<select name="currentStatusId" class="selectBox">
- <#assign currentStatusId = project.currentStatusId?if_exists>
- <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatusId))>
- <option SELECTED value="${currentStatusId}">${currentStatusId}</option>
+ <#assign currentStatus = project.getRelatedOne("CurrentStatusItem")?if_exists>
+ <option value="${currentStatus.statusId}">${currentStatus.description}</option>
+ <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.statusId))>
<option>--</option>
<#list statusValidChangeToDetailList as statusValidChangeToDetail>
<option value=${statusValidChangeToDetail.statusId}>[${uiLabelMap.WorkEffortGeneral}]${statusValidChangeToDetail.description}</option>
@@ -136,11 +136,11 @@
<td>
<select name="scopeEnumId" class="selectBox">
<#if project.scopeEnumId?exists>
- <#assign enumeration = delegator.findByPrimaryKey("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumId", project.scopeEnumId?if_exists ))>
- <option SELECTED value=${enumeration.enumId?if_exists}>${enumeration.description?if_exists}</option>
+ <#assign currentScope = project.getRelatedOne("ScopeEnumeration")?if_exists>
+ <option value="${currentScope.enumId}">${currentScope.description}</option>
</#if>
<#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))>
- <option--</option>
+ <option>--</option>
<#list enumerations as enumeration>
<option value=${enumeration.enumId?if_exists}>${enumeration.description?if_exists}</option>
</#list>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl Wed Sep 19 19:45:29 2007
@@ -47,9 +47,6 @@
</#if>
</tr>
<tr>
- <td class="label" >${uiLabelMap.ProjectMgrWorkEffortIdFrom}</td>
- <#assign workEffort=delegator.findByPrimaryKey("WorkEffort", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortId", workEffortIdFrom?if_exists ))>
- <td>${(workEffort.workEffortName)?if_exists} [${(workEffort.workEffortId)?if_exists}]<span class="tooltip">${uiLabelMap.CommonNotModifRecreat}</td>
<td><input type="hidden" name="workEffortIdFrom" value="${workEffortIdFrom?if_exists}"/>
<td><input type="hidden" name="workEffortParentId" value="${workEffortIdFrom?if_exists}"/></td>
<td><input type="hidden" name="workEffortAssocTypeId" value="WORK_EFF_BREAKDOWN"/>
@@ -86,10 +83,10 @@
<td>
<select name="currentStatusId" class="selectBox">
<#if project?exists>
- <#assign currentStatusId = project.currentStatusId?if_exists>
- <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatusId))>
+ <#assign currentStatus = project.getRelatedOne("CurrentStatusItem")?if_exists>
+ <option value="${currentStatus.statusId}">${currentStatus.description}</option>
+ <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.statusId))>
<#list statusValidChangeToDetailList as statusValidChangeToDetail>
- <option SELECTED value="${currentStatusId}">${currentStatusId}</option>
<option value=${statusValidChangeToDetail.statusId}>[${uiLabelMap.WorkEffortGeneral}]${statusValidChangeToDetail.description}</option>
</#list>
<#else>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittask.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittask.ftl?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittask.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittask.ftl Wed Sep 19 19:45:29 2007
@@ -54,13 +54,13 @@
<tr>
<#if task?exists>
<td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td>
- <td>${task.workEffortId?if_exists}</td>
+ <td>${task.workEffortId?if_exists}<span class="tooltip">${uiLabelMap.CommonNotModifRecreat}</span></td>
</#if>
</tr>
<tr>
<td class="label" >${uiLabelMap.CommonName}*</td>
<#if task?exists>
- <td>${task.workEffortName?if_exists} <span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+ <td>${task.workEffortName?if_exists}</td>
<#else>
<td><input type="text" name="workEffortName" value=""/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
</#if>
@@ -137,9 +137,11 @@
<#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))>
<select name="scopeEnumId" class="selectBox">
<#if task?exists>
- <#assign scopeEnumId = task.scopeEnumId?if_exists>
+ <#assign currentScope = task.getRelatedOne("ScopeEnumeration")?if_exists>
+ <option value="${currentScope.enumId}">${currentScope.description}</option>
+ <option>--<option>
<#list enumerations as enumeration>
- <option value="${enumeration.enumId}" <#if "${enumeration.enumId}" == scopeEnumId?if_exists>selected="selected"</#if>>${enumeration.description}</option>
+ <option value="${enumeration.enumId}">${enumeration.description}</option>
</#list>
<#else>
<#list enumerations as enumeration>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl Wed Sep 19 19:45:29 2007
@@ -47,9 +47,6 @@
</#if>
</tr>
<tr>
- <td class="label" >${uiLabelMap.ProjectMgrWorkEffortIdFrom}</td>
- <#assign workEffort=delegator.findByPrimaryKey("WorkEffort", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortId", workEffortIdFrom?if_exists ))>
- <td>${(workEffort.workEffortName)?if_exists} [${(workEffort.workEffortId)?if_exists}]<span class="tooltip">${uiLabelMap.CommonNotModifRecreat}</td>
<td><input type="hidden" name="workEffortIdFrom" value="${workEffortIdFrom?if_exists}"/></td>
<td><input type="hidden" name="workEffortParentId" value="${workEffortIdFrom?if_exists}"/></td>
<td><input type="hidden" name="workEffortAssocTypeId" value="WORK_EFF_BREAKDOWN"/>
@@ -92,10 +89,10 @@
<td>
<select name="currentStatusId" class="selectBox">
<#if task?exists>
- <#assign currentStatusId = task.currentStatusId?if_exists>
- <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatusId))>
+ <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")?if_exists>
+ <option SELECTED value="${currentStatus.currentStatusId}">${currentStatus.description}</option>
+ <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.currentStatusId))>
<#list statusValidChangeToDetailList as statusValidChangeToDetail>
- <option SELECTED value="${currentStatusId}">${currentStatusId}</option>
<option value=${statusValidChangeToDetail.statusId}>[${uiLabelMap.WorkEffortGeneral}]${statusValidChangeToDetail.description}</option>
</#list>
<#else>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl Wed Sep 19 19:45:29 2007
@@ -90,15 +90,15 @@
<tr>
<#if task?exists>
<td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td>
- <td>${task.workEffortId?if_exists}</td>
+ <td>${task.workEffortId?if_exists}<span class="tooltip">${uiLabelMap.CommonNotModifRecreat}</span></td>
</#if>
</tr>
<tr>
<td class="label" >${uiLabelMap.CommonName}*</td>
<#if task?exists>
- <td>${task.workEffortName?if_exists} <span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+ <td>${task.workEffortName?if_exists}</td>
<#else>
- <td><input type="text" name="workEffortName" value=""/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td>
+ <td><input type="text" name="workEffortName" value=""/></td>
</#if>
</tr>
<tr>
@@ -114,10 +114,10 @@
<td>
<select name="currentStatusId" class="selectBox">
<#if task?exists>
- <#assign currentStatusId = task.currentStatusId?if_exists>
- <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatusId))>
+ <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")?if_exists>
+ <option SELECTED value="${currentStatus.currentStatusId}">${currentStatus.description}</option>
+ <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.currentStatusId))>
<#list statusValidChangeToDetailList as statusValidChangeToDetail>
- <option SELECTED value="${currentStatusId}">${currentStatusId}</option>
<option value=${statusValidChangeToDetail.statusId}>[${uiLabelMap.WorkEffortGeneral}]${statusValidChangeToDetail.description}</option>
</#list>
<#else>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl Wed Sep 19 19:45:29 2007
@@ -45,42 +45,11 @@
</#if>
</tr>
<tr>
- <td class="label" >${uiLabelMap.ProjectMgrWorkEffortIdFrom}</td>
- <#assign workEffort=delegator.findByPrimaryKey("WorkEffort", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortId", workEffortIdFrom?if_exists ))>
- <td>${(workEffort.workEffortName)?if_exists} [${(workEffort.workEffortId)?if_exists}]<span class="tooltip">${uiLabelMap.CommonNotModifRecreat}</td>
<td><input type="hidden" name="workEffortIdFrom" value="${workEffortIdFrom?if_exists}"/></td>
+ <td><input type="hidden" name="workEffortAssocTypeId" value="WORK_EFF_BREAKDOWN"/></td>
<td><input type="hidden" name="workEffortParentId" value="${workEffortIdFrom?if_exists}"/></td>
</tr>
<tr>
- <td class="label" >${uiLabelMap.ProjectMgrWorkEffortAssocTypeId}</td>
- <td>
- <select class="selectBox" name="workEffortAssocTypeId">
- <#assign WorkEffortAssocTypes = delegator.findAll("WorkEffortAssocType", Static["org.ofbiz.base.util.UtilMisc"].toList("description"))>
- <#list WorkEffortAssocTypes as WorkEffortAssocType>
- <option value="${WorkEffortAssocType.workEffortAssocTypeId?if_exists}">${WorkEffortAssocType.description?if_exists}</option>
- </#list>
- </select>
- </td>
- </tr>
- <tr>
- <td class="label" >${uiLabelMap.CommonSequenceNum}</td>
- <td><input type="text" name="sequenceNum" value=""/></td>
- </tr>
- <tr>
- <td class="label" >${uiLabelMap.CommonFromDate}</td>
- <td>
- <input type="text" size="20" name="fromDate"/>
- <a href="javascript:call_cal(document.addProjectAndAssocForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- </td>
- </tr>
- <tr>
- <td class="label" >${uiLabelMap.CommonThruDate}</td>
- <td>
- <input type="text" size="20" name="thruDate"/>
- <a href="javascript:call_cal(document.addProjectAndAssocForm.thruDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- </td>
- </tr>
- <tr>
<td width="20%">
Enter the WorkEffort Details below
</td>
@@ -112,10 +81,10 @@
<td>
<select name="currentStatusId" class="selectBox">
<#if task?exists>
- <#assign currentStatusId = task.currentStatusId?if_exists>
- <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatusId))>
+ <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")?if_exists>
+ <option SELECTED value="${currentStatus.currentStatusId}">${currentStatus.description}</option>
+ <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.currentStatusId))>
<#list statusValidChangeToDetailList as statusValidChangeToDetail>
- <option SELECTED value="${currentStatusId}">${currentStatusId}</option>
<option value=${statusValidChangeToDetail.statusId}>[${uiLabelMap.WorkEffortGeneral}]${statusValidChangeToDetail.description}</option>
</#list>
<#else>
@@ -175,9 +144,11 @@
<#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))>
<select name="scopeEnumId" class="selectBox">
<#if task?exists>
- <#assign scopeEnumId = task.scopeEnumId?if_exists>
+ <#assign currentScope = task.getRelatedOne("ScopeEnumeration")?if_exists>
+ <option value="${currentScope.enumId}">${currentScope.description}</option>
+ <option>--</option>
<#list enumerations as enumeration>
- <option <#if "${enumeration.enumId}" == scopeEnumId?if_exists>selected="selected"</#if>>${enumeration.description}</option>
+ <option value="${enumeration.enumId}">${enumeration.description}</option>
</#list>
<#else>
<#list enumerations as enumeration>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/listtasksbydaterange.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/listtasksbydaterange.ftl?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/listtasksbydaterange.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/listtasksbydaterange.ftl Wed Sep 19 19:45:29 2007
@@ -30,29 +30,38 @@
<tr>
<td><b>${uiLabelMap.ProjectMgrToFindTask}</b></td>
</tr>
- <tr>
- <td align="right">${uiLabelMap.CommonFromDate}</td>
- <td>
- <input type="text" size="20" name="fromDate" class="field text">
- <a href="javascript:call_cal(document.listTasksByDateRange.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- </td>
- <td> </td>
- </tr>
- <tr>
- <td align="right">${uiLabelMap.CommonThruDate}</td>
- <td>
- <input type="text" size="20" name="thruDate" class="field text">
- <a href="javascript:call_cal(document.listTasksByDateRange.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
- </td>
- <td> </td>
- </tr>
+ <tr><td>
+ <fieldset class="right">
+ <div class="form-row">
+ <div class="field-label">
+ <label for="fromDate">${uiLabelMap.CommonFromDate}<span class="requiredLabel"></span></label>
+ </div>
+ <div class="field-widget">
+ <input name="fromDate" class="field text" type="text" size=20 value="" title=""/>
+ <a href="javascript:call_cal(document.listTasksByDateRange.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ </div>
+ </div>
+ <div class="form-row">
+ <div class="field-label">
+ <label for="thruDate">${uiLabelMap.CommonThruDate}<span class="requiredLabel"></span></label>
+ </div>
+ <div class="field-widget">
+ <input name="thruDate" class="field text" type="text" size=20 value="" title="" />
+ <a href="javascript:call_cal(document.listTasksByDateRange.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+ </div>
+ </div>
+ </fieldset>
+ </td></tr>
<tr><td> </td></tr>
- <tr>
- <td> </td>
- <td align="left">
- <a href="javascript:document.listTasksByDateRange.submit()" class="buttontext">${uiLabelMap.CommonFind}</a>
- </td>
- </tr>
+ <tr><td>
+ <fieldset class="right">
+ <div class="form-row">
+ <div>
+ <a href="javascript:document.listProjectsByDateRange.submit()" class="buttontext">${uiLabelMap.CommonFind}</a>
+ </div>
+ </div>
+ </fieldset>
+ </td></tr>
</table>
</form>
</div>

Added: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl?rev=577516&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl (added)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl Wed Sep 19 19:45:29 2007
@@ -0,0 +1,127 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3"> ${uiLabelMap.WorkEffortNotes}</li>
+ <#if project?has_content>
+ <li><a href="<@ofbizUrl>newNotesForProject?workEffortId=${project.workEffortId?if_exists}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li>
+ <#else>
+ <li><a href="<@ofbizUrl>newNotesForTask?workEffortId=${task.workEffortId?if_exists}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li>
+ </#if>
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
+ <tr>
+ <td>
+ <#if workEffortNoteandDetails?has_content>
+ <table width="100%" border="0" cellpadding="1">
+ <#list workEffortNoteandDetails as note>
+ <tr>
+ <td align="left" valign="top" width="35%">
+ <div class="tabletext"> <b>${uiLabelMap.CommonBy}: </b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</div>
+ <div class="tabletext"> <b>${uiLabelMap.CommonAt}: </b>${Static["org.ofbiz.base.util.UtilDateTime"].timeStampToString(note.noteDateTime?if_exists,"dd-MM-yyyy HH:mm",Static["java.util.TimeZone"].getDefault(),context.get("locale"))}</div>
+ </td>
+ <td align="left" valign="top" width="50%">
+ <div class="tabletext">${note.noteInfo?if_exists}</div>
+ </td>
+ <td align="right" valign="top" width="15%">
+ <#if note.internalNote?if_exists == "N">
+ <div class="tabletext">${uiLabelMap.ProjectMgrPrintableNote}</div>
+ <#if project?has_content>
+ <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a>
+ <#else>
+ <a href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a>
+ </#if>
+ </#if>
+ <#if note.internalNote?if_exists == "Y">
+ <div class="tabletext">${uiLabelMap.ProjectMgrNotPrintableNote}</div>
+ <#if project?has_content>
+ <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a>
+ <#else>
+ <a href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a>
+ </#if>
+ </#if>
+ </td>
+ </tr>
+ <#if note_has_next>
+ <tr><td colspan="3"><hr class="sepbar"></td></tr>
+ </#if>
+ </#list>
+ </table>
+ <#else>
+ <#if project?has_content>
+ <div class="tabletext"> ${uiLabelMap.ProjectMgrProjectNoNotes}.</div>
+ <#else>
+ <div class="tabletext"> ${uiLabelMap.ProjectMgrTaskNoNotes}.</div>
+ </#if>
+
+ </#if>
+ </td>
+ </tr>
+ </table>
+ <#if parameters.showForm?exists>
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="head3"> ${uiLabelMap.OrderAddNote}</li>
+ </ul>
+ <br class="clear" />
+ </div>
+ <div class="screenlet-body">
+ <form name="createnoteform" method="post"
+ <#if project?has_content> action="<@ofbizUrl>createNewNotesForProject</@ofbizUrl>"
+ <#else> action="<@ofbizUrl>createNewNotesForTask</@ofbizUrl>"
+ </#if>>
+ <table width="90%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <#if project?has_content>
+ <td><input type="hidden" name="workEffortId" value="${project.workEffortId}"></td>
+ <#else>
+ <td><input type="hidden" name="workEffortId" value="${task.workEffortId}"></td>
+ </#if>
+ </tr>
+ <tr>
+ <td width="26%" align="right"><div class="tabletext">${uiLabelMap.OrderNote}</div></td>
+ <td width="54%">
+ <textarea name="noteInfo" class="textAreaBox" rows="5" cols="70"></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td/><td class="tabletext">${uiLabelMap.OrderInternalNote} :
+ <select class="selectBox" name="internalNote" size="1"><option value=""></option><option value="Y" selected>${uiLabelMap.CommonYes}</option><option value="N">${uiLabelMap.CommonNo}</option></select></td>
+ </tr>
+ <tr>
+ <td/><td class="tabletext"><i>${uiLabelMap.OrderInternalNoteMessage}</i></td>
+ </tr>
+ </table>
+ <#if project?has_content>
+  <a href="javascript:document.createnoteform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
+ <#else>
+  <a href="javascript:document.createnoteform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
+ </#if>
+ </form>
+ </div>
+ </#if>
+ </div>
+ </div>
+

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/projectinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/projectinfo.ftl?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/projectinfo.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/projectinfo.ftl Wed Sep 19 19:45:29 2007
@@ -19,7 +19,11 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="head3"> ${uiLabelMap.ProjectMgrProjectName} #${project.workEffortId?if_exists} ${uiLabelMap.CommonInformation}</li>
+ <#if project?has_content>
+ <li class="head3"> ${uiLabelMap.ProjectMgrProjectName} #${project.workEffortId?if_exists} ${uiLabelMap.CommonInformation}</li>
+ <#else>
+ <li class="head3"> ${uiLabelMap.ProjectMgrTaskName} #${task.workEffortId?if_exists} ${uiLabelMap.CommonInformation}</li>
+ </#if>
</ul>
<br class="clear" />
</div>
@@ -43,7 +47,10 @@
<tr><td colspan="3"><hr class="sepbar"/></td></tr>
<tr>
<td class="label" >${uiLabelMap.CommonStatus}</td>
- <td>${project.currentStatusId?if_exists}</td>
+ <td>
+ <#assign currentStatus = project.getRelatedOne("CurrentStatusItem")?if_exists>
+ ${currentStatus.description?if_exists}
+ </td>
</tr>
<tr><td colspan="3"><hr class="sepbar"/></td></tr>
<tr>
@@ -53,7 +60,10 @@
<tr><td colspan="3"><hr class="sepbar"/></td></tr>
<tr>
<td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td>
- <td>${project.scopeEnumId?if_exists}</td>
+ <td>
+ <#assign currentScope = project.getRelatedOne("ScopeEnumeration")?if_exists>
+ ${currentScope.description?if_exists}
+ </td>
</tr>
<tr><td colspan="3"><hr class="sepbar"/></td></tr>
<tr>
@@ -76,6 +86,64 @@
<td>${project.actualCompletionDate?if_exists}</td>
</tr>
</table>
- </#if>
+ <#else>
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <tr>
+ <td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td>
+ <td>${task.workEffortId?if_exists}</td>
+ </tr>
+ <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr>
+ <td class="label" >${uiLabelMap.CommonName}</td>
+ <td>${task.workEffortName?if_exists}</td>
+ </tr>
+ <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr>
+ <td class="label" >${uiLabelMap.CommonDescription}</td>
+ <td>${task.description?if_exists}</td>
+ </tr>
+ <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr>
+ <td class="label" >${uiLabelMap.CommonStatus}</td>
+ <td>
+ <#assign currentStatus = task.getRelatedOne("CurrentStatusItem")?if_exists>
+ ${currentStatus.description?if_exists}
+ </td>
+ </tr>
+ <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr>
+ <td class="label">${uiLabelMap.CommonPriority}</td>
+ <td>${task.priority?if_exists}</td>
+ </tr>
+ <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr>
+ <td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td>
+ <td>
+ <#assign currentScope = task.getRelatedOne("ScopeEnumeration")?if_exists>
+ ${currentScope.description?if_exists}
+ </td>
+ </tr>
+ <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr>
+ <td class="label">${uiLabelMap.WorkEffortEstimatedStartDate}</td>
+ <td>${task.estimatedStartDate?if_exists}</td>
+ </tr>
+ <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr>
+ <td class="label">${uiLabelMap.WorkEffortEstimatedCompletionDate}</td>
+ <td>${task.estimatedCompletionDate?if_exists}</td>
+ </tr>
+ <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr>
+ <td class="label">${uiLabelMap.FormFieldTitle_actualStartDate}</td>
+ <td>${task.actualStartDate?if_exists}</td>
+ </tr>
+ <tr><td colspan="3"><hr class="sepbar"/></td></tr>
+ <tr>
+ <td class="label">${uiLabelMap.FormFieldTitle_actualCompletionDate}</td>
+ <td>${task.actualCompletionDate?if_exists}</td>
+ </tr>
+ </table>
+ </#if>
</div>
</div>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Wed Sep 19 19:45:29 2007
@@ -30,6 +30,7 @@
<property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="AssetMaintUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>


</container>
<container style="righthalf">
<include-screen name="SubProjectsInfo"/>
<include-screen name="TasksInfo"/>
+ <include-screen name="NoteInfo"/>
</container>
</widgets>
</section>
@@ -594,6 +625,22 @@
<include-form name="ListAssociatedParties" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
</container>
</container>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="NoteInfo">
+ <section>
+ <actions>
+ <set field="workEffortId" from-field="parameters.workEffortId"/>
+ <entity-and entity-name="WorkEffortNoteAndData" list-name="workEffortNoteandDetails">
+ <field-map field-name="workEffortId" env-name="workEffortId"/>
+ <order-by field-name="-noteDateTime"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl"/></html>
+ </platform-specific>
</widgets>
</section>
</screen>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Wed Sep 19 19:45:29 2007
@@ -150,7 +150,9 @@
<set field="tabButtonItem" value="projectskills"/>
<set field="labelTitleProperty" value="PageTitleEditSkill"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
- <entity-one entity-name="WorkEffortSkillStandard" value-name="workEffortSkillStandard"/>
+ <entity-and entity-name="WorkEffortSkillStandard" list-name="workEffortSkillStandards">
+ <field-map field-name="workEffortId" env-name="workEffortId"/>
+ </entity-and>
</actions>
<widgets>
<decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
@@ -217,6 +219,109 @@
<link target="EditTaskListAndAssoc?workEffortIdFrom=${workEffortAssoc.workEffortIdFrom}&workEffortIdTo=${workEffortAssoc.workEffortIdTo}&workEffortAssocTypeId=${workEffortAssoc.workEffortAssocTypeId}&fromDate=${workEffortAssoc.fromDate}&DONE_PAGE=${donePage}" text="Edit Assoc Detail" style="buttontext"></link>
</widgets>
</section>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditTaskNotes">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleListTaskNotes"/>
+ <set field="headerItem" value="task"/>
+ <set field="tabButtonItem" value="notes"/>
+ <set field="labelTitleProperty" value="PageTitleListTaskNotes"/>
+
+ <set field="workEffortId" from-field="parameters.workEffortId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container style="screenlet">
+ <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.${titleProperty}}</label></container>
+ <container style="screenlet-body">
+ <include-form name="ListTaskNotes" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </container>
+ <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddTaskNotes}</label></container>
+ <container style="screenlet-body">
+ <include-form name="AddTaskNote" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </container>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="TaskSummary">
+ <section>
+ <actions>
+ <set field="headerItem" value="task"/>
+ <set field="tabButtonItem" value="taskView"/>
+ <set field="workEffortId" from-field="parameters.workEffortId"/>
+ <set field="workEffortIdFrom" from-field="parameters.workEffortId"/>
+ <entity-one entity-name="WorkEffort" value-name="task"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <not><if-empty field-name="task"/></not>
+ </condition>
+ <widgets>
+ <container style="lefthalf">
+ <include-screen name="TaskInfo"/>
+ <include-screen name="SubTasksInfo"/>
+ </container>
+ <container style="righthalf">
+ <include-screen name="NoteInfo"/>
+ </container>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="TaskInfo">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://projectmgr/webapp/projectmgr/project/summary/projectinfo.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="SubTasksInfo">
+ <section>
+ <actions>
+ <set field="parameters.workEffortIdFrom" from-field="parameters.workEffortId"/>
+ <set field="parameters.workEffortTypeId" value="TASK"/>
+ <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh"/>
+ </actions>
+ <widgets>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <label style="boxhead">${uiLabelMap.ProjectMgrSubTasks}</label>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="ListTaskLists" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </container>
+ </container>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="NoteInfo">
+ <section>
+ <actions>
+ <set field="workEffortId" from-field="parameters.workEffortId"/>
+ <entity-and entity-name="WorkEffortNoteAndData" list-name="workEffortNoteandDetails">
+ <field-map field-name="workEffortId" env-name="workEffortId"/>
+ <order-by field-name="-noteDateTime"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl"/></html>
+ </platform-specific>
</widgets>
</section>
</screen>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=577516&r1=577515&r2=577516&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed Sep 19 19:45:29 2007
@@ -21,26 +21,26 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">


- <form name="ListProjects" type="list" list-name="projects">
+ <form name="ListProjects" type="list" list-name="projects" paginate-target="FindProject">
<field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${workEffortId}" target="EditProject?workEffortId=${workEffortId}"/>
</field>
<field name="workEffortName" title="${uiLabelMap.CommonName}"><display/></field>
<field name="workEffortTypeId" title="${uiLabelMap.ProjectMgrWorkEffortTypeId}"><display-entity entity-name="WorkEffortType"/></field>
<field name="workEffortPurposeTypeId" title="${uiLabelMap.ProjectMgrWorkEffortPurposeTypeId}"><display-entity entity-name="WorkEffortPurposeType"/></field>
- <field name="projectView" title="${uiLabelMap.ProjectMgrProjectSummary}" widget-style="linktext">
+ 
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="linktext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteProject?workEffortId=${workEffortId}"/>
</field>
</form>
- <form name="ListChildEfforts" target="updateProjectAndAssoc" title="" list-name="projects" type="list" separate-columns="true">
- <actions>
- <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
+ <form name="ListChildEfforts" target="updateProjectAndAssoc" title="" list-name="projects" type="list" separate-columns="true" paginate-target="FindProject">
+ <row-actions>
+ <entity-one entity-name="StatusItem" value-name="currentStatus">
<field-map field-name="statusId" env-name="currentStatusId"/>
</entity-one>
- </actions>
+ </row-actions>
<field name="workEffortTypeId"><hidden/></field>
<field name="workEffortId"><hidden/></field>
<field name="workEffortIdFrom"><hidden/></field>
@@ -70,12 +70,12 @@
</form>


- <form name="ListTasks" target="updateTaskAndAssoc" title="" list-name="tasks" type="list" separate-columns="true">
- <actions>
- <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
+ <form name="ListTasks" target="updateTaskAndAssoc" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTask">
+ <row-actions>
+ <entity-one entity-name="StatusItem" value-name="currentStatus">
<field-map field-name="statusId" env-name="currentStatusId"/>
</entity-one>
- </actions>
+ </row-actions>
<field name="workEffortTypeId"><hidden/></field>
<field name="workEffortId"><hidden/></field>
<field name="workEffortIdFrom"><hidden/></field>
@@ -102,16 +102,16 @@
<field name="actualCompletionDate" entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><date-time/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><textarea cols="6"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
- <field name="timeEntries" title="${uiLabelMap.ProjectMgrTimeEntries}" widget-style="linktext">
+ <field name="timeEntries" title="${uiLabelMap.ProjectMgrTimeEntries}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.ProjectMgrTimeEntries}" target="EditTimeEntries?workEffortId=${workEffortId}"/>
</field>
</form>
- <form name="ListUnassignedTasks" target="updateTaskAndAssoc" title="" list-name="tasks" type="list" separate-columns="true">
- <actions>
- <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
+ <form name="ListUnassignedTasks" target="updateTaskAndAssoc" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTask">
+ <row-actions>
+ <entity-one entity-name="StatusItem" value-name="currentStatus">
<field-map field-name="statusId" env-name="currentStatusId"/>
</entity-one>
- </actions>
+ </row-actions>
<field name="workEffortTypeId"><hidden/></field>
<field name="workEffortId"><hidden/></field>
<field name="workEffortAssocTypeId"><hidden/></field>
@@ -136,12 +136,12 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
- <form name="ListPhases" target="updatePhaseAndAssoc" title="" list-name="phases" type="list" separate-columns="true">
- <actions>
- <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
+ <form name="ListPhases" target="updatePhaseAndAssoc" title="" list-name="phases" type="list" separate-columns="true" paginate-target="FindPhase">
+ <row-actions>
+ <entity-one entity-name="StatusItem" value-name="currentStatus">
<field-map field-name="statusId" env-name="currentStatusId"/>
</entity-one>
- </actions>
+ </row-actions>
<field name="workEffortTypeId"><hidden/></field>
<field name="workEffortId"><hidden/></field>
<field name="workEffortIdFrom"><hidden/></field>
@@ -171,42 +171,42 @@
<field name="workEffortName" title="${uiLabelMap.CommonName}"><display/></field>
<field name="workEffortTypeId" title="${uiLabelMap.ProjectMgrWorkEffortTypeId}"><display-entity entity-name="WorkEffortType"/></field>
<field name="workEffortPurposeTypeId" title="${uiLabelMap.ProjectMgrWorkEffortPurposeTypeId}"><display-entity entity-name="WorkEffortPurposeType"/></field>
- <field name="projectView" title="${uiLabelMap.ProjectMgrProjectSummary}" widget-style="linktext">
+ 
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="linktext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteProject?workEffortId=${workEffortId}"/>
</field>
</form>
<form name="ListAssociatedParties" type="list" list-name="associatedParties">
<field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${workEffortId}" target="EditPhase?workEffortId=${workEffortId}"/>
+ <hyperlink also-hidden="false" description="${workEffortId}" target="EditProject?workEffortId=${workEffortId}"/>
</field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
<display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName}">
<sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="buttontext"/>
</display-entity>
</field>
- <field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}"><display/></field>
+ <field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}"><display-entity entity-name="RoleType" description="${description}"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
</form>
- <form name="ListProjectSkills" type="list" target="updateWorkEffortSkillStandard" list-name="workEffortSkillStandardList">
- <field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}"><display/></field>
- <field name="skillTypeId" title="${uiLabelMap.ProjectMgrSkillType}">
- <drop-down allow-empty="false" current-description="${currentStatus.description}">
- <entity-options entity-name="SkillType" key-field-name="skillTypeId" description="${description}"/>
- </drop-down>
+ <form name="ListProjectSkills" type="list" target="updateProjectSkillStandard" list-name="workEffortSkillStandardList" paginate-target="EditProjectSkills">
+ <field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}">
+ <display-entity entity-name="WorkEffort" description="${workEffortName} ${workEffortId}">
+ <sub-hyperlink target="EditProject?workEffortId=${workEffortId}" description="${workEffortId}" link-style="buttontext"/>
+ </display-entity>
</field>
+ <field name="skillTypeId" title="${uiLabelMap.ProjectMgrSkillType}"><display-entity entity-name="SkillType" description="${description}"/></field>
<field name="estimatedNumPeople" title="${uiLabelMap.ProjectMgrEstimatedNumPeople}"><text/></field>
<field name="estimatedDuration" title="${uiLabelMap.ProjectMgrEstimatedDuration}"><text/></field>
<field name="estimatedCost" title="${uiLabelMap.ProjectMgrEstimatedCost}" widget-style="linktext"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="linktext">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortSkillStandard?workEffortId=${workEffortId}&skillTypeId=${skillTypeId}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteProjectSkillStandard?workEffortId=${workEffortId}&skillTypeId=${skillTypeId}"/>
</field>
</form>
- <form name="ListWorkEffortPartyAssigns" separate-columns="false" target="updateWorkEffortPartyAssign" title="" type="list">
+ <form name="ListWorkEffortPartyAssigns" separate-columns="false" target="updateWorkEffortPartyAssign" title="" type="list" paginate-target="ListWorkEffortPartyAssigns">
<actions>
<entity-condition entity-name="WorkEffortPartyAssignment">
<condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>
@@ -250,7 +250,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListTimeEntries" type="list" list-name="timesheetEntries" target="updateTimeEntry">
+ <form name="ListTimeEntries" type="list" list-name="timesheetEntries" target="updateTimeEntry" paginate-target="EditTimeEntries">
<actions>
<entity-condition entity-name="TimeEntry">
<condition-expr field-name="workEffortId" env-name="workEffortId"/>
@@ -289,4 +289,15 @@
<hyperlink target="deleteTimeEntry?workEffortId=${workEffortId}&timeEntryId=${timeEntryId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
+ <form name="ListProjectNotes" extends="ListWorkEffortNotes" extends-resource="component://workeffort/widget/WorkEffortForms.xml" type="list" list-name="projectNotes" paginate-target="EditWorkEffortNotes">
+ <actions>
+ <entity-condition entity-name="WorkEffortNoteAndData">
+ <condition-expr field-name="workEffortId" env-name="workEffortId"/>
+ <order-by field-name="noteId"/>
+ </entity-condition>
+ </actions>
+ <field name="noteId" widget-style="tabletext"><hidden/></field>
+ <field name="workEffortId"><hidden/></field>
+ <field name="noteParty" title="${uiLabelMap.CommonBy}" widget-style="tabletext"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, "dd-MM-yyyy HH:mm", TimeZone.getDefault(), context.get("locale"))}"/></field>
+ </form>
</forms>