Changeset 7113
- Timestamp:
- Mar 29, 2018, 2:44:49 PM (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
holiday-manager/trunk/fuentes/holiday-manager/python3-holidaymanager/HolidayManager.py
r7105 r7113 17 17 super(HolidayManager, self).__init__() 18 18 19 self.db =119 self.dbg=1 20 20 self.config_dir=os.path.expanduser("/etc/manageHolidays/") 21 21 self.config_file=os.path.join(self.config_dir,"holiday_list") … … 103 103 info=self.holiday_list.copy() 104 104 105 ''' 105 106 if "-" in day: 106 107 intervalId=self._get_interval_id() 107 tmp=day.split("-") 108 date1=datetime.strptime(tmp[0],'%d/%m/%Y') 109 date2=datetime.strptime(tmp[1],'%d/%m/%Y') 110 delta=date2-date1 111 for i in range(delta.days + 1): 112 tmp_day=(date1 + timedelta(days=i)).strftime('%d/%m/%Y') 113 info[tmp_day]={} 114 info[tmp_day]["description"]=description 115 info[tmp_day]["intervalId"]=intervalId 108 list_days=self.get_days_inrange(day) 109 for i in list_days: 110 info[i]={} 111 info[i]["description"]=description 112 info[i]["intervalId"]=intervalId 116 113 117 114 else: … … 119 116 info[day]["description"]=description 120 117 info[day]["intervalId"]="" 121 122 118 ''' 119 info[day]={} 120 info[day]["description"]=description 121 123 122 result=self._write_conf(info) 124 123 125 124 if result["result"]: 126 125 shutil.move(self.block_file,self.config_file) 126 self.holiday_list=info 127 127 128 128 return result … … 158 158 info=self.holiday_list.copy() 159 159 160 ''' 160 161 if "-" in day: 161 delete_days=[] 162 tmp=day.split("-") 163 date1=datetime.strptime(tmp[0],'%d/%m/%Y') 164 date2=datetime.strptime(tmp[1],'%d/%m/%Y') 165 delta=date2-date1 166 for i in range(delta.days + 1): 167 tmp_day=(date1 + timedelta(days=i)).strftime('%d/%m/%Y') 168 delete_days.append(tmp_day) 169 162 delete_days=self.get_days_inrange(day) 170 163 for item in delete_days: 171 164 try: … … 181 174 self._debug("Delete day: ",str(e)) 182 175 pass 176 ''' 177 try: 178 info.pop(day) 179 except Exception as e: 180 self._debug("Delete day: ",str(e)) 181 pass 183 182 184 183 result=self._write_conf(info) … … 186 185 if result["result"]: 187 186 shutil.move(self.block_file,self.config_file) 188 187 self.holiday_list=info 188 189 189 return result 190 190 … … 192 192 193 193 194 def get_days_inrange(self,day): 195 196 list_days=[] 197 tmp=day.split("-") 198 date1=datetime.strptime(tmp[0],'%d/%m/%Y') 199 date2=datetime.strptime(tmp[1],'%d/%m/%Y') 200 delta=date2-date1 201 for i in range(delta.days + 1): 202 tmp_day=(date1 + timedelta(days=i)).strftime('%d/%m/%Y') 203 list_days.append(tmp_day) 204 205 return list_days 206 207 #def get_days_inrange 208 194 209 def is_holiday(self,day): 195 210 196 197 holiday_days=self.holiday_list.keys() 211 holiday_days=[] 212 for item in self.holiday_list: 213 tmp_list=[] 214 if "-" in item: 215 tmp_list=self.get_days_inrange(item) 216 holiday_days=holiday_days+tmp_list 217 else: 218 holiday_days.append(item) 219 220 221 #holiday_days=self.holiday_list.keys() 198 222 199 223 if day in holiday_days: … … 214 238 if result["result"]: 215 239 shutil.move(self.block_file,self.config_file) 216 240 self.holiday_list=info 241 217 242 return result 218 243 … … 220 245 221 246 222 def import_holiday_list(self,orig_path ,dest_path):247 def import_holiday_list(self,orig_path): 223 248 224 249 ''' … … 233 258 read=json.load(f) 234 259 if not os.path.exists(self.block_file): 235 shutil.copy 2(orig_path,self.config_dir)260 shutil.copyfile(orig_path,self.config_file) 236 261 f.close() 237 262 return {"result":True,"code":6,"info":""}
Note: See TracChangeset
for help on using the changeset viewer.