Corretto errore di genarazione maschere in relazione ai join

git-svn-id: svn://10.65.10.50/trunk@5700 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1997-12-05 11:56:14 +00:00
parent c067cee054
commit cb8d41dcd1
2 changed files with 21 additions and 7 deletions

View File

@ -160,7 +160,8 @@ public:
void message( const TString& s ) { outline( s, "ME "); };
// USE
void use( const TString& s ){ outline( s, "US " ); };
// void use( const TString& s ){ outline( s, "US " ); };
void use( const TString& s );
void use( const int file, const int key ){ _out << "US " << file << " KEY " << key << "\n"; };
void use( const TString& tab, const int key ){ _out << "US " << tab << " KEY " << key << "\n"; };
@ -393,6 +394,19 @@ void TMaschera::item( const TString& str )
}
}
void TMaschera::use(const TString& s)
{
if ( s.left( 1 ) == "@" )
_out << "CO US " << s.mid( 1 ) << "\n";
else
{
TToken_string u( s, '~');
_out << "US " << u.get(0) << "\n";
for ( int i = 1; i < u.items( ); i ++ )
_out << u.get( i ) << "\n";
}
}
class TField;
class TGruppo : public TObject

View File

@ -83,11 +83,11 @@ TYPE=T_NUMERO
PROMPT=Cliente
SIZE=6
FLAG=R
USE=20
USE=20~JO LF_CFVEN TO LF_CLIFO INTO TIPOCF=TIPOCF CODCF=CODCF
INPUT=TIPOCF F_TIPOCF SELECT~CODCF F_CODCF
DISPLAY="Codice" CODCF~"Ragione sociale@50" RAGSOC~"Indirizzo@35" INDCF
OUTPUT=F_CODCF CODCF~F_RAGSOC RAGSOC~F_INDCF INDCF~F_CIVCF CIVCF~F_CODAG CODAG~F_CODVAL CODVAL~F_OCCAS OCCAS~F_CODLIN CODLIN~F_CODABIA CODABI~F_CODCABA CODCAB~F_CODLIST LF_CFVEN->CODLIST~F_CODPAG CODPAG
SPECIAL=ME 9,F_CODVAL~ME 9,F_CODLIN~ME 9,F_CODABIA~ME 9,F_CODCABA~ME 9,F_CODPAG~JO LF_CFVEN TO LF_CLIFO INTO TIPOCF=TIPOCF CODCF=CODCF
SPECIAL=ME 9,F_CODVAL~ME 9,F_CODLIN~ME 9,F_CODABIA~ME 9,F_CODCABA~ME 9,F_CODPAG
WARNING=Cliente non presente
HELP=Inserire il codice del cliente
@ -372,11 +372,11 @@ FIELDNAME=DATACAMBIO
MSKID=F_DATACAMBIO1
TYPE=T_DATA
PROMPT="Data valuta"
USE=CAM
USE=CAM~JO %VAL TO CAM AL 50 INTO CODTAB=CODTAB[1,3]
INPUT=CODTAB[1,3] F_CODVAL SELECT~CODTAB[4,11] F_DATACAMBIO1
DISPLAY="Valuta" CODTAB[1,3]~"Data@10" -50->D0~"Descrizione@25" S0~"Cambio@15" R10
OUTPUT=F_CAMBIO R10~F_DATACAMBIO1 D0
SPECIAL=JO %VAL TO CAM AL 50 INTO CODTAB=CODTAB[1,3]~CH SEARCH~ME CO,F_DATACAMBIO
SPECIAL=CH SEARCH~ME CO,F_DATACAMBIO
[CAMBIO]
// attenzione se abilitato archivio cambi cambio e data rilevati da tale archivio
@ -648,11 +648,11 @@ TYPE=T_STRINGA
PROMPT="Listino "
SIZE=3
FLAG=U
USE=LF_CONDV SE CATVEN!=""
USE=LF_CONDV SE CATVEN!=""~JO CVE TO LF_CONDV INTO CODTAB=CATVEN
INPUT=TIPO "L"~CATVEN F_CATVEN~COD F_CODLIST1
DISPLAY="Cat.Ven." CATVEN~"Codice" COD~"Descrizione@50" DESCR
OUTPUT=F_CATVEN CATVEN~F_DESCATVEN CVE->S0~F_CODLIST1 COD~F_DESLIST DESCR
SPECIAL=ADD RUN ve2 -1 l~JOIN CVE TO LF_CONDV INTO CODTAB=CATVEN~ME CO,F_CODLIST
SPECIAL=ADD RUN ve2 -1 l~ME CO,F_CODLIST
[DESLIST]
GROUP=800