svn commit: r647483 - /ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl

Author: jleroux
Date: Sat Apr 12 11:22:30 2008
New Revision: 647483

URL: http://svn.apache.org/viewvc?rev=647483&view=rev
Log:
Revert commit 647481, see y comment in https://issues.apache.org/jira/browse/OFBIZ-1746

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl

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=647483&r1=647482&r2=647483&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/gantChart.ftl Sat Apr 12 11:22:30 2008
@@ -35,28 +35,28 @@
 
         // Convert the database data to json
         <#if tasks?has_content>
-        <#list tasks as taskNode>
+          <#list tasks as taskNode>
                 <#if taskNode.estimatedStartDate?exists>
-                   var dtStart = new Date("${taskNode.estimatedStartDate?string("yyyy/MM/dd HH:mm")}");
+                   var dtStart = new Date("${taskNode.estimatedStartDate?string.short}");
                    <#else>
-                   var dtStart = new Date("${chartStart?string("yyyy/MM/dd HH:mm")}");
+                   var dtStart = new Date("${chartStart?string.short}");
                 </#if>
                 <#if taskNode.estimatedCompletionDate?exists>
-                    var dtEnd = new Date("${taskNode.estimatedCompletionDate?string("yyyy/MM/dd HH:mm")}");
+                    var dtEnd = new Date("${taskNode.estimatedCompletionDate?string.short}");
                    <#else>
-                   var dtEnd = new Date("${chartEnd?string("yyyy/MM/dd HH:mm")}");
+                   var dtEnd = new Date("${chartEnd?string.short}");
                 </#if>
-            <#if taskNode.phaseName?exists>
-                json.push({high: dtEnd.getTime(), low: dtStart.getTime(), task: "${taskNode.phaseName}", type: "p"});
-            <#elseif taskNode.workEffortName?exists>
-                json.push({high: dtEnd.getTime(), low: dtStart.getTime(), task: "${taskNode.workEffortName}", type: "t"});
-            </#if>
-        </#list>
+              <#if taskNode.phaseName?exists>
+                  json.push({high: dtEnd.getTime(), low: dtStart.getTime(), task: "${taskNode.phaseName}", type: "p"});
+              <#elseif taskNode.workEffortName?exists>
+                  json.push({high: dtEnd.getTime(), low: dtStart.getTime(), task: "${taskNode.workEffortName}", type: "t"});
+              </#if>
+          </#list>
         </#if>
 
             //Parameters
-            var chartStart = new Date("${chartStart?string("yyyy/MM/dd HH:mm")}");
-            var dEnd = new Date("${chartEnd?string("yyyy/MM/dd HH:mm")}");
+            var chartStart = new Date("${chartStart?string.short}");
+            var dEnd = new Date("${chartEnd?string.short}");
 //          var duration = 14;      //Duration of the chart
             //Calculated parameters
             var nbDays = dojo.date.diff(chartStart, dtEnd, interv);
@@ -305,7 +305,7 @@
 <br/><br/>
 <#if tasks?has_content>
 <br/><br/><br/><br/><br/><br/>
- <#list tasks as taskNode>
- <br/>
- </#list>
-</#if>
+  <#list tasks as taskNode>
+  <br/>
+  </#list>
+</#if>
\ No newline at end of file