diff --git a/projectmgr/config/ProjectMgrUiLabels.properties b/projectmgr/config/ProjectMgrUiLabels.properties index 5d22dde9e..cf8fdcef1 100644 --- a/projectmgr/config/ProjectMgrUiLabels.properties +++ b/projectmgr/config/ProjectMgrUiLabels.properties @@ -148,4 +148,7 @@ PageTitleListTimeEntries=List Time Entries for ProjectMgrQuickAssignPartyId=Quick Assign Party Id CommonStatustoComplete=Status to 'complete' ProjectMgrStatusId = Status Id - +PageTitleCreateTaskbyRequest=Create Task by Request +ProjectMgrCreateTaskFromRequest=Create Task From Request +ProjectMgrProjectAndPhaseName=Project and Phase Name +ProjectMgrCustRequestWorkEffort=CustRequest WorkEffort diff --git a/projectmgr/webapp/projectmgr/RequestTabBar.ftl b/projectmgr/webapp/projectmgr/RequestTabBar.ftl new file mode 100644 index 000000000..edd00e0f4 --- /dev/null +++ b/projectmgr/webapp/projectmgr/RequestTabBar.ftl @@ -0,0 +1,39 @@ +<#-- +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. +--> + +<#assign unselectedClassName = "tabButton"> +<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}> + +<#if custRequest?exists> +
+ ${uiLabelMap.OrderViewRequest} + ${uiLabelMap.OrderRequest} +
+<#if custRequestItem?exists> +
+ ${uiLabelMap.OrderRequestItem} + ${uiLabelMap.OrderNotes} + <#if custRequest.custRequestTypeId = "RF_QUOTE"> + ${uiLabelMap.OrderOrderQuotes} + + ${uiLabelMap.OrderRequirements} + ${uiLabelMap.WorkEffortWorkEfforts} +
+ + diff --git a/projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh b/projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh new file mode 100644 index 000000000..75cb72905 --- /dev/null +++ b/projectmgr/webapp/projectmgr/WEB-INF/actions/custRequestWorkEffort.bsh @@ -0,0 +1,33 @@ +/* + * 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.lang.*; +import java.util.*; +import org.ofbiz.base.util.*; +import org.ofbiz.entity.*; +import org.ofbiz.entity.util.*; +import org.ofbiz.entity.condition.*; + + +custRequestWorkEffortList = delegator.findByAnd("CustRequestWorkEffort", UtilMisc.toMap("custRequestId", custRequestId), UtilMisc.toList("workEffortId")); +if (UtilValidate.isNotEmpty(custRequestWorkEffortList)) { + custRequestWorkEffort = custRequestWorkEffortList.get(0); + context.put("workEffortId", custRequestWorkEffort.getString("workEffortId")); + } + diff --git a/projectmgr/webapp/projectmgr/WEB-INF/controller.xml b/projectmgr/webapp/projectmgr/WEB-INF/controller.xml index e4f75db02..d26ba145d 100644 --- a/projectmgr/webapp/projectmgr/WEB-INF/controller.xml +++ b/projectmgr/webapp/projectmgr/WEB-INF/controller.xml @@ -527,6 +527,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -570,5 +594,9 @@ + + + + diff --git a/projectmgr/widget/RequestScreens.xml b/projectmgr/widget/RequestScreens.xml new file mode 100644 index 000000000..28384a500 --- /dev/null +++ b/projectmgr/widget/RequestScreens.xml @@ -0,0 +1,190 @@ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + +
+
+ +
+ + + + + +
+ + + + + + + + + +
+
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ + + + + + + + + +
+
+ +
+ + + + + + + + + +
+
+ +
+ +