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

cg5200.cpp MI3556 spostata all'inizio la colonna dei saldi

Browse Source 
cg5200a.uml  MI3556
cg5300a.uml  MI6299 riaggiustate colonne parametri liquidi


git-svn-id: svn://10.65.10.50/trunk@5597 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1997-11-11 12:00:51 +00:00
parent 33c2ddc489
commit 801039dd79
3 changed files with 70 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
cg/cg5200.cpp
View File

@ -95,8 +95,6 @@ bool TRiga_array::add_riga(const TRectype& rec_saldi)
} }
if (!found) if (!found)
{ {
// TRectype* r = new TRectype(rec_saldi); // copia anche i valori di rec_saldi
// add(r);
add(rec_saldi); add(rec_saldi);
} }
return found; return found;
@ -111,7 +109,7 @@ class TSaldibrowse_application : public TBrowse_application
TMask* _msk; TMask* _msk;
TCursor * _cur; TCursor * _cur;
TRelation * _rel,* _rel1; TRelation * _rel,* _rel1;
TTable * _esc; // TTable * _esc;
TRiga_array _riga; TRiga_array _riga;
int _anno, _annop, _g, _c; int _anno, _annop, _g, _c;
long _s; long _s;
@ -251,7 +249,7 @@ bool TSaldibrowse_application::anno_handler(TMask_field& f, KEY key)
bool TSaldibrowse_application::flsca_handler(TMask_field& f, KEY key) bool TSaldibrowse_application::flsca_handler(TMask_field& f, KEY key)
{ {
if (key == K_SPACE) if (key == K_SPACE)
app()._scarongly = f.get() == "" ? FALSE : TRUE; app()._scarongly = !f.get().blank();
return TRUE; return TRUE;
} }
@ -325,10 +323,11 @@ bool TSaldibrowse_application::sottoc_handler(TMask_field& f, KEY key)
bool TSaldibrowse_application::user_create() bool TSaldibrowse_application::user_create()
{ {
_rel = new TRelation(LF_PCON); _rel = new TRelation(LF_PCON);
_rel->add(LF_CLIFO,"TIPOCF=TMCF");
_rel1 = new TRelation(LF_SALDI); _rel1 = new TRelation(LF_SALDI);
_cur = new TCursor(_rel1, "", 2); _cur = new TCursor(_rel1, "", 2);
_esc = new TTable("ESC"); // _esc = new TTable("ESC");
_rel->add(LF_CLIFO,"TIPOCF=TMCF");
_msk = new TMask("cg5200a"); _msk = new TMask("cg5200a");
_msk->set_handler(F_ANNO, anno_handler); _msk->set_handler(F_ANNO, anno_handler);
_msk->set_handler(F_SCARICATO, flsca_handler); _msk->set_handler(F_SCARICATO, flsca_handler);
@ -349,7 +348,7 @@ bool TSaldibrowse_application::user_destroy()
delete _rel; delete _rel;
delete _rel1; delete _rel1;
delete _cur; delete _cur;
delete _esc; // delete _esc;
return TRUE; return TRUE;
} }
@ -378,28 +377,31 @@ int TSaldibrowse_application::read(TMask& m)
} }
void TSaldibrowse_application::add_r(int numrig,int a,real& slf,char sff,real& sc,char f,real& si, void TSaldibrowse_application::add_r(int numrig,int a,real& slf,char sff,real& sc,char f,real& si,
real& pd, real& pa,real& s,TDate& d,long n,real& pdp, real& pd, real& pa,real& saldo,TDate& d,long n,real& pdp,
real& pap,real& sp, real& dsc, real& asc) real& pap,real& sp, real& dsc, real& asc)
{ {
TSheet_field& cs = ss(); TSheet_field& cs = ss();
char segno = ' '; char segno = ' ';
TToken_string& riga = cs.row(numrig); TToken_string& riga = cs.row(numrig);
riga.add(a, 0); riga.add(a, 0); // 101 - Anno esercizio
riga.add(si.string(),1); riga.add(si.string(),1); // 102 - Saldo iniziale
if (si != ZERO) if (si != ZERO)
riga.add(f,2); riga.add(f,2); // 103 - Segno saldo iniziale
riga.add(pd.string(),3);
riga.add(pa.string(),4); riga.add(pd.string(),5); // 106 - Progressivo dare
if (s > ZERO) riga.add(pa.string(),6); // 107 - Progressivo avere
if (saldo > ZERO)
segno = 'D'; segno = 'D';
else if (s < ZERO) else if (saldo < ZERO)
{ {
s = -s; saldo = -saldo;
segno = 'A'; segno = 'A';
} }
riga.add(s.string(),5); riga.add(saldo.string(),3); // 104 - Saldo attuale
riga.add(segno,6); riga.add(segno,4); // 105 - Segno saldo attuale
segno = ' '; segno = ' ';
if (sc > ZERO) if (sc > ZERO)
segno = 'D'; segno = 'D';
@ -495,20 +497,21 @@ void TSaldibrowse_application::compilasheet()
_riga.destroy(); _riga.destroy();
TRecnotype items = _cur->items(); const TRecnotype items = _cur->items();
*_cur = 0l; *_cur = 0l;
const TRectype& curr = _cur->curr();
for (int i = 0; i < items; i++,++(*_cur)) for (int i = 0; i < items; i++,++(*_cur))
{ {
const bool scar = _cur->curr().get_bool(SLD_FLSCA); const bool scar = curr.get_bool(SLD_FLSCA);
if ((_scarongly && !scar) || (!_scarongly && scar)) if ((_scarongly && !scar) || (!_scarongly && scar))
continue; continue;
anno = _cur->curr().get_int(SLD_ANNOES); anno = curr.get_int(SLD_ANNOES);
gruppo = _cur->curr().get_int(SLD_GRUPPO); gruppo = curr.get_int(SLD_GRUPPO);
conto = _cur->curr().get_int(SLD_CONTO); conto = curr.get_int(SLD_CONTO);
sottoconto = _cur->curr().get_long(SLD_SOTTOCONTO); sottoconto = curr.get_long(SLD_SOTTOCONTO);
if (_anno != 0 && _anno != anno && _annop != anno) continue; if (_anno != 0 && _anno != anno && _annop != anno) continue;
@ -517,25 +520,24 @@ void TSaldibrowse_application::compilasheet()
if (_saldo_conto && conto != _c) continue; if (_saldo_conto && conto != _c) continue;
if (_saldo_conto || _saldo_gruppo) if (_saldo_conto || _saldo_gruppo)
_riga.add_riga(_cur->curr()); _riga.add_riga(curr);
if (_saldo_sottoc) if (_saldo_sottoc)
{ {
flagsal = _cur->curr().get_char(SLD_FLAGSALINI); flagsal = curr.get_char(SLD_FLAGSALINI);
flagfin = _cur->curr().get_char(SLD_FLAGSALFIN); flagfin = curr.get_char(SLD_FLAGSALFIN);
saldoini = _cur->curr().get_real(SLD_SALDO); saldoini = curr.get_real(SLD_SALDO);
saldofin = _cur->curr().get_real(SLD_SALDOFIN); saldofin = curr.get_real(SLD_SALDOFIN);
pdare = _cur->curr().get_real(SLD_PDARE); pdare = curr.get_real(SLD_PDARE);
pavere = _cur->curr().get_real(SLD_PAVERE); pavere = curr.get_real(SLD_PAVERE);
pdarepro = _cur->curr().get_real(SLD_PDAREPRO); pdarepro = curr.get_real(SLD_PDAREPRO);
paverepro = _cur->curr().get_real(SLD_PAVEREPRO); paverepro = curr.get_real(SLD_PAVEREPRO);
ultima_data = _cur->curr().get(SLD_DATAULMOV); ultima_data = curr.get(SLD_DATAULMOV);
ultimo_num = _cur->curr().get_long(SLD_NUMULTMOV); ultimo_num = curr.get_long(SLD_NUMULTMOV);
pdaresca = ZERO; pdaresca = ZERO;
paveresca = ZERO; paveresca = ZERO;
if (flagsal == 'D') if (flagsal == 'D')
saldo = pdare + saldoini - pavere; saldo = pdare + saldoini - pavere;
else else

48
cg/cg5200a.uml
View File

@ -28,7 +28,7 @@ BEGIN
PROMPT 40 1 "Solo saldi dei movimenti scaricati" PROMPT 40 1 "Solo saldi dei movimenti scaricati"
END END
GROUPBOX DLG_NULL 73 5 GROUPBOX DLG_NULL 73 4
BEGIN BEGIN
PROMPT 3 2 "" PROMPT 3 2 ""
END END
@ -212,33 +212,33 @@ END
SPREADSHEET F_SHEET_SALDI SPREADSHEET F_SHEET_SALDI
BEGIN BEGIN
PROMPT 0 7 "" PROMPT 1 7 ""
ITEM "Es.@4" ITEM "Es.@4F"
ITEM "Saldo iniziale@19" ITEM "Saldo iniziale@15"
ITEM "" ITEM "@1"
ITEM "Progr.Att.: Dare@19" ITEM "Saldo Att.@15"
ITEM "Avere@19" ITEM "@1"
ITEM "Saldo@19" ITEM "Progr.Att.:Dare@15"
ITEM "" ITEM "Avere@15"
ITEM "Saldo di chiusura@19" ITEM "Saldo di chiusura@15"
ITEM "" ITEM "@1"
ITEM "Saldo complessivo" ITEM "Saldo complessivo"
ITEM "@1"
ITEM "Ult.Op.:Data"
ITEM "Numero"
ITEM "Progr.Mov.Prov.:Dare@15"
ITEM "Avere@15"
ITEM "Saldo@15"
ITEM "" ITEM ""
ITEM "Ult.Op.: Data" ITEM "Progr.Mov.Elim.:Dare@15"
ITEM " Numero" ITEM "Avere@15"
ITEM "Progr.Mov.Prov.:Dare@19"
ITEM "Avere@19"
ITEM "Saldo@19"
ITEM ""
ITEM "Progr.Mov.Elim.:Dare@19"
ITEM "Avere@19"
END END
ENDPAGE ENDPAGE
ENDMASK ENDMASK
PAGE "" -1 -1 78 16 PAGE "" -1 -1 77 16
NUMBER 101 4 NUMBER 101 4
BEGIN BEGIN
@ -256,25 +256,25 @@ BEGIN
PROMPT 48 3 "" PROMPT 48 3 ""
END END
NUMBER 104 19 NUMBER 106 19
BEGIN BEGIN
PROMPT 1 4 "Progr.Attuali: Dare " PROMPT 1 4 "Progr.Attuali: Dare "
PICTURE "." PICTURE "."
END END
NUMBER 105 19 NUMBER 107 19
BEGIN BEGIN
PROMPT 51 4 "Avere " PROMPT 51 4 "Avere "
PICTURE "." PICTURE "."
END END
NUMBER 106 19 NUMBER 104 19
BEGIN BEGIN
PROMPT 22 5 "Saldo " PROMPT 22 5 "Saldo "
PICTURE "." PICTURE "."
END END
STRING 107 1 STRING 105 1
BEGIN BEGIN
PROMPT 48 5 "" PROMPT 48 5 ""
END END

11
cg/cg5300a.uml
View File

@ -62,7 +62,7 @@ BEGIN
PROMPT 2 4 "Parametri ditta" PROMPT 2 4 "Parametri ditta"
END END
LIST F_FREQ_VERS 1 14 LIST F_FREQ_VERS 1 15
BEGIN BEGIN
PROMPT 4 5 "Frequenza versamenti " PROMPT 4 5 "Frequenza versamenti "
HELP "Indicare la frequenza dei versamenti delle liquidazioni IVA" HELP "Indicare la frequenza dei versamenti delle liquidazioni IVA"
@ -103,18 +103,19 @@ BEGIN
NUM_CALC ROUND(#THIS_FIELD,-3) NUM_CALC ROUND(#THIS_FIELD,-3)
END END
SPREADSHEET F_SHEET_PLA 78 6 SPREADSHEET F_SHEET_PLA 78
BEGIN BEGIN
PROMPT 1 10 "Parametri attivita'" PROMPT 1 10 "Parametri attivita'"
ITEM "Attivita'@5F" ITEM "Attiv.@5F"
ITEM "Tipo@9" ITEM "Tipo@3"
ITEM "% Pro-rata@6" ITEM "Prorata"
ITEM "Plafond art.8@15" ITEM "Plafond art.8@15"
ITEM "Plafond art.8b@15" ITEM "Plafond art.8b@15"
ITEM "Plafond art.9@15" ITEM "Plafond art.9@15"
END END
ENDPAGE ENDPAGE
ENDMASK ENDMASK
PAGE "" -1 -1 65 16 PAGE "" -1 -1 65 16