svn commit: r598195 - in /ofbiz/trunk: applications/workeffort/config
Locked
svn commit: r598195 - in /ofbiz/trunk: applications/workeffort/config
 
|
Author: hansbak
Date: Mon Nov 26 02:00:19 2007 New Revision: 598195 URL: http://svn.apache.org/viewvc?rev=598195&view=rev Log: updated the tasks to be 'my tasks' which lists task entered by the loginId, or tasks which have been reported time about', renamed the option to 'my tasks' this includes tasks related to a project or without this relation. Also updated the projectviews to use the name workEffortId and not use taskId. Further did some cleanup for the variable 'headerItem' which is now defined in the decorator Added: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListMyTasks.bsh (with props) Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml 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=598195&r1=598194&r2=598195&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties (original) +++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties Mon Nov 26 02:00:19 2007 @@ -243,6 +243,7 @@ WorkEffortMyRates=My Rates WorkEffortMyRequestList=My Request List WorkEffortMyStatus=My Status +WorkEffortMyTasks=My Tasks WorkEffortMyTimesheets=My Timesheets WorkEffortName=Name WorkEffortNameIsMissing=Work Effort Name is missing. Modified: ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml?rev=598195&r1=598194&r2=598195&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml Mon Nov 26 02:00:19 2007 @@ -37,18 +37,15 @@ <member-entity entity-alias="WET" entity-name="WorkEffort"/> <alias-all entity-alias="WEPA"> <exclude field="facilityId"/> - </alias-all> - <alias-all entity-alias="WET"> <exclude field="workEffortId"/> - <exclude field="workEffortName"/> </alias-all> + <alias-all entity-alias="WET"/> + <alias entity-alias="WEPA" name="partyAssignFacilityId" field="facilityId"/> <alias entity-alias="WEP" field="workEffortId" name="projectId"/> <alias entity-alias="WEP" field="workEffortName" name="projectName"/> <alias entity-alias="WEPH" field="workEffortId" name="phaseId"/> <alias entity-alias="WEPH" field="workEffortName" name="phaseName"/> - <alias entity-alias="WET" field="workEffortId" name="taskId"/> - <alias entity-alias="WET" field="workEffortName" name="taskName"/> <view-link entity-alias="WEPA" rel-entity-alias="WEP"> <key-map field-name="workEffortId"/> </view-link> @@ -62,7 +59,7 @@ <key-map field-name="partyId"/> </relation> <relation type="many" rel-entity-name="TimeEntry"> - <key-map field-name="taskId" rel-field-name="workEffortId"/> + <key-map field-name="workEffortId"/> </relation> </view-entity> @@ -72,16 +69,11 @@ <member-entity entity-alias="WEP" entity-name="WorkEffort"/><!--project --> <member-entity entity-alias="WEPH" entity-name="WorkEffort"/><!-- phase --> <member-entity entity-alias="WET" entity-name="WorkEffort"/><!-- task --> - <alias-all entity-alias="WET"> - <exclude field="workEffortId"/> - <exclude field="workEffortName"/> - </alias-all> + <alias-all entity-alias="WET"/> <alias entity-alias="WEP" field="workEffortId" name="projectId"/> <alias entity-alias="WEP" field="workEffortName" name="projectName"/> <alias entity-alias="WEPH" field="workEffortId" name="phaseId"/> <alias entity-alias="WEPH" field="workEffortName" name="phaseName"/> - <alias entity-alias="WET" field="workEffortId" name="taskId"/> - <alias entity-alias="WET" field="workEffortName" name="taskName"/> <view-link entity-alias="WEP" rel-entity-alias="WEPH"> <key-map field-name="workEffortId" rel-field-name="workEffortParentId"/> </view-link> @@ -89,7 +81,7 @@ <key-map field-name="workEffortId" rel-field-name="workEffortParentId"/> </view-link> <relation type="many" rel-entity-name="TimeEntry"> - <key-map field-name="taskId" rel-field-name="workEffortId"/> + <key-map field-name="workEffortId"/> </relation> </view-entity> </entitymodel> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=598195&r1=598194&r2=598195&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Mon Nov 26 02:00:19 2007 @@ -110,7 +110,7 @@ <field-map field-name="workEffortId" env-name="parameters.taskId"/> </entity-one> <set field="highInfo.taskId" from-field="lowInfo.worEffortId"/> - <set field="highInfo.taskName" from-field="lowInfo.worEffortName"/> + <set field="highInfo.taskName" from-field="lowInfo.workEffortName"/> <set field="highInfo.tasDescription" from-field="lowInfo.description"/> <set field="highInfo.priority" from-field="lowInfo.priority"/> <set field="highInfo.scopeEnumId" from-field="lowInfo.scopeEnumId"/> Added: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListMyTasks.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListMyTasks.bsh?rev=598195&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListMyTasks.bsh (added) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListMyTasks.bsh Mon Nov 26 02:00:19 2007 @@ -0,0 +1,76 @@ +/* +/* + * 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. + */ + +import java.util.*; +import java.lang.*; +import org.ofbiz.entity.*; +import org.ofbiz.base.util.*; +import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.entity.condition.EntityConditionList; +import org.ofbiz.entity.condition.EntityExpr; +import org.ofbiz.entity.condition.EntityOperator; + + +import org.ofbiz.entity.util.*; +import org.ofbiz.base.util.*; +import org.ofbiz.entity.condition.*; +import java.sql.Timestamp; + +fromDate = parameters.get("fromDate"); +thruDate = parameters.get("thruDate"); +userLogin = parameters.get("userLogin"); + +// date conditions +dateCondition = new LinkedList(); +if (UtilValidate.isNotEmpty(fromDate)) { + dateCondition.add(new EntityExpr("createdDate", EntityOperator.GREATER_THAN, fromDate + " 00:00:00.0")); +} +if (UtilValidate.isNotEmpty(thruDate)) { + dateCondition.add(new EntityExpr("createdDate", EntityOperator.LESS_THAN, thruDate + " 00:00:00.0")); +} + +// create workEffort list for tasks with no phase. +exprList = UtilMisc.toList( + new EntityExpr("workEffortTypeId", EntityOperator.EQUALS, "TASK"), + new EntityExpr("workEffortParentId", EntityOperator.EQUALS, null), + new EntityExpr("createdByUserLogin", EntityOperator.EQUALS, userLogin.getString("userLoginId"))); +if (UtilValidate.isNotEmpty(dateCondition)) exprList.addAll(dateCondition); +condition = new EntityConditionList(exprList, EntityOperator.AND); +tasks = delegator.findByCondition("WorkEffort", condition, null, null); + +// create workEffort list in a project +exprList = UtilMisc.toList( + new EntityExpr("createdByUserLogin", EntityOperator.EQUALS, userLogin.getString("userLoginId"))); +if (UtilValidate.isNotEmpty(dateCondition)) exprList.addAll(dateCondition); +condition = new EntityConditionList(exprList, EntityOperator.AND); +tasks.addAll(delegator.findByCondition("ProjectAndPhaseAndTask", condition, null, null)); + +// add the timeEntry conditions +exprList = UtilMisc.toList( + new EntityExpr("workEffortTypeId", EntityOperator.EQUALS, "TASK"), + new EntityExpr("createdByUserLogin", EntityOperator.NOT_EQUAL, userLogin.getString("userLoginId"))); //already have these +if (UtilValidate.isNotEmpty(dateCondition)) exprList.addAll(dateCondition); +condition = new EntityConditionList(exprList, EntityOperator.AND); +tasks.addAll(delegator.findByCondition("WorkEffortAndTimeEntry", condition, null, null)); + +// sort tasks +UtilMisc.sortMaps(tasks, UtilMisc.toList("workEffortName")); +context.put("tasks", tasks); Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListMyTasks.bsh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListMyTasks.bsh ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListMyTasks.bsh ------------------------------------------------------------------------------ svn:mime-type = text/plain 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=598195&r1=598194&r2=598195&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Mon Nov 26 02:00:19 2007 @@ -155,9 +155,9 @@ <response name="success" type="view" value="FindTaskList"/> <response name="error" type="view" value="FindTaskList"/> </request-map> - <request-map uri="FindTaskByRange"> + <request-map uri="MyTasks"> <security https="true" auth="true"/> - <response name="success" type="view" value="FindTaskByRange"/> + <response name="success" type="view" value="MyTasks"/> </request-map> <request-map uri="EditTaskList"> <security https="true" auth="true"/> @@ -371,7 +371,7 @@ <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="main" type="screen" page="component://projectmgr/widget/TaskScreens.xml#FindTaskByRange"/> + <view-map name="main" type="screen" page="component://projectmgr/widget/TaskScreens.xml#MyTasks"/> <view-map name="FindProject" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#FindProject"/> <view-map name="FindProjectByRange" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#FindProjectByRange"/> <view-map name="EditProject" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProject"/> @@ -379,7 +379,7 @@ <view-map name="ChildWorkEfforts" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#ChildWorkEfforts"/> <view-map name="EditProjectAndAssoc" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectAndAssoc"/> <view-map name="FindTask" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#FindTask"/> - <view-map name="FindTaskByRange" type="screen" page="component://projectmgr/widget/TaskScreens.xml#FindTaskByRange"/> + <view-map name="MyTasks" type="screen" page="component://projectmgr/widget/TaskScreens.xml#MyTasks"/> <view-map name="EditTask" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTask"/> <view-map name="AddTaskAndAssoc" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#AddTaskAndAssoc"/> <view-map name="EditTaskAndAssoc" type="screen" page="component://projectmgr/widget/TaskScreens.xml#EditTaskAndAssoc"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=598195&r1=598194&r2=598195&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Mon Nov 26 02:00:19 2007 @@ -101,7 +101,8 @@ <screen name="CommonTaskDecorator"> <section> <actions> - <set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/> + <set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/> + <set field="headerItem" value="mytasks"/> <entity-one entity-name="WorkEffort" value-name="workEffort"/> </actions> <widgets> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=598195&r1=598194&r2=598195&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Mon Nov 26 02:00:19 2007 @@ -22,13 +22,13 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> <menu name="ProjectMgrAppBar" default-menu-item-name="task" id="app-navigation" type="simple" selected-menuitem-context-field-name="headerItem" default-selected-style="selected" title="${uiLabelMap.ProjectManagerApplication}" menu-container-style="button-bar tab-bar"> - <menu-item name="task" title="${uiLabelMap.WorkEffortTaskList}"><link target="FindTaskByRange?workEffortTypeId=TASK"/></menu-item> + <menu-item name="mytime" title="${uiLabelMap.TimesheetMyTime}"><link target="MyTimesheets"/></menu-item> + <menu-item name="mytasks" title="${uiLabelMap.WorkEffortMyTasks}"><link target="MyTasks"/></menu-item> <menu-item name="projects" title="${uiLabelMap.WorkEffortProjects}"><link target="FindProjectByRange?workEffortTypeId=PROJECT"/></menu-item> + <menu-item name="timesheet" title="${uiLabelMap.Timesheet}"><link target="FindTimeSheet?findAll=N"/></menu-item> + <menu-item name="SkillType" title="${uiLabelMap.ProjectMgrSkillType}"><link target="findSkillTypes"/></menu-item> <menu-item name="calendar" title="${uiLabelMap.WorkEffortCalendar}"><link target="day"/></menu-item> - <menu-item name="mytime" title="${uiLabelMap.TimesheetMyTime}"><link target="MyTimesheets"/></menu-item> <menu-item name="request" title="${uiLabelMap.WorkEffortRequestList}"><link target="requestlist"/></menu-item> - <menu-item name="timesheet" title="${uiLabelMap.Timesheet}"><link target="FindTimeSheet?findAll=N"/></menu-item> - <menu-item name="SkillType" title="${uiLabelMap.ProjectMgrSkillType}"><link target="findSkillTypes"/></menu-item> <menu-item name="Logout" title="Logout" align-style="col-right" widget-style="headerButtonRight" selected-style="headerButtonRightSelected"> <condition><not><if-empty field-name="userLogin"/></not></condition> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=598195&r1=598194&r2=598195&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Mon Nov 26 02:00:19 2007 @@ -209,7 +209,7 @@ <entity-and entity-name="ProjectAndPhaseAndTask" list-name="tasks"> <field-map field-name="projectId" env-name="parameters.workEffortIdFrom"/> <order-by field-name="phaseName"/> - <order-by field-name="taskName"/> + <order-by field-name="workEffortName"/> </entity-and> <set field="task" from-field=""/> </actions> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=598195&r1=598194&r2=598195&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Mon Nov 26 02:00:19 2007 @@ -24,7 +24,6 @@ <section> <actions> <set field="titleProperty" value="PageTitleUnassignedTask"/> - <set field="headerItem" value="task"/> <set field="tabButtonItem" value="subtasks"/> <set field="labelTitleProperty" value="PageTitleFindTask"/> <set field="workEffortId" from-field="parameters.workEffortIdFrom"/> @@ -41,7 +40,7 @@ <widgets> <container><label style="head1">${uiLabelMap.${titleProperty}}</label></container> <container style="button-bar"><link target="EditTask?workEffortTypeId=TASK" text="${uiLabelMap.ProjectMgrNewTask}" style="buttontext"/></container> - <include-form name="ListTaskLists" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <include-form name="FindTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> </widgets> <fail-widgets> <container style="screenlet"> @@ -60,16 +59,13 @@ </widgets> </section> </screen> - <screen name="FindTaskByRange"> + <screen name="MyTasks"> <section> <actions> <set field="titleProperty" value="PageTitleFindTask"/> - <set field="headerItem" value="task"/> <set field="labelTitleProperty" value="ProjectMgrTaskName"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/FindTaskList"/> - <set field="workEffortId" from-field="parameters.workEffortIdFrom"/> - <set field="parameters.workEffortTypeId" value="TASK"/> - <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListProjectsByDateRange.bsh"/> + <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListMyTasks.bsh"/> </actions> <widgets> <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}"> @@ -79,11 +75,11 @@ <container style="screenlet"> <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleFindTask}</label></container> <container style="screenlet-body"> - <include-form name="listtasksbydaterange" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <include-form name="FindTask" location="component://projectmgr/widget/forms/TaskForms.xml"/> </container> </container> <container style="button-bar"><link target="EditTask?workEffortTypeId=Task" text="${uiLabelMap.ProjectMgrNewTask}" style="buttontext"/></container> - <include-form name="ListTaskLists" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/> </widgets> </section> </decorator-section> @@ -95,7 +91,6 @@ <section> <actions> <set field="titleProperty" value="PageTitleEditTaskList"/> - <set field="headerItem" value="task"/> <set field="tabButtonItem" value="edittask"/> <set field="labelTitleProperty" value="PageTitleEditTaskList"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/FindTaskList"/> @@ -128,7 +123,6 @@ <actions> <set field="titleProperty" value="PageTitleEditTask"/> <set field="labelTitleProperty" value="PageTitleEditTask"/> - <set field="headerItem" value="task"/> <set field="tabButtonItem" value="edittask"/> <set field="donePage" from-field="parameters.DONE_PAGE"/> <set field="workEffortIdTo" from-field="parameters.workEffortIdTo"/> @@ -152,7 +146,6 @@ <section> <actions> <set field="titleProperty" value="PageTitleEditSkill"/> - <set field="headerItem" value="task"/> <set field="tabButtonItem" value="projectskills"/> <set field="labelTitleProperty" value="PageTitleEditSkill"/> <set field="workEffortId" from-field="parameters.workEffortId"/> @@ -259,7 +252,6 @@ <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"/> @@ -309,7 +301,7 @@ <label style="boxhead">${uiLabelMap.ProjectMgrSubTasks}</label> </container> <container style="screenlet-body"> - <include-form name="ListTaskLists" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <include-form name="ListTasks" location="component://projectmgr/widget/forms/TaskForms.xml"/> </container> </container> </widgets> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=598195&r1=598194&r2=598195&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Mon Nov 26 02:00:19 2007 @@ -109,8 +109,8 @@ <field-map field-name="statusId" env-name="currentStatusId"/> </entity-one> </row-actions> - <field name="taskName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}*"><hyperlink target="taskView?workEffortId=${taskId}" description="${taskName}"/></field> - <field name="workEffortId"><hidden value="${taskId}"/></field> + <field entry-name="workEffortName" name="taskName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}*"><hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortName}"/></field> + <field name="workEffortId"><hidden value="${workEffortId}"/></field> <field name="workEffortIdFrom"><hidden/></field> <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"> <drop-down allow-empty="false"> @@ -142,7 +142,7 @@ <!--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="buttontext"> - <hyperlink also-hidden="false" description="${uiLabelMap.ProjectMgrTimeEntries}" target="EditTimeEntries?workEffortId=${taskId}"/> + <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" paginate-target="FindTask"> @@ -209,7 +209,7 @@ <form name="ListPhaseTaskInfo" type="list" list-name="phases"> <field name="workEffortIdFrom"><hidden value="parameters.worEffortIdFrom"/></field> <field name="Phase"><hyperlink target="FindPhase?workEffortIdFrom=${projectId}" description="${phaseName}"/></field> - <field name="Task"><hyperlink target="EditTask?workEffortId=${taskId}" description="${taskName}"/></field> + <field name="Task"><hyperlink target="EditTask?workEffortId=${workEffortId}" description="${workEffortName}"/></field> <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="estimatedStartDate"><display/></field> <field name="estimatedCompletionDate"><display/></field> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=598195&r1=598194&r2=598195&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Mon Nov 26 02:00:19 2007 @@ -34,10 +34,10 @@ <field name="DONE_PAGE"><hidden value="${donePage}"/></field> <field name="workEffortTypeId"><hidden value="TASK"/></field> <field use-when="task!=null" name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="task==null&&taskId==null" name="taskId" title="${uiLabelMap.ProjectMgrWorkEffortId}"><ignored/></field> - <field use-when="task==null&&taskId!=null" name="workEffortName" title="${uiLabelMap.CommonName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field> + <field use-when="task==null&&workEffortId==null" name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}"><ignored/></field> + <field use-when="task==null&&workEffortId!=null" name="workEffortName" title="${uiLabelMap.CommonName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field> <field use-when="task!=null" name="workEffortName" title="${uiLabelMap.CommonName}*"><display/></field> - <field use-when="task==null&&taskId!=null" name="workEffortName" title="${uiLabelMap.CommonName}*"><text/></field> + <field use-when="task==null&&workEffortId!=null" name="workEffortName" title="${uiLabelMap.CommonName}*"><text/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> <field use-when="task!=null" name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="false" current-description="${currentStatus.description}"> @@ -157,19 +157,18 @@ <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field> </form> - <form name="listtasksbydaterange" type="single" target="FindTaskByRange?workEffortTypeId=TASK&findAll=Y"> - <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field> - <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> + <form name="FindTask" type="single" target="MyTasks"> + <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time type="date"/></field> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time type="date"/></field> <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field> </form> - <form name="ListTaskLists" type="list" list-name="tasks" paginate-target="FindTaskList"> + <form name="ListTasks" type="list" list-name="tasks" paginate-target="FindTaskList"> <field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditTask?workEffortId=${workEffortId}"/> </field> - <field name="workEffortTypeId" title="${uiLabelMap.ProjectMgrWorkEffortTypeId}"><display-entity entity-name="WorkEffortType"/></field> - <field name="createdStamp"><display/></field> - <field name="phase"><hyperlink target="FindPhase?workEffortIdFrom=${projectId}" description="${phaseName}[${phaseId}]"/></field> - <field name="project"><hyperlink target="EditProject?workEffortIdFrom=${projectId}" description="${projectName}[${projectId}]"/></field> + <field name="createdDate"><display/></field> + <field name="phaseId"><hyperlink target="FindPhase?workEffortIdFrom=${projectId}" description="${phaseName}[${phaseId}]"/></field> + <field name="projectId"><hyperlink target="EditProject?workEffortIdFrom=${projectId}" description="${projectName}[${projectId}]"/></field> </form> <form name="ListChildEfforts" target="updateTaskListAndAssoc" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTaskList"> <row-actions> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=598195&r1=598194&r2=598195&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Mon Nov 26 02:00:19 2007 @@ -51,10 +51,10 @@ </field> <field name="workEffortId"> <drop-down allow-empty="false"> - <entity-options entity-name="ProjectAndPhaseAndTask" key-field-name="taskId" description="${projectName}--${phaseName}--${taskName}"> + <entity-options entity-name="ProjectAndPhaseAndTask" key-field-name="taskId" description="${projectName}--${phaseName}--${workEffortName}"> <entity-order-by field-name="projectName"/> <entity-order-by field-name="phaseName"/> - <entity-order-by field-name="taskName"/> + <entity-order-by field-name="workEffortName"/> </entity-options> </drop-down> </field> @@ -83,7 +83,7 @@ <entity-constraint name="partyId" env-name="userLogin.partyId"/> <entity-order-by field-name="projectName"/> <entity-order-by field-name="phaseName"/> - <entity-order-by field-name="taskName"/> + <entity-order-by field-name="workEffortName"/> </entity-options> </drop-down></field> <field name="hours"><text size="5"/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |