Patch level : 10.0 patch ???

Files correlati     : ha3
Ricompilazione Demo : [ ]
Commento            :
Modifiche funzione di ordinamento dello sheet secondo indicazioni di Robby


git-svn-id: svn://10.65.10.50/branches/R_10_00@21839 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca83 2011-03-28 10:45:58 +00:00
parent 990bb2c98b
commit 47f8fbac2f

View File

@ -99,7 +99,7 @@ TGiri_key::TGiri_key(const TString& key)
}
///////////////////////////////////////
//// FUNZIONI DI ORDINAMENTO ////
//// FUNZIONE DI ORDINAMENTO ////
///////////////////////////////////////
static int sort_by_stop(TSheet_field& sheet, int r1, int r2)
@ -107,16 +107,16 @@ static int sort_by_stop(TSheet_field& sheet, int r1, int r2)
TToken_string& row1 = sheet.row(r1);
TToken_string& row2 = sheet.row(r2);
const int i1 = row1.get_int(sheet.cid2index(S_ORDPASS));
const int i2 = row2.get_int(sheet.cid2index(S_ORDPASS));
const int i1 = row1.get_int(sheet.cid2index(S_AGENTE));
const int i2 = row2.get_int(sheet.cid2index(S_AGENTE));
int dif = i1 - i2;
if (dif == 0)
{
dif = row1.get_int(sheet.cid2index(S_CLIENTE)) - row2.get_int(sheet.cid2index(S_CLIENTE));
dif = row1.get_int(sheet.cid2index(S_GIORNO)) - row2.get_int(sheet.cid2index(S_GIORNO));
if (dif == 0)
dif = row1.get_int(sheet.cid2index(S_AGENTE)) - row2.get_int(sheet.cid2index(S_AGENTE));
dif = row1.get_int(sheet.cid2index(S_ORDPASS)) - row2.get_int(sheet.cid2index(S_ORDPASS));
}
return dif;