svn commit: r785924 - in /ofbiz/trunk: applications/commonext/script/org/ofbiz/ applications/commonext/widget/ framework/common/webcommon/WEB-INF/ framework/common/widget/ specialpurpose/projectmgr/script/org/ofbiz/project/

[hansbak-2]

Author: hansbak
Date: Thu Jun 18 06:49:19 2009
New Revision: 785924

URL: http://svn.apache.org/viewvc?rev=785924&view=rev
Log:
small correction on previous commit

Modified:
    ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml
    ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml
    ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
    ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

Modified: ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml?rev=785924&r1=785923&r2=785924&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml (original)
+++ ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml Thu Jun 18 06:49:19 2009
@@ -81,25 +81,29 @@
             <set field="status.noteInfo" value="Open communication events: ${comCount}"/>
             <first-from-list entry="comm" list="comms"/>
             <set field="status.noteDateTime" from-field="comm.entryDate"/>
+            <set field="status.moreInfoPortletId" value="MyCommunications"/>
             <field-to-list field="status" list="systemInfoStatus"/>
             <clear-field field="status"/>
         </if-compare>
         <!-- assigned tasks -->
-        <entity-and entity-name="WorkEffortPartyAssignment" list="assigns" filter-by-date="true">
-            <field-map field-name="partyId" from-field="userLogin.partyId"/>
+        <entity-and entity-name="WorkEffortAndPartyAssign" list="assigns" filter-by-date="true">
+            <field-map field-name="partyId" from-field="parameters.userLogin.partyId"/>
             <field-map field-name="statusId" value="PAS_ASSIGNED"/>
+            <field-map field-name="workEffortTypeId" value="TASK"/>
             <order-by field-name="-fromDate"/>
         </entity-and>
-        <entity-count entity-name="WorkEffortPartyAssignment" count-field="assignCount">
+        <entity-count entity-name="WorkEffortAndPartyAssign" count-field="assignCount">
             <condition-list combine="and">
-                <condition-expr field-name="partyId" from-field="userLogin.partyId"/>
-                <condition-expr field-name="statusId" operator="not-equals" value="PAS_ASSIGNED"/>
+                <condition-expr field-name="partyId"  operator="equals" from-field="parameters.userLogin.partyId"/>
+                <condition-expr field-name="statusId" operator="equals" value="PAS_ASSIGNED"/>
+                <condition-expr field-name="workEffortTypeId" operator="equals" value="TASK"/>
             </condition-list>
         </entity-count>            
         <if-compare field="assignCount" value="0" operator="greater">
             <set field="status.noteInfo" value="Assigned and not completed tasks: ${assignCount}"/>
             <first-from-list entry="assign" list="assigns"/>
             <set field="status.noteDateTime" from-field="assign.fromDate"/>
+            <set field="status.moreInfoPortletId" value="mytasks"/>
             <field-to-list field="status" list="systemInfoStatus"/>
         </if-compare>
         
@@ -127,11 +131,11 @@
             <order-by field-name="-noteDateTime"/>
         </entity-and>
         <if-not-empty field="systemInfoNotes">
-            <set field="lastSystemInfoNote1" from-field="systemInfoNotes[0]"/>
+            <set field="lastSystemInfoNote1" from-field="systemInfoNotes[0]" default-value=""/>
             <field-to-result field="lastSystemInfoNote1"/>
-            <set field="lastSystemInfoNote2" from-field="systemInfoNotes[1]"/>
+            <set field="lastSystemInfoNote2" from-field="systemInfoNotes[1]" default-value=""/>
             <field-to-result field="lastSystemInfoNote2"/>
-            <set field="lastSystemInfoNote3" from-field="systemInfoNotes[2]"/>
+            <set field="lastSystemInfoNote3" from-field="systemInfoNotes[2]" default-value=""/>
             <field-to-result field="lastSystemInfoNote3"/>
         </if-not-empty>
     </simple-method>

Modified: ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml?rev=785924&r1=785923&r2=785924&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/SystemInfoForms.xml Thu Jun 18 06:49:19 2009
@@ -27,7 +27,7 @@
             <service service-name="getSystemInfoNotes" result-map-list="systemInfoNotes"/>
         </actions>
         <field name="noteDateTime" title="Date info created"><display/></field>
-        <field name="noteInfo" title="System Info Note"><hyperlink target="/myportal/control/showPortlet?portalPortletId=${moreInfoPortletId}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
+        <field name="noteInfo" title="System Info Note"><hyperlink target="/myportal/control/showPortletDecorator?portalPortletId=${moreInfoPortletId}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
     </form>
 
     <form name="SystemInfoStatus" type="list" list-name="systemInfoStatus"
@@ -36,6 +36,6 @@
             <service service-name="getSystemInfoStatus" result-map-list="systemInfoStatus"/>
         </actions>
         <field name="noteDateTime" title="Date Last Changed"><display/></field>
-        <field name="noteInfo" title="Item info"><hyperlink target="${moreInfoUrl}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
+        <field name="noteInfo" title="System Info Status"><hyperlink target="/myportal/control/showPortletDecorator?portalPortletId=${moreInfoPortletId}" target-type="inter-app" description="${noteInfo}"></hyperlink></field>
     </form>
 </forms>

Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=785924&r1=785923&r2=785924&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Thu Jun 18 06:49:19 2009
@@ -28,6 +28,10 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="showPortlet"/>
     </request-map>
+    <request-map uri="showPortletDecorator">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="showPortletDecorator"/>
+    </request-map>
     <request-map uri="showPortalPage">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="showPortalPage" save-home-view="true"/>
@@ -123,6 +127,7 @@
     <!-- View Mappings -->
     <view-map name="showPortalPage" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortalPage"/>
     <view-map name="showPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortlet"/>
+    <view-map name="showPortletDecorator" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortletDecorator"/>
     <view-map name="ManagePortalPages" type="screen" page="component://common/widget/PortalPageScreens.xml#ManagePortalPages"/>
     <view-map name="AddPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#AddPortlet"/>
 </site-conf>

Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=785924&r1=785923&r2=785924&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Thu Jun 18 06:49:19 2009
@@ -21,7 +21,7 @@
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
 
-    <screen name="showPortlet">
+    <screen name="showPortletDecorator">
         <section>
             <actions>
                 <set field="headerItem" from-field="parameters.portletId"/>
@@ -43,6 +43,28 @@
         </section>
     </screen>
     
+    <screen name="showPortlet">
+        <section>
+            <actions>
+                <set field="headerItem" from-field="parameters.portletId"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
+                    <decorator-section name="body">
+                        <section>
+                            <actions>
+                                <entity-one entity-name="PortalPortlet" value-field="portlet"/>
+                            </actions>
+                            <widgets>
+                                <platform-specific><html><html-template location="component://common/webcommon/portal/showPortlet.ftl"/></html></platform-specific>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
     <screen name="showPortalPage">
         <section>
             <actions>

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=785924&r1=785923&r2=785924&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Thu Jun 18 06:49:19 2009
@@ -433,7 +433,7 @@
                                     </else>
                                 </if-not-empty>
                                 <call-simple-method method-name="updateTimeEntry"/>
-                                <set field="parameters.hoursDay${dayNumber}" value="-999999"/>
+                                <set field="parameters.hoursDay${dayNumber}" value="-999999" type="Double"/>
                             </else>
                         </if-not-empty>
                     </if-compare-field>