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 2009/04/06 09:17:19 UTC
svn commit: r762232 - in /ofbiz/trunk: applications/accounting/data/
specialpurpose/myportal/data/
specialpurpose/myportal/webapp/myportal/WEB-INF/
specialpurpose/myportal/widget/ specialpurpose/projectmgr/data/
specialpurpose/projectmgr/script/org/ofb...
Author: hansbak
Date: Mon Apr 6 07:17:19 2009
New Revision: 762232
URL: http://svn.apache.org/viewvc?rev=762232&view=rev
Log:
move project info from myportal to projectmgr, added some demo data to test these screens
Modified:
ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
Modified: ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml?rev=762232&r1=762231&r2=762232&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml (original)
+++ ofbiz/trunk/applications/accounting/data/PaymentsInvoices.xml Mon Apr 6 07:17:19 2009
@@ -59,11 +59,10 @@
<PaymentApplication paymentApplicationId="demo11000" paymentId="demo10001" invoiceId="demo11001" amountApplied="543.23"/>
<!-- show on customer invoice list when DemoCustomer logs on to myportal -->
+ <Party partyId="DemoCustCompany" partyTypeId="PARTY_GROUP"/>
<Invoice invoiceId="demo1200" invoiceTypeId="SALES_INVOICE" partyIdFrom="Company" partyId="DemoCustCompany" statusId="INVOICE_APPROVED" invoiceDate="2006-04-25 12:46:27.122" description="This is an invoice to DemoCustomer" currencyUomId="USD" />
<InvoiceItem invoiceId="demo1200" invoiceItemSeqId="00001" invoiceItemTypeId="INV_SPROD_ITEM" uomId="USD" taxableFlag="Y" amount="511.23" description="this was e service for a product" />
<InvoiceStatus statusId="INVOICE_IN_PROCESS" invoiceId="demo1200" statusDate="2006-04-25 12:46:27.122" />
<InvoiceStatus statusId="INVOICE_APPROVED" invoiceId="demo1200" statusDate="2006-04-25 12:46:27.122" />
-
-
</entity-engine-xml>
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=762232&r1=762231&r2=762232&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Mon Apr 6 07:17:19 2009
@@ -75,7 +75,6 @@
<PortalPageColumn portalPageId="MYPORTAL_CUSTOMER3" columnSeqId="00001" />
<PortalPortlet portalPortletId="mycompanycomms" portletName="My Company Comms" screenName="MyCompanyComms" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Company Comms From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
- <PortalPortlet portalPortletId="ListProjects" portletName="List Projects" screenName="ListProjects" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Projects From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" />
<PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" />
<PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
@@ -137,11 +136,12 @@
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" sequenceNum="7"/>
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/>
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER2" portalPortletId="ListCustomerInvoices" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
- <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER3" portalPortletId="ListProjects" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER3" portalPortletId="ListCustomerProjects" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
<PortletPortletCategory portalPortletId="mycompanycomms" portletCategoryId="COMMUNICATIONS"/>
- <PortletPortletCategory portalPortletId="ListProjects" portletCategoryId="LIST_CUSTOMER"/>
+ <PortletPortletCategory portalPortletId="ListCustomerProjects" portletCategoryId="LIST_CUSTOMER"/>
+ <PortletPortletCategory portalPortletId="ListCustomerInvoices" portletCategoryId="LIST_CUSTOMER"/>
<WebSite webSiteId="MYPORTAL" siteName="My Portal" visualThemeSetId="BACKOFFICE" />
Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=762232&r1=762231&r2=762232&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Mon Apr 6 07:17:19 2009
@@ -73,6 +73,4 @@
<view-map name="newRegisterLogin" type="screen" page="component://myportal/widget/CommonScreens.xml#newRegisterLogin"/>
<view-map name="myCompanyComms" type="screen" page="component://myportal/widget/CommonScreens.xml#MyCompanyComms"/>
<view-map name="newEvent" type="screen" page="component://myportal/widget/MyPortalScreens.xml#newEvent"/>
- <view-map name="ListInvoices" type="screen" page="component://myportal/widget/MyPortalScreens.xml#ListInvoices"/>
- <view-map name="ListProjects" type="screen" page="component://myportal/widget/MyPortalScreens.xml#ListProjects"/>
</site-conf>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=762232&r1=762231&r2=762232&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Mon Apr 6 07:17:19 2009
@@ -66,13 +66,6 @@
<field name="partyId"><ignored/></field>
</form>
- <form name="ListPhaseInfo" extends="ListPhaseInfo" extends-resource="component://projectmgr/widget/forms/ProjectForms.xml">
- <field name="phase"><display description="${phaseName}"/></field>
- </form>
- <form name="ListTaskInfo" extends="ListTaskInfo" extends-resource="component://projectmgr/widget/forms/ProjectForms.xml">
- <field name="task"><display description="${workEffortName}"/></field>
- </form>
-
<!--New Register Person-->
<form name="RegisterPerson" type="single" target="createRegister" default-map-name="personInfo"
focus-field-name="whyWouldYouLikeToRegister" header-row-style="header-row" default-table-style="basic-table">
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=762232&r1=762231&r2=762232&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Mon Apr 6 07:17:19 2009
@@ -76,93 +76,6 @@
</widgets>
</section>
</screen>
- <screen name="ListProjects">
- <section>
- <actions>
- <set field="headerItem" value="projects"/>
- <set field="layoutSettings.javaScripts[]" value="/images/jsgantt.js" global="true"/>
- <set field="layoutSettings.styleSheets[]" value="/images/jsgantt.css" global="true"/>
- <entity-condition list="projects" entity-name="WorkEffortPartyAssignment" filter-by-date="true">
- <condition-list combine="and">
- <condition-expr field-name="partyId" from-field="userLogin.partyId"/>
- <condition-list combine="or">
- <condition-expr field-name="roleTypeId" value="CLIENT_MANAGER"/>
- <condition-expr field-name="roleTypeId" value="CLIENT_ANALYST"/>
- <condition-expr field-name="roleTypeId" value="CLIENT_BILLING"/>
- </condition-list>
- </condition-list>
- </entity-condition>
- </actions>
- <widgets>
- <iterate-section entry="project" list="projects">
- <section>
- <actions>
- <set field="projectId" from-field="project.workEffortId"/>
- <set field="parameters.projectId" from-field="project.workEffortId"/>
- <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy"/>
- <service service-name="getProject" result-map="result">
- <field-map field-name="projectId" from-field="projectId"/>
- </service>
- <set field="project" from-field="result.projectInfo"/>
- </actions>
- <widgets>
- <label style="h1" text="${uiLabelMap.ProjectMgrProjectCurrent}: ${project.projectName}[${project.projectId}]"/>
- <container style="lefthalf">
- <screenlet title="${uiLabelMap.PageTitleProjectInformation}">
- <include-form name="ProjectInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
- </screenlet>
- <section>
- <actions>
- <service service-name="getProjectPhaseList" result-map="result">
- <field-map field-name="projectId" from-field="projectId"/>
- </service>
- <set field="phases" from-field="result.phaseList"/>
- </actions>
- <widgets>
- <container style="screenlet">
- <screenlet title="${uiLabelMap.ProjectMgrPhases}">
- <include-form name="ListPhaseInfo" location="component://myportal/widget/MyPortalForms.xml"/>
- </screenlet>
- </container>
- </widgets>
- </section>
- </container>
- <container style="righthalf">
- <section>
- <actions>
- <service service-name="getProjectTaskList" result-map="result">
- <field-map field-name="projectId" from-field="projectId"/>
- </service>
- <set field="tasks" from-field="result.taskList"/>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.ProjectMgrTasks}" navigation-form-name="ListTaskInfo">
- <include-form name="ListTaskInfo" location="component://myportal/widget/MyPortalForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </container>
- <container style="clear"/>
- <screenlet title="${uiLabelMap.PageTitleProjectGanttChart}">
- <platform-specific>
- <html><html-template location="component://projectmgr/webapp/projectmgr/project/gantChart.ftl"/></html>
- </platform-specific>
- </screenlet>
- </widgets>
- </section>
- </iterate-section>
- <section>
- <condition>
- <if-empty field="projects"/>
- </condition>
- <widgets>
- <label style="h2" text="${uiLabelMap.MyPageNoProjectsFound}"></label>
- </widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
<screen name="CreateUserNotification">
<section>
<actions>
Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=762232&r1=762231&r2=762232&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml Mon Apr 6 07:17:19 2009
@@ -102,6 +102,7 @@
<!-- First Demo project from customer 1 and employee 1,2-->
<WorkEffort workEffortId="9000" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.901" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project1 Cust1" revisionNumber="1"/>
+ <WorkEffortPartyAssignment workEffortId="9000" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818" />
<WorkEffortPartyAssignment workEffortId="9000" partyId="admin" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffortPartyAssignment workEffortId="9000" partyId="DemoCustomer1" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffortPartyAssignment workEffortId="9000" partyId="DemoCustomer3" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_BILLING" fromDate="2007-12-14 16:45:21.831"/>
@@ -126,6 +127,7 @@
<!-- Second Demo project for customer 2 and employee 1,3-->
<WorkEffort workEffortId="9100" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.911" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project2 Cust 2" revisionNumber="1"/>
<WorkEffortPartyAssignment workEffortId="9100" partyId="admin" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
+ <WorkEffortPartyAssignment workEffortId="9100" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818" />
<WorkEffortPartyAssignment workEffortId="9100" partyId="DemoCustomer2" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffortPartyAssignment workEffortId="9100" partyId="DemoCustomer3" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_BILLING" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffortPartyAssignment workEffortId="9100" partyId="DemoEmployee1" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
@@ -146,21 +148,15 @@
<WorkEffortAssoc workEffortIdFrom="9103" workEffortIdTo="9105" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" sequenceNum="0" fromDate="2000-01-01 00:00:00.0"/>
<WorkEffortAssoc workEffortIdFrom="9105" workEffortIdTo="9106" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" sequenceNum="0" fromDate="2000-01-01 00:00:00.0"/>
- <!-- Recurring calendar event demo - set up a staff meeting on the first Monday of each month -->
- <TemporalExpression tempExprId="STAFF_MTG" tempExprTypeId="INTERSECTION"/>
- <TemporalExpression tempExprId="10AM" tempExprTypeId="TIME_OF_DAY_RANGE" string1="10:00" string2="10:00"/>
- <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" toTempExprId="1ST_MONDAY_IN_MONTH"/>
- <TemporalExpressionAssoc fromTempExprId="STAFF_MTG" toTempExprId="10AM"/>
- <FixedAsset fixedAssetId="DEMO_PROJECTOR" fixedAssetName="Overhead Projector" fixedAssetTypeId="EQUIPMENT"/>
- <FixedAssetGeoPoint fixedAssetId="DEMO_PROJECTOR" geoPointId="9000" fromDate="2009-01-09 00:00:00.000"/>
- <WorkEffort workEffortId="STAFF_MTG" workEffortTypeId="MEETING" currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" scopeEnumId="WES_PUBLIC" workEffortName="Staff Meeting" description="Staff Meeting" tempExprId="STAFF_MTG" estimatedStartDate="2008-01-01 00:00:00.0" estimatedMilliSeconds="3600000"/>
- <WorkEffortFixedAssetAssign workEffortId="STAFF_MTG" fixedAssetId="DEMO_PROJECTOR" statusId="FA_ASGN_REQUESTED" availabilityStatusId="WEFA_IN_USE" fromDate="2008-01-01 00:00:00.0"/>
- <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
- <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee2" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
- <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee3" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
-
- <!-- Publish the staff meeting calendar event -->
- <WorkEffort workEffortId="CALENDAR_PUB_DEMO" workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED" scopeEnumId="WES_PUBLIC" description="Demo Project 1 Customer 1" workEffortName="iCalendar Publish Demonstration"/>
- <WorkEffortAssoc workEffortIdFrom="CALENDAR_PUB_DEMO" workEffortIdTo="STAFF_MTG" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" fromDate="2008-01-01 00:00:00.0"/>
-
+ <!-- Another Demo project for DemoCustomeCompanyr and employee 1,3-->
+ <WorkEffort workEffortId="9200" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.911" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project3 DemoCustomerCompany" revisionNumber="1"/>
+ <WorkEffortPartyAssignment workEffortId="9200" partyId="DemoEmployee3" roleTypeId="PROVIDER_ANALYST" fromDate="2007-12-14 16:45:21.831" statusId="PAS_ASSIGNED" />
+ <WorkEffortPartyAssignment workEffortId="9200" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818" />
+ <WorkEffortPartyAssignment workEffortId="9200" partyId="DemoCustCompany" roleTypeId="CLIENT_BILLING" fromDate="2009-04-05 20:27:52.893"/>
+ <WorkEffortPartyAssignment workEffortId="9200" partyId="DemoEmployee1" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
+ <WorkEffort workEffortId="9201" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9200" workEffortName="phase1" revisionNumber="1" />
+ <WorkEffort workEffortId="9202" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9201" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1" />
+ <WorkEffortSkillStandard workEffortId="9202" skillTypeId="9000" estimatedDuration="16.0"/>
+
+
</entity-engine-xml>
Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml?rev=762232&r1=762231&r2=762232&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml Mon Apr 6 07:17:19 2009
@@ -35,4 +35,12 @@
description="My Tasks from the Project Manager" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
<PortletPortletCategory portalPortletId="mytasks" portletCategoryId="PROJECTMANAGER"/>
+ <PortalPortlet portalPortletId="ListCustomerProjects"
+ portletName="List Customer Projects"
+ screenName="ListCustomerProjects"
+ screenLocation="component://projectmgr/widget/ProjectScreens.xml"
+ description="List Projects For a certain Customer" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" />
+ <PortletPortletCategory portalPortletId="ListCustomerProjects" portletCategoryId="PROJECTMANAGER"/>
+
+
</entity-engine-xml>
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=762232&r1=762231&r2=762232&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml Mon Apr 6 07:17:19 2009
@@ -359,6 +359,7 @@
</entity-one>
<set field="projectId" from-field="phase.workEffortParentId"/>
</if-empty>
+ <!-- check if member of project -->
<if-not-empty field="projectId">
<entity-and entity-name="WorkEffortPartyAssignment" list="projectAssigns" filter-by-date="true" use-cache="true">
<field-map field-name="workEffortId" from-field="projectId"/>
@@ -368,5 +369,15 @@
<set field="isMember" value="true" type="Boolean"/>
</if-not-empty>
</if-not-empty>
+ <!-- check if contact of the company -->
+ <if-not-empty field="projectId">
+ <entity-and entity-name="WorkEffortPartyAssignByGroup" list="projectAssigns" filter-by-date="true" use-cache="true">
+ <field-map field-name="workEffortId" from-field="projectId"/>
+ <field-map field-name="partyId" from-field="partyId"/>
+ </entity-and>
+ <if-not-empty field="projectAssigns">
+ <set field="isMember" value="true" type="Boolean"/>
+ </if-not-empty>
+ </if-not-empty>
</simple-method>
</simple-methods>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=762232&r1=762231&r2=762232&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Mon Apr 6 07:17:19 2009
@@ -1066,4 +1066,91 @@
</widgets>
</section>
</screen>
+
+ <screen name="ListCustomerProjects">
+ <section>
+ <actions>
+ <set field="layoutSettings.javaScripts[]" value="/images/jsgantt.js" global="true"/>
+ <set field="layoutSettings.styleSheets[]" value="/images/jsgantt.css" global="true"/>
+ <entity-condition list="projects" entity-name="WorkEffortPartyAssignByGroup" filter-by-date="true">
+ <condition-list combine="and">
+ <condition-expr field-name="partyId" from-field="userLogin.partyId"/>
+ <condition-list combine="or">
+ <condition-expr field-name="roleTypeId" value="CLIENT_MANAGER"/>
+ <condition-expr field-name="roleTypeId" value="CLIENT_ANALYST"/>
+ <condition-expr field-name="roleTypeId" value="CLIENT_BILLING"/>
+ </condition-list>
+ </condition-list>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <iterate-section entry="project" list="projects">
+ <section>
+ <actions>
+ <set field="projectId" from-field="project.workEffortId"/>
+ <set field="parameters.projectId" from-field="project.workEffortId"/>
+ <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy"/>
+ <service service-name="getProject" result-map="result">
+ <field-map field-name="projectId" from-field="projectId"/>
+ </service>
+ <set field="project" from-field="result.projectInfo"/>
+ </actions>
+ <widgets>
+ <label style="h1" text="${uiLabelMap.ProjectMgrProjectCurrent}: ${project.projectName}[${project.projectId}]"/>
+ <container style="lefthalf">
+ <screenlet title="${uiLabelMap.PageTitleProjectInformation}">
+ <include-form name="ProjectInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ </screenlet>
+ <section>
+ <actions>
+ <service service-name="getProjectPhaseList" result-map="result">
+ <field-map field-name="projectId" from-field="projectId"/>
+ </service>
+ <set field="phases" from-field="result.phaseList"/>
+ </actions>
+ <widgets>
+ <container style="screenlet">
+ <screenlet title="${uiLabelMap.ProjectMgrPhases}">
+ <include-form name="ListPhaseInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ </screenlet>
+ </container>
+ </widgets>
+ </section>
+ </container>
+ <container style="righthalf">
+ <section>
+ <actions>
+ <service service-name="getProjectTaskList" result-map="result">
+ <field-map field-name="projectId" from-field="projectId"/>
+ </service>
+ <set field="tasks" from-field="result.taskList"/>
+ </actions>
+ <widgets>
+ <screenlet title="${uiLabelMap.ProjectMgrTasks}" navigation-form-name="ListTaskInfo">
+ <include-form name="ListTaskInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </container>
+ <container style="clear"/>
+ <screenlet title="${uiLabelMap.PageTitleProjectGanttChart}">
+ <platform-specific>
+ <html><html-template location="component://projectmgr/webapp/projectmgr/project/gantChart.ftl"/></html>
+ </platform-specific>
+ </screenlet>
+ </widgets>
+ </section>
+ </iterate-section>
+ <section>
+ <condition>
+ <if-empty field="projects"/>
+ </condition>
+ <widgets>
+ <label style="h2" text="${uiLabelMap.MyPageNoProjectsFound}"></label>
+ </widgets>
+ </section>
+ </widgets>
+ </section>
+ </screen>
+
</screens>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=762232&r1=762231&r2=762232&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Mon Apr 6 07:17:19 2009
@@ -889,4 +889,11 @@
<field name="createButton" use-when="content==null"><submit button-type="button"/></field>
<field name="updateButton" use-when="content!=null"><submit button-type="button"/></field>
</form>
+ <form name="ListPhaseInfo" extends="ListPhaseInfo" extends-resource="component://projectmgr/widget/forms/ProjectForms.xml">
+ <field name="phase"><display description="${phaseName}"/></field>
+ </form>
+ <form name="ListTaskInfo" extends="ListTaskInfo" extends-resource="component://projectmgr/widget/forms/ProjectForms.xml">
+ <field name="task"><display description="${workEffortName}"/></field>
+ </form>
+
</forms>
\ No newline at end of file