svn commit: r672200 - in /ofbiz/trunk/applications/party: config/PartyUiLabels.xml webapp/partymgr/WEB-INF/controller.xml webapp/partymgr/communication/CommForms.xml webapp/partymgr/communication/CommMenus.xml widget/partymgr/CommunicationScreens.xml

[hansbak-2]

Author: hansbak
Date: Fri Jun 27 02:47:27 2008
New Revision: 672200

URL: http://svn.apache.org/viewvc?rev=672200&view=rev
Log:
add a form to send an internal note to another user of the same system

Modified:
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
    ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=672200&r1=672199&r2=672200&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Fri Jun 27 02:47:27 2008
@@ -4225,6 +4225,9 @@
         <value xml:lang="th">ค้นหาใหม่</value>
         <value xml:lang="zh">新建查找</value>
     </property>
+    <property key="PartyNewInternalNote">
+        <value xml:lang="en">New Internal Note</value>
+    </property>
     <property key="PartyNewRelationship">
         <value xml:lang="en">New Relationship</value>
         <value xml:lang="it">Nuovo Rapporto</value>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=672200&r1=672199&r2=672200&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Fri Jun 27 02:47:27 2008
@@ -1087,7 +1087,7 @@
     <view-map name="AddCommContent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#AddCommContent"/>
     <view-map name="EditCommContent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#EditCommContent"/>
     <view-map name="newEmail" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#newEmail"/>
-    <view-map name="newInternalNote" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#newInternalNote"/>
+    <view-map name="newInternalNote" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#NewInternalNote"/>
     
     <view-map name="CreateNewParty" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#CreateNewParty"/>
     <view-map name="NewCustomer" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#NewCustomer"/>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=672200&r1=672199&r2=672200&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Fri Jun 27 02:47:27 2008
@@ -189,9 +189,8 @@
     </form>
     
     <form name="NewEmail" type="single" target="createCommunicationEvent" default-map-name="communicationEvent">
-        <field name="communicationEventTypeId"><hidden/></field>
+        <field name="communicationEventTypeId"><hidden value="EMAIL_COMMUNICATION"/></field>
         <field name="parentCommEventId"><hidden value="${parentCommEventId}"/></field>
-        <field name="statusId"><hidden value="COM_ENTERED"/></field>
         <field name="partyIdFrom"><hidden value="${partyIdFrom}"/></field>
         <field name="emailAddress" parameter-name="contactMechIdFrom">
             <drop-down>
@@ -212,6 +211,21 @@
         <field name="sendButton"><submit button-type="button"/></field>
     </form>
     
+    <form name="NewInternalNote" type="single" target="createCommunicationEvent" default-map-name="communicationEvent">
+        <field name="communicationEventTypeId"><hidden value="COMMENT_NOTE"/></field>
+        <field name="parentCommEventId"><hidden value="${parentCommEventId}"/></field>
+        <field name="statusId"><hidden value="COM_ENTERED"/></field>
+        <field name="partyIdFrom"><hidden value="${partyIdFrom}"/></field>
+        <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
+            <lookup target-form-name="LookupPartyName"/>
+        </field>
+        <field name="subject"><text size="60"/></field>
+        <field name="contentMimeTypeId"><hidden value="text/plain"/></field>
+        <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="60" rows="10"/></field>
+        <field name="note" title="${uiLabelMap.CommonNote}"><textarea cols="60" rows="3"/></field>
+        <field name="sendButton"><submit button-type="button"/></field>
+    </form>
+    
     <form name="ViewCommEvent" type="single" default-map-name="communicationEvent"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="communicationEventId"><display/></field>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml?rev=672200&r1=672199&r2=672200&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml Fri Jun 27 02:47:27 2008
@@ -58,11 +58,11 @@
             <link target="EditCommunicationEvent?partyId=${partyId}&amp;partyIdFrom=${partyId}"/>
         </menu-item>
         <menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}">
-            <link target="newEmail?partyIdFrom=${partyId}"/>
+            <link target="newEmail"/>
+        </menu-item>
+        <menu-item name="newInternalNote" title="${uiLabelMap.PartyNewInternalNote}">
+            <link target="newInternalNote"/>
         </menu-item>
-        <!--menu-item name="newInternalNote" title="${uiLabelMap.PartyNewInternalNote}">
-            <link target="newInternalNote?partyIdFrom=${partyId}"/>
-        </menu-item-->
         <menu-item name="reply" title="${uiLabelMap.PartyReply}">
             <condition>
                 <not><if-empty field-name="communicationEventId"/></not>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=672200&r1=672199&r2=672200&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Fri Jun 27 02:47:27 2008
@@ -304,6 +304,37 @@
         </section>
     </screen>
     
+    <screen name="NewInternalNote">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditCommunication"/>
+                <set field="tabButtonItem" value="PartyCommEvents"/>
+                <set field="subTabButtonItem" value="CommunicationEvent"/>
+                <set field="entityName" value="CommunicationEvent"/>
+                
+                <set field="parentCommEventId" from-field="parameters.parentCommEventId"/>
+                <set field="partyId" from-field="parameters.partyId"/>
+                <set field="partyIdFrom" from-field="parameters.partyIdFrom" default-value="${userLogin.partyId}"/>
+                <set field="partyIdTo" from-field="parameters.partyIdTo"/>
+                
+                <entity-one entity-name="Party" use-cache="true" value-name="party"/>
+                <entity-one entity-name="Person" use-cache="true" value-name="lookupPerson"/>
+                <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
+                <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/FindCommEventContactMechs.groovy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-menu name="CommSubTabBar" location="component://party/webapp/partymgr/communication/CommMenus.xml"/>
+                        <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent}" collapsible="true">
+                            <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="NewInternalNote"/>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
     <screen name="UpdateCommRoles">
         <section>
             <actions>