root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sostituite varie TCursor::filter con TCursor::setfilter.

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@105 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1994-08-31 07:06:12 +00:00
parent 4e890c5a83
commit 74f2ca61c9
3 changed files with 215 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cg/cg2100b.uml
View File

@ -33,7 +33,7 @@ END
NUMBER F_NUMREG 7 NUMBER F_NUMREG 7
BEGIN BEGIN
PROMPT 1 3 "Operazione n. " PROMPT 1 3 "Operazione n. "
FIELD LF_MOV->NUMREG FIELD NUMREG
FLAGS "RD" FLAGS "RD"
KEY 1 KEY 1
END END
@ -41,26 +41,26 @@ END
DATE F_DATAREG DATE F_DATAREG
BEGIN BEGIN
PROMPT 44 3 "Data operazione " PROMPT 44 3 "Data operazione "
FIELD LF_MOV->DATAREG FIELD DATAREG
END END
STRING F_NUMDOC 7 STRING F_NUMDOC 7
BEGIN BEGIN
PROMPT 1 4 "Documento n. " PROMPT 1 4 "Documento n. "
FIELD LF_MOV->NUMDOC FIELD NUMDOC
WARNING "La causale impone di specificare il numero documento" WARNING "La causale impone di specificare il numero documento"
END END
DATE F_DATACOMP DATE F_DATACOMP
BEGIN BEGIN
PROMPT 44 4 "Data di competenza " PROMPT 44 4 "Data di competenza "
FIELD LF_MOV->DATACOMP FIELD DATACOMP
END END
NUMBER F_ANNOES 4 NUMBER F_ANNOES 4
BEGIN BEGIN
PROMPT 1 5 "Esercizio " PROMPT 1 5 "Esercizio "
FIELD LF_MOV->ANNOES FIELD ANNOES
FLAGS "D" FLAGS "D"
END END
@ -72,7 +72,7 @@ END
DATE F_DATADOC DATE F_DATADOC
BEGIN BEGIN
PROMPT 44 5 "Data del documento " PROMPT 44 5 "Data del documento "
FIELD LF_MOV->DATADOC FIELD DATADOC
FLAGS "A" FLAGS "A"
WARNING "Specificare una data del documento non superiore a quella di registrazione" WARNING "Specificare una data del documento non superiore a quella di registrazione"
VALIDATE DATE_CMP_FUNC <= F_DATAREG VALIDATE DATE_CMP_FUNC <= F_DATAREG
@ -94,7 +94,7 @@ END
STRING F_DESCR 50 STRING F_DESCR 50
BEGIN BEGIN
PROMPT 25 6 "" PROMPT 25 6 ""
FIELD LF_MOV->DESCR FIELD DESCR
USE %DPN KEY 2 USE %DPN KEY 2
INPUT S0 F_DESCR INPUT S0 F_DESCR
DISPLAY "Descrizione@50" S0 DISPLAY "Descrizione@50" S0
@ -107,18 +107,15 @@ BEGIN
PROMPT 1 7 "Movimento provvisorio " PROMPT 1 7 "Movimento provvisorio "
FIELD PROVVIS FIELD PROVVIS
ITEM " |No (movimento normale)" ITEM " |No (movimento normale)"
MESSAGE ENABLE,DLG_DELREC
ITEM "P|Si (cancellabile)" ITEM "P|Si (cancellabile)"
MESSAGE ENABLE,DLG_DELREC
ITEM "N|Si (non cancellabile)" ITEM "N|Si (non cancellabile)"
MESSAGE DISABLE,DLG_DELREC
END END
STRING F_CODCAUS 3 STRING F_CODCAUS 3
BEGIN BEGIN
PROMPT 1 8 "Causale " PROMPT 1 8 "Causale "
FLAGS "U" FLAGS "U"
FIELD LF_MOV->CODCAUS FIELD CODCAUS
USE LF_CAUSALI KEY 1 USE LF_CAUSALI KEY 1
INPUT CODCAUS F_CODCAUS INPUT CODCAUS F_CODCAUS
DISPLAY "Codice" CODCAUS DISPLAY "Codice" CODCAUS
@ -142,7 +139,7 @@ END
STRING F_VALUTA 3 STRING F_VALUTA 3
BEGIN BEGIN
PROMPT 1 9 "Valuta " PROMPT 1 9 "Valuta "
FIELD LF_MOV->CODVAL FIELD CODVAL
FLAGS "U" FLAGS "U"
GROUP 3 GROUP 3
USE %VAL USE %VAL
@ -157,7 +154,7 @@ END
NUMBER F_CAMBIO 10 NUMBER F_CAMBIO 10
BEGIN BEGIN
PROMPT 16 9 "Cambio " PROMPT 16 9 "Cambio "
FIELD LF_MOV->CAMBIO FIELD CAMBIO
FLAGS "RU" FLAGS "RU"
GROUP 3 GROUP 3
PICTURE ".3" PICTURE ".3"

19
cg/cg3100.cpp
View File

@ -9,6 +9,7 @@
#include <urldefid.h> #include <urldefid.h>
#include <lffiles.h> #include <lffiles.h>
#include <mov.h> #include <mov.h>
#include <rmov.h> #include <rmov.h>
#include <rmoviva.h> #include <rmoviva.h>
@ -1363,8 +1364,8 @@ bool CG3100_application::set_print(int m)
{ {
select_cursor(_cur1); select_cursor(_cur1);
if (!provvis) if (!provvis)
_curr1->filter("(PROVVIS=\"\")"); _curr1->setfilter("(PROVVIS=\"\")");
else _curr1->filter(""); else _curr1->setfilter("");
fl = current_cursor()->file(LF_MOV); fl = current_cursor()->file(LF_MOV);
TRectype da (fl->curr()); TRectype da (fl->curr());
TRectype a (fl->curr()); TRectype a (fl->curr());
@ -1372,7 +1373,7 @@ bool CG3100_application::set_print(int m)
a.zero(); a.zero();
da.put(MOV_NUMREG, _numreg_ini); da.put(MOV_NUMREG, _numreg_ini);
a.put(MOV_NUMREG, _numreg_fin); a.put(MOV_NUMREG, _numreg_fin);
current_cursor()->setregion(&da,&a); current_cursor()->setregion(da,a);
add_file(LF_MOV); add_file(LF_MOV);
add_file(LF_RMOV,LF_MOV); add_file(LF_RMOV,LF_MOV);
add_file(LF_RMOVIVA,LF_MOV); add_file(LF_RMOVIVA,LF_MOV);
@ -1381,7 +1382,9 @@ bool CG3100_application::set_print(int m)
{ {
select_cursor(_cur2); select_cursor(_cur2);
if (!provvis) if (!provvis)
_curr2->filter("(PROVVIS=\"\")"); else _curr2->filter(""); _curr2->setfilter("(PROVVIS=\"\")");
else
_curr2->setfilter("");
fl = current_cursor()->file(LF_MOV); fl = current_cursor()->file(LF_MOV);
TRectype da (fl->curr()); TRectype da (fl->curr());
TRectype a (fl->curr()); TRectype a (fl->curr());
@ -1389,7 +1392,7 @@ bool CG3100_application::set_print(int m)
a.zero(); a.zero();
da.put(MOV_DATAREG, _data_ini); da.put(MOV_DATAREG, _data_ini);
a.put(MOV_DATAREG, _data_fin); a.put(MOV_DATAREG, _data_fin);
current_cursor()->setregion(&da,&a); current_cursor()->setregion(da,a);
add_file(LF_MOV); add_file(LF_MOV);
add_file(LF_RMOV,LF_MOV); add_file(LF_RMOV,LF_MOV);
add_file(LF_RMOVIVA,LF_MOV); add_file(LF_RMOVIVA,LF_MOV);
@ -1426,8 +1429,8 @@ bool CG3100_application::set_print(int m)
} }
select_cursor(_cur3); select_cursor(_cur3);
if (!movprov) if (!movprov)
_curr3->filter("(PROVVIS=\"\")"); _curr3->setfilter("(PROVVIS=\"\")");
else _curr3->filter(""); else _curr3->setfilter("");
TRectype da (fl->curr()); TRectype da (fl->curr());
TRectype a (fl->curr()); TRectype a (fl->curr());
da.zero(); da.zero();
@ -1440,7 +1443,7 @@ bool CG3100_application::set_print(int m)
da.put(MOV_DATAREG, _data_ini); da.put(MOV_DATAREG, _data_ini);
a.put(MOV_DATAREG, _data_fin); a.put(MOV_DATAREG, _data_fin);
da.put(MOV_TIPO, _tipo_ini); da.put(MOV_TIPO, _tipo_ini);
current_cursor()->setregion(&da,&a); current_cursor()->setregion(da,a);
add_file(LF_MOV); add_file(LF_MOV);
add_file(LF_RMOVIVA,LF_MOV); add_file(LF_RMOVIVA,LF_MOV);

19
cg/cg3200.cpp
View File

@ -60,8 +60,9 @@ class CG3200_application : public TPrintapp
bool _stampaprogre,_stampatotiva,_stampatot,_prima_volta,_stampa_mov_prov; bool _stampaprogre,_stampatotiva,_stampatot,_prima_volta,_stampa_mov_prov;
long _annomsk,_annoesmsk,_sottoc,_numreg,_annoes; int _annomsk,_annoesmsk,_annoes,_annomsksucc;
long _annomsksucc,_numgio,_protiva; long _sottoc,_numreg,_protiva,_numgio;
bool _stampa_progressivi_si,_competenza,_inizio_stampa,_puoi_stampare; bool _stampa_progressivi_si,_competenza,_inizio_stampa,_puoi_stampare;
int _tipocf; int _tipocf;
char _ricerca; char _ricerca;
@ -437,7 +438,7 @@ bool CG3200_application::preprocess_pconti(int file, int counter)
_mov->curr().zero(); _mov->curr().zero();
_mov->curr().put(MOV_NUMREG,_numreg); _mov->curr().put(MOV_NUMREG,_numreg);
_mov->read(); _mov->read();
_annoes = atol(_mov->curr().get(MOV_ANNOES)); _annoes = _mov->get_int(MOV_ANNOES);
_regiva = _mov->curr().get(MOV_REG); _regiva = _mov->curr().get(MOV_REG);
// Controlla se saldo e' diverso da 0 // Controlla se saldo e' diverso da 0
@ -467,7 +468,7 @@ bool CG3200_application::preprocess_pconti(int file, int counter)
_numdoc = _mov->curr().get(MOV_NUMDOC); _numdoc = _mov->curr().get(MOV_NUMDOC);
descrizione_causale(); descrizione_causale();
_descrizionemov = _mov->curr().get(MOV_DESCR); _descrizionemov = _mov->curr().get(MOV_DESCR);
_numgio = atol(_mov->curr().get(MOV_NUMGIO)); _numgio = _mov->get_long(MOV_NUMGIO);
if (_sezione == "D") if (_sezione == "D")
{ {
_totale_periodo_dare += _importo; _totale_periodo_dare += _importo;
@ -591,7 +592,7 @@ bool CG3200_application::preprocess_clifo(int file, int counter)
_mov->curr().zero(); _mov->curr().zero();
_mov->curr().put(MOV_NUMREG,_numreg); _mov->curr().put(MOV_NUMREG,_numreg);
_mov->read(); _mov->read();
_annoes = atol(_mov->curr().get(MOV_ANNOES)); _annoes = _mov->get_int(MOV_ANNOES);
_regiva = _mov->curr().get(MOV_REG); _regiva = _mov->curr().get(MOV_REG);
// Controlla se saldo e' diverso da 0 // Controlla se saldo e' diverso da 0
@ -621,7 +622,7 @@ bool CG3200_application::preprocess_clifo(int file, int counter)
_numdoc = _mov->curr().get(MOV_NUMDOC); _numdoc = _mov->curr().get(MOV_NUMDOC);
descrizione_causale(); descrizione_causale();
_descrizionemov = _mov->curr().get(MOV_DESCR); _descrizionemov = _mov->curr().get(MOV_DESCR);
_numgio = atol(_mov->curr().get(MOV_NUMGIO)); _numgio = _mov->get_int(MOV_NUMGIO);
if (_sezione == "D") if (_sezione == "D")
{ {
_totale_periodo_dare += _importo; _totale_periodo_dare += _importo;
@ -928,7 +929,7 @@ bool CG3200_application::set_print(int)
_data_ini = (_msk->get(F_DATAINI)); _data_ini = (_msk->get(F_DATAINI));
_data_fine = (_msk->get(F_DATAFINE)); _data_fine = (_msk->get(F_DATAFINE));
_annomsk = atol(_msk->get(F_ANNO)); _annomsk = _msk->get_int(F_ANNO);
if (_annomsk == 0) if (_annomsk == 0)
if (_data_fine == botime) //Se data_fine e' vuota if (_data_fine == botime) //Se data_fine e' vuota
@ -999,7 +1000,7 @@ bool CG3200_application::set_print(int)
a.put(PCN_CONTO,contofine); a.put(PCN_CONTO,contofine);
a.put(PCN_SOTTOCONTO,sottocontofine); a.put(PCN_SOTTOCONTO,sottocontofine);
current_cursor()->setregion(&da, &a); current_cursor()->setregion(da, a);
} }
else else
{ {
@ -1029,7 +1030,7 @@ bool CG3200_application::set_print(int)
a.put(CLI_CONTO,contofine); a.put(CLI_CONTO,contofine);
a.put(CLI_CODCF,sottocontofine); a.put(CLI_CODCF,sottocontofine);
current_cursor()->setregion(&da, &a); current_cursor()->setregion(da, a);
} }
if (_stampatotiva) if (_stampatotiva)