svn commit: r604795 - in /ofbiz/trunk/specialpurpose/projectmgr: data/ProjectMgrDemoData.xml widget/ProjectScreens.xml widget/TaskScreens.xml widget/TimeSheetScreens.xml widget/forms/ProjectForms.xml

[hansbak-2]

Author: hansbak
Date: Mon Dec 17 00:50:54 2007
New Revision: 604795

URL: http://svn.apache.org/viewvc?rev=604795&view=rev
Log:
changed resource selection, need reload of demo data

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=604795&r1=604794&r2=604795&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml Mon Dec 17 00:50:54 2007
@@ -10,7 +10,7 @@
     <PartyContactMech partyId="DemoEmployee1" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
     <PartyContactMech partyId="DemoEmployee1" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
     <PartyContactMech partyId="DemoEmployee1" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
-    <PartyRole partyId="DemoEmployee1" roleTypeId="PROVIDER_MANAGER"/>
+    <PartyRole partyId="DemoEmployee1" roleTypeId="PROJECT_TEAM"/>
     <!-- Demo Employee2 -->
     <Party partyId="DemoEmployee2" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
     <Person partyId="DemoEmployee2" firstName="Jo" lastName="Analist" />
@@ -19,9 +19,10 @@
     <PartyContactMech partyId="DemoEmployee2" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
     <PartyContactMech partyId="DemoEmployee2" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
     <PartyContactMech partyId="DemoEmployee2" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
-    <PartyRole partyId="DemoEmployee2" roleTypeId="PROVIDER_ANALYST"/>
-    <!-- Demo customer -->
-    <PartyRole partyId="DemoCustomer" roleTypeId="CLIENT_MANAGER"/>
+    <PartyRole partyId="DemoEmployee2" roleTypeId="PROJECT_TEAM"/>
+    <!-- make sure they show up as resources -->
+    <PartyRole partyId="DemoCustomer" roleTypeId="PROJECT_TEAM"/>
+    <PartyRole partyId="admin" roleTypeId="PROJECT_TEAM"/>
     
     <!-- Demo project, phases and tasks -->
     <WorkEffort workEffortId="9000" workEffortTypeId="PROJECT" currentStatusId="CAL_ACCEPTED" lastStatusUpdate="2007-12-14 15:07:52.901" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project" revisionNumber="1"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=604795&r1=604794&r2=604795&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Mon Dec 17 00:50:54 2007
@@ -55,9 +55,8 @@
                 <set field="titleProperty" value="PageTitleFindResource"/>
                 <set field="labelTitleProperty" value="ProjectMgrResourceName"/>
                 <set field="workEffortId" from-field="parameters.projectId"/>
-                <entity-and entity-name="PartyRoleDetailAndPartyDetail" list-name="resources">
-                    <field-map field-name="parentTypeId" value="PROJECT_TEAM"/>
-                    <order-by field-name="roleTypeId"/>
+                <entity-and entity-name="PartyRoleAndPartyDetail" list-name="resources">
+                    <field-map field-name="roleTypeId" value="PROJECT_TEAM"/>
                     <order-by field-name="lastName"/>
                     <order-by field-name="groupName"/>
                 </entity-and>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=604795&r1=604794&r2=604795&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Mon Dec 17 00:50:54 2007
@@ -254,6 +254,10 @@
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
                 <entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
                 <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString(&quot;yyyy-MM-dd HH:mm:ss.S&quot;)}" type="String"/>
+                <service service-name="getProjectIdAndName" result-map-name="result">
+                    <field-map field-name="taskId" env-name="parameters.workEffortId"/>
+                </service>
+                <set field="projectId" from-field="result.projectId"/>
             </actions>            
             <widgets>
                 <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=604795&r1=604794&r2=604795&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Mon Dec 17 00:50:54 2007
@@ -93,7 +93,7 @@
                                     </container>
                                 </container>
                                 <container style="screenlet">
-                                    <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleMyTimesheets} # ${timesheet.timesheetId}</label></container>                                
+                                    <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleMyTimesheets}</label></container>                                
                                     <container style="screenlet-body">
                                         <include-form name="ListTimeSheets" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
                                     </container>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=604795&r1=604794&r2=604795&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Mon Dec 17 00:50:54 2007
@@ -75,7 +75,7 @@
         <field name="resourceName" parameter-name="partyId" title="${uiLabelMap.ProjectMgrResourceName}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${personalTitle} ${lastName},${firstName} ${middleName} ${groupName}" target="viewprofile?partyId=${partyId}"/>
         </field>
-        <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
+        <field name="roleTypeId"><hidden/></field>
         <field name="emailAddess"><hyperlink target="/partymgr/control/EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&amp;partyIdTo=${partyId}&amp;communicationEventTypeId=EMAIL_COMMUNICATION&amp;contactMechIdTo=${contactMechId}&amp;contactMechTypeId=EMAIL_ADDRESS" description="${emailResult.emailAddress}" target-type="inter-app"/></field>
         <field use-when="telResult.get(&quot;extension&quot;)!=null" name="telephone"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber} Ext:${telResult.extension}"/></field>
         <field use-when="telResult.get(&quot;extension&quot;)==null" name="telephone"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}"/></field>
@@ -84,14 +84,7 @@
     </form>                                        
     <form name="AddResource" type="single" target="addResource">
         <field name="PartyId" parameter-name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="roleTypeId">
-            <drop-down>
-                <entity-options entity-name="RoleType" description="${description}">
-                    <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
+        <field name="roleTypeId"><hidden value="PROJECT_TEAM"/></field>
         <field name="addButton" ><submit/></field>
     </form>
     <form name="FindProject" type="single" target="FindProject">
@@ -310,10 +303,20 @@
         <field name="projectId"><hidden/></field>
         <field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field>
         <field name="workEffortId"><hidden value="${workEffortId}"/></field>
-        <field entry-name="xx" name="partyId">
+        <field use-when="workEffortId==projectId" entry-name="xx" name="partyId"><!-- project level -->
+            <drop-down>
+                <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${middleName} ${lastName} ${groupName}">
+                    <entity-constraint name="roleTypeId" value="PROJECT_TEAM"/>
+                    <entity-order-by field-name="lastName"/>
+                    <entity-order-by field-name="groupName"/>
+                    <entity-order-by field-name="roleTypeId"/>
+                </entity-options>        
+            </drop-down>
+        </field>
+        <field use-when="workEffortId!=projectId" entry-name="xx" name="partyId"><!-- task level -->
             <drop-down>
-                <entity-options entity-name="PartyRoleDetailAndPartyDetail" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                    <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
+                <entity-options entity-name="WorkEffortPartyAssignView" filter-by-date="true" description="${firstName} ${middleName} ${lastName} ${groupName}">
+                    <entity-constraint name="workEffortId" env-name="projectId"/>
                     <entity-order-by field-name="lastName"/>
                     <entity-order-by field-name="groupName"/>
                     <entity-order-by field-name="roleTypeId"/>