1.1 --- a/imiptools/client.py Mon Aug 31 15:44:46 2015 +0200
1.2 +++ b/imiptools/client.py Mon Aug 31 18:09:31 2015 +0200
1.3 @@ -24,7 +24,7 @@
1.4 from imiptools.data import Object, get_address, get_uri, get_window_end, \
1.5 is_new_object, make_freebusy, to_part, \
1.6 uri_dict, uri_items, uri_values
1.7 -from imiptools.dates import check_resolution, format_datetime, get_default_timezone, \
1.8 +from imiptools.dates import check_permitted_values, format_datetime, get_default_timezone, \
1.9 get_timestamp, to_timezone
1.10 from imiptools.period import can_schedule, remove_period, \
1.11 remove_additional_periods, remove_affected_period, \
1.12 @@ -89,7 +89,7 @@
1.13 def have_manager(self):
1.14 return MANAGER_INTERFACE
1.15
1.16 - def get_scheduling_resolution(self):
1.17 + def get_permitted_values(self):
1.18
1.19 """
1.20 Decode a specification of one of the following forms...
1.21 @@ -102,11 +102,11 @@
1.22 """
1.23
1.24 prefs = self.get_preferences()
1.25 - resolution = prefs and prefs.get("scheduling_resolution")
1.26 - if resolution:
1.27 + permitted_values = prefs and prefs.get("permitted_times")
1.28 + if permitted_values:
1.29 try:
1.30 l = []
1.31 - for component in resolution.split(":")[:3]:
1.32 + for component in permitted_values.split(":")[:3]:
1.33 if component:
1.34 l.append(map(int, component.split(",")))
1.35 else:
1.36 @@ -424,8 +424,8 @@
1.37
1.38 "Check the object against any scheduling constraints."
1.39
1.40 - resolution = self.get_scheduling_resolution()
1.41 - if not resolution:
1.42 + permitted_values = self.get_permitted_values()
1.43 + if not permitted_values:
1.44 return None
1.45
1.46 invalid = []
1.47 @@ -433,8 +433,8 @@
1.48 for period in self.obj.get_periods(self.get_tzid()):
1.49 start = period.get_start()
1.50 end = period.get_end()
1.51 - start_errors = check_resolution(start, resolution)
1.52 - end_errors = check_resolution(end, resolution)
1.53 + start_errors = check_permitted_values(start, permitted_values)
1.54 + end_errors = check_permitted_values(end, permitted_values)
1.55 if start_errors or end_errors:
1.56 invalid.append((period.origin, start_errors, end_errors))
1.57
1.58 @@ -444,8 +444,8 @@
1.59
1.60 "Correct the object according to any scheduling constraints."
1.61
1.62 - resolution = self.get_scheduling_resolution()
1.63 - return resolution and self.obj.correct_object(self.get_tzid(), resolution)
1.64 + permitted_values = self.get_permitted_values()
1.65 + return permitted_values and self.obj.correct_object(self.get_tzid(), permitted_values)
1.66
1.67 # Object retrieval.
1.68