Corrette maschere e tolti campi inutili: PDARESCA e PAVERESCA

git-svn-id: svn://10.65.10.50/trunk@2795 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1996-05-13 07:27:34 +00:00
parent 59b6c26876
commit d15ddcf5f5
5 changed files with 1578 additions and 1577 deletions

View File

@ -1,11 +1,13 @@
#include <relapp.h> #include <relapp.h>
#include <defmask.h> #include <defmask.h>
#include <pconti.h>
#include <saldi.h>
#include "cg0.h" #include "cg0.h"
#include "cg0100.h" #include "cg0100.h"
#include <pconti.h>
#include <saldi.h>
#define ATTIVITA 1 #define ATTIVITA 1
#define PASSIVITA 2 #define PASSIVITA 2
#define COSTI 3 #define COSTI 3
@ -44,7 +46,7 @@ int CG0100_application::read(TMask& m)
{ {
const TRelation *r = get_relation(); const TRelation *r = get_relation();
m.autoload(r); m.autoload(*r);
if (m.get(FLD_CM1_LETTIVD).empty()) if (m.get(FLD_CM1_LETTIVD).empty())
{ {
int sezivd = m.get_int(FLD_CM1_SEZIVD); int sezivd = m.get_int(FLD_CM1_SEZIVD);
@ -65,7 +67,7 @@ int CG0100_application::rewrite(const TMask& m)
{ {
TRelation *r = get_relation(); TRelation *r = get_relation();
m.autosave(r); m.autosave(*r);
int sezivd = m.get_int(FLD_CM1_SEZIVD); int sezivd = m.get_int(FLD_CM1_SEZIVD);
TString16 sez; TString16 sez;
@ -119,7 +121,7 @@ int CG0100_application::write(const TMask& m)
TRelation *r = get_relation(); TRelation *r = get_relation();
TString16 sez; TString16 sez;
m.autosave(r); m.autosave(*r);
int sezivd = m.get_int(FLD_CM1_SEZIVD); int sezivd = m.get_int(FLD_CM1_SEZIVD);
if (sezivd == 6 || sezivd == 7) if (sezivd == 6 || sezivd == 7)
@ -167,8 +169,6 @@ bool CG0100_application::protected_record(TRectype &rec)
ok = _saldi->get_real(SLD_SALDO) != ZERO || ok = _saldi->get_real(SLD_SALDO) != ZERO ||
_saldi->get_real(SLD_PDARE) != ZERO || _saldi->get_real(SLD_PDARE) != ZERO ||
_saldi->get_real(SLD_PAVERE) != ZERO || _saldi->get_real(SLD_PAVERE) != ZERO ||
_saldi->get_real(SLD_PDARESCA) != ZERO ||
_saldi->get_real(SLD_PAVERESCA) != ZERO ||
_saldi->get_real(SLD_PDAREPRO) != ZERO || _saldi->get_real(SLD_PDAREPRO) != ZERO ||
_saldi->get_real(SLD_PAVEREPRO) != ZERO; _saldi->get_real(SLD_PAVEREPRO) != ZERO;
return ok && gruppo ==_saldi->get_int(PCN_GRUPPO) && return ok && gruppo ==_saldi->get_int(PCN_GRUPPO) &&
@ -321,7 +321,7 @@ HIDDEN bool gruppo_handler(TMask_field& f, KEY key)
else else
if (m.query_mode() && key == K_TAB) if (m.query_mode() && key == K_TAB)
{ {
const int next = m.next_fld(); const int next = f.dlg(); // m.next_fld();
bool key_ok = TRUE; bool key_ok = TRUE;
if (sottoc > 0) if (sottoc > 0)
@ -366,7 +366,7 @@ HIDDEN bool conto_handler(TMask_field& f, KEY key)
else else
if (m.query_mode() && key == K_TAB) if (m.query_mode() && key == K_TAB)
{ {
const int next = m.next_fld(); const int next = f.dlg(); // m.next_fld();
bool key_ok = TRUE; bool key_ok = TRUE;
if (sottoc > 0) if (sottoc > 0)
@ -389,7 +389,7 @@ HIDDEN bool sottoc_handler(TMask_field& f, KEY key)
const int gruppo = m.get_int(FLD_CM1_GRUPPO); const int gruppo = m.get_int(FLD_CM1_GRUPPO);
const int conto = m.get_int(FLD_CM1_CONTO); const int conto = m.get_int(FLD_CM1_CONTO);
const long sottoc = m.get_long(FLD_CM1_SOTTOCONTO); const long sottoc = m.get_long(FLD_CM1_SOTTOCONTO);
const int next = m.next_fld(); const int next = f.dlg(); // m.next_fld();
if (gruppo == 0) return TRUE; if (gruppo == 0) return TRUE;
if (sottoc != 0 && conto == 0) if (sottoc != 0 && conto == 0)

View File

@ -54,7 +54,7 @@ protected:
virtual int rewrite(const TMask& m); virtual int rewrite(const TMask& m);
virtual int read(TMask& m); virtual int read(TMask& m);
TSheet_field& indsp_sheet() const; TSheet_field& indsp_sheet() const;
TArray_sheet* field_sheet(const int n) const; TString_array& field_sheet(short id) const;
void reset_sheet(); void reset_sheet();
void indsp_pack(); void indsp_pack();
void common_f(const TMask& m); void common_f(const TMask& m);
@ -383,8 +383,7 @@ void TClifo_application::init_pages(TMask& m)
// Se non e' abilitata la gestione delle vendite disabilita le // Se non e' abilitata la gestione delle vendite disabilita le
// maschere dalla 4 in poi // maschere dalla 4 in poi
if (!_ignoreven) if (!_ignoreven)
for (int j = 3; j < 8;j++) m.enable_page(3, _gesven);
m.enable_page(j, _gesven);
} }
void TClifo_application::init_query_mode(TMask& m) void TClifo_application::init_query_mode(TMask& m)
@ -431,9 +430,9 @@ int TClifo_application::read(TMask& m)
riga.add(rec.get(IND_INDIR)); riga.add(rec.get(IND_INDIR));
riga.add(rec.get(IND_CIV)); riga.add(rec.get(IND_CIV));
riga.add(rec.get(IND_LOCALITA)); riga.add(rec.get(IND_LOCALITA));
field_sheet(F_CODINDDOC)->add(riga); field_sheet(F_CODINDDOC).add(riga);
field_sheet(F_CODINDSP)->add(riga); field_sheet(F_CODINDSP).add(riga);
field_sheet(F_CODINDEFF)->add(riga); field_sheet(F_CODINDEFF).add(riga);
} }
} }
return _rel->status(); return _rel->status();
@ -451,10 +450,10 @@ int TClifo_application::write(const TMask& m)
return TRelation_application::write(m); return TRelation_application::write(m);
} }
TArray_sheet* TClifo_application::field_sheet(const int n) const TString_array& TClifo_application::field_sheet(short id) const
{ {
TEdit_field& f=(TEdit_field&) _msk->field(n); TEdit_field& f = _msk->efield(id);
TArray_sheet* ss=(TArray_sheet*) f.sheet()->sheet(); TString_array& ss = f.sheet()->rows_array();
return ss; return ss;
} }
@ -468,12 +467,13 @@ void TClifo_application::reset_sheet()
{ {
const TToken_string nulla("|**Nessuno**||||"); const TToken_string nulla("|**Nessuno**||||");
app().field_sheet(F_CODINDDOC)->destroy(); TClifo_application& a = app();
app().field_sheet(F_CODINDDOC)->add(nulla); a.field_sheet(F_CODINDDOC).destroy();
app().field_sheet(F_CODINDSP)->destroy(); a.field_sheet(F_CODINDDOC).add(nulla);
app().field_sheet(F_CODINDSP)->add(nulla); a.field_sheet(F_CODINDSP).destroy();
app().field_sheet(F_CODINDEFF)->destroy(); a.field_sheet(F_CODINDSP).add(nulla);
app().field_sheet(F_CODINDEFF)->add(nulla); a.field_sheet(F_CODINDEFF).destroy();
a.field_sheet(F_CODINDEFF).add(nulla);
} }
void TClifo_application::indsp_pack() void TClifo_application::indsp_pack()
@ -528,22 +528,23 @@ void TClifo_application::common_f(const TMask& m)
} }
void TClifo_application::indsp_sheet_rebuilder() void TClifo_application::indsp_sheet_rebuilder()
{ {
TArray& righe=app().indsp_sheet().rows_array(); TClifo_application& a = app();
TString_array& righe = a.indsp_sheet().rows_array();
const int n=righe.items(); const int n=righe.items();
app().reset_sheet(); a.reset_sheet();
// Rebuild Sheets // Rebuild Sheets
for (int i=0; i<n; i++) for (int i=0; i<n; i++)
{ {
TToken_string& riga=(TToken_string&)righe[i]; TToken_string& riga= righe.row(i);
TToken_string rigav; TToken_string rigav;
rigav.add(riga.get(12)); rigav.add(riga.get(12));
rigav.add(riga.get(0)); rigav.add(riga.get(0));
rigav.add(riga.get()); rigav.add(riga.get());
rigav.add(riga.get()); rigav.add(riga.get());
rigav.add(riga.get()); rigav.add(riga.get());
app().field_sheet(F_CODINDDOC)->add(rigav); a.field_sheet(F_CODINDDOC).add(rigav);
app().field_sheet(F_CODINDSP)->add(rigav); a.field_sheet(F_CODINDSP).add(rigav);
app().field_sheet(F_CODINDEFF)->add(rigav); a.field_sheet(F_CODINDEFF).add(rigav);
} }
} }

View File

@ -186,13 +186,13 @@ SPREADSHEET F_SHEET_GCS
BEGIN BEGIN
PROMPT 0 7 "" PROMPT 0 7 ""
ITEM "Tipo conto@21F" ITEM "Tipo conto@21F"
ITEM "D/A@1" ITEM "D/A"
ITEM "C/F@1" ITEM "C/F"
ITEM "Gr." ITEM "Gr."
ITEM "Co." ITEM "Co."
ITEM "Sottoc.@6" ITEM "Sottoc."
ITEM "Descrizione Conto@50" ITEM "Descrizione Conto@50"
ITEM "Desc. agg.@5" ITEM "Desc. agg."
ITEM "Descrizione Aggiuntiva@50" ITEM "Descrizione Aggiuntiva@50"
END END

View File

@ -8,7 +8,7 @@ BEGIN
FLAGS "D" FLAGS "D"
END END
LISTBOX SS_TIPOCF 1 11 LISTBOX SS_TIPOCF 11
BEGIN BEGIN
PROMPT 33 1 "C/F " PROMPT 33 1 "C/F "
ITEM " |Conto" MESSAGE SHOW,106|HIDE,206|HIDE,306|SHOW,107|HIDE,207|HIDE,307 ITEM " |Conto" MESSAGE SHOW,106|HIDE,206|HIDE,306|SHOW,107|HIDE,207|HIDE,307
@ -135,7 +135,7 @@ BEGIN
GROUP 1 GROUP 1
END END
LISTBOX SS_SEZIONE 1 5 LISTBOX SS_SEZIONE 5
BEGIN BEGIN
PROMPT 51 3 "Sezione " PROMPT 51 3 "Sezione "
HELP "Indicare la sezione del conto" HELP "Indicare la sezione del conto"