1.1 --- a/imipweb/data.py Wed Sep 13 00:09:24 2017 +0200
1.2 +++ b/imipweb/data.py Wed Sep 13 00:21:06 2017 +0200
1.3 @@ -358,6 +358,39 @@
1.4 active_periods[p] += 1
1.5 return active_periods
1.6
1.7 +def get_removed_periods(periods, still_to_remove):
1.8 +
1.9 + """
1.10 + From the recurrence 'periods', given details of those 'still_to_remove',
1.11 + return the remaining active periods and the periods to unschedule or
1.12 + exclude, using a tuple of the form (active, unscheduled, excluded).
1.13 + """
1.14 +
1.15 + to_remove = set()
1.16 +
1.17 + # Get all periods that are not replaced.
1.18 +
1.19 + active_periods = get_active_periods(periods)
1.20 +
1.21 + for i in still_to_remove:
1.22 + try:
1.23 + period = periods[int(i)]
1.24 + except (IndexError, ValueError):
1.25 + continue
1.26 +
1.27 + active_periods[period] -= 1
1.28 + to_remove.add(period)
1.29 +
1.30 + # Determine whether some periods are both removed and added.
1.31 +
1.32 + remaining = []
1.33 + for period, n in active_periods.items():
1.34 + if n > 0:
1.35 + remaining.append(period)
1.36 +
1.37 + to_remove.difference_update(remaining)
1.38 + return remaining, to_remove
1.39 +
1.40
1.41
1.42 # Form field extraction and serialisation.
2.1 --- a/imipweb/event.py Wed Sep 13 00:09:24 2017 +0200
2.2 +++ b/imipweb/event.py Wed Sep 13 00:21:06 2017 +0200
2.3 @@ -25,7 +25,7 @@
2.4 from imiptools.mail import Messenger
2.5 from imipweb.data import EventPeriod, event_period_from_period, \
2.6 filter_duplicates, get_active_periods, \
2.7 - remove_from_collection, \
2.8 + get_removed_periods, remove_from_collection, \
2.9 get_period_control_values, set_period_control_values, \
2.10 PeriodError
2.11 from imipweb.resource import DateTimeFormUtilities, FormUtilities, ResourceClientForObject
2.12 @@ -1045,38 +1045,21 @@
2.13 excluded).
2.14 """
2.15
2.16 - args = self.env.get_args()
2.17 + # Get remaining periods and those whose removal is deferred.
2.18 +
2.19 + remaining, to_remove = get_removed_periods(periods,
2.20 + self.env.get_args().get("recur-remove", []))
2.21 +
2.22 + # Sort the deferred removal periods into categories.
2.23 +
2.24 to_unschedule = set()
2.25 to_exclude = set()
2.26
2.27 - # Get all periods that are not replaced.
2.28 -
2.29 - active_periods = get_active_periods(periods)
2.30 -
2.31 - for i in args.get("recur-remove", []):
2.32 - try:
2.33 - period = periods[int(i)]
2.34 - except (IndexError, ValueError):
2.35 - continue
2.36 -
2.37 - active_periods[period] -= 1
2.38 -
2.39 + for period in to_remove:
2.40 if not self.can_edit_recurrence(period) and self.is_organiser():
2.41 - l = to_unschedule
2.42 + to_unschedule.add(period)
2.43 else:
2.44 - l = to_exclude
2.45 -
2.46 - l.add(period)
2.47 -
2.48 - # Determine whether some periods are both removed and added.
2.49 -
2.50 - remaining = []
2.51 - for period, n in active_periods.items():
2.52 - if n > 0:
2.53 - remaining.append(period)
2.54 -
2.55 - to_unschedule.difference_update(remaining)
2.56 - to_exclude.difference_update(remaining)
2.57 + to_exclude.add(period)
2.58
2.59 return remaining, to_unschedule, to_exclude
2.60