Article validation code (statistics update)

diff --git a/includes/SpecialValidate.php b/includes/SpecialValidate.php
index 4ec0869..eccd77b 100644 (file)
--- a/includes/SpecialValidate.php
+++ b/includes/SpecialValidate.php
@@ -226,16 +226,27 @@ class Validation
                return $ret ;
                }
                
+       # Show statistics for the different versions of a single article
        function getPageStatistics ( $article_title = "" )
                {
                global $wgLang, $wgUser ;
                $validationtypes = $wgLang->getValidationTypes() ;
                $article_title = $_GET['article_title'] ;
-               $html = "<h1>Page validation statistics</h1>\n" ;
                $d = $this->getData ( -1 , $article_title , -1 ) ;
                if ( count ( $d ) ) $d = array_shift ( $d ) ;
                else $d = array () ;
                krsort ( $d ) ;
+
+               # Getting table data (cur_id, old_id etc.) for each version
+               $table_id = array() ;
+               $table_name = array() ;
+               foreach ( $d AS $version => $data )
+                       {
+                       $this->find_this_version ( $article_title , $version , $table_id[$version] , $table_name[$version] ) ;
+                       }
+ 
+               # Generating HTML
+               $html = "<h1>Page validation statistics</h1>\n" ;
                $html .= "<table border=1 cellpadding=2 style='font-size:8pt;'>\n" ;
                $html .= "<tr><th>" . wfMsg('val_version') . "</th>" ;
                foreach ( $validationtypes AS $idx => $title )
@@ -247,12 +258,18 @@ class Validation
                $html .= "</tr>\n" ;
                foreach ( $d AS $version => $data )
                        {
+                       # Preamble for this version
                        $title = Title::newFromDBkey ( $article_title ) ;
-                       $version_link = $title->getLocalURL( "action=validate&timestamp={$version}" ) ;
-                       $version_link = "<a class=intern href=\"{$version_link}\">" . gmdate("F d, Y H:i:s",wfTimestamp2Unix($version)) . "</a>" ;
+                       $version_date = gmdate("F d, Y H:i:s",wfTimestamp2Unix($version)) ;
+                       $version_validate_link = $title->getLocalURL( "action=validate&timestamp={$version}" ) ;
+                       $version_validate_link = "<a class=intern href=\"{$version_validate_link}\">" . wfMsg('val_validate_version') . "</a>" ;
+                       if ( $table_name[$version] == 'cur' ) $version_view_link = $title->getLocalURL( "" ) ;
+                       else $version_view_link = $title->getLocalURL( "oldid={$table_id[$version]}" ) ;
+                       $version_view_link = "<a href=\"{$version_view_link}\">" . wfMsg('val_view_version') . "</a>" ;
                        $html .= "<tr>" ;
-                       $html .= "<th align=left>{$version_link}</th>" ;
+                       $html .= "<td align=center valign=top nowrap><b>{$version_date}</b><br>{$version_view_link}<br>{$version_validate_link}</td>" ;
 
+                       # Individual data
                        $vmax = array() ;
                        $vcur = array() ;
                        $users = array() ;
@@ -270,12 +287,10 @@ class Validation
                                        }
                                }
        
-       
                        $total_count = 0 ;
                        $total_percent = 0 ;
                        foreach ( $validationtypes AS $idx => $title )
                                {
-                               $html .= "<td align=center valign=center>" ;
                                if ( isset ( $vcur[$idx] ) )
                                        {
                                        $average = 100 * $vcur[$idx] / $vmax[$idx] ;
@@ -283,23 +298,27 @@ class Validation
                                        $total_percent += $average ;
                                        if ( $users[$idx] > 1 ) $h = wfMsg ( "val_percent" ) ;
                                        else $h = wfMsg ( "val_percent_single" ) ;
-                                       $h = str_replace ( "$1" , $average , $h ) ;
+                                       $h = str_replace ( "$1" , number_format ( $average , 2 ) , $h ) ;
                                        $h = str_replace ( "$2" , $vcur[$idx] , $h ) ;
                                        $h = str_replace ( "$3" , $vmax[$idx] , $h ) ;
                                        $h = str_replace ( "$4" , $users[$idx] , $h ) ;
-                                       $html .= $h ;
+                                       $html .= "<td align=center valign=top>" . $h ;
+                                       }
+                               else
+                                       {
+                                       $html .= "<td align=center valign=center>" ;
+                                       $html .= "(" . wfMsg ( "val_noop" ) . ")" ;
                                        }
-                               else $html .= "(" . wfMsg ( "val_noop" ) . ")" ;
                                $html .= "</td>" ;
                                }
                        
                        if ( $total_count > 0 )
                                {
                                $total = $total_percent / $total_count ;
-                               $total = "{$total} %" ;
+                               $total = number_format ( $total , 2 ) . " %" ;
                                }
                        else $total = "" ;
-                       $html .= "<td align=center valign=center>{$total}</td>" ;
+                       $html .= "<td align=center valign=top nowrap><b>{$total}</b></td>" ;
                        
                        $html .= "</tr>" ;
                        }

diff --git a/languages/Language.php b/languages/Language.php
index 5c71635..352f144 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1260,7 +1260,7 @@ Type the name of the user in the box and press the button to make the user an ad
 
 # Validation
 'val_clear_old' => 'Clear my other validation data for $1',
-'val_merge_old' => 'Merge my other validation data into this version',
+'val_merge_old' => 'Use my previous assessment where selected \'No opinion\'',
 'val_form_note' => '<b>Hint:</b> Merging your data means that for the article
 revision you select, all options where you have specified <i>no opinion</i>
 will be set to the value and comment of the most recent revision for which you
@@ -1269,8 +1269,8 @@ for a newer revision, but also keep your other settings for this article in
 this revision, just select which option you intend to <i>change</i>, and
 merging will fill in the other options with your previous settings.',
 'val_noop' => 'No opinion',
-'val_percent' => '<b>$1%</b><br>($2 of $3 points by $4 users)',
-'val_percent_single' => '<b>$1%</b><br>($2 of $3 points by one user)',
+'val_percent' => '<b>$1%</b><br>($2 of $3 points<br>by $4 users)',
+'val_percent_single' => '<b>$1%</b><br>($2 of $3 points<br>by one user)',
 'val_total' => 'Total',
 'val_version' => 'Version',
 'val_tab' => 'Validate',
@@ -1278,6 +1278,8 @@ merging will fill in the other options with your previous settings.',
 'val_version_of' => "<h2>Version of $1</h2>\n" ,
 'val_table_header' => "<tr><th>Class</th>$1<th colspan=4>Opinion</th>$1<th>Comment</th></tr>\n",
 'val_stat_link_text' => 'Validation statistics for this article',
+'val_view_version' => 'View this version',
+'val_validate_version' => 'Validate this version',
 
 # Move page
 #