From dec93d43969af40df51e4a69da971a39165ba23d Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 9 Jan 2009 14:30:31 +0000
Subject: [PATCH] Patch level         :10.0 206 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
---
 lv/lv0300.cpp |  8 +++++---
 lv/lvlib.cpp  | 12 ++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lv/lv0300.cpp b/lv/lv0300.cpp
index d61a58d3f..144eb376e 100755
--- a/lv/lv0300.cpp
+++ b/lv/lv0300.cpp
@@ -145,13 +145,12 @@ void TConf_Lavanderie::load_mask()
 void TConf_Lavanderie::save_mask(bool tosave)
 {
   TConfig* cnf = get_config();
-  if (!tosave || cnf==NULL) 
+  if (!tosave || cnf == NULL) 
     return;
 
-  TAssoc_array& v = cnf->list_variables("lv");
-
   TConfig_application::save_mask(tosave);
 
+  TAssoc_array& v = cnf->list_variables("lv");
   FOR_EACH_ASSOC_STRING(v, h, k, str)
   {
     const TFixed_string name = k;
@@ -178,7 +177,10 @@ void TConf_Lavanderie::save_mask(bool tosave)
       
     }
   }
+
+  cnf->set_paragraph("");
 	m.calendario().write();
+  cnf->set_paragraph("lv");
 }
  
 int lv0300(int argc, char* argv[])
diff --git a/lv/lvlib.cpp b/lv/lvlib.cpp
index f076a0b81..2c76650e0 100755
--- a/lv/lvlib.cpp
+++ b/lv/lvlib.cpp
@@ -47,7 +47,7 @@ bool lv_is_holiday(const TDate& data)
   const TDate primo(1,1,anno);
   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
@@ -509,7 +509,7 @@ int TLavanderie_calendar::read(int year)
 	{
 		const int len = val.len();
 		for (int i = 0; i < len; i++)
-			_days.set(i, val[i] != ' ');
+			_days.set(i, val[i] == 'X');
 	}
 	else
 	{
@@ -526,28 +526,28 @@ int TLavanderie_calendar::read(int year)
 
 int TLavanderie_calendar::write() const
 {
-	TString val(255);
+	TString val(366);
 	const TDate inizio(1, 1, _year);
 	const TDate fine(31, 12, _year);
 	TDate data(inizio);
   TConfig cfg(CONFIG_DITTA);
 
 	for (int i = 0;  data <= fine; ++data, i++)
-		val << (_days[i] ? 'X' : ' ');
+		val << (_days[i] ? 'X' : '-');
 	cfg.set("CAL", val, "lv", true, _year);
 	return NOERR;
 }
 
 int TLavanderie_calendar::remove() const
 {
-	TString val(255);
+	TString val(366);
   TConfig cfg(CONFIG_DITTA);
 	const TDate inizio(1, 1, _year);
 	const TDate fine(31, 12, _year);
 	TDate data(inizio);
 
 	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);
   return NOERR;
 }