--- XpTrackerPlugin.pm.3.1.beta	2002-12-31 14:18:05.000000000 -0800
+++ XpTrackerPlugin.pm	2003-01-01 07:27:44.000000000 -0800
@@ -734,8 +734,17 @@
 
             my @teamIters = &xpGetTeamIterations($team, $web);
 
-            # write out all iterations to table
+            # Get date of each iteration
+            my %iterKeys = ();
             foreach my $iter (@teamIters) {
+                my $iterText = &TWiki::Store::readTopic($web, $iter);
+                my $iterDate = &xpGetValue("\\*Start\\*", $iterText, "START");
+                my $iterSec = HTTP::Date::str2time( $iterDate ) - time;
+                $iterKeys{$iter} = $iterSec;
+            }
+
+            # write out all iterations to table
+            foreach my $iter (sort { $iterKeys{$a} <=> $iterKeys{$b} } @teamIters) {
               
                 # get additional information from iteration
                 my $iterText = &TWiki::Store::readTopic($web, $iter);
@@ -767,8 +776,17 @@
       
         my @teamIters = &xpGetTeamIterations($team, $web);
 
-        # write out all iterations to table
+        # Get date of each iteration
+        my %iterKeys = ();
         foreach my $iter (@teamIters) {
+            my $iterText = &TWiki::Store::readTopic($web, $iter);
+            my $iterDate = &xpGetValue("\\*Start\\*", $iterText, "START");
+            my $iterSec = HTTP::Date::str2time( $iterDate ) - time;
+            $iterKeys{$iter} = $iterSec;
+        }
+
+        # write out all iterations to table
+        foreach my $iter (sort { $iterKeys{$a} <=> $iterKeys{$b} } @teamIters) {
           
             # get additional information from iteration
             my $iterText = &TWiki::Store::readTopic($web, $iter);
@@ -856,8 +874,17 @@
 
     $list .= "| *Iter* | *Summary* | *Start* | *End* | *Est* | *Spent* | *ToDo* | *Progress* | *Done* | *Overrun* |\n";
 
-    # write out all iterations to table
+    # Get date of each iteration
+    my %iterKeys = ();
     foreach my $iter (@teamIters) {
+        my $iterText = &TWiki::Store::readTopic($web, $iter);
+        my $iterDate = &xpGetValue("\\*Start\\*", $iterText, "START");
+        my $iterSec = HTTP::Date::str2time( $iterDate ) - time;
+        $iterKeys{$iter} = $iterSec;
+    }
+
+    # write out all iterations to table
+    foreach my $iter (sort { $iterKeys{$a} <=> $iterKeys{$b} } @teamIters) {
 
         # get additional information from iteration
         my $iterText = &TWiki::Store::readTopic($web, $iter);
@@ -963,7 +990,7 @@
 sub xpGetProjectTeams {
 
     my ($project, $web) = @_;
-    return split( /\s+/, $cachedProjectTeams{$project} );
+    return defined($cachedProjectTeams{$project}) ? split( /\s+/, $cachedProjectTeams{$project} ) : ();
 }
 
 ###########################
@@ -1032,8 +1059,9 @@
     my %iterKeys = ();
     foreach my $iteration (keys %master) {
         my $iterText = &TWiki::Store::readTopic($web, $iteration);
-        $iterText =~ /\<!--START *(.*?) *--\>/s;
-        $iterKeys{$iteration} = $1;
+        my $iterDate = &xpGetValue("\\*Start\\*", $iterText, "START");
+        my $iterSec = HTTP::Date::str2time( $iterDate ) - time;
+        $iterKeys{$iteration} = $iterSec;
     }
 
     # OK, display them
@@ -1113,8 +1141,9 @@
     my %iterKeys = ();
     foreach my $iteration (keys %master) {
         my $iterText = &TWiki::Store::readTopic($web, $iteration);
-        $iterText =~ /\<!--START *(.*?) *--\>/s;
-        $iterKeys{$iteration} = $1;
+        my $iterDate = &xpGetValue("\\*Start\\*", $iterText, "START");
+        my $iterSec = HTTP::Date::str2time( $iterDate ) - time;
+        $iterKeys{$iteration} = $iterSec;
     }
 
     # OK, display them
@@ -1198,7 +1227,7 @@
 
     # Iterate over each story
     my (%whoAssigned,%whoSpent,%whoEtc,%whoTAssigned,%whoTRemaining) = ();
-    my ($totalSpent,$totalEtc,$totalAssigned,$totalVelocity,$totalTAssigned) = 0;
+    my ($totalSpent,$totalEtc,$totalAssigned,$totalVelocity,$totalTAssigned,$totalTRemaining) = (0,0,0,0,0,0);
     foreach my $story (@allStories) {
     my $storyText = &TWiki::Store::readTopic($web, $story);
     if(&xpGetValue("\\*Iteration\\*", $storyText, "storyiter") eq $iteration) {
@@ -1301,7 +1330,7 @@
 sub xpGetIterStories {
 
     my ($iteration,$web) = @_;
-    return split( /\s+/, $cachedIterationStories{$iteration} );
+    return defined($cachedIterationStories{$iteration}) ? split( /\s+/, $cachedIterationStories{$iteration} ) : ();
 }
 
 ###########################
@@ -1312,7 +1341,7 @@
 sub xpGetStoryStatus {
     my $storyText = $_[0];
 
-    my @taskStatus = ();
+    my @taskStatus = ( 0, 0, 0 );
 
     # Get acceptance test status
     my $storyComplete = "N";
@@ -1464,7 +1493,7 @@
 sub xpGetTeamIterations {
 
     my ($team, $web) = @_;
-    return split( /\s+/, $cachedTeamIterations{$team} );
+    return defined($cachedTeamIterations{$team}) ? split( /\s+/, $cachedTeamIterations{$team} ) : ();
 }
 
 ###########################
@@ -1712,7 +1741,18 @@
         my @teams = &xpGetProjectTeams($project, $web);
         foreach my $team (@teams){
             my @teamIters = &xpGetTeamIterations($team, $web);
-            foreach my $iterationName (@teamIters) {
+
+            # Get date of each iteration
+            my %iterKeys = ();
+            foreach my $iter (@teamIters) {
+                my $iterText = &TWiki::Store::readTopic($web, $iter);
+                my $iterDate = &xpGetValue("\\*Start\\*", $iterText, "START");
+                my $iterSec = HTTP::Date::str2time( $iterDate ) - time;
+                $iterKeys{$iter} = $iterSec;
+            }
+
+            # write out all iterations to table
+            foreach my $iterationName (sort { $iterKeys{$a} <=> $iterKeys{$b} } @teamIters) {
 
             # Get date of iteration
             my $iterText = &TWiki::Store::readTopic($web, $iterationName);
@@ -1741,8 +1781,8 @@
             }
 
             # Show them
-#            foreach my $story (sort { $targetOrder{$a} <=> $targetOrder{$b} || $a cmp $b } keys %targetStories) {
-            foreach my $story (sort { $a cmp $b } keys %targetStories) {
+            foreach my $story (sort { $targetOrder{$a} <=> $targetOrder{$b} || $a cmp $b } keys %targetStories) {
+#            foreach my $story (sort { $a cmp $b } keys %targetStories) {
 
                 my $storyText = $targetStories{$story};
 
@@ -2013,7 +2053,7 @@
             #$list .= " <br> (".sprintf("%0.2f/%0.2f/%d",$load,$cumulLoad/(24*3600),$projiterSec[$pi]/(24*3600)).") ";
             if ( defined $devDays{$who}[$pi] && ($devDays{$who}[$pi] > 0) ) {
                 if ( $load > 0 ) {
-                    $list .= " <br> ".sprintf("%d \%",100*$load)." ";
+                    $list .= " <br> ".sprintf("%d \%\%",100*$load)." ";
                 } else {
                     $list .= " <br> (late!) ";
                 }