From b035170704381e829e299fe5ff27a00c9525fc25 Mon Sep 17 00:00:00 2001 From: Alfredos-Panagiotis Damkalis Date: Wed, 5 Sep 2018 16:05:00 +0300 Subject: [PATCH] Show error message on none selected observation and show the number of successfully scheduled observations in success message in observation page. --- network/base/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/network/base/views.py b/network/base/views.py index 51308ad..fea5e8a 100644 --- a/network/base/views.py +++ b/network/base/views.py @@ -248,6 +248,9 @@ def create_new_observation(station_id, def observation_new_post(request): total = int(request.POST.get('total')) + if total == 0: + messages.error(request, 'Please select at least one observation.') + return redirect(reverse('base:observation_new')) new_observations = [] for item in range(total): @@ -323,7 +326,7 @@ def observation_new_post(request): messages.success(request, 'Observation was scheduled successfully.') return redirect(reverse('base:observation_view', kwargs={'id': new_observations[0].id})) - messages.success(request, 'Observations were scheduled successfully.') + messages.success(request, str(total) + ' Observations were scheduled successfully.') return redirect(reverse('base:observations_list'))