From 433135c22a6b0e36117241db18619404a0e66ff4 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 12 Dec 1994 15:51:57 +0000 Subject: [PATCH] Tolte funzioni inutili git-svn-id: svn://10.65.10.50/trunk@751 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg1100.cpp | 60 ++++++++++---------------------------------------- cg/cg5500c.uml | 22 +++++++++--------- 2 files changed, 23 insertions(+), 59 deletions(-) diff --git a/cg/cg1100.cpp b/cg/cg1100.cpp index dd9898d75..94835f945 100755 --- a/cg/cg1100.cpp +++ b/cg/cg1100.cpp @@ -1,18 +1,18 @@ // cg1100.cpp // Stampa piano dei conti +#include +#include #include #include #include +#include #include #include -#include -#include -#include -#include #include #include + #include "cg1.h" #include "cg1100.h" @@ -52,8 +52,7 @@ class CG1100_application : public TPrintapp }; bil_ivd* _bil; - TTable _tab; // tabella codici IV direttiva - TTable _tab_anabil ; // tabella codici analisi di bilancio + TTable* _tab; // tabella codici IV direttiva TRectype* _rec; TSort* _sort; TRelation* _rel; @@ -101,7 +100,6 @@ public: void init_sort(); const char* descrizione_numero(char, char, int, int); void setta_righe_descr(TParagraph_string*); - const char * decodifica_codanabil (const char * ); int leggo_sottoc(int,int,long); void riempi_record(char,char,const TString&,int,int,int,long,const TString&,char,char,const TString&,int); void set_bil_key(bil_ivd* b, char sezione, char lettera, @@ -110,14 +108,9 @@ public: void set_bil_val(bil_ivd* b, const char* descr,char sez_opp,char let_opp, const char* numr_opp,int num_opp); - const char * decodifica_IV_dir (const char * sezivd, - const char * lettivd = "", - int numrivd = 0, int numivd = 0); - void process_link(int id, const char* txt); - CG1100_application() : _tab (TAB_IVD), _tab_anabil (TAB_ANABIL), _clivd(8), - _clivdo(8) {} + CG1100_application() : _clivd(8), _clivdo(8) {} }; void CG1100_application::process_link(int id, const char* txt) @@ -1117,7 +1110,7 @@ void CG1100_application::intesta (stampe tipo) const char* CG1100_application::descrizione_numero(char sezione, char lettera, int numr, int numero) { - TTable tabivd(TAB_IVD); + TTable& tabivd = *_tab; TString dep,dep2; tabivd.zero(); @@ -1149,42 +1142,11 @@ const char* CG1100_application::descrizione_numero(char sezione, char lettera, i return (__tmp); } -const char * CG1100_application::decodifica_IV_dir (const char * sezivd, const char * lettivd, int numrivd, int numivd) -{ - TString dep (CODTABLEN); - - _tab.curr().zero(); - dep.format("%1s%1s", sezivd, lettivd); - if (numivd != 0) - { - dep << format("%04d", numrivd); - dep << format("%02d", numivd); - } - else - if (numrivd != 0) - dep << format("%04d", numrivd); - - _tab.curr().put("CODTAB", (const char*)dep); - _tab.read(); - if (_tab.bad()) _tab.curr().zero(); - return _tab.curr().get ("S0"); -} - -const char * CG1100_application::decodifica_codanabil (const char * codpcab) -{ - // TString dep (CODTABLEN); - // non sara' un tabella ma un file - _tab_anabil.curr().zero(); - - _tab_anabil.curr().put("CODTAB", (const char*) codpcab); - _tab_anabil.read(); - if (_tab_anabil.bad()) _tab_anabil.curr().zero(); - return _tab_anabil.curr().get ("S0"); -} bool CG1100_application::user_create() { _rel = new TRelation (LF_PCON); + _tab = new TTable(TAB_IVD); _msk = new TMask ("cg1100a") ; TCursor *cursor = new TCursor (_rel); @@ -1200,7 +1162,8 @@ bool CG1100_application::user_create() add_file(LF_PCON); _descr = new TParagraph_string ("",40); - + + _tipo_stampa = completa; _salto_pag = FALSE; _bil = new bil_ivd; @@ -1210,8 +1173,9 @@ bool CG1100_application::user_create() bool CG1100_application::user_destroy() { - delete _msk; delete _rel; + delete _tab; + delete _msk; delete _rec; delete _descr; delete _bil; diff --git a/cg/cg5500c.uml b/cg/cg5500c.uml index 5c841f2e2..a6ae05dfa 100755 --- a/cg/cg5500c.uml +++ b/cg/cg5500c.uml @@ -10,7 +10,7 @@ PAGE "Visualizzazione liquidazione" -1 -1 77 20 GROUPBOX DLG_NULL 79 3 BEGIN - PROMPT 0 1 "@bDitta corrente" + PROMPT 0 1 "@BDitta corrente" END NUMBER F_CODDITTA 5 @@ -34,7 +34,7 @@ END SPREADSHEET F_VISLIQ1 80 5 BEGIN PROMPT 1 6 "Liquidazione" - ITEM "V@1@F" + ITEM "V@1F#109" ITEM "Mese@10" ITEM "Risultato@15" ITEM "D/C" @@ -46,7 +46,7 @@ END SPREADSHEET F_VISLIQ2 80 5 BEGIN PROMPT 1 12 "Versamenti" - ITEM "V@1@F" + ITEM "V@1F#109" ITEM "Mese@10" ITEM "Data@10" ITEM "Azienda@10" @@ -61,9 +61,9 @@ ENDMASK PAGE "Prospetto mensile" -1 -1 50 7 -BUTTON 101 +BUTTON 101 10 2 BEGIN - PROMPT -11 -2 "DIO CAIMANO" + PROMPT -13 -1 "CAIMANO" END LIST 102 @@ -113,12 +113,12 @@ END BUTTON DLG_CANCEL 10 2 BEGIN - PROMPT -12 -1 "" + PROMPT -23 -1 "" END BUTTON DLG_OK 10 2 BEGIN - PROMPT -22 -1 "" + PROMPT -33 -1 "" END ENDPAGE @@ -126,9 +126,9 @@ ENDMASK PAGE "Prospetto versamenti" -1 -1 50 7 -BUTTON 101 +BUTTON 101 10 2 BEGIN - PROMPT -11 -2 "DIO CANGURO" + PROMPT -13 -1 "CANGURO" END LIST 102 @@ -179,12 +179,12 @@ END BUTTON DLG_CANCEL 10 2 BEGIN - PROMPT -12 -1 "" + PROMPT -23 -1 "" END BUTTON DLG_OK 10 2 BEGIN - PROMPT -22 -1 "" + PROMPT -33 -1 "" END