root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0 patch ???

Browse Source 
Files correlati     : ci0
Ricompilazione Demo : [ ]
Commento            :
Correzioni per tener conto delle modifiche fatte in cilib


git-svn-id: svn://10.65.10.50/trunk@20641 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca83 2010-06-30 14:36:53 +00:00
parent 27071b7f22
commit c5ce010781
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ci/ci0200.cpp
View File

@ -10,7 +10,6 @@
#include "ci0.h" #include "ci0.h"
#include "cilib.h" #include "cilib.h"
#include "ci0200a.h" #include "ci0200a.h"
#include "ci0200b.h"
#include "../ve/velib.h" #include "../ve/velib.h"
/////////////////////////////////// ///////////////////////////////////
@ -121,20 +120,21 @@ void TRisoatt_msk::riempi_sheet()
//riempio lo sheet con i dati che soddisfano il filtro preparato prima //riempio lo sheet con i dati che soddisfano il filtro preparato prima
for(bool ok = roa.move_first(); ok; ok = roa.move_next()) for(bool ok = roa.move_first(); ok; ok = roa.move_next())
{ {
TRisorsa ris(roa.cursor()->curr()); TRisoatt roa(roa.cursor()->curr());
TRisoatt_key roakey(roa.chiave());
TToken_string& riga = sheet.row(-1); TToken_string& riga = sheet.row(-1);
riga.add(ris.tipo(), sheet.cid2index(S_RISOATT)); riga.add(roakey.tipo(), sheet.cid2index(S_RISOATT));
TString16 cod = ris.cod(); TString16 cod = roakey.cod();
cod.trim(); cod.trim();
switch(ris.tipo()) switch(roakey.tipo())
{ {
case 'A': riga.add(cod, sheet.cid2index(S_CODATT)); break; case 'A': riga.add(cod, sheet.cid2index(S_CODATT)); break;
case 'R': riga.add(cod, sheet.cid2index(S_CODRIS)); break; case 'R': riga.add(cod, sheet.cid2index(S_CODRIS)); break;
default : break; default : break;
} }
riga.add(ris.mese(), sheet.cid2index(S_MESE)); riga.add(roakey.mese(), sheet.cid2index(S_MESE));
riga.add(ris.tpora(), sheet.cid2index(S_TPORA)); riga.add(roakey.tpora(), sheet.cid2index(S_TPORA));
riga.add(ris.valuni().string(), sheet.cid2index(S_VALUNI)); riga.add(roa.valuni().string(), sheet.cid2index(S_VALUNI));
sheet.check_row(sheet.items() - 1); sheet.check_row(sheet.items() - 1);
} }
@ -262,8 +262,9 @@ void TRisoatt_msk::registra()
const TString4 mese = riga.get(sheet.cid2index(S_MESE)); const TString4 mese = riga.get(sheet.cid2index(S_MESE));
const TString4 tpora = riga.get(sheet.cid2index(S_TPORA)); const TString4 tpora = riga.get(sheet.cid2index(S_TPORA));
const real valuni(riga.get(sheet.cid2index(S_VALUNI))); const TString80 descr = tipo == 'R' ? riga.get(sheet.cid2index(S_DESRIS)) : riga.get(sheet.cid2index(S_DESATT));
const real valuni(riga.get(sheet.cid2index(S_VALUNI)));
TString16 cod = codice; TString16 cod = codice;
cod.left_just(16); cod.left_just(16);
@ -287,6 +288,7 @@ void TRisoatt_msk::registra()
else else
{ {
tab.put("CODTAB", chiave); tab.put("CODTAB", chiave);
tab.put("S0", descr);
tab.put("R1", valuni); tab.put("R1", valuni);
tab.write(); tab.write();
} }