WebSVN – svn1-original – Diff – /Mara/trunk/legtime.c

     report_it = getyes( "\nGenerate leg start report" );
     if( abort_flag )
         return;
-    clear_it = getyes("Reset the leg start times" );
+    clear_it = getyes("Invalidate the leg start times" );
     if( abort_flag )
         return;
     /*
     **  Read existing data into memory
     if( report_it )
         legs_start_report(9);
     if ( clear_it )
-        tm_clearleg_specified( leg, 10 );
+        tm_clearleg_specified( leg, TRUE, 10 );
+}
 /*========================================================================
+ *
  *  Set up the leg start times for leg
     report_it = getyes( "\nGenerate leg start report" );
     if( abort_flag )
         return;
     line++;
-    clear_it = getyes("Reset the leg start times" );
+    clear_it = getyes("Invalidate the leg start times" );
     if( abort_flag )
         return;
     line++;
     team = config.min_team;                      /* Team we are working with */
     if( report_it )
         legs_start_report(++line);
     if ( clear_it )
-        tm_clearleg_specified( leg, ++line );
+        tm_clearleg_specified( leg, TRUE, ++line );
+}
 /*========================================================================
+ *
  *  Set up the leg start times
  *========================================================================*/
 void tm_fixedstart(void)
+{
     time_t      starttime;                       /* The start time */
+    int         report_it = FALSE;               /* Report the operation */
+    int         clear_it = FALSE;
+    int         line = 5;                        /* Current line */
     cur( 0, 5 );
     while( TRUE )
+    {
         leg = 0;
-        d_field( 0, 5, "Enter leg to set start time :", D_NUMBER, 1,
+        d_field( 0, line, "Enter leg to set start time :", D_NUMBER, 1,
                  ( char * ) &leg, TRUE, M_UPDATE );
         if( leg == 0 )
             return;                              /* Null leg - just exit */
         if( leg <= config.num_legs )             /* Valid leg number - Exit loop */
             break;
         beep();                                  /* Make a noise and wait for valid number */
+    }
+    line++;
     team = config.min_team;                      /* Team we are working with */
-    cur( 0, 5 );
+    cur( 0, line++ );
     printf
         ( "Setting start times for all valid teams from %-d to %-d for leg %d\n",
           config.min_team, config.max_team, leg );
     starttime = 0;
     do
+    {
-        d_time( 0, 6, "Enter the start time : ", &starttime, TRUE );
+        d_time( 0, line, "Enter the start time : ", &starttime, TRUE );
         if( abort_flag )
             return;
         if( starttime < 0 )
             beep();
     } while( starttime < 0 );
+    line++;
+    report_it = getyes( "\nGenerate leg start report" );
+    if( abort_flag )
+        return;
+    line++;
+    clear_it = getyes("Invalidate the leg start times" );
+    if( abort_flag )
+        return;
     while( team <= config.max_team )
+    {
         if( valid_field( team ) )
+        {
             g_record( team, &team_buf );
             printf( "Upto team %d", team );
             flush_out();
+        }
         team++;
+    }
+    if( report_it )
+        legs_start_report(++line);
+    if ( clear_it )
+        tm_clearleg_specified( leg, TRUE, ++line );
+}
 /*========================================================================
+ *
  *  Set a staggered start time for a specific leg
 void tm_staggered(void)
+{
     time_t      starttime;                       /* The start time */
     time_t      delta;                           /* The stagger */
+    int         report_it = FALSE;               /* Report the operation */
+    int         clear_it = FALSE;
+    int         line = 5;                        /* Current line */
-    cur( 0, 5 );
+    cur( 0, line );
     while( TRUE )
+    {
         leg = 0;
         d_field( 0, 5, "Enter leg to set start time :", D_NUMBER, 1,
                  ( char * ) &leg, TRUE, M_UPDATE );
             return;                              /* Null leg - just exit */
         if( leg <= config.num_legs )             /* Valid leg number - Exit loop */
             break;
         beep();                                  /* Make a noise and wait for valid number */
+    }
+    line++;
     team = config.min_team;                      /* Team we are working with */
-    cur( 0, 5 );
+    cur( 0, line++ );
     printf
         ( "Setting staggered start times for all valid teams from %-d to %-d for leg %d\n",
           config.min_team, config.max_team, leg );
     starttime = 0;
     do
+    {
-        d_time( 0, 6, "Enter the start time : ", &starttime, TRUE );
+        d_time( 0, line, "Enter the start time : ", &starttime, TRUE );
         if( abort_flag )
             return;
         if( starttime < 0 )
             beep();
     } while( starttime < 0 );
+    line++;
     delta = 0;
     do
+    {
-        d_time( 0, 7, "Enter the stagger time : ", &delta, TRUE );
+        d_time( 0, line, "Enter the stagger time : ", &delta, TRUE );
         if( abort_flag )
             return;
         if( delta < 0 )
             beep();
     } while( delta < 0 );
+    line++;
+    report_it = getyes( "\nGenerate leg start report" );
+    if( abort_flag )
+        return;
+    line++;
+    clear_it = getyes("Invalidate the leg start times" );
+    if( abort_flag )
+        return;
     while( team <= config.max_team )
+    {
         if( valid_field( team ) )
+        {
             printf( "Upto team %d", team );
             flush_out();
+        }
         team++;
+    }
+    if( report_it )
+        legs_start_report(++line);
+    if ( clear_it )
+        tm_clearleg_specified( leg, TRUE,  ++line );
+}
 /*========================================================================
+ *
  *  Clear start times on a specific leg
         ( "Setting start times for all valid teams from %-d to %-d for leg %d\n",
           config.min_team, config.max_team, leg );
     if( !getyes( "Continue operation" ) )
         return;
-    tm_clearleg_specified( leg, 6 );
+    tm_clearleg_specified( leg, FALSE, 6 );
+}
 /*========================================================================
+ *
  *  Clear start times on a specific leg
+ *
  *  Purpose:
  *      This function is called to clear start times on a specifc leg
+ *
  *  Parameters:
- *      None
+ *      cleg                - Leg to clear
+ *      manual              - Force manual, else leave alone
+ *      line                - Current display line number
+ *
  *  Returns:
  *      Nothing
+ *
  *========================================================================*/
-void tm_clearleg_specified(int cleg, int line)
+void tm_clearleg_specified(int cleg, bool manual, int line)
+{
     /*
     **  Validate the users argument
     */
     while( team <= config.max_team )
+    {
         if( valid_field( team ) )
+        {
             g_record( team, &team_buf );
-            team_buf.leg[leg].manual = FALSE;
+            team_buf.leg[leg].manual = manual;
             team_buf.leg[leg].start = ( time_t ) -1;
             set_times( &team_buf );
             test_times( &team_buf, 0 );
             put_team_record( team, &team_buf );
+        }
         if( team % 10 == 0 )

Subversion Repositories svn1-original

(root)/Mara/trunk/legtime.c @ 81 – Rev 24 → 31