diff --git a/ba/ba6100.cpp b/ba/ba6100.cpp index c57d7d778..7bb54b8ca 100755 --- a/ba/ba6100.cpp +++ b/ba/ba6100.cpp @@ -109,7 +109,12 @@ bool TAnaprint_app::preprocess_page(int file, int counter) && _pr_what != nditte) if (current_cursor()->is_first_match(LF_NDITTE)) return FALSE; - + if (_pr_type == elenco || _pr_type == rubriche) + { + _surname_name = current_cursor()->curr(LF_ANAG).get("RAGSOC"); + _surname_name.strip_d_spaces(); + } + if (_pr_type == rubriche) { // vale per ditte, anagiu, anafis diff --git a/ba/ba6100.h b/ba/ba6100.h index a4bcd805f..4ca2cbe51 100755 --- a/ba/ba6100.h +++ b/ba/ba6100.h @@ -40,7 +40,7 @@ class TAnaprint_app : public TPrintapp int _piv_row, _piv_col, _cod_row, _cod_col; bool _is_piv, _is_cod; bool* _frpos; - TString _cod, _cofi, _name, _surname, _address, + TString _cod, _cofi, _name, _surname, _address, _surname_name, // questa vale solo per elenchi e rubriche, quando stampa nome e cognome per persone fisiche _cap, _prov, _loc, _com, _civ, _stato, _phone; TString16 _sex; diff --git a/ba/ba6100a.uml b/ba/ba6100a.uml index 5cd4cb5d9..eb5d08f13 100755 --- a/ba/ba6100a.uml +++ b/ba/ba6100a.uml @@ -217,13 +217,6 @@ BEGIN HELP "Indicare se includere informazioni relative alle ditte" END -BOOLEAN CHK_BA6_PRINTONE -BEGIN - PROMPT 3 11 "Stampa un solo record" - HELP "Indicare se stampare soltanto il record nel campo DA" -END - - GROUPBOX DLG_NULL 50 4 BEGIN PROMPT 3 13 "Stampa" diff --git a/ba/ba6101.cpp b/ba/ba6101.cpp index 4ada7ee97..f112f50eb 100755 --- a/ba/ba6101.cpp +++ b/ba/ba6101.cpp @@ -788,8 +788,8 @@ void TAnaprint_app::set_rubriche() } else if (_pr_what == anafis) { - set_row(1,"@b$[b]@pN$[n]@r@3j@S @S", FLD(LF_ANAG,"CODANAGR","@@@@@"), - FLD(LF_ANAG,"RAGSOC",0,29), FLD(LF_ANAG,"RAGSOC",30,50)); + set_row(1,"@b$[b]@pN$[n]@r@3j#T", FLD(LF_ANAG,"CODANAGR","@@@@@"), + &_surname_name); } else { @@ -810,17 +810,15 @@ void TAnaprint_app::set_elenco() if (_pr_what == anafis) { if (_inclditte) - set_row(1,"$[b]@pN$[n]@4j@S @S@55g$[r]@pN$[n]@66g@S", + set_row(1,"$[b]@pN$[n]@4j#T@55g$[r]@pN$[n]@66g@S", FLD(LF_ANAG,"CODANAGR","@@@@@"), - FLD(LF_ANAG,"RAGSOC",0,29), - FLD(LF_ANAG,"RAGSOC",30,50), + &_surname_name, FLD(LF_NDITTE,"CODDITTA","@@@@@"), FLD(LF_NDITTE,"RAGSOC")); else - set_row(1,"$[b]@pN$[n]@4j@S @S", + set_row(1,"$[b]@pN$[n]@4j#T", FLD(LF_ANAG,"CODANAGR","@@@@@"), - FLD(LF_ANAG,"RAGSOC",0,29), - FLD(LF_ANAG,"RAGSOC",30,50)); + &_surname_name); } else { diff --git a/ba/ba6200.cpp b/ba/ba6200.cpp index 01fae75a1..b5fa003d0 100755 --- a/ba/ba6200.cpp +++ b/ba/ba6200.cpp @@ -24,9 +24,9 @@ class BA6200_application : public TPrintapp int _cur1, _cur2; TString _provcom_msk, _com, _dencom, _provcom, _capcom; - TString _codistat; + TString _codistat, _uffreg; int _uffiidd1, _uffiidd2, _uffiidd3, _uffiva1, _uffiva2, _uffiva3; - int _uffreg, _uffconc, _uffcserv, _uffesprov, _uffescom, _terrmon; + int _uffconc, _uffcserv, _uffesprov, _uffescom, _terrmon; bool _stampa_alici; TDate _data_stampa; @@ -71,7 +71,7 @@ bool BA6200_application::preprocess_page(int file, int counter) _uffiva1 = current_cursor()->curr(LF_COMUNI).get_int(COM_UFFIVA1); _uffiva2 = current_cursor()->curr(LF_COMUNI).get_int(COM_UFFIVA2); _uffiva3 = current_cursor()->curr(LF_COMUNI).get_int(COM_UFFIVA3); - _uffreg = current_cursor()->curr(LF_COMUNI).get_int(COM_UFFREG); + _uffreg = current_cursor()->curr(LF_COMUNI).get(COM_UFFREG); _uffconc = current_cursor()->curr(LF_COMUNI).get_int(COM_UFFCONC); _uffcserv = current_cursor()->curr(LF_COMUNI).get_int(COM_UFFCSERV); _uffesprov = current_cursor()->curr(LF_COMUNI).get_int(COM_UFFESPROV); @@ -86,7 +86,7 @@ bool BA6200_application::preprocess_page(int file, int counter) set_row (1,"@46g%6s", (const char*) _codistat); if (_terrmon != 0) - set_row (1,"@56g%s", _terrmon == 1 ? "M" : "PM"); + set_row (1,"@56g%2s", _terrmon == 1 ? "M" : "PM"); if (_uffiidd1 != 0) set_row (1,"@65g%03d", _uffiidd1); @@ -106,20 +106,20 @@ bool BA6200_application::preprocess_page(int file, int counter) if (_uffiva3 != 0) set_row (1,"@86g%03d", _uffiva3); - if (_uffreg != 0) - set_row (1,"@92g%03d", _uffreg); + if (_uffreg.not_empty()) + set_row (1,"@92g%3s", (const char*) _uffreg); if (_uffconc != 0) - set_row (1,"@97g%03d", _uffconc); + set_row (1,"@98g%03d", _uffconc); if (_uffcserv != 0) - set_row (1,"@103g%03d", _uffcserv); + set_row (1,"@104g%03d", _uffcserv); if (_uffesprov != 0) - set_row (1,"@108g%03d", _uffesprov); + set_row (1,"@110g%03d", _uffesprov); if (_uffescom != 0) - set_row (1,"@112g%03d", _uffescom); + set_row (1,"@114g%03d", _uffescom); return TRUE; } @@ -253,10 +253,10 @@ void BA6200_application::crea_intestazione() sep.fill('-'); set_header (3, (const char *) sep); - set_header(5,"@0gCodice@7gDenominazione@33gProv.@40gCap@45gCd.Istat@54gMont.@60gUff.@67gII.DD.@80gI.V.A.@92gRegi.@96gConc.@102gServ.@108gEsatt."); + set_header(5,"@0gCodice@7gDenominazione@33gProv.@40gCap@45gCd.Istat@54gMont.@60gUff.@67gII.DD.@80gI.V.A.@92gRegi.@98gConc.@104gServ.@110gEsatt."); set_header (6,"@0g------@7g-------------------------@33g-----@39g-----"); set_header (6,"@45g--------@54g-----@65g-----------"); - set_header (6,"@78g------------@90g-----@96g-----@102g-----@108g-------"); + set_header (6,"@78g------------@92g-----@98g-----@104g-----@110g-------"); } bool BA6200_application::user_create() diff --git a/ba/ba6200a.uml b/ba/ba6200a.uml index e4ff5110b..13ed7d34e 100755 --- a/ba/ba6200a.uml +++ b/ba/ba6200a.uml @@ -1,6 +1,6 @@ #include "ba6200.h" -PAGE "" -1 -1 67 16 +PAGE "Stampa comuni" -1 -1 67 16 RADIOBUTTON F_SCELTA 25 BEGIN