From 3f587f9bc84134f6753974ee8d8f55008f304461 Mon Sep 17 00:00:00 2001
From: nik <nik@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 28 Apr 1995 15:09:17 +0000
Subject: [PATCH] Correzioni alla lista clienti

git-svn-id: svn://10.65.10.50/trunk@1315 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg1200.cpp | 75 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 63 insertions(+), 12 deletions(-)

diff --git a/cg/cg1200.cpp b/cg/cg1200.cpp
index 96d3a3361..a70cf6015 100755
--- a/cg/cg1200.cpp
+++ b/cg/cg1200.cpp
@@ -41,12 +41,12 @@ class TPrintclifo_app : public TPrintapp
   TLocalisamfile* _comuni;
 
   // etichette
-  int     _startrow, _rows_et, _cols_et, _startcol;
+  int _startrow, _rows_et, _cols_et, _startcol;
 
   // variable field slots
   TString _piva,_cpercip,_fax,_telex,_name,_telefono,_indir,_localita;               
   TString _cod_from,_cod_to,_data_stampa,_cofi,_d_c_ric,_d_alleg;
-  TString _datanas;
+  TString _datanas,_comprov,_comnasc,_comune,_prov;
   long    _codice;   
   char    _tipocf,_tipoaper;
   bool    _gia_iniziati_fornitori;                       
@@ -78,6 +78,7 @@ public:
   const char* compatta_ragsoc(TString& ragsoc,char tipoaper); 
   void header_elenco();
   void header_rubriche();
+  TRectype& look_comuni(const char*);
   const char* descrizione_conto_ric(int,int,long);
   const char* descrizione_allegato(char,long);
 
@@ -153,6 +154,17 @@ const char* TPrintclifo_app::descrizione_allegato(char tipocf,long cod)
   return tmp;
 }            
 
+TRectype& TPrintclifo_app::look_comuni(const char* cod)
+{
+  _comuni->zero();
+  _comuni->put(COM_COM, cod);
+  _comuni->read();
+  if (_comuni->bad())
+    _comuni->zero();
+
+  return _comuni->curr();
+}
+
 bool TPrintclifo_app::preprocess_page(int file, int counter)
 {
   TString s;
@@ -230,12 +242,34 @@ bool TPrintclifo_app::preprocess_page(int file, int counter)
     _localita = get_field(LF_CLIFO, CLI_LOCCF);
     if (!_localita.empty()) 
       _localita.trim(); 
-
+    
+    //modifica del 27/04/1995
+    TString16 comcf = get_field(LF_CLIFO, CLI_COMCF);
+    TRectype com = look_comuni(comcf);
+    if (com.empty())
+    {
+      _comprov = _comune = _localita;
+      _prov = "";
+    }
+    else
+    {
+      _comprov = com.get(COM_DENCOM);
+      _comprov << " ";
+      _comprov << com.get(COM_PROVCOM);
+      _comune = (com.get(COM_DENCOM)).left(20);
+      _prov   = com.get(COM_PROVCOM);
+    }
+    TString16 comnasc = get_field(LF_CLIFO, CLI_COMNASC);
+    TRectype comn = look_comuni(comnasc);  
+    _comnasc = (comn.get(COM_DENCOM)).left(29);
+    _comnasc << " ";
+    _comnasc << comn.get(COM_PROVCOM);
+    //fine modifica
+    
     _name = get_field(LF_CLIFO, CLI_RAGSOC);
     s = get_field(LF_CLIFO, CLI_CODANAGPER);
     _cpercip = "";
     
-
     if (s.not_empty()) _cpercip << tipoaper << " " << s;
 
     if (tipoaper == "F")
@@ -567,17 +601,33 @@ void TPrintclifo_app::header_rubriche()
   set_header(j++, (const char *)(TString(132).fill('-')));
 }
 
+/*
+   void TPrintclifo_app::set_elenco()
+   {
+   // body
+   set_row(1,"$[r]@1s$[n] $[r]@pn$[n] #t", FLD(LF_CLIFO, CLI_TIPOCF),
+   FLD(LF_CLIFO, CLI_CODCF,"@@@@@@"), &_name);
+   set_row(2,"@9g#t@56g@s@63g#t @s @s", &_indir, FLD(LF_CLIFO, CLI_CAPCF),
+   &_localita, FLD(-COMRF_ALIAS,COM_DENCOM), FLD(-COMRF_ALIAS,COM_PROVCOM));
+   set_row(3,"@9g#t@90g#t@115g#t", &_telefono, &_fax, &_telex);
+   set_row(4,"@9g@s @s@45g#t@56g#t@69g#t",FLD(-COMNASC_ALIAS, COM_DENCOM), 
+   FLD(-COMNASC_ALIAS, COM_PROVCOM), &_datanas, &_piva,&_cofi);
+   set_row(5,"@9g@3n @3n @6n #t@56g@n #t@90g#t",FLD(LF_CLIFO,CLI_GRUPPORIC),
+   FLD(LF_CLIFO,CLI_CONTORIC), FLD(LF_CLIFO, CLI_SOTTOCRIC),&_d_c_ric,
+   FLD(LF_CLIFO, CLI_CODALLEG), &_d_alleg, &_cpercip);
+   
+   for(int i = 0; i < _interline; i++)
+   set_row(i+5,"");
+   }
+   */           
+//modifica del 27/04/1995
 void TPrintclifo_app::set_elenco()
 {
-  // body
   set_row(1,"$[r]@1s$[n] $[r]@pn$[n] #t", FLD(LF_CLIFO, CLI_TIPOCF),
           FLD(LF_CLIFO, CLI_CODCF,"@@@@@@"), &_name);
-  set_row(2,"@9g#t@56g@s@63g#t @s @s", &_indir, FLD(LF_CLIFO, CLI_CAPCF),
-          &_localita, FLD(-COMRF_ALIAS,COM_DENCOM), FLD(-COMRF_ALIAS,COM_PROVCOM));
+  set_row(2,"@9g#t@56g@s@63g#t", &_indir, FLD(LF_CLIFO, CLI_CAPCF),&_comprov);
   set_row(3,"@9g#t@90g#t@115g#t", &_telefono, &_fax, &_telex);
-  set_row(4,"@9g@s @s@45g#t@56g#t@69g#t",FLD(-COMNASC_ALIAS, COM_DENCOM), 
-          FLD(-COMNASC_ALIAS, COM_PROVCOM), &_datanas, &_piva,&_cofi);
-  
+  set_row(4,"@9g#t@45g#t@56g#t@69g#t",&_comnasc, &_datanas, &_piva,&_cofi);
   set_row(5,"@9g@3n @3n @6n #t@56g@n #t@90g#t",FLD(LF_CLIFO,CLI_GRUPPORIC),
           FLD(LF_CLIFO,CLI_CONTORIC), FLD(LF_CLIFO, CLI_SOTTOCRIC),&_d_c_ric,
           FLD(LF_CLIFO, CLI_CODALLEG), &_d_alleg, &_cpercip);
@@ -591,8 +641,9 @@ void TPrintclifo_app::set_rubriche()
   // body
   set_row(1,"$[r]@1s$[n] $[r]@pn$[n] #t", FLD(LF_CLIFO,CLI_TIPOCF),
           FLD(LF_CLIFO,CLI_CODCF,"@@@@@@"), &_name);
-  set_row(1,"@60g#t@100g@s@106g#t @127g@s", &_indir, FLD(LF_CLIFO, CLI_CAPCF),
-          &_localita, FLD(-COMRF_ALIAS,COM_PROVCOM));
+  //set_row(1,"@60g#t@100g@s@106g#t@127g@s", &_indir, FLD(LF_CLIFO, CLI_CAPCF),
+  //        &_localita, FLD(-COMRF_ALIAS,COM_PROVCOM));
+  set_row(1,"@60g#t@100g@s@106g#t@127g#t", &_indir, FLD(LF_CLIFO, CLI_CAPCF), &_comune, &_prov);
   set_row(2,"@9g#t@25g#t", &_piva,&_telefono);
 
   for(int i = 0; i < _interline; i++)