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

Patch level :10.0 206

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :risolto l'annoso problema del calendario!


git-svn-id: svn://10.65.10.50/trunk@18001 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2009-01-09 14:30:31 +00:00
parent e581b5b559
commit dec93d4396
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lv/lv0300.cpp
View File

@ -145,13 +145,12 @@ void TConf_Lavanderie::load_mask()
void TConf_Lavanderie::save_mask(bool tosave) void TConf_Lavanderie::save_mask(bool tosave)
{ {
TConfig* cnf = get_config(); TConfig* cnf = get_config();
if (!tosave || cnf==NULL) if (!tosave || cnf == NULL)
return; return;
TAssoc_array& v = cnf->list_variables("lv");
TConfig_application::save_mask(tosave); TConfig_application::save_mask(tosave);
TAssoc_array& v = cnf->list_variables("lv");
FOR_EACH_ASSOC_STRING(v, h, k, str) FOR_EACH_ASSOC_STRING(v, h, k, str)
{ {
const TFixed_string name = k; const TFixed_string name = k;
@ -178,7 +177,10 @@ void TConf_Lavanderie::save_mask(bool tosave)
} }
} }
cnf->set_paragraph("");
m.calendario().write(); m.calendario().write();
cnf->set_paragraph("lv");
} }
int lv0300(int argc, char* argv[]) int lv0300(int argc, char* argv[])

12
lv/lvlib.cpp
View File

@ -47,7 +47,7 @@ bool lv_is_holiday(const TDate& data)
const TDate primo(1,1,anno); const TDate primo(1,1,anno);
const long index = data - primo; const long index = data - primo;
return (*cal)[index] > ' '; return (*cal)[index] != 'X';
} }
//funzione che restituisce un codice contratto valido dato cliente, indirizzo di spedizione e data //funzione che restituisce un codice contratto valido dato cliente, indirizzo di spedizione e data
@ -509,7 +509,7 @@ int TLavanderie_calendar::read(int year)
{ {
const int len = val.len(); const int len = val.len();
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
_days.set(i, val[i] != ' '); _days.set(i, val[i] == 'X');
} }
else else
{ {
@ -526,28 +526,28 @@ int TLavanderie_calendar::read(int year)
int TLavanderie_calendar::write() const int TLavanderie_calendar::write() const
{ {
TString val(255); TString val(366);
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); 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("CAL", val, "lv", true, _year); cfg.set("CAL", val, "lv", true, _year);
return NOERR; return NOERR;
} }
int TLavanderie_calendar::remove() const int TLavanderie_calendar::remove() const
{ {
TString val(255); TString val(366);
TConfig cfg(CONFIG_DITTA); 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("CAL", val, "lv", true, _year); cfg.set("CAL", val, "lv", true, _year);
return NOERR; return NOERR;
} }