WebSVN – svn1 – Diff – /Mara/branches/QtMain/report.cpp

     int winmax;
     ty_s_data  *ptr;
     team_type   team_buf;
     int         last_class;
     char    solid_line[100];
+    bool header_done = false;
     /*
     **  Calculate Summary information
     **  Should cache the data
     */
     if ( report_html == html )
+    {
         print( "<hr>" );
         print( "<A NAME=\"%s\"></A>",url_encode("INDEX"));
+    }
-    print( "Award Categories");
+    print( "Award Categories - Full Event");
     for( j = 1; j <= config.num_class; j++ )
+    {
         /*
         **  Header for the class
         if ( config.class_winners[j-1] <= 0 )
             continue;
         winmax = config.class_winners[j-1];
+        {
-            int valid =   sdata.teamclass[j].valid;
+            int valid =   sdata.teamclass[j].valid_ev;
             if ( valid < winmax )
                 winmax = valid;
+        }
         print( "\n");
         print( "%s",  tprintf( "%-*s", LEN_CLASS_NAME ,config.team_class[j-1].full_name ));
         if ( report_html == html ) print( "</A>" );
         print( "  %3d Awards", winmax );
         if ( config.class_winners[j-1] != winmax )
             print( " from a maximum of %3d", config.class_winners[j-1] );
+    }
+    /*
+    **  NE Award Categories
+    */
+    if ( config.class_ne_winners_by_class )
+    {
+        print( "\n");
+        print( "Award Categories - Non Equestrian");
+        for( j = 1; j <= config.num_class; j++ )
+        {
+            /*
+            **  Header for the class
+            */
+            if ( config.class_ne_winners[j-1] <= 0 )
+                continue;
+            winmax = config.class_ne_winners[j-1];
+            {
+                int valid =   sdata.teamclass[j].valid_ne;
+                if ( valid < winmax )
+                    winmax = valid;
+            }
+            print( "\n");
+            print( "    ");
+            if ( report_html == html ) print( "<A HREF=\"#%s_NE\">",url_encode(config.team_class[j-1].full_name));
+            print( "%s",  tprintf( "%-*s", LEN_CLASS_NAME ,config.team_class[j-1].full_name ));
+            if ( report_html == html ) print( "</A>" );
+            print( "  %3d Awards", winmax );
+            if ( config.class_ne_winners[j-1] != winmax )
+                print( " from a maximum of %3d", config.class_ne_winners[j-1] );
+        }
+    }
     /*
     **  Manual entries
     */
+    print( "\n");
+    print( "Miscellaneous");
+        print( "\n");
+        print( "    ");
+        if ( report_html == html ) print( "<A HREF=\"#%s_by_cat\">",url_encode("Full Event"));
+        print( "%s",  tprintf( "%-*s", LEN_CLASS_NAME ,"Full Event"));
+        if ( report_html == html ) print( "</A>" );
+        print (" by Category");
     if ( config.class_ne_winners_by_class )
+    {
         print( "\n");
         print( "    ");
         if ( report_html == html ) print( "<A HREF=\"#%s_by_cat\">",url_encode(config.team_class[config.nonequestrian_class-1].full_name));
         */
         print( "\n");
         if ( report_html == html )
+        {
             print( "<hr>" );
+            if ( !header_done )
+            {
+                header_done = true;
+                if ( report_html == html )
+                {
+                    print( "<A name=\"%s_by_cat\"></A>",url_encode("Full Event"));
+                }
+            }
             print( "<A name=\"%s\"></A>",url_encode(config.team_class[j-1].full_name));
+        }
         else
+        {
             print( "%s\n", solid_line);
         if ( config.class_winners[j-1] <= 0 )
+        {
             print( "\n");
             print( "No winners awarded" );
+            if ( report_html == html ) print("<br>");
             continue;
+        }
         /*
         **  Enties for 'n' the best teams as configured
     /*
     ** Non Equestrian winners by category
     */
     if ( config.class_ne_winners_by_class)
+    {
-        bool header_done = false;
+        header_done = false;
         /*
         **  Sort the data by class with NE data sorted by real class
         */
         sort_team_data( 0, S_LC_NE );      /* Generate class placement data */
             print( "\n");
             if ( report_html == html )
+            {
                 print( "<hr>" );
-                print( "<A name=\"%s\"></A>",url_encode(config.team_class[j-1].full_name));
+                print( "<A name=\"%s_NE\"></A>",url_encode(config.team_class[j-1].full_name));
+            }
             else
+            {
                 print( "%s\n", solid_line);
+            }
     for( i = config.min_team; i <= config.max_team; i++ )
+    {
         if( valid_field( i ) && g_record( i, &team_buf ) )
+        {
             bool valid = true;
+            bool valid_ne = true;
             if ( team_buf.flags.disqualified )
+            {
                 ptr->teamclass[team_buf.teamclass].disqualified++;
                 ptr->total.disqualified++;
                 valid = false;
+                valid_ne = false;
+            }
             if ( team_buf.flags.vet_check )
+            {
                 ptr->teamclass[team_buf.teamclass].vet_check++;
                 ptr->total.vet_check++;
                 valid = false;
+                valid_ne = false;
+            }
             if ( config.nonequestrian_class && team_buf.flags.non_equestrian )
+            {
                 ptr->teamclass[team_buf.teamclass].non_equestrian++;
                 ptr->total.non_equestrian++;
                 valid = false;
+            }
+            else
+            {
+                valid_ne = false;
+            }
             ptr->total.total++;
             ptr->teamclass[team_buf.teamclass].total++;
             if ( valid )
+            {
                 ptr->total.valid++;
                 ptr->teamclass[team_buf.teamclass].valid++;
+                if ( ! team_buf.flags.bad_times )
+                {
+                    ptr->total.valid_ev++;
+                    ptr->teamclass[team_buf.teamclass].valid_ev++;
+                }
+            }
+            if ( valid_ne )
+            {
+                if ( ! team_buf.flags.bad_times )
+                {
+                    ptr->total.valid_ne++;
+                    ptr->teamclass[team_buf.teamclass].valid_ne++;
+                }
+            }
+        }
+    }
     /*
     /*
     **  Display summary stats
     */
-    print( "%*s : %-7s %-7s%-7s%-7s%-7s\n",
+    print( "%*s : %-7s %-7s %-7s %-7s %-7s %-7s %-7s\n",
                                       LEN_CLASS_NAME, "Category",
                                       "Total",
                                       "Valid",
                                       "Disq",
                                       "NonEq",
-                                      "VetChck"
+                                      "VetChk",
+                                      "CompEv",
+                                      "CompNe"
                                        );
     for( i = 0; i < config.num_class; i++ )
+    {
         /*
         if ( report_html == html ) print( "<A HREF=\"%s\">",url_encode(p_filename(filebase, config.team_class[i].abr ,"html")) );
         print( "%*s ", LEN_CLASS_NAME, config.team_class[i].full_name );
         if ( report_html == html ) print( "</A>" );
-        print( ": %-7d %-7d %-7d%-7d %-7d\n",
+        print( ": %-7d %-7d %-7d %-7d %-7d %-7d %-7d\n",
                                           data.teamclass[i+1].total,
                                           data.teamclass[i+1].valid,
                                           data.teamclass[i+1].disqualified,
                                           data.teamclass[i+1].non_equestrian,
-                                          data.teamclass[i+1].vet_check
+                                          data.teamclass[i+1].vet_check,
+                                          data.teamclass[i+1].valid_ev,
+                                          data.teamclass[i+1].valid_ne
                                           );
+    }
     print( "\n" );
-    print( "%*s : %-7d %-7d %-7d%-7d %-7d\n",
+    print( "%*s : %-7d %-7d %-7d%-7d %-7d %-7d %-7d\n",
                                       LEN_CLASS_NAME, "Totals",
                                       data.total.total,
                                       data.total.valid,
                                       data.total.disqualified,
                                       data.total.non_equestrian,
-                                      data.total.vet_check
+                                      data.total.vet_check,
+                                      data.total.valid_ev,
+                                      data.total.valid_ne
                                       );
     close_printer();
+}

Subversion Repositories svn1

(root)/Mara/branches/QtMain/report.cpp – Rev 272 → 284