svn commit: r600237 - in /ofbiz/trunk/specialpurpose/projectmgr: webapp/projectmgr/WEB-INF/ webapp/projectmgr/js/ webapp/projectmgr/project/ widget/ widget/forms/

[hansbak-2]

Author: hansbak
Date: Sat Dec  1 20:46:07 2007
New Revision: 600237

URL: http://svn.apache.org/viewvc?rev=600237&view=rev
Log:
simplyfied task assign screens

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/js/gantt.js
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl
    ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.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=600237&r1=600236&r2=600237&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Sat Dec  1 20:46:07 2007
@@ -27,11 +27,16 @@
 
     <description>Project Management Component Site Configuration File</description>
 
-    <request-map uri="main">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="main"/>
-    </request-map>
-  
+    <request-map uri="main">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="main"/>
+    </request-map>
+    
+    <request-map uri="ganttChart">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ganttChart"/>
+    </request-map>
+    
     <request-map uri="ListSubProjects">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ListSubProjects"/>
@@ -389,7 +394,8 @@
 
     <!-- View Mappings -->
     <view-map name="main" type="screen" page="component://projectmgr/widget/TaskScreens.xml#MyTasks"/>
-    <view-map name="ListSubProjects" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#ListSubProjects"/>    
+    <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="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="EditWorkEffort" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProject"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/js/gantt.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/js/gantt.js?rev=600237&r1=600236&r2=600237&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/js/gantt.js (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/js/gantt.js Sat Dec  1 20:46:07 2007
@@ -175,7 +175,7 @@
             });
             dojo.debug("--end callBack");
     }          
-//          dojo.event.connect(dojo, "loaded", "init")
+          dojo.event.connect(dojo, "loaded", "init")
 
     function loadData(){
         var xml = {

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl?rev=600237&r1=600236&r2=600237&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl Sat Dec  1 20:46:07 2007
@@ -16,5 +16,14 @@
 specific language governing permissions and limitations
 under the License.
 -->
+<html>
+<header>
+    <script type="text/javascript" src="/images/dojo/dojo.js"
+            djConfig="parseOnLoad: true"></script>
+
+</header>
+<body>
 <script language="javascript" src="/projectmgr/js/gantt.js" type="text/javascript"></script>
+</body>
+</html>
 

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=600237&r1=600236&r2=600237&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Sat Dec  1 20:46:07 2007
@@ -35,7 +35,6 @@
 
                 <!-- The two default (global) stylesheets are added to the list
                      of stylesheets to the first and second position -->
-                <set field="layoutSettings.javaScripts[]" value="/images/dojo/dojo.js" global="true"/>
 
                 <set field="layoutSettings.companyName" from-field="uiLabelMap.ProjectMgrCompanyName" global="true"/>
                 <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ProjectMgrCompanySubtitle" global="true"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=600237&r1=600236&r2=600237&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sat Dec  1 20:46:07 2007
@@ -334,7 +334,8 @@
                 <set field="titleProperty" value="PageTitleListWorkEffortPartyAssigns"/>
                 <set field="tabButtonItem" value="parties"/>
                 <set field="labelTitleProperty" value="PageTitleListWorkEffortPartyAssigns"/>
-                <set field="workEffortId" from-field="parameters.projectId"/>
+                <set field="workEffortId" from-field="parameters.projectId" default-value="parameters.workEffortId"/>
+                <set field="projectId" from-field="workEffortId"/>
                 <entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
             </actions>            
             <widgets>
@@ -349,7 +350,7 @@
                         <container style="screenlet">
                              <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddWorkEffortPartyAssign}</label></container>
                              <container style="screenlet-body">      
-                                 <include-form name="EditWorkEffortPartyAssign" location="component://workeffort/widget/WorkEffortPartyAssignForms.xml"/>
+                                 <include-form name="AddWorkEffortPartyAssign" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
                              </container>
                         </container>        
                     </decorator-section>
@@ -500,7 +501,6 @@
                                     <include-screen name="PartiesInfo"/>
                                     <include-screen name="NoteInfo"/>
                                 </container>
-                                <include-screen name="gantChart"/>
                             </widgets>
                         </section>
                     </decorator-section>
@@ -508,7 +508,7 @@
             </widgets>            
         </section>
     </screen>
-    <screen name="gantChart">
+    <screen name="ganttChart">
         <section>
             <widgets>
                 <platform-specific>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=600237&r1=600236&r2=600237&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Dec  1 20:46:07 2007
@@ -266,47 +266,41 @@
     <form name="ListWorkEffortPartyAssigns" separate-columns="false" target="updateWorkEffortPartyAssign" title="" type="list" paginate-target="ListWorkEffortPartyAssigns">
         <actions>
             <entity-condition entity-name="WorkEffortPartyAssignment">
-                <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>
+                <condition-expr field-name="workEffortId" operator="equals" env-name="projectId"/>
                 <order-by field-name="roleTypeId"/>
             </entity-condition>
         </actions>
-        <field name="workEffortId"><hidden/></field>
+        <field name="workEffortId"><hidden/></field>
+        <field name="projectId"><hidden/></field>
         <field name="partyId" widget-style="buttontext">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
                 <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="buttontext"/>
             </display-entity>
         </field>
-        <field name="fromDate"><display/></field>
+        <field name="fromDate"><display type="date"/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
             <display-entity entity-name="RoleType"/>
         </field>
-        <field name="statusDateTime"><display/></field>
-        
-        <field name="thruDate"><date-time/></field>
-        <field name="statusId">
-            <drop-down no-current-selected-key="PARTYASSIGN_UNASSIGNED">
-                <entity-options description="${description}" entity-name="StatusItem">
-                    <entity-constraint name="statusTypeId" operator="equals" value="PRTYASGN_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="expectationEnumId" title="${uiLabelMap.CommonExpectation}">
-            <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
-                    <entity-constraint name="enumTypeId" operator="equals" value="WORK_EFF_EXPECT"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
-        <field name="mustRsvp"><check/></field>
-        <field name="comments"><text size="60" maxlength="255"/></field>
-        <field name="PartySkills" title="${uiLabelMap.ProjectMgrPartySkills}" widget-style="buttontext">
-            <hyperlink target="EditPartySkills?partyId=${partyId}&amp;workEffortId=${workEffortId}" description="${uiLabelMap.ProjectMgrPartySkills}" also-hidden="false"/>
-        </field>
+        <field name="thruDate"><date-time type="date"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
+    <form name="AddWorkEffortPartyAssign" target="createWorkEffortPartyAssign" title="" type="single">
+        <field name="projectId"><hidden/></field>
+        <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field>
+        <field name="workEffortId"><hidden value="${projectId}"/></field>
+        <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
+            <drop-down>
+                <entity-options entity-name="RoleType" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="fromDate"><date-time type="date"/></field>
+        
+        <field name="thruDate"><date-time type="date"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
     <form name="ListTimeEntries" type="list" list-name="timesheetEntries" target="updateTimeEntry" paginate-target="EditTimeEntries">
         <actions>
             <entity-condition entity-name="TimeEntry">