diff --git a/m770/772200.cpp b/m770/772200.cpp index 0da5cf4ea..925a7d0ae 100755 --- a/m770/772200.cpp +++ b/m770/772200.cpp @@ -51,8 +51,8 @@ class TSt_certif : public TPrintapp TLocalisamfile* _rpag; TLocalisamfile* _scperc; TLocalisamfile* _comuni; - TString80 _ragsocER, _indER, _civER, _capER, _dencomER, _provER, _cofiER; - TString80 _ragsocPE, _indPE, _civPE, _capPE, _dencomPE, _provPE, _cofiPE; + TString80 _ragsocER, _indER, _civER, _capER, _dencomER, _provER, _cofiER, _pivaER; + TString80 _ragsocPE, _indPE, _civPE, _capPE, _dencomPE, _provPE, _cofiPE, _pivaPE; TString80 _dencomnscER, _provnscER, _dencomnscPE, _provnscPE; TString80 _datanascER, _datanascPE, _luogo; TString16 _key1p, _key2p, _perc_p; @@ -495,7 +495,8 @@ void TSt_certif::preprocess_footer() set_footer(r++, "@3g%s %s %s", (const char*) _capER, (const char*) _dencomER, (const char*) _provER); set_footer(r++, ""); - set_footer(r, "@3g%s", (const char*)_cofiER); + set_footer(r, "@3g%s", (const char*)_cofiER); + //set_footer(r, "@3g%s", (const char*)_pivaER); la partita iva non � ancora richiesta ma andrebbe qui (occhi alle coordinate!) r+=2; if (_st_data) set_footer(++r, "@16g%s", (const char*)_data); @@ -519,7 +520,7 @@ void TSt_certif::preprocess_footer() set_footer(r++, "! Indirizzo:@15g%s %s@72g!",(const char*) _indER, (const char*) _civER); set_footer(r++, "!@6g%s@15g%s %s@72g!",(const char*) _capER, (const char*) _dencomER, (const char*) _provER); - set_footer(r, "! Cod.Fiscale: %s@72g!", (const char*) _cofiER); + set_footer(r, "! Cod.Fiscale: %16s@40gP.Iva: %11s@72g!", (const char*) _cofiER, (const char*)_pivaER); set_footer(r++, "@74g----------------------------------------"); set_footer(r, "@1g%s", (const char*) dep); set_footer(r, "@90g(Firma)"); @@ -661,10 +662,6 @@ bool TSt_certif::init_print() } else { - /* - printer().footerlen(22); - for (int i=1; i<=22; i++) set_footer(i, "%s", " "); - */ int area_footer = 31 - _off_lung; printer().footerlen(area_footer); for (int i=1; i<=area_footer; i++) @@ -712,12 +709,7 @@ bool TSt_certif::set_print(int) void TSt_certif::stampa_su_modulo() { dati_percipiente(); - //in origine _off_lung era fisso (=3) - //in origine _off_larg era fisso (=3) - /* - set_header(3, "@26g%s", (const char*)_ragsocPE); - set_header(4, "@8g%4d", _anno_dic); - */ + set_header(_off_lung, "@26g%s", (const char*)_ragsocPE); set_header(_off_lung + 1, "@8g%4d", _anno_dic); if (_tipoa_p == 'F') @@ -728,12 +720,10 @@ void TSt_certif::stampa_su_modulo() } set_header(_off_lung + 6, "@8g%ld", _num_att++); set_header(_off_lung + 4, "@26g%16s", (const char*)_cofiPE); + //set_header(_off_lung + 4, "@26g%16s", (const char*)_pivaPE); la partita iva non � ancora richiesta ma andrebbe qui (occhi alle coordinate!) set_header(_off_lung + 8, "@26g%-.35s %s %5s %-.35s %s", (const char*)_indPE, (const char*)_civPE,(const char*)_capPE,(const char*)_dencomPE,(const char*)_provPE); - /* - for (int i = 12; i <= 25; i++) - set_header(i, ""); - */ + int app = _off_lung + 6; for (int i = app; i <= app + 12; i++) set_header(i, ""); @@ -785,7 +775,7 @@ void TSt_certif::preprocess_header() set_header(i++, "@58g!@132g!"); set_header(i++, "ANNO EROGAZIONE ATTESTAZIONE@58g!@132g!"); } - set_header(i++, "@5g%d@25g%ld@58g!@60gCodice fiscale: %16s@132g!", _anno_dic,_num_att++,(const char*)_cofiPE); + set_header(i++, "@5g%d@25g%ld@58g!@60gCodice fiscale: %16s@97gP.IVA: %11s@132g!", _anno_dic,_num_att++,(const char*)_cofiPE, (const char*)_pivaPE); set_header(i++, "@59g%s", (const char*) dep); set_header(i++, ""); set_header(i++, "@50g%s,li %d %s %d", (const char*)_luogo, _data.day(), itom(_data.month()), _data.year()); @@ -829,6 +819,7 @@ void TSt_certif::dati_erogante() { _ragsocER = _anag->get(ANA_RAGSOC); _cofiER = _anag->get(ANA_COFI); + _pivaER = _anag->get(ANA_PAIV); if (tipoa == 'F') { @@ -913,6 +904,7 @@ void TSt_certif::dati_percipiente() { _ragsocPE = _anag->get(ANA_RAGSOC); _cofiPE = _anag->get(ANA_COFI); + _pivaPE = _anag->get(ANA_PAIV); if (_tipoa_p == 'F') { TString80 nome = _ragsocPE.mid(30); @@ -992,7 +984,7 @@ bool TSt_certif::user_create() _rpag = new TLocalisamfile (LF_RPAG); _scperc = new TLocalisamfile (LF_SCPERC); - return TRUE; + return true; } bool TSt_certif::user_destroy() @@ -1007,7 +999,7 @@ bool TSt_certif::user_destroy() delete _cnf; delete _cns; - return TRUE; + return true; } int m72200(int argc, char* argv[])