Patch level : 10.0 194

Files correlati     : lv*.exe
Ricompilazione Demo : [ ]
Commento            :

Cambiata la memorizzazione del calendario ora la variabile e' CAL(anno)


git-svn-id: svn://10.65.10.50/trunk@17899 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2008-12-15 13:53:16 +00:00
parent 31237c545a
commit 8c905109c1

View File

@ -37,11 +37,10 @@ bool lv_is_holiday(const TDate& data)
if (cal == NULL) if (cal == NULL)
{ {
TConfig ini(CONFIG_DITTA,"lv"); TConfig ini(CONFIG_DITTA);
cal = new TString(366); cal = new TString(366);
calendari.add(key,cal); calendari.add(key,cal);
key.format("CAL%4d",anno); *cal = ini.get("CAL", "lv", anno);
*cal = ini.get(key);
cal->left_just(366); cal->left_just(366);
} }
@ -180,9 +179,10 @@ void TRecmag_lavanderie::update()
ianno = imese; ianno = imese;
} }
query="USE MOVMAG KEY 3\n"; query="USE MOVMAG KEY 2\n";
query << "SELECT (TIPOCF='C')&&(STR(CODCF=" << codcf << "))&&(STR(CODINDSP=" << indsped << "))\n"; query << "SELECT (TIPOCF='C')&&(STR(CODCF=" << codcf << "))&&(STR(CODINDSP=" << indsped << "))&&(STR(DATAREG==" << oggi << "))\n";
query << "TO DATAREG=" << oggi << "\n"; query << "FROM ANNOES=" << anno << "\n";
query << "TO ANNOES=" << anno << "\n";
TISAM_recordset recmag(query); TISAM_recordset recmag(query);
@ -224,16 +224,10 @@ void TRecmag_lavanderie::update()
int TRecmag_lavanderie::name2index(const char* fieldname) const int TRecmag_lavanderie::name2index(const char* fieldname) const
{ {
if (strcmp(fieldname, "DOTIN") == 0)
return 0;
if (strcmp(fieldname, "DOTOD") == 0)
return 1;
if (strcmp(fieldname, "DOTTM") == 0)
return 2;
if (strcmp(fieldname, "CONSANNO") == 0) if (strcmp(fieldname, "CONSANNO") == 0)
return 3; return 0;
if (strcmp(fieldname, "CONSMESE") == 0) if (strcmp(fieldname, "CONSMESE") == 0)
return 4; return 1;
return -1; return -1;
} }
@ -250,7 +244,7 @@ int TRecmag_lavanderie::length(const char* fieldname) const
{ {
if (name2index(fieldname) >= 0) if (name2index(fieldname) >= 0)
return 18; return 15;
return TRectype::length(fieldname); return TRectype::length(fieldname);
} }
@ -258,7 +252,7 @@ int TRecmag_lavanderie::length(const char* fieldname) const
int TRecmag_lavanderie::ndec(const char* fieldname) const int TRecmag_lavanderie::ndec(const char* fieldname) const
{ {
if (name2index(fieldname) >= 0) if (name2index(fieldname) >= 0)
return 3; return 5;
return TRectype::ndec(fieldname); return TRectype::ndec(fieldname);
} }
@ -277,11 +271,8 @@ const TString & TRecmag_lavanderie::get_str(const char* fieldname) const
((TRecmag_lavanderie *)this)->update(); ((TRecmag_lavanderie *)this)->update();
switch (index) switch (index)
{ {
case 0: return get_tmp_string() = _dotin.string(); case 0: return get_tmp_string() = _consanno.string();
case 1: return get_tmp_string() = _dotod.string(); case 1: return get_tmp_string() = _consmese.string();
case 2: return get_tmp_string() = _dottm.string();
case 3: return get_tmp_string() = _consanno.string();
case 4: return get_tmp_string() = _consmese.string();
default: break; default: break;
} }
return TVariable_rectype::get_str(fieldname); return TVariable_rectype::get_str(fieldname);
@ -511,12 +502,9 @@ int TLavanderie_calendar::read(int year)
{ {
if (year != 0) if (year != 0)
_year = year; _year = year;
TConfig cfg(CONFIG_DITTA, "lv");
TString8 varname("CAL");
varname << _year; TConfig cfg(CONFIG_DITTA);
_days.reset(); const TString val = cfg.get("CAL", "lv", _year);
const TString val = cfg.get(varname);
if (val.full()) if (val.full())
{ {
@ -541,18 +529,15 @@ int TLavanderie_calendar::write() const
{ {
if (_dirty) if (_dirty)
{ {
TConfig cfg(CONFIG_DITTA, "lv");
TString8 varname("CAL");
varname << _year;
TString val(255); TString val(255);
const TDate inizio(1, 1, _year); const TDate inizio(1, 1, _year);
const TDate fine(31, 12, _year); const TDate fine(31, 12, _year);
TDate data(inizio); TDate data(inizio);
TConfig cfg(CONFIG_DITTA);
for (int i = 0; data <= fine; ++data, i++) for (int i = 0; data <= fine; ++data, i++)
val << (_days[i] ? 'X' : ' '); val << (_days[i] ? 'X' : ' ');
cfg.set(varname, val); cfg.set("CAL", val, "lv", true, _year);
} }
((TLavanderie_calendar *)this)->_dirty = false; ((TLavanderie_calendar *)this)->_dirty = false;
return NOERR; return NOERR;
@ -560,18 +545,15 @@ int TLavanderie_calendar::write() const
int TLavanderie_calendar::remove() const int TLavanderie_calendar::remove() const
{ {
TConfig cfg(CONFIG_DITTA, "lv");
TString8 varname("CAL");
varname << _year;
TString val(255); TString val(255);
TConfig cfg(CONFIG_DITTA);
const TDate inizio(1, 1, _year); const TDate inizio(1, 1, _year);
const TDate fine(31, 12, _year); const TDate fine(31, 12, _year);
TDate data(inizio); TDate data(inizio);
for (int i = 0; data <= fine; ++data, i++) for (int i = 0; data <= fine; ++data, i++)
val << data.is_holiday() ? "X" : " "; val << data.is_holiday() ? "X" : " ";
cfg.set(varname, val); cfg.set("CAL", val, "lv", true, _year);
return NOERR; return NOERR;
} }