From 6a86a4ae1a9c108d46c1c5486445fd2945987b24 Mon Sep 17 00:00:00 2001 From: cris Date: Thu, 22 Jul 2004 14:28:11 +0000 Subject: [PATCH] Patch level : 1.7 AT Files correlati : at8.exe at9.exe Ricompilazione Demo : [ ] Commento : ultime modifiche alle procedure di Parma git-svn-id: svn://10.65.10.50/trunk@12254 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- at/at1500.cpp | 1 - at/at8900.cpp | 76 ++++++++------- at/at8900a.ini | 258 ++++++++++++++++++++++++++++++++++++++++++++++++- at/at9300.cpp | 74 +++++++------- at/at9300a.ini | 4 +- 5 files changed, 332 insertions(+), 81 deletions(-) diff --git a/at/at1500.cpp b/at/at1500.cpp index a1c092f94..3cb40de99 100755 --- a/at/at1500.cpp +++ b/at/at1500.cpp @@ -155,7 +155,6 @@ void TControlloBenemerenze::set_page(int file, int cnt) set_row(2,"@2g@S", FLD(LF_SOGGETTI,SOG_TESSAVIS)); set_row(1,"@9g@S", FLD(LF_SOGGETTI,SOG_CATDON)); set_row(1,"@12g#a", &_cognome_nome); - //set_row(1,"@38g@ld", FLD(LF_SOGGETTI,SOG_DATANASC)); set_row(1,"@38g@ld", FLD(LF_SOGGETTI,SOG_DATAULTDON)); set_row(2,"@41g@pn", FLD(LF_SOGGETTI,SOG_TOTDON,"###")); diff --git a/at/at8900.cpp b/at/at8900.cpp index e9489eceb..a30019dec 100755 --- a/at/at8900.cpp +++ b/at/at8900.cpp @@ -741,9 +741,9 @@ bool TCtpr2at::update_record(TRectype& record_at, TAssoc_array& record_ct) record_at.put(SOG_KELL, "POS"); else record_at.put(SOG_KELL, "NEG"); } - else if ((elab == "TELEFONO") || (elab == "CELLULARE") || (elab == "NOCELLULARE")) // toglie barre e altre cose inutili dal numero di telefono + else if ((elab == "TELEFONO") || (elab == "CELLULARE")) // toglie barre e altre cose inutili dal numero di telefono { - str = val; + str = val; str.trim(); if (str.not_empty()) { @@ -753,12 +753,18 @@ bool TCtpr2at::update_record(TRectype& record_at, TAssoc_array& record_ct) if (elab == "TELEFONO") record_at.put(campo, str); else - { + { + TString80 campo1, campo2; + const int pipe = campo.find('|'); + if (pipe != -1) + { + campo2 = campo.sub(pipe+1); + campo1 = campo.sub(0,pipe); + } if ((elab == "CELLULARE") && ((str[0]!='0') && (str.len()>9))) - record_at.put(campo, str); + record_at.put(campo1, str); else - if ((elab == "NOCELLULARE") && (str[0]=='0')) - record_at.put(campo, str); + record_at.put(campo2, str); } } } @@ -809,7 +815,7 @@ bool TCtpr2at::update_record(TRectype& record_at, TAssoc_array& record_ct) localita = str.sub(i+1); str = str.sub(0,i); str.trim(); - localita.trim(); + localita.trim(); localita.upper(); } TString tmp = record_at.get(SOG_DOM_INDIR); @@ -830,35 +836,32 @@ bool TCtpr2at::update_record(TRectype& record_at, TAssoc_array& record_ct) stampa << " diverso: avis " << tmp << " sit " << str; print_line(stampa); stampa = ""; - if (localita.not_empty()) - { - tmp = record_at.get(SOG_DOM_CODLOC); - TString80 desloc = cache().get("LCP",tmp).get("S0"); - desloc.trim(); - if (localita != desloc) + } + tmp = record_at.get(SOG_DOM_CODLOC); + TString80 desloc = cache().get("LCP",tmp).get("S0"); + desloc.trim(); + if (localita != desloc) + { + stampa << "LOCALITA "; + if (desloc.empty()) + { + TTable lcp("LCP"); + lcp.setkey(2); + lcp.put("S0", localita); + if (lcp.read() == NOERR) { - stampa << "LOCALITA "; - if (desloc.empty()) - { - TTable lcp("LCP"); - lcp.setkey(2); - lcp.put("S0", localita); - if (lcp.read() == NOERR) - { - tmp = lcp.get("CODTAB"); - record_at.put(SOG_DOM_CODLOC, tmp); - stampa << " inserito da CETRAPLUS: " << tmp << " " << localita; - tmp = lcp.get("S6"); - record_at.put(SOG_DOM_CAP, tmp); - } - else - stampa << " non presente in tabella avis " << localita; - } - else - stampa << " diverso: avis " << desloc << " sit " << localita; - print_line(stampa); + tmp = lcp.get("CODTAB"); + record_at.put(SOG_DOM_CODLOC, tmp); + stampa << " inserito da CETRAPLUS: " << tmp << " " << localita; + tmp = lcp.get("S6"); + record_at.put(SOG_DOM_CAP, tmp); } + else + stampa << " non presente in tabella avis " << localita; } + else + stampa << " diverso: avis " << desloc << " sit " << localita; + print_line(stampa); } } else if (elab == "CAP") // cap @@ -1013,7 +1016,7 @@ bool TCtpr2at::accesso(const TString& istruzione) recdon.put(DON_DATADON, datadon); if (_donaz->read() == NOERR) { - if ((codabar.left(2) == "52") || (codabar.left(2) == "53") || (codabar.left(2) == "54") || (codabar.left(2) == "55")) + if ((codabar.left(2) == "52") || (codabar.left(2) == "53") || (codabar.left(2) == "54") || (codabar.left(2) == "55") || (codabar.left(2) == "56") || (codabar.left(2) == "57")) luogodon_at = "0001"; else { @@ -1291,6 +1294,11 @@ bool TCtpr2at::sacca(const TString& istruzione) stampa = ""; stampa << "Inserita donazione del " << datadon; print_line(stampa); + if (modstato_tcs(recsog.get(SOG_STATO)) == 'S') + { + stampa = "** ATTENZIONE ** il soggetto e' sospeso"; + print_line(stampa); + } } calcola_donazioni_lib(recsog, _sdonazioni); // questo metodo sistema tutto!!! calcola_categoria(recsog); // modificato per dare i messaggi al posto dei veri cambiamenti diff --git a/at/at8900a.ini b/at/at8900a.ini index 940977ee0..2b25e1126 100755 --- a/at/at8900a.ini +++ b/at/at8900a.ini @@ -17,11 +17,10 @@ TP_DOCUMENTO = DOCID NR_DOCUMENTO = INDIRIZZO = !_INDIRIZZO LG_RESIDENZA = !_COMUNE,DOM_CODCOM -CAP = DOM_CAP +CAP = !_CAP PROFESSIONE = PROFESS TEL_ABITAZIONE = !_TELEFONO,TELABI -TEL_LAVORO = !_NOCELLULARE,TELLAV -TEL_LAVORO = !_CELLULARE,TELALT +TEL_LAVORO = !_CELLULARE,TELALT|TELLAV FL_DONATORE = FL_PAZIENTE = FL_RICEVENTE = @@ -156,18 +155,24 @@ USER_ID_VAL = [ARCHIVIO] COMMIT; = 0 -PERCORSO = d:\datipr\provaaaa.txt +PERCORSO = c:\datiat16\datipr\annoni.txt T_ACCESSO = 6 T_ACC_ANA = 3 +T_ANALISI = 0 +T_ANA_COD_RIS = 0 T_ANA_DON_SUC = 0 T_ASSISTITO = 1 +T_CARTELLA = 0 +T_DECODIFICA = 0 T_DON_SUC = 0 T_ENTE = 0 T_ESC_DON = 5 T_GRUPPO = 0 T_PROFILO = 0 T_PUNTO_ACC = 0 +T_REPARTO = 0 T_RICETTA = 0 +T_RISP_DESC = 0 T_RIS_DES = 0 T_SACCA = 2 T_STO_EMO_DON = 0 @@ -179,7 +184,252 @@ C=CR [ANALISI] ANN=CR ANF=CR +ABAB=CS +ABPL=CS +PLISO=CS +PLAUT=CS +ALB=CS +AFE=CS +AL1=CS +AL2=CS +GPT=CS +AMI=CS +HBCAB=CS +KELL=CS +HCVAG=CS +UAS=CS +GOT=CS +IMPAU=CS +UREA=CS +BE1=CS +BE2=CS +BILDI=CS +BILTO=CS +UBI=CS +CAL19=CS +CA=CS +CEA=CS +UCH=CS +CL=CS +COL=CS +HDL=CS +UCL=CS +AAA=CS +AAA4=CS +AAA18=CS +AAA37=CS +AAF=CS +AAF4=CS +AAF18=CS +AAF37=CS +AAP=CS +AAP4=CS +AAP18=CS +AAP37=CS +CON=CS +CHB=CS +CHC=CS +CHI=CS +CLU=CS +TCD=CS +TCDC=CS +TCDG=CS +TCIE=CS +CK=CS +CREA=CS +DIAGN=CS +IgA=CS +IgE=CS +IgG=CS +IgM=CS +GAM=CS +ECG=EL +HCT=CS +EMOE=CS +PLT=CS +EMOMT=CS +UHB=CS +EPN=CS +GRV=CS +RHV=CS +GRX=CS +RHX=CS +ERTER=CS +EMOS=CS +G.BIA=CS +G.ROS=CS +EM=CS +HT=CS +PIAS=CS +MCV1=CS +MCHS=CS +MCHCS=CS +PRETR=CS +ESITO=CS +UES=CS +FEN=CS +FERRI=CS +FE=CS +FORES=CS +ALP=CS +P=CS +FT3=CS +FT4=CS +GA=CS +GGT=CS +GEM1=CS +AB01=CS +RH1=CS +FEN1=CS +DU1=CS +TCD1=CS +GEM2=CS +AB02=CS +RH2=CS +FEN2=CS +DU2=CS +TCD2=CS +GEM3=CS +AB03=CS +RH3=CS +FEN3=CS +DU3=CS +TCD3=CS +GLI=CS +WBC=CS +RBC=CS +UGL=CS +G6PD=CS +GRE=CS +RHE=CS +GRIP=CS +2150h=CS +2152h=CS +2154h=CS +2155h=CS +2158h=CS +2151h=CS +2200=CS +2156h=CS +HPB=CS +2153h=CS +2159h=CS +2157h=CS +HBSAB=CS +ABEI=CS +IDO=CS +1250i=CS +IMMS=CS +IMUR=CS +SAT=CS +FLEB=CS +LDH=CS +LEUTE=CS +LINF=CS +MAD=CS +PART=CS +AB0M=CS +RHM=CS +FENM=CS +DUM=CS +TCIM=CS +MG=CS +MRK=CS +MCH=CS +MCHC=CS +MCV=CS +MTALB=CS +NEO=CS +AB0N=CS +RHN=CS +FENN=CS +DUN=CS +TCDN=CS +UNI=CS +1573S=CS +NOTE=CS +AV16=CS +NOTF=CS +NOT2=CS +1251i=CS +AT=CS +IMMU=CS +ALLO=CS +SELF=CS +PCR=CS +PESO=CS +UPS=CS +UPH=CS +PLTTE=CS +PLTER=CS +PLFIL=CS +K=CS +PRESV=CS +PRES=CS +AUTO=CS +PROF=CS +UPR=CS +PCMD=CS +PX=CS +PXNEO=CS +P1=CS +P2=CS +P3=CS +PSA=CS +PSAF=CS +RA=CS +ABG=CS +RET=CS +RAA=CS +A1=CS +DU=CS +FORM=CS +RX=CS +ERIAF=CS +SCHE=CS +NA=CS +SWT=CS +TEAS=CS +TAA=CS +AAABI=CS +AAAI=CS +AABI=CS +ABET=CS +AGGT=CS +ALTRE=CS +UIBC=CS +TIBC=CS +TRAMT=CS +TRI=CS +TSH=CS +URIC=CS +URIN=CS +UUR=CS +VES=CS +VES3=CS +VES1=CS +VES2=CS +VISIC=CS +WAR=CS +WAR1=CS +WAR2=CS +ONP=CS +GR1MD=CS +VISIM=CS +GR2MD=CS +PSA%=CS [ESCLUSIONI] SOS=SO +[FINESOSPENSIONE] +15=15 + +[PRIORITA] +CR = 11 +CS = 10 +EL = 999 +ID = 0 +SO = 999 +VS = 0 + diff --git a/at/at9300.cpp b/at/at9300.cpp index add98b0b7..5ebd1100a 100755 --- a/at/at9300.cpp +++ b/at/at9300.cpp @@ -393,27 +393,24 @@ void TProv2com::agg_donazione(const TRectype& recsog, const TRectype& recdon) TRectype* key = new TRectype(LF_DONAZ); key->put(DON_CODICE, rec.get(SOG_CODICE)); int err = _sdonazioni->read(key); - if (err == NOERR) + TRectype recnew(recdon); + recnew.put(DON_CODICE, rec.get_long(SOG_CODICE)); + recnew.put(DON_PROGDON, _sdonazioni->rows()+1); + _sdonazioni->add_row(recnew); + _sdonazioni->rewrite(); + calcola_donazioni_lib(rec, _sdonazioni); + TDate oggi(TODAY); + rec.put(SOG_DATAULTAGG, oggi); + rec.put(SOG_UTENULTAGG, "PROV"); + _soggetti->rewrite(rec); + if (!_print_header) { - TRectype recnew(recdon); - recnew.put(DON_CODICE, rec.get_long(SOG_CODICE)); - recnew.put(DON_PROGDON, _sdonazioni->rows()+1); - _sdonazioni->add_row(recnew); - _sdonazioni->rewrite(); - calcola_donazioni_lib(rec, _sdonazioni); - TDate oggi(TODAY); - rec.put(SOG_DATAULTAGG, oggi); - rec.put(SOG_UTENULTAGG, "PROV"); - _soggetti->rewrite(rec); - if (!_print_header) - { - print_line(intestazione); - _print_header = TRUE; - } - message = " INSERITA DONAZIONE in data "; - message << datadon.string(); - print_line(message); + print_line(intestazione); + _print_header = TRUE; } + message = " INSERITA DONAZIONE in data "; + message << datadon.string(); + print_line(message); } } } @@ -453,28 +450,25 @@ void TProv2com::agg_controllo(const TRectype& recsog, const TRectype& reccon) TRectype* key = new TRectype(LF_CONTSAN); key->put(CON_CODICE, rec.get(SOG_CODICE)); int err = _scontrolli->read(key); - if (err == NOERR) - { - TRectype recnew(reccon); - recnew.put(CON_CODICE, rec.get_long(SOG_CODICE)); - recnew.put(CON_PROGCON, _scontrolli->rows()+1); - _scontrolli->add_row(recnew); - _scontrolli->sort(compare_date); - _scontrolli->rewrite(); - calcola_donazioni_lib(rec, _sdonazioni); - TDate oggi(TODAY); - rec.put(SOG_DATAULTAGG, oggi); - rec.put(SOG_UTENULTAGG, "PROV"); - _soggetti->rewrite(rec); - if (!_print_header) - { - print_line(intestazione); - _print_header = TRUE; - } - const char* tipocon = reccon.get(CON_TIPOCON); - message.format(" INSERITO CONTROLLO %s in data %s", tipocon, datacon.string()); - print_line(message); + TRectype recnew(reccon); + recnew.put(CON_CODICE, rec.get_long(SOG_CODICE)); + recnew.put(CON_PROGCON, _scontrolli->rows()+1); + _scontrolli->add_row(recnew); + _scontrolli->sort(compare_date); + _scontrolli->rewrite(); + calcola_donazioni_lib(rec, _sdonazioni); + TDate oggi(TODAY); + rec.put(SOG_DATAULTAGG, oggi); + rec.put(SOG_UTENULTAGG, "PROV"); + _soggetti->rewrite(rec); + if (!_print_header) + { + print_line(intestazione); + _print_header = TRUE; } + const char* tipocon = reccon.get(CON_TIPOCON); + message.format(" INSERITO CONTROLLO %s in data %s", tipocon, datacon.string()); + print_line(message); } } } diff --git a/at/at9300a.ini b/at/at9300a.ini index a722bb3c7..2153054ea 100755 --- a/at/at9300a.ini +++ b/at/at9300a.ini @@ -7,8 +7,8 @@ V=VISUALIZZA SE DIVERSO I=IGNORA [ARCHIVIO] -DATA = 18-12-2003 -PERCORSO = c:\tmp\ +DATA = 30-03-2004 +PERCORSO = c:\temp\ [SOGGETTI] CODSEZ = V