Correzioni pr Modulaser

git-svn-id: svn://10.65.10.50/trunk@3476 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1996-09-02 13:59:31 +00:00
parent 46922674c3
commit c4c17f1e9a

View File

@ -38,9 +38,9 @@ HIDDEN TString16 __dep16;
HIDDEN TString80 __dep80; HIDDEN TString80 __dep80;
// Vega-Key di Modulaser // Vega-Key di Modulaser
HIDDEN const char* VK_STARTDOC = "<VK>&MA795&0&1"; HIDDEN const char* VK_STARTDOC = "<VK>&MA796&0&1";
HIDDEN const char* VK_ENDDOC = "<VK>!0"; HIDDEN const char* VK_ENDDOC = "<VK>!0";
HIDDEN const char* VK_STARTPAGE[] = { "<VK>*9*1", "<VK>*9*2", "<VK>*9*3", "<VK>*9*4" }; HIDDEN const char* VK_STARTPAGE[] = { "<VK>*1*1", "<VK>*1*2", "<VK>*1*3", "<VK>*1*4" };
typedef enum { STARTDOC, STARTDITTA, STARTPAGE, ENDDOC } ModulaserKey; typedef enum { STARTDOC, STARTDITTA, STARTPAGE, ENDDOC } ModulaserKey;
// Campi form // Campi form
@ -571,18 +571,17 @@ void TDicForm::put_modulaser(TPrintrow& row, ModulaserKey Cmd, int page)
case STARTDITTA: case STARTDITTA:
{ {
TString cofi(16); TString cofi(16);
const char* tmp = _cur->file(-116).get(ANA_COFI); cofi.format("%-16s", (const char*)_cur->file(-116).get(ANA_COFI));
cofi.format("%-16s", tmp);
TString ragsoc(50); TString ragsoc(50);
ragsoc = _cur->file(LF_NDITTE).get(NDT_RAGSOC); ragsoc = _cur->file(LF_NDITTE).get(NDT_RAGSOC);
riga = "<VK>$"; riga = "<VK>$";
riga << cofi; riga << cofi; // Cod.Fiscale
riga << "$0$"; riga << "$0$"; // Cod.Studio/Cod.Cliente
riga << ragsoc; riga << ragsoc; // RagSoc
} }
break; break;
case STARTPAGE: case STARTPAGE:
riga = "<VK>*9*"; riga = "<VK>*1*";
riga << page; riga << page;
_GiaMessoStartPage[page] = TRUE; _GiaMessoStartPage[page] = TRUE;
break; break;
@ -5036,10 +5035,10 @@ class TBase2 : public TDicForm
long _codditta; long _codditta;
protected: protected:
void stampa_corpo(TPrinter& pr); void stampa_corpo(TPrinter& pr);
virtual int dic_form_len() const { return BASE_FORMLEN; } virtual int dic_form_len() const { return BASE_FORMLEN; }
virtual void next_page(TPrinter& pr) { fill_page(pr, -1); } virtual void next_page(TPrinter& pr) { fill_page(pr, -1); }
virtual void set_body(TPrinter& pr, const char tipo) {} virtual void set_body(TPrinter& pr, const char tipo) {}
virtual int prima_riga(PaginaQuadro p) const { return 4;} virtual int prima_riga(PaginaQuadro p) const { return 4;}
public: public:
virtual bool print(const long codditta, const long NumFis, const long NumNoFis); virtual bool print(const long codditta, const long NumFis, const long NumNoFis);
TBase2(const char* sNomeForm, const char* quadro) : TDicForm(sNomeForm, quadro) {} TBase2(const char* sNomeForm, const char* quadro) : TDicForm(sNomeForm, quadro) {}
@ -5079,14 +5078,14 @@ bool TBase2::print(const long codditta, const long NumFis, const long NumNoFis)
class TBase3 : public TDicForm class TBase3 : public TDicForm
{ {
private: private:
long _codditta; long _codditta;
protected: protected:
void stampa_testata(TPrinter& pr); void stampa_testata(TPrinter& pr);
void stampa_corpo(TPrinter& pr); void stampa_corpo(TPrinter& pr);
virtual int dic_form_len() const { return BASE_FORMLEN; } virtual int dic_form_len() const { return BASE_FORMLEN; }
virtual void next_page(TPrinter& pr) { fill_page(pr, -1); } virtual void next_page(TPrinter& pr) { fill_page(pr, -1); }
virtual void set_body(TPrinter& pr, const char tipo) {} virtual void set_body(TPrinter& pr, const char tipo) {}
virtual int prima_riga(PaginaQuadro p) const { return 4;} virtual int prima_riga(PaginaQuadro p) const { return 4;}
public: public:
virtual bool print(const long codditta, const long NumFis, const long NumNoFis); virtual bool print(const long codditta, const long NumFis, const long NumNoFis);
TBase3(const char* sNomeForm, const char* quadro) : TDicForm(sNomeForm, quadro) {} TBase3(const char* sNomeForm, const char* quadro) : TDicForm(sNomeForm, quadro) {}
@ -5141,14 +5140,14 @@ bool TBase3::print(const long codditta, const long NumFis, const long NumNoFis)
class TBase4 : public TDicForm class TBase4 : public TDicForm
{ {
private: private:
long _codditta; long _codditta;
protected: protected:
void stampa_testata(TPrinter& pr); void stampa_testata(TPrinter& pr);
void stampa_corpo(TPrinter& pr); void stampa_corpo(TPrinter& pr);
virtual int dic_form_len() const { return BASE_FORMLEN; } virtual int dic_form_len() const { return BASE_FORMLEN; }
virtual void next_page(TPrinter& pr) { fill_page(pr, -1); } virtual void next_page(TPrinter& pr) { fill_page(pr, -1); }
virtual void set_body(TPrinter& pr, const char tipo) {} virtual void set_body(TPrinter& pr, const char tipo) {}
virtual int prima_riga(PaginaQuadro p) const { return 4;} virtual int prima_riga(PaginaQuadro p) const { return 4;}
public: public:
virtual bool print(const long codditta, const long NumFis, const long NumNoFis); virtual bool print(const long codditta, const long NumFis, const long NumNoFis);
TBase4(const char* sNomeForm, const char* quadro) : TDicForm(sNomeForm, quadro) {} TBase4(const char* sNomeForm, const char* quadro) : TDicForm(sNomeForm, quadro) {}
@ -5203,23 +5202,23 @@ bool TBase4::print(const long codditta, const long NumFis, const long NumNoFis)
class TStampaBase : public TStampaQuadro class TStampaBase : public TStampaQuadro
{ {
private: private:
TBase1* _fBase1; TBase1* _fBase1;
TBase2* _fBase2; TBase2* _fBase2;
TBase3* _fBase3; TBase3* _fBase3;
TBase4* _fBase4; TBase4* _fBase4;
TRelation* _rel; TRelation* _rel;
TCursor* _cur, *_cur2, *_cur3, *_cur4; TCursor* _cur, *_cur2, *_cur3, *_cur4;
protected: protected:
virtual bool user_create(); virtual bool user_create();
virtual bool user_destroy(); virtual bool user_destroy();
virtual bool conta_tipi_per() const { return FALSE; } virtual bool conta_tipi_per() const { return FALSE; }
virtual TDicForm* get_form() const { return _fBase1; } virtual TDicForm* get_form() const { return _fBase1; }
virtual TCursor* get_cursor() const { return _cur; } virtual TCursor* get_cursor() const { return _cur; }
virtual bool print_quadro(const int OffsetDitta, const bool modulaser); virtual bool print_quadro(const int OffsetDitta, const bool modulaser);
public: public:
TStampaBase(char livel) : TStampaQuadro("Base", livel) { } TStampaBase(char livel) : TStampaQuadro("Base", livel) { }
}; };
bool TStampaBase::user_create() bool TStampaBase::user_create()