svn commit: r671482 - in /ofbiz/trunk/specialpurpose/projectmgr/widget: CommonScreens.xml forms/TaskForms.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r671482 - in /ofbiz/trunk/specialpurpose/projectmgr/widget: CommonScreens.xml forms/TaskForms.xml

hansbak-2
Author: hansbak
Date: Wed Jun 25 02:19:17 2008
New Revision: 671482

URL: http://svn.apache.org/viewvc?rev=671482&view=rev
Log:
show list of projects on projectmanager main screen to allow initial selection

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=671482&r1=671481&r2=671482&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CommonScreens.xml Wed Jun 25 02:19:17 2008
@@ -321,35 +321,16 @@
     
     <screen name="Main">
         <section>
+            <actions>
+                <set field="parameters.currentStatus" value="_NA_"/>
+            </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                        <label style="h1" text="Introduction to the Project Manager Application"/>
-                        </container>
-                        <section>
-                            <actions>
-                                <set field="text1" value="The projectmanager supports the administration/sheduling of projects, task assignment/re-assignment with time registration and invoicing.
-                                    For comments and requirements please add this to the documents below or open an issue in Jira.&lt;br/&gt;&lt;br/&gt;
-                                    This component is now fairly complete, the current status of the component is documented in the development document below." />
-                                <set field="text2" value="The following documents/systems are available:"/>
-                                <set field="link1Text" value="A development document."/>
-                                <set field="link1" value="http://docs.ofbiz.org/display/OFBIZ/Complete+the+implementation+of+the+ProjectMgr+component."/>
-                                <set field="link2Text" value="User document"/>
-                                <set field="link2" value="http://docs.ofbiz.org/display/OFBENDUSER/Project+Manager+Application+Roles"/>
-                                <set field="link3Text" value="A Jira issue system for fault reports and change requests"/>
-                                <set field="link3" value="https://issues.apache.org/jira/browse/OFBIZ/component/12312073"/>
-                                
-                            </actions>
-                            <widgets>
-                                <platform-specific>
-                                    <html>
-                                        <html-template location="component://projectmgr/main.ftl"/>
-                                    </html>
-                                </platform-specific>
-                            </widgets>
-                        </section>
-                        
+                        <screenlet title="${uiLabelMap.ProjectMgrProjectSummary}" navigation-form-name="main" navigation-menu-name="ProjectSubTabBar">
+                            <include-menu name="ProjectSubTabBar" location="component://projectmgr/widget/Menus.xml"/>
+                            <include-form name="ListProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=671482&r1=671481&r2=671482&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed Jun 25 02:19:17 2008
@@ -242,7 +242,7 @@
         </field>
         <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${resultProject.phaseName}"/></field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><hyperlink target="projectView?projectId=${resultProject.projectId}" description="${resultProject.projectName}"/></field>
-        <field entry-name="result.taskInfo.currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <!--field entry-name="result.taskInfo.currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field-->
         <field name="priority"><display/></field>
         <field name="estimatedStartDate"><display type="date"/></field>
         <field name="estimatedCompletionDate" red-when="before-now"><display type="date"/></field>