diff --git a/at/at2500.cpp b/at/at2500.cpp index ad4a4f635..8b6b188b9 100755 --- a/at/at2500.cpp +++ b/at/at2500.cpp @@ -4,6 +4,7 @@ #include #include "soggetti.h" +#include "contsan.h" #include "sezioni.h" #include "at2.h" @@ -37,7 +38,7 @@ class TStampaIdonei : public TPrintapp TAssoc_array _categorie; TString16 _tipoidon; TString16 _idon1, _idon2, _idon3, _idon4; - TParagraph_string _cognome_nome; + TParagraph_string _cognome_nome, _responsab;; TDate _data_stampa; ts _tipostampa; TString16 _codsez, _codsot; @@ -60,7 +61,7 @@ public: void footer_sezione(); void fine_stampa(); TMask& app_mask() { return *_msk; } - TStampaIdonei() : _data_stampa(TODAY), _cognome_nome("",25) {} + TStampaIdonei() : _data_stampa(TODAY), _cognome_nome("",25), _responsab("",50) {} }; HIDDEN inline TStampaIdonei& app() { return (TStampaIdonei&) main_app(); } @@ -171,7 +172,11 @@ void TStampaIdonei::set_page(int file, int cnt) set_row(2,"@66g@pn", FLD(LF_SOGGETTI,SOG_INTAF,"###")); set_row(1,"@70g@ld", FLD(LF_SOGGETTI,SOG_DATAULTDON)); set_row(2,"@73g@S", FLD(LF_SOGGETTI,SOG_TIPOULTDON)); - set_row(3,""); + set_row(3,"@49g#a", &_responsab); + set_row(1,"@81g@S", FLD(LF_SOGGETTI,SOG_TELABI)); + set_row(2,"@81g@S", FLD(LF_SOGGETTI,SOG_TELLAV)); + set_row(3,"@81g@S", FLD(LF_SOGGETTI,SOG_TELALT)); + set_row(4,""); } break; } @@ -248,6 +253,15 @@ bool TStampaIdonei::preprocess_page(int file, int counter) nome << recsog.get(SOG_NOME); _cognome_nome = nome; // salto pagina se cambio sezione + TString80 responsab = ""; + TLocalisamfile contsan(LF_CONTSAN); + contsan.setkey(2); + contsan.put(CON_DATACON, recsog.get(SOG_DATASTATO)); + contsan.put(CON_CODICE, recsog.get(SOG_CODICE)); + if (contsan.read() == NOERR) + responsab = contsan.get(CON_RESPONSAB); + _responsab = responsab; + const TString16 codsez = recsog.get(SOG_CODSEZ); const TString16 codsot = recsog.get(SOG_CODSOT); if ((_codsez!=codsez)||(_codsot!=codsot)) @@ -433,9 +447,10 @@ void TStampaIdonei::crea_intestazione() sep = ""; sep.fill('-'); set_header(3, (const char *) sep); - set_header(4,"@0gCodice@9gC.@12gCognome e nome@38gNato il@49gData stato@60gIdon.@66g SI@70gUltima don."); - set_header(5,"@0gTessera@38gGruppo Rh@49g Stato@66g AF"); - set_header(6,"@0g--------@9g--@12g-------------------------@38g----------@49g----------@60g-- --@66g---@70g----------"); + set_header(4,"@0gCodice@9gC.@12gCognome e nome@38gNato il@49gData stato@60gIdon.@66g SI@70gUltima don.@81gTel. abit."); + set_header(5,"@0gTessera@38gGruppo Rh@49g Stato@66g AF@81gTel. lavoro"); + set_header(6,"@49gResponsabile@81gTel. altro"); + set_header(7,"@0g--------@9g--@12g-------------------------@38g----------@49g----------@60g-- --@66g---@70g----------@81g--------------"); printer().footerlen(3); } }