svn commit: r687326 - in /ofbiz/trunk/specialpurpose: mypage/widget/ projectmgr/config/ projectmgr/script/org/ofbiz/project/ projectmgr/widget/ projectmgr/widget/forms/

[hansbak-2]

Author: hansbak
Date: Wed Aug 20 06:30:25 2008
New Revision: 687326

URL: http://svn.apache.org/viewvc?rev=687326&view=rev
Log:
improve custrequest screens, add notes to custrequest items, several fault fixes, project/phase dropdowns changed

Modified:
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=687326&r1=687325&r2=687326&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Wed Aug 20 06:30:25 2008
@@ -37,7 +37,7 @@
             <alt-target use-when="!headerItem.equals(&quot;main&quot;)" target="updateTimesheetKey"/>        
             <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${workEffortName} -- ${phaseName} -- ${projectName}">
+                <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${projectName} -- ${phaseName} -- ${workEffortName}">
                     <entity-constraint name="workEffortTypeId" operator="not-equals" value="TASK_TEMPLATE"/>
                     <entity-constraint name="partyId" env-name="timesheet.partyId"/>
                     <entity-order-by field-name="projectName"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=687326&r1=687325&r2=687326&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Wed Aug 20 06:30:25 2008
@@ -523,7 +523,7 @@
         <value xml:lang="zh">你没有访问该项目的权限：${projectId}</value>
     </property>
     <property key="ProjectMgrNoAccessToTask">
-        <value xml:lang="en">You have no access to the task#: ${taskId}</value>
+        <value xml:lang="en">You have no access to the taskId: ${taskId} or projectId: ${projectId}</value>
         <value xml:lang="it">Tu non hai accesso al compito#: ${taskId}</value>
         <value xml:lang="th">คุณไม่มีสิทธิ์ในการเข้าถึงงาน#: ${taskId}</value>
         <value xml:lang="zh">你没有访问该任务的权限：${taskId}</value>

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml?rev=687326&r1=687325&r2=687326&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml Wed Aug 20 06:30:25 2008
@@ -54,7 +54,7 @@
         
         <!-- PROJECT -->
         <if-compare field="sec_object" value="PROJECT" operator="equals">
-            <!--log level="info" message="======ProjectMGR Security=====  action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.projectId} resourceDescription: ${parameters.resourceDescription}"/-->
+            <log level="info" message="======ProjectMGR Security=====  action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.projectId} resourceDescription: ${parameters.resourceDescription}"/>
             <set field="projectId" from-field="parameters.projectId"/>
             <set field="partyId" from-field="parameters.userLogin.partyId"/>
             <call-simple-method method-name="checkProjectMembership"/>
@@ -148,10 +148,10 @@
                 <set field="phaseId" from-field="parameters.workEffortParentId"/>
             </if-empty>
             <set field="partyId" from-field="parameters.userLogin.partyId"/>
-            <!--log level="info" message="======ProjectMGR Security=====  action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.taskId} PhaseId:  ${parameters.workEffortParentId} resourceDescription: ${parameters.resourceDescription}"/-->
             <call-simple-method method-name="checkProjectMembership"/>
+            <!-- log level="info" message="======ProjectMGR Security=====  action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.taskId} PhaseId:  ${parameters.workEffortParentId} resourceDescription: ${parameters.resourceDescription} isMember: ${isMember}"/-->
             <entity-and list-name="custRequests" entity-name="WorkEffortCustRequestView">
-                <field-map field-name="workEffortId" env-name="parameters.taskId"/>
+                <field-map field-name="workEffortId" env-name="taskId"/>
             </entity-and>
             <first-from-list list-name="custRequests" entry-name="custRequest"/>
             <if>
@@ -188,7 +188,7 @@
                         </and>
                         <and>
                             <if-has-permission permission="PROJECTMGR_ROLE_TASK_CREATE"/>
-                            <if-compare field="isMember" value="true" operator="equals"/>
+                            <!-- if-compare field="isMember" value="true" operator="equals"/--><!-- currently disabled because the workEffortParentId is supplied but is empty here -->
                             <or>
                                 <if-compare field="parameters.mainAction" value="CREATE" operator="equals"/>
                                 <if-compare field="parameters.mainAction" value="UPDATE" operator="equals"/>
@@ -343,6 +343,9 @@
                     <set field="isMember" value="true" type="Boolean"/>
                 </else>
             </if-empty>
+            <else>
+                <set field="isMember" value="false" type="Boolean"/>
+            </else>
         </if-not-empty>
     </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=687326&r1=687325&r2=687326&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Wed Aug 20 06:30:25 2008
@@ -380,7 +380,7 @@
         </menu-item>
     </menu>
     <menu name="RequestTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
-        <menu-item name="viewRequest" title="${uiLabelMap.ProjectMgrView}">
+        <menu-item name="ViewRequest" title="${uiLabelMap.ProjectMgrView}">
             <link target="ViewRequest?custRequestId=${parameters.custRequestId}"/>
         </menu-item>
         <menu-item name="editRequest" title="${uiLabelMap.ProjectMgrEdit}">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=687326&r1=687325&r2=687326&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed Aug 20 06:30:25 2008
@@ -416,7 +416,7 @@
                 <set field="titleProperty" value="PageTitleListWorkEffortPartyAssigns"/>
                 <set field="tabButtonItem" value="parties"/>
                 <set field="labelTitleProperty" value="PageTitleListWorkEffortPartyAssigns"/>
-                <set field="workEffortId" from-field="parameters.projectId" default-value="parameters.workEffortId"/>
+                <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
                 <set field="projectId" from-field="workEffortId"/>
                 <entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
@@ -528,7 +528,7 @@
             <actions>
                 <set field="titleProperty" value="ProjectMgrProjectSummary"/>
                 <set field="tabButtonItem" value="projectView"/>
-                <set field="projectId" from-field="parameters.projectId" default-value="parameters.workEffortId"/>
+                <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
                 <service service-name="getProject" result-map-name="result">
                     <field-map field-name="projectId" env-name="projectId"/>
                 </service>
@@ -784,7 +784,7 @@
                     <field-map field-name="projectId" env-name="projectId"/>
                 </service>
                 <set field="project" from-field="result.projectInfo"/>
-                <set field="workEffortId" from-field="parameters.projectId" default-value="parameters.workEffortId"/>
+                <set field="workEffortId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
                 <set field="projectId" from-field="workEffortId"/>
                 <entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=687326&r1=687325&r2=687326&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Wed Aug 20 06:30:25 2008
@@ -95,6 +95,10 @@
                 <entity-and list-name="commEvents" entity-name="CommunicationEventAndCustRequest">
                     <field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
                 </entity-and>
+                <entity-and list-name="notes" entity-name="CustRequestItemNoteView">
+                    <field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
+                    <order-by  field-name="custRequestItemSeqId"/>
+                </entity-and>
             </actions>
             <widgets>
                 <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
@@ -106,6 +110,9 @@
                             <screenlet title="${uiLabelMap.PageTitleRequestItems}">
                                 <include-form name="OverviewRequestItems" location="component://projectmgr/widget/forms/RequestForms.xml"/>
                             </screenlet>
+                            <screenlet title="${uiLabelMap.PageTitleRequestItemNotes}">
+                                <include-form name="ListRequestItemNotes" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+                            </screenlet>
                         </container>
                         <container style="righthalf">
                             <platform-specific>
@@ -121,7 +128,7 @@
                                 <include-form name="ViewRequestCommunicationEvents" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
                             </screenlet>
                             <screenlet title="${uiLabelMap.WorkEffortWorkEfforts}" navigation-form-name="ViewRequestWorkEfforts">
-                                <include-form name="ViewRequestWorkEfforts" location="component://projectmgr/widget/forms/RequestForms.xml"/>
+                                <include-form name="ListRequestItemNotes" location="component://projectmgr/widget/forms/RequestForms.xml"/>
                             </screenlet>
                         </container>
                     </decorator-section>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=687326&r1=687325&r2=687326&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Wed Aug 20 06:30:25 2008
@@ -156,11 +156,17 @@
         </field>
     </form>
     <form name="OverviewRequestItems" extends="OverviewRequestItems" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
+        <field name="custRequestItemSeqId" title="${uiLabelMap.CommonNbr}"><display/></field>
         <field name="story" title="${uiLabelMap.CommonText}"><display/></field>
         <field name="productId"><ignored/></field>
         <field name="statusId"><ignored/></field>
         <field name="quantity"><ignored/></field>
         <field name="description"><ignored/></field>
-        <field name="custRequestItemSeqId"><ignored/></field>
+    </form>
+    <form name="ListRequestItemNotes" extends="ListRequestItemNotes" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
+        <field name="custRequestItemSeqId" title="${uiLabelMap.CommonNbr}"><display/></field>
+        <field name="noteDateTime"><ignored/></field>
+        <field name="partyId"><ignored/></field>
+        <field name="name"><ignored/></field>
     </form>
 </forms>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=687326&r1=687325&r2=687326&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed Aug 20 06:30:25 2008
@@ -56,8 +56,9 @@
         </field>
         <field use-when="myTask!=void" name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="ProjectPartyAndPhase" key-field-name="phaseId" description="${phaseName} (Proj:${projectName})">
+                <entity-options entity-name="ProjectPartyAndPhase" key-field-name="phaseId" description="${projectName} -- ${phaseName}">
                     <entity-constraint name="partyId" env-name="userLogin.partyId"/>
+                    <entity-order-by field-name="projectName"/>
                     <entity-order-by field-name="phaseName"/>
                 </entity-options>        
             </drop-down>
@@ -114,9 +115,9 @@
             <drop-down allow-empty="false">
                 <entity-options entity-name="ProjectAndPhaseAndTask" description="${projectName} : ${phaseName}">    
                     <entity-order-by field-name="workEffortParentId"/>
-                    </entity-options>
-                </drop-down>
-            </field>
+                </entity-options>
+            </drop-down>
+        </field>
         <field name="estimatedHours" title="${uiLabelMap.ProjectMgrEstimatedHours}"><text size="5"/></field>
         <field name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}">
             <drop-down allow-empty="true">
@@ -286,7 +287,7 @@
         <field name="statusId"><hidden value="PAS_ASSIGNED"/></field>
         <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
             <drop-down>
-                <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${workEffortName} (${phaseName}-${projectName})">
+                <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${projectName} -- ${phaseName} -- ${workEffortName}">
                     <entity-constraint name="partyId" env-name="userLogin.partyId"/>
                     <entity-constraint name="workEffortTypeId" value="TASK"/>
                     <entity-constraint name="currentStatusId" operator="equals" value="PTS_CREATED"/>