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/07/07 02:38:17 UTC

svn commit: r674373 - in /ofbiz/trunk/specialpurpose/mypage/widget: CommonScreens.xml MyPageMenus.xml MyPageScreens.xml

Author: hansbak
Date: Sun Jul  6 17:38:17 2008
New Revision: 674373

URL: http://svn.apache.org/viewvc?rev=674373&view=rev
Log:
spaces for tabs and workaround the screenlet limitation

Modified:
    ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml

Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=674373&r1=674372&r2=674373&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Sun Jul  6 17:38:17 2008
@@ -51,15 +51,15 @@
                 <set field="applicationMenuLocation" value="component://mypage/widget/MyPageMenus.xml" global="true"/>
             </actions>
             <widgets>
-            	<section>
-            		<condition><not><if-empty field-name="userLogin"/></not></condition>
-            		<actions>
-                		<service service-name="getUserPreferenceGroup" result-map-name="preferences">
-							<field-map field-name="userPrefGroupId" value="MyPage" />
-						</service>
-            		</actions>
-            		<widgets/>
-            	</section>
+                <section>
+                    <condition><not><if-empty field-name="userLogin"/></not></condition>
+                    <actions>
+                        <service service-name="getUserPreferenceGroup" result-map-name="preferences">
+                            <field-map field-name="userPrefGroupId" value="MyPage" />
+                        </service>
+                    </actions>
+                    <widgets/>
+                </section>
                 <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
             </widgets>
         </section>
@@ -68,7 +68,7 @@
    <screen name="CommonPartyDecorator">
         <section>
             <actions>
-            	<set field="headerItem" value="viewprofile"/>
+                <set field="headerItem" value="viewprofile"/>
                 <set field="partyId" from-field="userLogin.partyId"/>
                 <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <entity-one entity-name="Party" value-name="party"/>
@@ -137,16 +137,16 @@
                     <decorator-section name="body">
                         <section>
                             <condition>
-                            	<or>
-                                	<if-has-permission action="_VIEW" permission="PARTYMGR"/>
-                                	<and><!-- everybody can see his own communication events -->
-                                    	<not><if-empty field-name="communicationEvent"/></not>
-                                    	<or>
-	                               			<if-compare field-name="communicationEvent.partyIdFrom" operator="equals" value="${userLogin.partyId}"/>
-	                               			<if-compare field-name="communicationEvent.partyIdTo" operator="equals" value="${userLogin.partyId}"/>
-	                               		</or>
-	                               	</and>
-                                   	<if-empty field-name="communicationEvent"/><!-- new one -->
+                                <or>
+                                    <if-has-permission action="_VIEW" permission="PARTYMGR"/>
+                                    <and><!-- everybody can see his own communication events -->
+                                        <not><if-empty field-name="communicationEvent"/></not>
+                                        <or>
+                                               <if-compare field-name="communicationEvent.partyIdFrom" operator="equals" value="${userLogin.partyId}"/>
+                                               <if-compare field-name="communicationEvent.partyIdTo" operator="equals" value="${userLogin.partyId}"/>
+                                           </or>
+                                       </and>
+                                       <if-empty field-name="communicationEvent"/><!-- new one -->
                                 </or>
                             </condition>
                             <widgets>
@@ -209,87 +209,87 @@
             </widgets>
         </section>
     </screen>
-	<screen name="main">
-		<section>
-			<actions>
-				<set field="headerItem" value="main" />
+    <screen name="main">
+        <section>
+            <actions>
+                <set field="headerItem" value="main" />
                 <!-- refresh every 3 minutes -->
-				<!--
-					set field="layoutSettings.extraHead" value="&lt;META
-					HTTP-EQUIV=&quot;REFRESH&quot; CONTENT=&quot;180&quot;&gt;"/
-				-->
-				<service service-name="getUserPreferenceGroup"
-					result-map-name="preferences">
-					<field-map field-name="userPrefGroupId" value="MyPage" />
-				</service>
-			</actions>
-			<widgets>
-				<decorator-screen name="main-decorator"
-					location="${parameters.mainDecoratorLocation}">
-					<decorator-section name="body">
-						<section>
-							<condition>
-								<if-compare field-name="preferences.userPrefMap.myCommunications"
-									operator="equals" value="Y" />
-							</condition>
-							<widgets>
-								<include-screen name="MyCommunications"
-									location="component://mypage/widget/MyPageScreens.xml" />
-							</widgets>
-						</section>
-						<section>
-							<condition>
-								<if-compare field-name="preferences.userPrefMap.otherCommunications"
-									operator="equals" value="Y" />
-							</condition>
-							<widgets>
-								<include-screen name="OtherCommunications"
-									location="component://mypage/widget/MyPageScreens.xml" />
-							</widgets>
-						</section>
-						<section>
-							<condition>
-								<if-compare field-name="preferences.userPrefMap.myCompanyComms"
-									operator="equals" value="Y" />
-							</condition>
-							<widgets>
-								<include-screen name="MyCompanyComms"
-									location="component://mypage/widget/MyPageScreens.xml" />
-							</widgets>
-						</section>
-						<section>
-							<condition>
-								<if-compare field-name="preferences.userPrefMap.myTasks"
-									operator="equals" value="Y" />
-							</condition>
-							<widgets>
-								<include-screen name="MyTasks"
-									location="component://mypage/widget/MyPageScreens.xml" />
-							</widgets>
-						</section>
-						<section>
-							<condition>
-								<if-compare field-name="preferences.userPrefMap.myTimesheet"
-									operator="equals" value="Y" />
-							</condition>
-							<widgets>
-								<include-screen name="MyTimesheet"
-									location="component://mypage/widget/MyPageScreens.xml" />
-							</widgets>
-						</section>
-					</decorator-section>
-				</decorator-screen>
-			</widgets>
-		</section>
-	</screen>
+                <!--
+                    set field="layoutSettings.extraHead" value="&lt;META
+                    HTTP-EQUIV=&quot;REFRESH&quot; CONTENT=&quot;180&quot;&gt;"/
+                -->
+                <service service-name="getUserPreferenceGroup"
+                    result-map-name="preferences">
+                    <field-map field-name="userPrefGroupId" value="MyPage" />
+                </service>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator"
+                    location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <if-compare field-name="preferences.userPrefMap.myCommunications"
+                                    operator="equals" value="Y" />
+                            </condition>
+                            <widgets>
+                                <include-screen name="MyCommunications"
+                                    location="component://mypage/widget/MyPageScreens.xml" />
+                            </widgets>
+                        </section>
+                        <section>
+                            <condition>
+                                <if-compare field-name="preferences.userPrefMap.otherCommunications"
+                                    operator="equals" value="Y" />
+                            </condition>
+                            <widgets>
+                                <include-screen name="OtherCommunications"
+                                    location="component://mypage/widget/MyPageScreens.xml" />
+                            </widgets>
+                        </section>
+                        <section>
+                            <condition>
+                                <if-compare field-name="preferences.userPrefMap.myCompanyComms"
+                                    operator="equals" value="Y" />
+                            </condition>
+                            <widgets>
+                                <include-screen name="MyCompanyComms"
+                                    location="component://mypage/widget/MyPageScreens.xml" />
+                            </widgets>
+                        </section>
+                        <section>
+                            <condition>
+                                <if-compare field-name="preferences.userPrefMap.myTasks"
+                                    operator="equals" value="Y" />
+                            </condition>
+                            <widgets>
+                                <include-screen name="MyTasks"
+                                    location="component://mypage/widget/MyPageScreens.xml" />
+                            </widgets>
+                        </section>
+                        <section>
+                            <condition>
+                                <if-compare field-name="preferences.userPrefMap.myTimesheet"
+                                    operator="equals" value="Y" />
+                            </condition>
+                            <widgets>
+                                <include-screen name="MyTimesheet"
+                                    location="component://mypage/widget/MyPageScreens.xml" />
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
     <screen name="preferences">
         <section>
             <actions>
                 <set field="headerItem" value="preferences"/>
-                				<service service-name="getUserPreferenceGroup"
-					result-map-name="preferences">
-					<field-map field-name="userPrefGroupId" value="MyPage" />
-				</service>
+                                <service service-name="getUserPreferenceGroup"
+                    result-map-name="preferences">
+                    <field-map field-name="userPrefGroupId" value="MyPage" />
+                </service>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -302,86 +302,86 @@
             </widgets>
         </section>
     </screen>
-	<screen name="MyTasks">
-		<section>
-			<actions>
-				<set field="headerItem" value="myTasks" />
-			</actions>
-			<widgets>
-				<decorator-screen name="main-decorator"
-					location="${parameters.mainDecoratorLocation}">
-					<decorator-section name="body">
-								<include-screen name="MyTasks"
-									location="component://mypage/widget/MyPageScreens.xml" />
-					</decorator-section>
-				</decorator-screen>
-			</widgets>
-		</section>
-	</screen>
-	<screen name="MyCommunications">
-		<section>
-			<actions>
-				<set field="headerItem" value="myCommunications" />
-			</actions>
-			<widgets>
-				<decorator-screen name="main-decorator"
-					location="${parameters.mainDecoratorLocation}">
-					<decorator-section name="body">
-								<include-screen name="MyCommunications"
-									location="component://mypage/widget/MyPageScreens.xml" />
-					</decorator-section>
-				</decorator-screen>
-			</widgets>
-		</section>
-	</screen>
-	<screen name="OtherCommunications">
-		<section>
-			<actions>
-				<set field="headerItem" value="otherCommunications" />
-			</actions>
-			<widgets>
-				<decorator-screen name="main-decorator"
-					location="${parameters.mainDecoratorLocation}">
-					<decorator-section name="body">
-								<include-screen name="OtherCommunications"
-									location="component://mypage/widget/MyPageScreens.xml" />
-					</decorator-section>
-				</decorator-screen>
-			</widgets>
-		</section>
-	</screen>
-	<screen name="MyCompanyComms">
-		<section>
-			<actions>
-				<set field="headerItem" value="myCompanyComms" />
-			</actions>
-			<widgets>
-				<decorator-screen name="main-decorator"
-					location="${parameters.mainDecoratorLocation}">
-					<decorator-section name="body">
-								<include-screen name="MyCompanyComms"
-									location="component://mypage/widget/MyPageScreens.xml" />
-					</decorator-section>
-				</decorator-screen>
-			</widgets>
-		</section>
-	</screen>
-	<screen name="MyTimesheet">
-		<section>
-			<actions>
-				<set field="headerItem" value="myTimesheet" />
-			</actions>
-			<widgets>
-				<decorator-screen name="main-decorator"
-					location="${parameters.mainDecoratorLocation}">
-					<decorator-section name="body">
-								<include-screen name="MyTimesheet"
-									location="component://mypage/widget/MyPageScreens.xml" />
-					</decorator-section>
-				</decorator-screen>
-			</widgets>
-		</section>
-	</screen>
+    <screen name="MyTasks">
+        <section>
+            <actions>
+                <set field="headerItem" value="myTasks" />
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator"
+                    location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                                <include-screen name="MyTasks"
+                                    location="component://mypage/widget/MyPageScreens.xml" />
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="MyCommunications">
+        <section>
+            <actions>
+                <set field="headerItem" value="myCommunications" />
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator"
+                    location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                                <include-screen name="MyCommunications"
+                                    location="component://mypage/widget/MyPageScreens.xml" />
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="OtherCommunications">
+        <section>
+            <actions>
+                <set field="headerItem" value="otherCommunications" />
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator"
+                    location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                                <include-screen name="OtherCommunications"
+                                    location="component://mypage/widget/MyPageScreens.xml" />
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="MyCompanyComms">
+        <section>
+            <actions>
+                <set field="headerItem" value="myCompanyComms" />
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator"
+                    location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                                <include-screen name="MyCompanyComms"
+                                    location="component://mypage/widget/MyPageScreens.xml" />
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="MyTimesheet">
+        <section>
+            <actions>
+                <set field="headerItem" value="myTimesheet" />
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator"
+                    location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                                <include-screen name="MyTimesheet"
+                                    location="component://mypage/widget/MyPageScreens.xml" />
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>
 
 

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=674373&r1=674372&r2=674373&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Sun Jul  6 17:38:17 2008
@@ -35,45 +35,45 @@
         </menu-item>
         <menu-item name="myCommunications" title="${uiLabelMap.MyCommunications}">
             <condition>
-            	<and>
-	                <not><if-empty field-name="userLogin"/></not>
-    	            <if-compare field-name="preferences.userPrefMap.myCommunications" operator="not-equals" value="Y"/>
+                <and>
+                    <not><if-empty field-name="userLogin"/></not>
+                    <if-compare field-name="preferences.userPrefMap.myCommunications" operator="not-equals" value="Y"/>
                 </and>
             </condition>
             <link target="myCommunications"/>
         </menu-item>
         <menu-item name="otherCommunications" title="${uiLabelMap.OtherCommunications}">
             <condition>
-            	<and>
-	                <not><if-empty field-name="userLogin"/></not>
-    	            <if-compare field-name="preferences.userPrefMap.otherCommunications" operator="not-equals" value="Y"/>
+                <and>
+                    <not><if-empty field-name="userLogin"/></not>
+                    <if-compare field-name="preferences.userPrefMap.otherCommunications" operator="not-equals" value="Y"/>
                 </and>
             </condition>
             <link target="otherCommunications"/>
         </menu-item>
         <menu-item name="myCompanyComms" title="${uiLabelMap.MyCompanyComms}">
             <condition>
-            	<and>
-	                <not><if-empty field-name="userLogin"/></not>
-    	            <if-compare field-name="preferences.userPrefMap.myCompanyComms" operator="not-equals" value="Y"/>
+                <and>
+                    <not><if-empty field-name="userLogin"/></not>
+                    <if-compare field-name="preferences.userPrefMap.myCompanyComms" operator="not-equals" value="Y"/>
                 </and>
             </condition>
             <link target="myCompanyComms"/>
         </menu-item>
         <menu-item name="myTimesheet" title="${uiLabelMap.myTimesheet}">
             <condition>
-            	<and>
-	                <not><if-empty field-name="userLogin"/></not>
-    	            <if-compare field-name="preferences.userPrefMap.myTimesheet" operator="not-equals" value="Y"/>
+                <and>
+                    <not><if-empty field-name="userLogin"/></not>
+                    <if-compare field-name="preferences.userPrefMap.myTimesheet" operator="not-equals" value="Y"/>
                 </and>
             </condition>
             <link target="myTimesheet"/>
         </menu-item>
         <menu-item name="myTasks" title="${uiLabelMap.myTasks}">
             <condition>
-            	<and>
-	                <not><if-empty field-name="userLogin"/></not>
-    	            <if-compare field-name="preferences.userPrefMap.myTasks" operator="not-equals" value="Y"/>
+                <and>
+                    <not><if-empty field-name="userLogin"/></not>
+                    <if-compare field-name="preferences.userPrefMap.myTasks" operator="not-equals" value="Y"/>
                 </and>
             </condition>
             <link target="myTasks"/>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=674373&r1=674372&r2=674373&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Sun Jul  6 17:38:17 2008
@@ -39,129 +39,176 @@
                 <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/>
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get(&quot;fromDate&quot;).toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get(&quot;thruDate&quot;).toString().substring(0,10)}"
-                    navigation-menu-name="MyTimesheetMenu" collapsible="true" name="timesheet">
-                    <section>
-                    	<condition>
-                    		<if-has-permission permission="PROJECTMGR" action="_VIEW"/>
-                    	</condition>
-                    	<widgets>
-		                    <include-menu name="MyTimesheetMenu" location="component://mypage/widget/MyPageMenus.xml"/>
-                    	</widgets>
-                    </section>
-                    <section>
-                        <condition>
-                            <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
-                        </condition>          
-                        <widgets>
-                            <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
-                        </widgets>
-                        <fail-widgets>
-                            <include-form name="EditWeekTimesheet" location="component://mypage/widget/MyPageForms.xml"/>
-                        </fail-widgets>
-                    </section>
+                <section>
+                    <condition>
+                         <if-has-permission permission="PROJECTMGR" action="_VIEW"/>
+                    </condition>
+                    <widgets>
+                        <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get(&quot;fromDate&quot;).toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get(&quot;thruDate&quot;).toString().substring(0,10)}"
+                        navigation-menu-name="MyTimesheetMenu" collapsible="true" name="timesheet">
+                            <include-menu name="MyTimesheetMenu" location="component://mypage/widget/MyPageMenus.xml"/>
+                            <section>
+                                <condition>
+                                    <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
+                                </condition>          
+                                <widgets>
+                                    <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+                                </widgets>
+                                <fail-widgets>
+                                    <include-form name="EditWeekTimesheet" location="component://mypage/widget/MyPageForms.xml"/>
+                                </fail-widgets>
+                            </section>
+                        </screenlet>
+                    </widgets>
+                    <fail-widgets>
+                        <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get(&quot;fromDate&quot;).toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get(&quot;thruDate&quot;).toString().substring(0,10)}"
+                            collapsible="true" name="timesheet">
+                        <section>
+                            <condition>
+                                <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
+                            </condition>          
+                            <widgets>
+                                <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+                            </widgets>
+                            <fail-widgets>
+                                <include-form name="EditWeekTimesheet" location="component://mypage/widget/MyPageForms.xml"/>
+                            </fail-widgets>
+                        </section>
+                        </screenlet>
+                    </fail-widgets>
+                </section>
+            </widgets>
+        </section>
+    </screen>
+	<screen name="MyTasks">
+		<section>
+			<actions>
+				<entity-and entity-name="WorkEffortAndPartyAssign"
+					list-name="tasks" filter-by-date="true">
+					<field-map field-name="partyId" env-name="userLogin.partyId" />
+					<field-map field-name="workEffortTypeId" value="TASK" />
+					<field-map field-name="currentStatusId" value="PTS_CREATED" />
+				</entity-and>
+			</actions>
+			<widgets>
+				<section>
+					<condition>
+						<if-has-permission permission="PROJECTMGR"
+							action="_VIEW" />
+					</condition>
+					<widgets>
+						<screenlet title="${uiLabelMap.PageTitleTaskAssignedToMe}"
+							name="mytasks" collapsible="true" navigation-menu-name="MyTasksMenu">
+							<include-menu name="MyTasksMenu"
+								location="component://mypage/widget/MyPageMenus.xml" />
+							<section>
+								<condition>
+									<not>
+										<if-empty field-name="tasks" />
+									</not>
+								</condition>
+								<widgets>
+									<include-form name="MyTasks"
+										location="component://mypage/widget/MyPageForms.xml" />
+								</widgets>
+								<fail-widgets>
+									<container>
+										<label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"></label>
+									</container>
+									<container>
+										<label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"></label>
+									</container>
+								</fail-widgets>
+							</section>
+						</screenlet>
+					</widgets>
+					<fail-widgets>
+						<screenlet title="${uiLabelMap.PageTitleTaskAssignedToMe}"
+							name="mytasks" collapsible="true">
+							<section>
+								<condition>
+									<not>
+										<if-empty field-name="tasks" />
+									</not>
+								</condition>
+								<widgets>
+									<include-form name="MyTasks"
+										location="component://mypage/widget/MyPageForms.xml" />
+								</widgets>
+								<fail-widgets>
+									<container>
+										<label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"></label>
+									</container>
+									<container>
+										<label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"></label>
+									</container>
+								</fail-widgets>
+							</section>
+						</screenlet>
+					</fail-widgets>
+				</section>
+			</widgets>
+		</section>
+	</screen>
+
+    <screen name="MyCompanyComms">
+        <section>
+            <widgets>
+                <screenlet title="Company events" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
+                    <include-menu name="MyCompanyCommsMenu" location="component://mypage/widget/MyPageMenus.xml"/>
+                    <include-form name="MyCompanyComms" location="component://mypage/widget/MyPageForms.xml"/>
                 </screenlet>
             </widgets>
         </section>
-    </screen>    
-    <screen name="MyTasks">
+    </screen>
+    <screen name="MyCommunications">
         <section>
             <actions>
-                <entity-and entity-name="WorkEffortAndPartyAssign" list-name="tasks" filter-by-date="true">
-                    <field-map field-name="partyId" env-name="userLogin.partyId"/>
-                    <field-map field-name="workEffortTypeId" value="TASK"/>
-                    <field-map field-name="currentStatusId" value="PTS_CREATED"/>
-                </entity-and>
+                <set field="partyId" from-field="userLogin.partyId" />
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.PageTitleTaskAssignedToMe}" name="mytasks" collapsible="true" navigation-menu-name="MyTasksMenu">
-                    <section>
-                    	<condition>
-                    		<if-has-permission permission="PROJECTMGR" action="_VIEW"/>
-                    	</condition>
-                    	<widgets>
-		                    <include-menu name="MyTasksMenu" location="component://mypage/widget/MyPageMenus.xml"/>
-                    	</widgets>
-                    </section>
-                    <section>
-                        <condition>
-                            <not><if-empty field-name="tasks"/></not>                                        
-                        </condition>
-                        <widgets>
-                            <include-form name="MyTasks" location="component://mypage/widget/MyPageForms.xml"/>
-                        </widgets>
-                        <fail-widgets>
-                            <container>
-                                <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"></label>
-                            </container>
-                            <container>
-                                <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"></label>
-                            </container>
-                        </fail-widgets>
-                    </section>
+                <screenlet title="${uiLabelMap.MyCommunications}" navigation-menu-name="MyCommunicationsMenu"
+                    navigation-form-name="ListPartyCommEvents" name="comms">
+                    <include-menu name="MyCommunicationsMenu"
+                        location="component://mypage/widget/MyPageMenus.xml" />
+                    <include-form name="ListPartyCommEvents"
+                        location="component://party/webapp/partymgr/communication/CommForms.xml" />
                 </screenlet>
             </widgets>
         </section>
     </screen>
-
-    <screen name="MyCompanyComms">
+    <screen name="OtherCommunications">
         <section>
+            <actions>
+                <entity-and list-name="emailOwners" entity-name="PartyRelationship" filter-by-date="true">
+                    <field-map field-name="partyIdFrom" value="${userLogin.partyId}" />
+                    <field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN" />
+                </entity-and>
+            </actions>
             <widgets>
-                <screenlet title="Company events" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
-                    <include-menu name="MyCompanyCommsMenu" location="component://mypage/widget/MyPageMenus.xml"/>
-                    <include-form name="MyCompanyComms" location="component://mypage/widget/MyPageForms.xml"/>
-                </screenlet>
+                <iterate-section entry-name="emailOwner" list-name="emailOwners">
+                    <section>
+                        <actions>
+                            <set field="partyId" from-field="emailOwner.partyIdTo" />
+                            <entity-one entity-name="PartyNameView" value-name="partyName">
+                                <field-map field-name="partyId" env-name="partyId"/>
+                            </entity-one>
+                        </actions>
+                        <widgets>
+                            <screenlet title="${uiLabelMap.OtherCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
+                                navigation-menu-name="MyCommunicationsMenu"
+                                navigation-form-name="ListPartyCommEvents" name="comms">
+                                <include-menu name="MyCommunicationsMenu"
+                                    location="component://mypage/widget/MyPageMenus.xml" />
+                                <include-form name="ListPartyCommEvents"
+                                    location="component://party/webapp/partymgr/communication/CommForms.xml" />
+                            </screenlet>
+                        </widgets>
+                    </section>
+                </iterate-section>
             </widgets>
         </section>
     </screen>
-	<screen name="MyCommunications">
-		<section>
-			<actions>
-				<set field="partyId" from-field="userLogin.partyId" />
-			</actions>
-			<widgets>
-				<screenlet title="${uiLabelMap.MyCommunications}" navigation-menu-name="MyCommunicationsMenu"
-					navigation-form-name="ListPartyCommEvents" name="comms">
-					<include-menu name="MyCommunicationsMenu"
-						location="component://mypage/widget/MyPageMenus.xml" />
-					<include-form name="ListPartyCommEvents"
-						location="component://party/webapp/partymgr/communication/CommForms.xml" />
-				</screenlet>
-			</widgets>
-		</section>
-	</screen>
-	<screen name="OtherCommunications">
-		<section>
-			<actions>
-				<entity-and list-name="emailOwners" entity-name="PartyRelationship" filter-by-date="true">
-					<field-map field-name="partyIdFrom" value="${userLogin.partyId}" />
-					<field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN" />
-				</entity-and>
-			</actions>
-			<widgets>
-				<iterate-section entry-name="emailOwner" list-name="emailOwners">
-					<section>
-						<actions>
-							<set field="partyId" from-field="emailOwner.partyIdTo" />
-							<entity-one entity-name="PartyNameView" value-name="partyName">
-								<field-map field-name="partyId" env-name="partyId"/>
-							</entity-one>
-						</actions>
-						<widgets>
-							<screenlet title="${uiLabelMap.OtherCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
-								navigation-menu-name="MyCommunicationsMenu"
-								navigation-form-name="ListPartyCommEvents" name="comms">
-								<include-menu name="MyCommunicationsMenu"
-									location="component://mypage/widget/MyPageMenus.xml" />
-								<include-form name="ListPartyCommEvents"
-									location="component://party/webapp/partymgr/communication/CommForms.xml" />
-							</screenlet>
-						</widgets>
-					</section>
-				</iterate-section>
-			</widgets>
-		</section>
-	</screen>
 </screens>