msksheet.cpp Reindentato modulo scritto da qualcun altro
relation.cpp Usata la set_filter nella TRecord_array::read scadenze.h Aggiornata lista campi git-svn-id: svn://10.65.10.50/trunk@1777 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
		
							parent
							
								
									e0f1f18c7e
								
							
						
					
					
						commit
						995621f8ec
					
				@ -482,7 +482,7 @@ void TSpreadsheet::update(int row)
 | 
				
			|||||||
  if (row < 0)
 | 
					  if (row < 0)
 | 
				
			||||||
  {                 
 | 
					  {                 
 | 
				
			||||||
    xi_cell_request(_list);                 // Force updatde
 | 
					    xi_cell_request(_list);                 // Force updatde
 | 
				
			||||||
    xi_scroll(_list, XI_SCROLL_FIRST);
 | 
					    //    xi_scroll(_list, XI_SCROLL_FIRST);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  else
 | 
					  else
 | 
				
			||||||
    update_rec(row);  
 | 
					    update_rec(row);  
 | 
				
			||||||
@ -1353,21 +1353,26 @@ KEY TSpreadsheet::edit(int n, KEY tasto)
 | 
				
			|||||||
    
 | 
					    
 | 
				
			||||||
    // Carico la maschera dell'utente con la maschera totale
 | 
					    // Carico la maschera dell'utente con la maschera totale
 | 
				
			||||||
    for( int i = 0; i < usermask.fields(); i ++ )
 | 
					    for( int i = 0; i < usermask.fields(); i ++ )
 | 
				
			||||||
    {   TMask_field& dest_field = usermask.fld( i );
 | 
					    {   
 | 
				
			||||||
 | 
					      TMask_field& dest_field = usermask.fld( i );
 | 
				
			||||||
      if ( dest_field.dlg( ) > 100 )
 | 
					      if ( dest_field.dlg( ) > 100 )
 | 
				
			||||||
        { TMask_field& source_field = totalmask.field( dest_field.dlg( ) );
 | 
					      { 
 | 
				
			||||||
          dest_field.set( source_field.get( ) ); }
 | 
					        const TMask_field& source_field = totalmask.field( dest_field.dlg( ) );
 | 
				
			||||||
      };              
 | 
					        dest_field.set( source_field.get( ) ); 
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }              
 | 
				
			||||||
    k = usermask.run();
 | 
					    k = usermask.run();
 | 
				
			||||||
    if (k == K_ENTER)
 | 
					    if (k == K_ENTER)
 | 
				
			||||||
      // Carico la maschera totale con la maschera dell'utente
 | 
					      // Carico la maschera totale con la maschera dell'utente
 | 
				
			||||||
      for( i = 0; i < usermask.fields(); i ++ )
 | 
					      for( i = 0; i < usermask.fields(); i ++ )
 | 
				
			||||||
      {   
 | 
					      {   
 | 
				
			||||||
        TMask_field& source_field = usermask.fld( i );
 | 
					        const TMask_field& source_field = usermask.fld( i );
 | 
				
			||||||
        if ( source_field.dlg( ) > 100 )
 | 
					        if ( source_field.dlg( ) > 100 )
 | 
				
			||||||
        { TMask_field& dest_field = totalmask.field( source_field.dlg() );
 | 
					        { 
 | 
				
			||||||
          dest_field.set( source_field.get( ) ); }
 | 
					          TMask_field& dest_field = totalmask.field( source_field.dlg() );
 | 
				
			||||||
      };
 | 
					          dest_field.set( source_field.get( ) ); 
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
    _getmask( n, totalmask, TRUE );
 | 
					    _getmask( n, totalmask, TRUE );
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
				
			|||||||
@ -1,4 +1,4 @@
 | 
				
			|||||||
// $Id: relation.cpp,v 1.62 1995-08-30 12:16:23 guy Exp $
 | 
					// $Id: relation.cpp,v 1.63 1995-09-01 15:09:18 guy Exp $
 | 
				
			||||||
// relation.cpp
 | 
					// relation.cpp
 | 
				
			||||||
// fv 12/8/93
 | 
					// fv 12/8/93
 | 
				
			||||||
// relation class for isam files
 | 
					// relation class for isam files
 | 
				
			||||||
@ -1734,7 +1734,7 @@ int TRecord_array::read(TRectype* filter)
 | 
				
			|||||||
  CHECKS(filter->get(_num).empty(), "You can't specify in the filter the field ", (const char*)_num);
 | 
					  CHECKS(filter->get(_num).empty(), "You can't specify in the filter the field ", (const char*)_num);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  destroy();
 | 
					  destroy();
 | 
				
			||||||
  add(filter, 0);    // Store filter record for later use
 | 
					  set_key(filter);    // Store filter record for later use
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
  int err = NOERR;
 | 
					  int err = NOERR;
 | 
				
			||||||
  if (!filter->empty())
 | 
					  if (!filter->empty())
 | 
				
			||||||
@ -1742,7 +1742,7 @@ int TRecord_array::read(TRectype* filter)
 | 
				
			|||||||
    TLocalisamfile f(_file);
 | 
					    TLocalisamfile f(_file);
 | 
				
			||||||
    TRectype* rec = (TRectype*)filter->dup();
 | 
					    TRectype* rec = (TRectype*)filter->dup();
 | 
				
			||||||
    err = rec->read(f, _isgteq);
 | 
					    err = rec->read(f, _isgteq);
 | 
				
			||||||
    for (int e = err; e == NOERR && *rec == key(); e = rec->next(f))
 | 
					    for (int e = err; e == NOERR && *rec == *filter; e = rec->next(f))
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
      add_row(rec);
 | 
					      add_row(rec);
 | 
				
			||||||
      rec = (TRectype*)filter->dup();
 | 
					      rec = (TRectype*)filter->dup();
 | 
				
			||||||
@ -1752,15 +1752,12 @@ int TRecord_array::read(TRectype* filter)
 | 
				
			|||||||
  return err;  
 | 
					  return err;  
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
int TRecord_array::read(const TRectype& filter)
 | 
					int TRecord_array::read(const TRectype& filter)
 | 
				
			||||||
{ 
 | 
					{ 
 | 
				
			||||||
  TRectype* f = (TRectype*)filter.dup();
 | 
					  TRectype* f = (TRectype*)filter.dup();
 | 
				
			||||||
  return read(f);  
 | 
					  return read(f);  
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
int TRecord_array::write(bool re) const
 | 
					int TRecord_array::write(bool re) const
 | 
				
			||||||
{          
 | 
					{          
 | 
				
			||||||
  int err = NOERR;
 | 
					  int err = NOERR;
 | 
				
			||||||
 | 
				
			|||||||
@ -22,6 +22,9 @@
 | 
				
			|||||||
#define SCAD_IMPORTOPAG "IMPORTOPAG"
 | 
					#define SCAD_IMPORTOPAG "IMPORTOPAG"
 | 
				
			||||||
#define SCAD_CODABIPR   "CODABIPR"
 | 
					#define SCAD_CODABIPR   "CODABIPR"
 | 
				
			||||||
#define SCAD_CODCABPR   "CODCABPR"
 | 
					#define SCAD_CODCABPR   "CODCABPR"
 | 
				
			||||||
 | 
					#define SCAD_CODABI     "CODABI"
 | 
				
			||||||
 | 
					#define SCAD_CODCAB     "CODCAB"
 | 
				
			||||||
 | 
					#define SCAD_CODAG      "CODAG"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user