You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/08/27 04:58:22 UTC
svn commit: r689347 - in /ofbiz/trunk/specialpurpose/projectmgr:
webapp/projectmgr/WEB-INF/controller.xml widget/ProjectScreens.xml
widget/ResourceScreens.xml widget/forms/ProjectForms.xml
widget/forms/ResourceForms.xml
Author: hansbak
Date: Tue Aug 26 19:58:21 2008
New Revision: 689347
URL: http://svn.apache.org/viewvc?rev=689347&view=rev
Log:
moved some resource screens and added accounts and contact to profile screen
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
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=689347&r1=689346&r2=689347&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Tue Aug 26 19:58:21 2008
@@ -772,7 +772,7 @@
<!-- end of request mappings -->
<!-- View Mappings -->
- <view-map name="viewprofile" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#viewprofile"/>
+ <view-map name="viewprofile" type="screen" page="component://projectmgr/widget/ResourceScreens.xml#viewprofile"/>
<view-map name="listResourcesTask" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#listResourcesTask"/>
<view-map name="listResourcesProject" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#listResourcesProject"/>
<view-map name="EditPartyGroup" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditPartyGroup"/>
@@ -786,7 +786,7 @@
<view-map name="main" type="screen" page="component://projectmgr/widget/CommonScreens.xml#Main"/>
<view-map name="ganttChart" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#ganttChart"/>
<view-map name="ListSubProjects" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#ListSubProjects"/>
- <view-map name="FindResource" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#FindResource"/>
+ <view-map name="FindResource" type="screen" page="component://projectmgr/widget/ResourceScreens.xml#FindResource"/>
<view-map name="FindProject" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#FindProject"/>
<view-map name="EditProject" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProject"/>
<view-map name="projectBilling" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#projectBilling"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=689347&r1=689346&r2=689347&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Tue Aug 26 19:58:21 2008
@@ -44,30 +44,6 @@
</widgets>
</section>
</screen>
- <screen name="FindResource">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleFindResource"/>
- <set field="labelTitleProperty" value="ProjectMgrResourceName"/>
- <set field="workEffortId" from-field="parameters.projectId"/>
- <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>
- </actions>
- <widgets>
- <decorator-screen name="CommonResourceDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet id="AddResourcePanel" title="${uiLabelMap.PageTitleAddResource}" collapsible="true">
- <include-form name="AddResource" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
- </screenlet>
- <include-form name="ListResources" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="FindProject">
<section>
<actions>
@@ -704,45 +680,6 @@
</widgets>
</section>
</screen>
- <screen name="viewprofile">
- <section>
- <actions>
- <set field="tabButtonItem" value="ResourcesProfile"/>
- <set field="titleProperty" value="PartyProfile"/>
- <set field="headerItem" value="find"/>
- <set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/control.progress_bar.js" global="true"/>
- <set field="layoutSettings.styleSheets[]" value="/images/prototypejs/progress_bar.css" global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/partymgr/js/PartyProfileContent.js" global="true"/>
- <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
- <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
- </actions>
- <widgets>
- <decorator-screen name="CommonListResourceDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <condition>
- <not><if-empty field-name="party"/></not>
- </condition>
- <widgets>
- <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="UserLogin" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="Visits" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- <include-screen name="Notes" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="listResourcesProject">
<section>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml?rev=689347&r1=689346&r2=689347&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml Tue Aug 26 19:58:21 2008
@@ -20,6 +20,30 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+ <screen name="FindResource">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleFindResource"/>
+ <set field="labelTitleProperty" value="ProjectMgrResourceName"/>
+ <set field="workEffortId" from-field="parameters.projectId"/>
+ <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>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonResourceDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet id="AddResourcePanel" title="${uiLabelMap.PageTitleAddResource}" collapsible="true">
+ <include-form name="AddResource" location="component://projectmgr/widget/forms/ResourceForms.xml"/>
+ </screenlet>
+ <include-form name="ListResources" location="component://projectmgr/widget/forms/ResourceForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="ListUnBilledHours">
<section>
<actions>
@@ -43,4 +67,39 @@
</section>
</screen>
+ <screen name="viewprofile">
+ <section>
+ <actions>
+ <set field="tabButtonItem" value="ResourcesProfile"/>
+ <set field="titleProperty" value="PartyProfile"/>
+ <set field="headerItem" value="find"/>
+ <set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
+ <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/control.progress_bar.js" global="true"/>
+ <set field="layoutSettings.styleSheets[]" value="/images/prototypejs/progress_bar.css" global="true"/>
+ <set field="layoutSettings.javaScripts[]" value="/partymgr/js/PartyProfileContent.js" global="true"/>
+ <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
+ <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonListResourceDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <not><if-empty field-name="party"/></not>
+ </condition>
+ <widgets>
+ <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="contactsAndAccounts" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="UserLogin" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Visits" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Notes" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=689347&r1=689346&r2=689347&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Tue Aug 26 19:58:21 2008
@@ -72,33 +72,6 @@
</field>
<field name="add"><submit/></field>
</form>
- <form name="FindResource" type="single" target="FindResource"
- header-row-style="header-row" default-table-style="basic-table">
- <field name="resourceName" parameter-name="partyId" title="${uiLabelMap.ProjectMgrResourceName}"><text/></field>
- <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>
- </form>
- <form name="ListResources" type="list" list-name="resources" paginate-target="FindResource"
- odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
- <row-actions>
- <service service-name="getPartyEmail" result-map-name="emailResult"/>
- <service service-name="getPartyTelephone" result-map-name="telResult"/>
- </row-actions>
- <field name="resourceName" parameter-name="partyId" title="${uiLabelMap.ProjectMgrResourceName}" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${firstName} ${middleName} ${lastName} ${groupName}" target="viewprofile?partyId=${partyId}"/>
- </field>
- <field name="roleTypeId"><hidden/></field>
- <field name="emailAddess" title="${uiLabelMap.PartyEmailAddress}"><hyperlink target="/partymgr/control/EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyIdTo=${partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMechId}&contactMechTypeId=EMAIL_ADDRESS" description="${emailResult.emailAddress}" target-type="inter-app"/></field>
- <field use-when="telResult.get("extension")!=null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber} Ext:${telResult.extension}"/></field>
- <field use-when="telResult.get("extension")==null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}"/></field>
- <field name="contactMechPurposeTypeId" entry-name="telResult.contactMechPurposeTypeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="ContactMechPurposeType"/></field>
- <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="removeResource?partyId=${partyId}&roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonRemove}"/></field>
- </form>
- <form name="AddResource" type="single" target="addResource"
- header-row-style="header-row" default-table-style="basic-table">
- <field name="PartyId" parameter-name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="roleTypeId"><hidden value="PROJECT_TEAM"/></field>
- <field name="addButton" ><submit/></field>
- </form>
<form name="FindProject" type="single" target="FindProject" title="Find and List Project"
header-row-style="header-row" default-table-style="basic-table">
<field name="projectId" title="${uiLabelMap.ProjectMgrProjectId}" parameter-name="workEffortId"><text-find size="25" default-option="contains"></text-find></field>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=689347&r1=689346&r2=689347&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Tue Aug 26 19:58:21 2008
@@ -19,6 +19,27 @@
-->
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+ <form name="FindResource" type="single" target="FindResource"
+ header-row-style="header-row" default-table-style="basic-table">
+ <field name="resourceName" parameter-name="partyId" title="${uiLabelMap.ProjectMgrResourceName}"><text/></field>
+ <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>
+ </form>
+ <form name="ListResources" type="list" list-name="resources" paginate-target="FindResource"
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+ <row-actions>
+ <service service-name="getPartyEmail" result-map-name="emailResult"/>
+ <service service-name="getPartyTelephone" result-map-name="telResult"/>
+ </row-actions>
+ <field name="resourceName" parameter-name="partyId" title="${uiLabelMap.ProjectMgrResourceName}" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${firstName} ${middleName} ${lastName} ${groupName}" target="viewprofile?partyId=${partyId}"/>
+ </field>
+ <field name="roleTypeId"><hidden/></field>
+ <field name="emailAddess" title="${uiLabelMap.PartyEmailAddress}"><hyperlink target="/partymgr/control/EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyIdTo=${partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMechId}&contactMechTypeId=EMAIL_ADDRESS" description="${emailResult.emailAddress}" target-type="inter-app"/></field>
+ <field use-when="telResult.get("extension")!=null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber} Ext:${telResult.extension}"/></field>
+ <field use-when="telResult.get("extension")==null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}"/></field>
+ <field name="contactMechPurposeTypeId" entry-name="telResult.contactMechPurposeTypeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="ContactMechPurposeType"/></field>
+ <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="removeResource?partyId=${partyId}&roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonRemove}"/></field>
+ </form>
<form name="ListUnBilledHours" type="list" list-name="unBilledList" paginate-target="ListResourcesUnBilledHours"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="projectName"><display/></field>
@@ -28,4 +49,10 @@
<field name="rate"><display/></field>
<field name="total"><display/></field>
</form>
+ <form name="AddResource" type="single" target="addResource"
+ header-row-style="header-row" default-table-style="basic-table">
+ <field name="PartyId" parameter-name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="roleTypeId"><hidden value="PROJECT_TEAM"/></field>
+ <field name="addButton" ><submit/></field>
+ </form>
</forms>
\ No newline at end of file