svn commit: r575954 - in /ofbiz/trunk/specialpurpose/pr
Locked
 
|
Author: apatel
Date: Sat Sep 15 11:49:19 2007 New Revision: 575954 URL: http://svn.apache.org/viewvc?rev=575954&view=rev Log: Associated skill requirements with Project, now setting quickassignpartyid for workefforts, added some form data validation using map processors. Modified: 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/editproject.ftl ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/findtasks.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 Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties?rev=575954&r1=575953&r2=575954&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original) +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Sat Sep 15 11:49:19 2007 @@ -65,6 +65,7 @@ ProjectMgrPhaseDetails=Enter the Phase Details below ProjectMgrPhases=Phases ProjectMgrPhaseList=List of Phase +ProjectMgrPartySkills=Party Skills ProjectMgrSkillStandards=Skill Standards ProjectMgrSkillType=Skill Type ProjectMgrSubProjectName=Sub Project Name @@ -96,4 +97,6 @@ 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=575954&r1=575953&r2=575954&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 Sat Sep 15 11:49:19 2007 @@ -60,8 +60,8 @@ else { if(workEffortTypeId.equals("PHASE")) { Map phaseMap = FastMap.newInstance(); - taskMap.putAll((Map) workEffort); - taskMap.putAll((Map) workEffortAssoc); + phaseMap.putAll((Map) workEffort); + phaseMap.putAll((Map) workEffortAssoc); childPhases.add(phaseMap); context.put("phases", childPhases); } @@ -92,5 +92,6 @@ 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=575954&r1=575953&r2=575954&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Sat Sep 15 11:49:19 2007 @@ -50,7 +50,7 @@ </request-map> <request-map uri="createProject"> <security https="true" auth="true"/> - <event type="service" invoke="createWorkEffort"/> + <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffort"/> <response name="success" type="view" value="EditProject"/> <response name="error" type="view" value="EditProject"/> </request-map> @@ -76,7 +76,7 @@ </request-map> <request-map uri="createProjectAndAssoc"> <security https="true" auth="true"/> - <event type="service" invoke="createWorkEffortAndAssoc"/> + <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/> <response name="success" type="view" value="FindProject"/> <response name="error" type="view" value="FindProject"/> </request-map> @@ -96,7 +96,7 @@ </request-map> <request-map uri="createTask"> <security https="true" auth="true"/> - <event type="service" invoke="createWorkEffort"/> + <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/> <response name="success" type="view" value="EditTask"/> <response name="error" type="view" value="EditTask"/> </request-map> @@ -119,7 +119,7 @@ </request-map> <request-map uri="createTaskAndAssoc"> <security https="true" auth="true"/> - <event type="service" invoke="createWorkEffortAndAssoc"/> + <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/> <response name="success" type="view" value="FindTask"/> <response name="error" type="view" value="FindTask"/> </request-map> @@ -145,7 +145,7 @@ </request-map> <request-map uri="createTaskList"> <security https="true" auth="true"/> - <event type="service" invoke="createWorkEffort"/> + <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffort"/> <response name="success" type="view" value="EditTaskList"/> <response name="error" type="view" value="EditTaskList"/> </request-map> @@ -162,7 +162,7 @@ </request-map> <request-map uri="createTaskListAndAssoc"> <security https="true" auth="true"/> - <event type="service" invoke="createWorkEffortAndAssoc"/> + <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/> <response name="success" type="view" value="FindTaskList"/> <response name="error" type="view" value="FindTaskList"/> </request-map> @@ -182,7 +182,7 @@ </request-map> <request-map uri="createPhaseAndAssoc"> <security https="true" auth="true"/> - <event type="service" invoke="createWorkEffortAndAssoc"/> + <event type="simple" path="org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml" invoke="createWorkEffortAndAssoc"/> <response name="success" type="view" value="FindPhase"/> <response name="error" type="view" value="FindPhase"/> </request-map> @@ -240,18 +240,6 @@ <response name="success" type="view" value="ListWorkEffortPartyAssigns"/> <response name="error" type="view" value="ListWorkEffortPartyAssigns"/> </request-map> - <request-map uri="createWorkEffortPartyAssign"> - <security https="true" auth="true"/> - <event type="service" invoke="assignPartyToWorkEffort"/> - <response name="success" type="view" value="ListWorkEffortPartyAssigns"/> - <response name="error" type="view" value="ListWorkEffortPartyAssigns"/> - </request-map> - <request-map uri="updateWorkEffortPartyAssign"> - <security https="true" auth="true"/> - <event type="service" invoke="updatePartyToWorkEffortAssignment"/> - <response name="success" type="view" value="ListWorkEffortPartyAssigns"/> - <response name="error" type="view" value="ListWorkEffortPartyAssigns"/> - </request-map> <request-map uri="EditTimeEntries"> <security https="true" auth="true"/> <response name="success" type="view" value="EditTimeEntries"/> @@ -335,5 +323,7 @@ <view-map name="EditTimeEntries" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditTimeEntries"/> <view-map name="FindTimeSheet" type="screen" page="component://projectmgr/widget/TimeSheetScreens.xml#FindTimeSheet"/> <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"/> <!-- end of view mappings --> </site-conf> 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=575954&r1=575953&r2=575954&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl Sat Sep 15 11:49:19 2007 @@ -66,6 +66,12 @@ <td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td> <td>${project.workEffortId?if_exists}<span class="tooltip">${uiLabelMap.CommonNotModifRecreat}</span></td> </tr> + <tr> + <td class="label" >${uiLabelMap.ProjectMgrQuickAssignPartyId}</td> + <td><input type="text" name="quickAssignPartyId" value=""/> + <a href="javascript:call_fieldlookup2(document.editProjectForm.quickAssignPartyId,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a></td> + </td> + </tr> <tr> <td class="label" >${uiLabelMap.CommonName}</td> <td>${project.workEffortName?if_exists}<span class="tooltip">${uiLabelMap.CommonNotModifRecreat}</span></td> 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=575954&r1=575953&r2=575954&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl Sat Sep 15 11:49:19 2007 @@ -59,6 +59,12 @@ ${uiLabelMap.ProjectMgrTaskDetails} </td> </tr> + <tr> + <td class="label" >${uiLabelMap.ProjectMgrQuickAssignPartyId}</td> + <td><input type="text" name="quickAssignPartyId" value=""/> + <a href="javascript:call_fieldlookup2(document.addTaskAndAssocForm.quickAssignPartyId,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a></td> + </td> + </tr> <tr> <#if task?exists> <td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl?rev=575954&r1=575953&r2=575954&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl Sat Sep 15 11:49:19 2007 @@ -16,7 +16,14 @@ specific language governing permissions and limitations under the License. --> -<div class="head1">${uiLabelMap.PageTitleAddSkill}</div></td> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3"> ${uiLabelMap.PageTitleAddSkill}</li> + </ul> + <br class="clear" /> + </div> + <div class="screenlet-body"> <form name="editTaskSkillForm" action="<@ofbizUrl>createTaskSkillStandard</@ofbizUrl>"> <table width="100%" cellpadding="2" cellspacing="0" border="1"> <tr> @@ -53,3 +60,5 @@ </tr> </table> </form> +</div> +</div> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/findtasks.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/findtasks.ftl?rev=575954&r1=575953&r2=575954&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/findtasks.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/findtasks.ftl Sat Sep 15 11:49:19 2007 @@ -40,6 +40,7 @@ <table width=""> <tr> <td><input type="hidden" name="workEffortIdFrom" value="${parameters.workEffortIdFrom?if_exists}"/></td> + <td><input type="hidden" name="workEffortId" value="${parameters.workEffortIdFrom?if_exists}"/></td> <td><input type="hidden" name="workEffortAssocTypeId" value="${parameters.workEffortAssocTypeId?if_exists}"/></td> </tr> <tr> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=575954&r1=575953&r2=575954&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Sat Sep 15 11:49:19 2007 @@ -29,6 +29,7 @@ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <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="CommonUiLabels" map-name="uiLabelMap" global="true"/> <!-- The two default (global) stylesheets are added to the list @@ -86,7 +87,6 @@ <actions> <set field="headerItem" value="projects"/> <set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/> - <set field="workEffortId" from-field="parameters.workEffortId"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -154,6 +154,32 @@ </widgets> </section> </screen> + <screen name="CommonSkillTypeDecorator"> + <section> + <actions> + <set field="skillTypeId" from-field="parameters.skillTypeId"/> + <entity-one entity-name="SkillType" value-name="skillType"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <!-- do check for PartyAbility, _VIEW permission --> + <condition> + <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/> + </condition> + <widgets> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="head3">${uiLabelMap.WorkEffortViewPermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="CommonTimesheetDecorator"> <section> <actions> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=575954&r1=575953&r2=575954&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Sat Sep 15 11:49:19 2007 @@ -28,6 +28,7 @@ <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> @@ -41,9 +42,9 @@ <menu name="ProjectTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected"> <menu-item name="projectView" title="${uiLabelMap.ProjectMgrProjectSummary}"><link target="projectView?workEffortId=${workEffortId}"/></menu-item> <menu-item name="editproject" title="${uiLabelMap.ProjectMgrEditPoject}"><link target="EditProject?workEffortId=${workEffortId}"/></menu-item> - <menu-item name="phases" title="${uiLabelMap.ProjectMgrPhases}"><link target="FindPhase?workEffortId=${workEffortId}&workEffortIdFrom=${workEffortId}&workEffortTypeId=PHASE&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item> - <menu-item name="subprojects" title="${uiLabelMap.ProjectMgrSubProjects}"><link target="FindProject?workEffortId=${workEffortId}&workEffortIdFrom=${workEffortId}&workEffortTypeId=PROJECT&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item> - <menu-item name="tasks" title="${uiLabelMap.ProjectMgrTasks}"><link target="FindTask?workEffortId=${workEffortId}&workEffortIdFrom=${workEffortId}&workEffortTypeId=TASK&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item> + <menu-item name="phases" title="${uiLabelMap.ProjectMgrPhases}"><link target="FindPhase?workEffortIdFrom=${workEffortId}&workEffortTypeId=PHASE&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item> + <menu-item name="subprojects" title="${uiLabelMap.ProjectMgrSubProjects}"><link target="FindProject?workEffortIdFrom=${workEffortId}&workEffortTypeId=PROJECT&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item> + <menu-item name="tasks" title="${uiLabelMap.ProjectMgrTasks}"><link target="FindTask?workEffortIdFrom=${workEffortId}&workEffortTypeId=TASK&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item> <menu-item name="projectskills" title="${uiLabelMap.ProjectMgrSkillStandards}"><link target="EditProjectSkills?workEffortId=${workEffortId}"/></menu-item> <menu-item name="parties" title="${uiLabelMap.ProjectMgrParties}"><link target="ListWorkEffortPartyAssigns?workEffortId=${workEffortId}"/></menu-item> <menu-item name="treeDetails" title="${uiLabelMap.ProjectMgrTreeDetails}"><link target="ChildWorkEfforts?workEffortId=${workEffortId}&trail=${workEffortId}&workEffortTypeId=PROJECT&workEffortAssocTypeId=WORK_EFF_BREAKDOWN"/></menu-item> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=575954&r1=575953&r2=575954&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sat Sep 15 11:49:19 2007 @@ -102,6 +102,7 @@ <set field="titleProperty" value="PageTitleEditProject"/> <set field="tabButtonItem" value="editproject"/> <set field="labelTitleProperty" value="PageTitleEditProject"/> + <set field="workEffortId" from-field="parameters.workEffortId"/> <entity-one entity-name="WorkEffort" value-name="project"/> </actions> <widgets> @@ -340,6 +341,7 @@ <set field="titleProperty" value="PageTitleEditPhase"/> <set field="tabButtonItem" value="phases"/> <set field="labelTitleProperty" value="PageTitleFindPhase"/> + <set field="workEffortId" from-field="parameters.workEffortIdFrom"/> <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/> <set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/> <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ChildWorkEffort.bsh"/> @@ -372,6 +374,8 @@ <set field="titleProperty" value="PageTitleListWorkEffortPartyAssigns"/> <set field="tabButtonItem" value="parties"/> <set field="labelTitleProperty" value="PageTitleListWorkEffortPartyAssigns"/> + <set field="workEffortId" from-field="parameters.workEffortId"/> + <entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/> </actions> <widgets> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> @@ -379,7 +383,7 @@ <container style="screenlet"> <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleListWorkEffortPartyAssigns}</label></container> <container style="screenlet-body"> - <include-form name="ListWorkEffortPartyAssigns" location="component://workeffort/widget/WorkEffortPartyAssignForms.xml"/> + <include-form name="ListWorkEffortPartyAssigns" location="component://projectmgr/widget/forms/ProjectForms.xml"/> </container> </container> <container style="screenlet"> @@ -399,6 +403,7 @@ <set field="titleProperty" value="PageTitleEditSkill"/> <set field="tabButtonItem" value="projectskills"/> <set field="labelTitleProperty" value="PageTitleEditSkill"/> + <set field="workEffortId" from-field="parameters.workEffortId"/> <entity-and entity-name="WorkEffortSkillStandard" list-name="workEffortSkillStandardList"> <field-map field-name="workEffortId"/> </entity-and> @@ -423,6 +428,31 @@ </decorator-screen> </widgets> </section> + </screen> + <screen name="EditPartySkills"> + <section> + <actions> + <set field="headerItem" value="PartyReview"/> + <set field="tabButtonItem" value="parties"/> + <set field="partyId" from-field="parameters.partyId"/> + </actions> + <widgets> + <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <container> + <link target="EditPartySkill" text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/> + </container> + <container style="boxoutside"> + <container style="screenlet-header"> + <label style="boxhead">${uiLabelMap.HumanResEditPartySkill}</label> + </container> + <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + <include-form name="EditPartySkill" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> </screen> <screen name="EditTimeEntries"> <section> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=575954&r1=575953&r2=575954&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Sat Sep 15 11:49:19 2007 @@ -44,8 +44,12 @@ <include-form name="ListTaskLists" location="component://projectmgr/widget/forms/TaskForms.xml"/> </widgets> <fail-widgets> - <container><label style="head1">${uiLabelMap.PageTitleEditSubTask}</label></container> - <include-form name="ListChildEfforts" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditSubTask}</label></container> + <container style="screenlet-body"> + <include-form name="ListChildEfforts" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </container> + </container> <platform-specific> <html><html-template location="component://projectmgr/webapp/projectmgr/project/edittasklistandassoc.ftl"/></html> </platform-specific> @@ -153,8 +157,14 @@ <decorator-section name="body"> <section> <widgets> - <container><label style="head1">${uiLabelMap.${titleProperty}}</label></container> - <include-form name="ListTaskSkills" location="component://projectmgr/widget/forms/TaskForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <label style="boxhead">${uiLabelMap.${titleProperty}}</label> + </container> + <container style="screenlet-body"> + <include-form name="ListTaskSkills" location="component://projectmgr/widget/forms/TaskForms.xml"/> + </container> + </container> <platform-specific> <html><html-template location="component://projectmgr/webapp/projectmgr/project/edittaskskills.ftl"/></html> </platform-specific> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=575954&r1=575953&r2=575954&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Sep 15 11:49:19 2007 @@ -245,44 +245,11 @@ <field name="facilityId"><lookup target-form-name="LookupFacility"/></field> <field name="mustRsvp"><check/></field> <field name="comments"><text size="60" maxlength="255"/></field> + <field name="PartySkills" title="${uiLabelMap.ProjectMgrPartySkills}" widget-style="buttontext"> + <hyperlink target="EditPartySkills?partyId=${partyId}&workEffortId=${workEffortId}" description="${uiLabelMap.ProjectMgrPartySkills}" also-hidden="false"/> + </field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="EditWorkEffortPartyAssign" default-map-name="workEffortPartyAssignment" target="updateWorkEffortPartyAssign" title="" type="single"> - <alt-target target="createWorkEffortPartyAssign" use-when="workEffortPartyAssignment==null"/> - <field name="workEffortId"><hidden/></field> - <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> - <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}"> - <drop-down> - <entity-options entity-name="RoleType" description="${description}"> - <entity-constraint name="parentTypeId" operator="equals" value="PROJECT_TEAM"/> - <entity-order-by field-name="description"/> - </entity-options> - </drop-down> - </field> - <field name="fromDate"><date-time/></field> - - <field name="thruDate"><date-time/></field> - <field name="statusId"> - <drop-down no-current-selected-key="PARTYASSIGN_UNASSIGNED"> - <entity-options description="${description}" entity-name="StatusItem"> - <entity-constraint name="statusTypeId" operator="equals" value="PRTYASGN_STATUS"/> - <entity-order-by field-name="description"/> - </entity-options> - </drop-down> - </field> - <field name="expectationEnumId" title="${uiLabelMap.CommonExpectation}"> - <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> - <entity-constraint name="enumTypeId" operator="equals" value="WORK_EFF_EXPECT"/> - <entity-order-by field-name="description"/> - </entity-options> - </drop-down> - </field> - <field name="facilityId"><lookup target-form-name="LookupFacility"/></field> - <field name="mustRsvp" widget-style="tabletext"><check/></field> - <field name="comments"><text size="60" maxlength="255"/></field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> <form name="ListTimeEntries" type="list" list-name="timesheetEntries" target="updateTimeEntry"> <actions> <entity-condition entity-name="TimeEntry"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |