svn commit: r575017 - in /ofbiz/trunk/specialpurpose/pr
Locked
 
|
Author: apatel
Date: Wed Sep 12 10:16:02 2007 New Revision: 575017 URL: http://svn.apache.org/viewvc?rev=575017&view=rev Log: code cleanup, added estimated hours field on tasks/project. Added: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/MilliSecToHour.bsh 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/actions/ListFilteredTasks.bsh ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml 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/edittaskandassoc.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/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=575017&r1=575016&r2=575017&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties (original) +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties Wed Sep 12 10:16:02 2007 @@ -43,6 +43,7 @@ PageTitleUnassignedTask=Unassigned Task PageTitleAddPartyAssign=Add Party Assign PageTitleListPartyAssigns=Party Assigns +ProjectMgrActualHours=Actual Hours ProjectMgrCompanyName=Ofbiz Company ProjectMgrCompanySubtitle=Project ProjectMgrEditPatySkill=Edit PatySkill @@ -50,6 +51,7 @@ ProjectMgrEditTask=Edit Task ProjectMgrEstimatedCost=Estimated Cost ProjectMgrEstimatedDuration=Estimated Duration +ProjectMgrEstimatedHours=Estimated Hours ProjectMgrEstimatedNumPeople=Estimated People ProjectMgrFilterOn=Filter on ProjectMgrNewProject=New Project @@ -59,6 +61,8 @@ ProjectMgrPartyList=List of Parties ProjectMgrProjectName=Project Name ProjectMgrProjectSummary=Project Summary +ProjectMgrProjectTeam=Project Team +ProjectMgrPhaseDetails=Enter the Phase Details below ProjectMgrPhases=Phases ProjectMgrPhaseList=List of Phase ProjectMgrSkillStandards=Skill Standards @@ -66,8 +70,10 @@ ProjectMgrSubProjectName=Sub Project Name ProjectMgrSubProjects=Sub Projects ProjectMgrSubTaskName=Sub Task Name +ProjectMgrSubProjectDetails=Enter the SubProject Details below ProjectMgrSubProjectList=List of SubProject ProjectMgrSubTasks=Sub Tasks +ProjectMgrTaskDetails=Enter the Task Details below ProjectMgrTaskName=Task Name ProjectMgrTasks=Tasks ProjectMgrTaskList=List of Task 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=575017&r1=575016&r2=575017&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 12 10:16:02 2007 @@ -27,11 +27,11 @@ import javolution.util.FastMap; workEffortIdFrom = parameters.get("workEffortIdFrom"); - +workEffortAssocTypeId = parameters.get("workEffortAssocTypeId"); workEffortTypeId = parameters.get("workEffortTypeId"); if(workEffortIdFrom != null) { - List workEffortAssocs = delegator.findByAnd("WorkEffortAssocView", UtilMisc.toMap("workEffortIdFrom", workEffortIdFrom, "workEffortAssocTypeId", "WORK_EFF_BREAKDOWN")); + List workEffortAssocs = delegator.findByAnd("WorkEffortAssocView", UtilMisc.toMap("workEffortIdFrom", workEffortIdFrom, "workEffortAssocTypeId",workEffortAssocTypeId)); if(workEffortAssoc != null) { List childProjects = new LinkedList(); List childTasks = new LinkedList(); @@ -44,50 +44,24 @@ String workEffortTypeId = workEffort.get("workEffortTypeId"); if(workEffortTypeId.equals("PROJECT")) { Map projectMap = FastMap.newInstance(); - projectMap.put("currentStatusId", workEffort.getString("currentStatusId")); - projectMap.put("fromDate", workEffortAssoc.getString("fromDate")); - projectMap.put("workEffortId", workEffort.getString("workEffortId")); - projectMap.put("workEffortName", workEffort.getString("workEffortName")); - projectMap.put("priority", workEffort.getString("priority")); - projectMap.put("workEffortToActualStartDate", workEffortAssoc.getString("workEffortToActualStartDate")); - projectMap.put("workEffortToActualCompletionDate", workEffortAssoc.getString("workEffortToActualCompletionDate")); - projectMap.put("description", workEffort.getString("description")); - projectMap.put("workEffortTypeId", workEffort.getString("workEffortTypeId")); - projectMap.put("workEffortPurposeTypeId", workEffort.getString("workEffortPurposeTypeId")); - projectMap.put("workEffortAssocTypeId", "WORK_EFF_BREAKDOWN"); + projectMap.putAll((Map) workEffort); + projectMap.putAll((Map) workEffortAssoc); childProjects.add(projectMap); context.put("projects", childProjects); } else { if(workEffortTypeId.equals("TASK")) { Map taskMap = FastMap.newInstance(); - taskMap.put("currentStatusId", workEffort.getString("currentStatusId")); - taskMap.put("fromDate", workEffortAssoc.getString("fromDate")); - taskMap.put("workEffortId", workEffort.getString("workEffortId")); - taskMap.put("workEffortName", workEffort.getString("workEffortName")); - taskMap.put("priority", workEffort.getString("priority")); - taskMap.put("workEffortToActualStartDate", workEffortAssoc.getString("workEffortToActualStartDate")); - taskMap.put("workEffortToActualCompletionDate", workEffortAssoc.getString("workEffortToActualCompletionDate")); - taskMap.put("description", workEffort.getString("description")); - taskMap.put("workEffortTypeId", workEffort.getString("workEffortTypeId")); - taskMap.put("workEffortPurposeTypeId", workEffort.getString("workEffortPurposeTypeId")); - taskMap.put("workEffortAssocTypeId", "WORK_EFF_BREAKDOWN"); + taskMap.putAll((Map) workEffort); + taskMap.putAll((Map) workEffortAssoc); childTasks.add(taskMap); context.put("tasks", childTasks); } else { if(workEffortTypeId.equals("PHASE")) { Map phaseMap = FastMap.newInstance(); - phaseMap.put("currentStatusId", workEffort.getString("currentStatusId")); - phaseMap.put("fromDate", workEffortAssoc.getString("fromDate")); - phaseMap.put("workEffortId", workEffort.getString("workEffortId")); - phaseMap.put("workEffortName", workEffort.getString("workEffortName")); - phaseMap.put("workEffortToActualStartDate", workEffortAssoc.getString("workEffortToActualStartDate")); - phaseMap.put("workEffortToActualCompletionDate", workEffortAssoc.getString("workEffortToActualCompletionDate")); - phaseMap.put("description", workEffort.getString("description")); - phaseMap.put("workEffortAssocTypeId", "WORK_EFF_BREAKDOWN"); - phaseMap.put("workEffortTypeId", workEffort.getString("workEffortTypeId")); - phaseMap.put("workEffortPurposeTypeId", workEffort.getString("workEffortPurposeTypeId")); + taskMap.putAll((Map) workEffort); + taskMap.putAll((Map) workEffortAssoc); childPhases.add(phaseMap); context.put("phases", childPhases); } @@ -118,4 +92,5 @@ context.put("projects", projects); } } + Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListFilteredTasks.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListFilteredTasks.bsh?rev=575017&r1=575016&r2=575017&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListFilteredTasks.bsh (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListFilteredTasks.bsh Wed Sep 12 10:16:02 2007 @@ -93,16 +93,13 @@ } if(!innerFlag) { Map taskMap = FastMap.newInstance(); - taskMap.put("currentStatusId", task.getString("currentStatusId")); - taskMap.put("workEffortId", task.getString("workEffortId")); - taskMap.put("workEffortName", task.getString("workEffortName")); - taskMap.put("priority", task.getString("priority")); - taskMap.put("description", task.getString("description")); - taskMap.put("workEffortTypeId", task.getString("workEffortTypeId")); - taskMap.put("workEffortPurposeTypeId", task.getString("workEffortPurposeTypeId")); - taskMap.put("workEffortAssocTypeId", "WORK_EFF_BREAKDOWN"); + taskMap.putAll((Map) task); unassignedTasks.add(taskMap); } + } else { + Map taskMap = FastMap.newInstance(); + taskMap.putAll((Map) task); + unassignedTasks.add(taskMap); } } context.put("tasks", unassignedTasks); @@ -143,17 +140,8 @@ workEffortTypeId = task.get("workEffortTypeId"); if(workEffortTypeId.equals("TASK")) { Map taskMap = FastMap.newInstance(); - taskMap.put("currentStatusId", task.getString("currentStatusId")); - taskMap.put("fromDate", workEffortAssoc.getString("fromDate")); - taskMap.put("workEffortId", task.getString("workEffortId")); - taskMap.put("workEffortName", task.getString("workEffortName")); - taskMap.put("priority", task.getString("priority")); - taskMap.put("description", task.getString("description")); - taskMap.put("workEffortTypeId", task.getString("workEffortTypeId")); - taskMap.put("workEffortToActualStartDate", workEffortAssoc.getString("workEffortToActualStartDate")); - taskMap.put("workEffortToActualCompletionDate", workEffortAssoc.getString("workEffortToActualCompletionDate")); - taskMap.put("workEffortPurposeTypeId", task.getString("workEffortPurposeTypeId")); - taskMap.put("workEffortAssocTypeId", "WORK_EFF_BREAKDOWN"); + taskMap.putAll((Map) task); + taskMap.putAll((Map) workEffortAssoc); tasks.add(taskMap); context.put("tasks", tasks); } Added: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/MilliSecToHour.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/MilliSecToHour.bsh?rev=575017&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/MilliSecToHour.bsh (added) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/MilliSecToHour.bsh Wed Sep 12 10:16:02 2007 @@ -0,0 +1,34 @@ +/* +/* + * 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. + */ + +if (project != null) { + estimatedTimeInMiliSec = project.getDouble("estimatedMilliSeconds"); + if (estimatedTimeInMiliSec != null) { + estimatedHours = estimatedTimeInMiliSec/(60*60*1000); + context.put("estimatedHours", estimatedHours); + context.put("estimatedMilliSeconds", estimatedTimeInMiliSec); + } + actualTimeInMiliSec = project.getDouble("actualMilliSeconds"); + if (actualTimeInMiliSec != null) { + actualHours = actualTimeInMiliSec/(60*60*1000); + context.put("actualHours", actualHours); + context.put("actualMilliSeconds", actualTimeInMiliSec); + } +} 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=575017&r1=575016&r2=575017&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 12 10:16:02 2007 @@ -192,11 +192,6 @@ <response name="success" type="view" value="FindPhase"/> <response name="error" type="view" value="FindPhase"/> </request-map> - <request-map uri="projectView"> - <security https="true" auth="true"/> - <response name="success" type="view" value="projectView"/> - <response name="error" type="view" value="projectView"/> - </request-map> <request-map uri="EditProjectSkills"> <security https="true" auth="true"/> <response name="success" type="view" value="EditProjectSkills"/> 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=575017&r1=575016&r2=575017&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editphaseandassoc.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editphaseandassoc.ftl Wed Sep 12 10:16:02 2007 @@ -52,39 +52,11 @@ <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> - </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> + <td><input type="hidden" name="workEffortAssocTypeId" value="WORK_EFF_BREAKDOWN"/> </tr> <tr> <td width="20%"> - Enter the WorkEffort Details below + ${uiLabelMap.ProjectMgrPhaseDetails} </td> </tr> <tr> @@ -110,7 +82,7 @@ </#if> </tr> <tr> - <td class="label" >${uiLabelMap.CommonStatus}*</td> + <td class="label" >${uiLabelMap.CommonStatus}</td> <td> <select name="currentStatusId" class="selectBox"> <#if phase?exists> @@ -134,7 +106,7 @@ <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortEvent}]${statusItem.description}</option> </#list> </#if> - </select><span class="tooltip">${uiLabelMap.CommonRequired}</span> + </select> </td> </tr> <tr> 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=575017&r1=575016&r2=575017&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editproject.ftl Wed Sep 12 10:16:02 2007 @@ -17,6 +17,22 @@ under the License. --> +<script language="JavaScript" type="text/javascript"> + +function estimatedTimeHourToMilliSec() { + + estimatedTimeInHours = document.editProjectForm.jestimatedHours.value; + jEstimatedMilliSec = estimatedTimeInHours*60*60*1000; + document.editProjectForm.estimatedMilliSeconds.value = jEstimatedMilliSec; +} + +function actualTimeHourToMilliSec() { + + actualTimeInHours = document.editProjectForm.jactualHours.value; + jActualMilliSec = actualTimeInHours*60*60*1000; + document.editProjectForm.actualMilliSeconds.value = jActualMilliSec; +} +</script> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -30,7 +46,7 @@ </div> <div class="screenlet-body"> <#if project?has_content> - <a href="<@ofbizUrl>EditProject?DONE_PAGE=${donePage}</@ofbizUrl>"></a> + <a href="<@ofbizUrl>EditProject</@ofbizUrl>"></a> <form name="editProjectForm" action="<@ofbizUrl>updateProject</@ofbizUrl>"> <#else> <form name="editProjectForm" action="<@ofbizUrl>createProject</@ofbizUrl>"> @@ -58,6 +74,22 @@ <td class="label" >${uiLabelMap.CommonDescription}</td> <td><input type="text" name="description" value="${project.description?if_exists}"/></td> </tr> + <tr> + <td class="label">${uiLabelMap.CommonPurpose}</td> + <td> + <select name="workEffortPurposeTypeId" class="selectBox"> + <#if project.workEffortPurposeTypeId?exists> + <#assign workEffortPurposeType = delegator.findByPrimaryKey("WorkEffortPurposeType", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortPurposeTypeId", project.workEffortPurposeTypeId?if_exists))/> + <option SELECTED value="${project.workEffortPurposeTypeId?if_exists}">${workEffortPurposeType.description?if_exists}</option> + </#if> + <option>--</option> + <#assign workEffortPurposeTypes = delegator.findAll("WorkEffortPurposeType", Static["org.ofbiz.base.util.UtilMisc"].toList("description"))> + <#list workEffortPurposeTypes as workEffortPurposeType> + <option value="${workEffortPurposeType.workEffortPurposeTypeId?if_exists}">${workEffortPurposeType.description?if_exists}</option> + </#list> + </select> + </td> + </tr> <tr> <td class="label" >${uiLabelMap.CommonStatus}</td> <td> @@ -97,10 +129,14 @@ <td class="label">${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}</td> <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> + </#if> <#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"))> - <#assign scopeEnumId = project.scopeEnumId?if_exists> + <option--</option> <#list enumerations as enumeration> - <option <#if "${enumeration.enumId}" == scopeEnumId?if_exists>selected="selected"</#if>>${enumeration.description}</option> + <option value=${enumeration.enumId?if_exists}>${enumeration.description?if_exists}</option> </#list> </select> </td> @@ -132,6 +168,24 @@ <input type="text" name="actualCompletionDate" value="${project.actualCompletionDate?if_exists}"/> <a href="javascript:call_cal(document.editProjectForm.actualCompletionDate,'${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.ProjectMgrEstimatedHours}</td> + <td> + <input type="text" name="jestimatedHours" value="${estimatedHours?if_exists}" size="8" onchange="estimatedTimeHourToMilliSec()"/> + </td> + <td> + <input type="hidden" name="estimatedMilliSeconds" value="${estimatedMilliSeconds?if_exists}"/> + </td> + </tr> + <tr> + <td class="label">${uiLabelMap.ProjectMgrActualHours}</td> + <td> + <input type="text" name="jactualHours" value="${actualHours?if_exists}" size="8" onchange="actualTimeHourToMilliSec()"/> + </td> + <td> + <input type="hidden" name="actualMilliSeconds" value="${actualMilliSeconds?if_exists}"/> + </td> </tr> <#else> <tr> @@ -142,6 +196,17 @@ <td class="label" >${uiLabelMap.CommonDescription}</td> <td><input type="text" name="description" value=""/></td> </tr> + <tr> + <td class="label">${uiLabelMap.CommonPurpose}</td> + <td> + <select name="workEffortPurposeTypeId" class="selectBox"> + <#assign workEffortPurposeTypes = delegator.findAll("WorkEffortPurposeType", Static["org.ofbiz.base.util.UtilMisc"].toList("description"))> + <#list workEffortPurposeTypes as workEffortPurposeType> + <option value="${workEffortPurposeType.workEffortPurposeTypeId?if_exists}">${workEffortPurposeType.description?if_exists}</option> + </#list> + </select> + </td> + </tr> <tr> <td class="label" >${uiLabelMap.CommonStatus}</td> <td> @@ -219,6 +284,24 @@ <input type="text" name="actualCompletionDate" value=""/> <a href="javascript:call_cal(document.editProjectForm.actualCompletionDate,'${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.ProjectMgrEstimatedHours}</td> + <td> + <input type="text" name="jestimatedHours" value="" size="8" onchange="estimatedTimeHourToMilliSec()"/> + </td> + <td> + <input type="hidden" name="estimatedMilliSeconds"/> + </td> + </tr> + <tr> + <td class="label">${uiLabelMap.ProjectMgrActualHours}</td> + <td> + <input type="text" name="jactualHours" value="" size="8" onchange="actualTimeHourToMilliSec()"/> + </td> + <td> + <input type="hidden" name="actualMilliSeconds"/> + </td> </tr> </#if> <tr> 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=575017&r1=575016&r2=575017&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl Wed Sep 12 10:16:02 2007 @@ -52,39 +52,11 @@ <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> - </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> + <td><input type="hidden" name="workEffortAssocTypeId" value="WORK_EFF_BREAKDOWN"/> </tr> <tr> <td width="20%"> - Enter the WorkEffort Details below + ${uiLabelMap.ProjectMgrSubProjectDetails} </td> </tr> <tr> @@ -110,7 +82,7 @@ </#if> </tr> <tr> - <td class="label" >${uiLabelMap.CommonStatus}*</td> + <td class="label" >${uiLabelMap.CommonStatus}</td> <td> <select name="currentStatusId" class="selectBox"> <#if project?exists> 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=575017&r1=575016&r2=575017&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl Wed Sep 12 10:16:02 2007 @@ -52,39 +52,11 @@ <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> - </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> + <td><input type="hidden" name="workEffortAssocTypeId" value="WORK_EFF_BREAKDOWN"/> </tr> <tr> <td width="20%"> - Enter the WorkEffort Details below + ${uiLabelMap.ProjectMgrTaskDetails} </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=575017&r1=575016&r2=575017&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Wed Sep 12 10:16:02 2007 @@ -86,7 +86,7 @@ <actions> <set field="headerItem" value="projects"/> <set field="workEffortTypeId" from-field="parameters.workEffortTypeId"/> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> + <set field="workEffortId" from-field="parameters.workEffortId"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=575017&r1=575016&r2=575017&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Wed Sep 12 10:16:02 2007 @@ -39,10 +39,11 @@ </menu-item> </menu> <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?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="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="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=575017&r1=575016&r2=575017&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed Sep 12 10:16:02 2007 @@ -100,13 +100,9 @@ <section> <actions> <set field="titleProperty" value="PageTitleEditProject"/> - <set field="headerItem" value="projects"/> <set field="tabButtonItem" value="editproject"/> <set field="labelTitleProperty" value="PageTitleEditProject"/> - <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/FindProjectList"/> - <set field="workEffortId" from-field="parameters.workEffortId"/> - <set field="workEffortAssocTypeId" from-field="parameters.workEffortAssocTypeId"/> - <entity-one entity-name="WorkEffort" value-name="project"/> + <entity-one entity-name="WorkEffort" value-name="project"/> </actions> <widgets> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> @@ -342,10 +338,8 @@ <section> <actions> <set field="titleProperty" value="PageTitleEditPhase"/> - <set field="headerItem" value="projects"/> <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"/> @@ -378,9 +372,6 @@ <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}"> @@ -406,11 +397,8 @@ <section> <actions> <set field="titleProperty" value="PageTitleEditSkill"/> - <set field="headerItem" value="projects"/> <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="workEffortSkillStandardList"> <field-map field-name="workEffortId"/> </entity-and> @@ -440,10 +428,8 @@ <section> <actions> <set field="titleProperty" value="PageTitleListTimeEntries"/> - <set field="headerItem" value="projects"/> <set field="tabButtonItem" value="tasks"/> <set field="labelTitleProperty" value="PageTitleEditSkill"/> - <set field="workEffortId" from-field="parameters.workEffortId"/> </actions> <widgets> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> @@ -468,7 +454,8 @@ </screen> <screen name="ProjectSummary"> <section> - <actions> + <actions> + <set field="tabButtonItem" value="projectView"/> <entity-one entity-name="WorkEffort" value-name="project"/> </actions> <widgets> @@ -484,7 +471,6 @@ <include-screen name="PhasesInfo"/> <include-screen name="PartiesInfo"/> <!--include-screen name="ProjectTeamInfo"/--> - </container> <container style="righthalf"> <include-screen name="SubProjectsInfo"/> @@ -572,7 +558,7 @@ <widgets> <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="boxhead" text="">${uiLabelMap.ProjectMgrPhaseList}</label> + <label style="boxhead" text="">${uiLabelMap.ProjectMgrProjectTeam}</label> </container> <container style="screenlet-body"> <include-form name="ListAssociatedParties" location="component://projectmgr/widget/forms/ProjectForms.xml"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=575017&r1=575016&r2=575017&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed Sep 12 10:16:02 2007 @@ -92,7 +92,6 @@ </entity-options> </drop-down> </field> - <field name="description" title="${uiLabelMap.CommonDescription}"><text size="15"/></field> <field name="priority" title="${uiLabelMap.CommonPriority}" widget-style="selectBox" position="1"> <drop-down allow-empty="true"> <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/><option key="2"/><option key="3"/><option key="4"/><option key="5"/> @@ -101,6 +100,7 @@ </field> <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><date-time/></field> <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"> <hyperlink also-hidden="false" description="${uiLabelMap.ProjectMgrTimeEntries}" target="EditTimeEntries?workEffortId=${workEffortId}"/> @@ -158,8 +158,10 @@ </drop-down> </field> <field name="description" title="${uiLabelMap.CommonDescription}"><text size="15"/></field> - <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><date-time/></field> - <field name="actualCompletionDate" entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><date-time/></field> + <field name="estimatedStartDate" entry-name="workEffortToEstimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><date-time/></field> + <field name="estimatedCompletionDate" entry-name="workEffortToEstimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><date-time/></field> + <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><date-time/></field> + <field name="actualCompletionDate" entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> <form name="ListPhaseInfo" type="list" list-name="phases"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |