Commit f45f181f authored by Daniel W Bond's avatar Daniel W Bond
Browse files

clarified wording presented to users, tried a little harder to meet the 79 chracter break

parent 78d54af1
Pipeline #2168 canceled with stage
...@@ -28,7 +28,8 @@ class FacilityAdmin(admin.ModelAdmin): ...@@ -28,7 +28,8 @@ class FacilityAdmin(admin.ModelAdmin):
num = queryset.count() num = queryset.count()
for facility in queryset: for facility in queryset:
facility.special_schedules.clear() facility.special_schedules.clear()
self.message_user(request, "Successfully removed special schedules from %d facilities." % num) self.message_user(request, "Successfully cleared all special schedules for %d facilities." % num)
drop_special_schedules.short_description = 'Clear all special schedules'
def assign_bulk_schedules(self, request, queryset): def assign_bulk_schedules(self, request, queryset):
num = queryset.count() num = queryset.count()
...@@ -40,15 +41,17 @@ class FacilityAdmin(admin.ModelAdmin): ...@@ -40,15 +41,17 @@ class FacilityAdmin(admin.ModelAdmin):
for facility in queryset: for facility in queryset:
facility.main_schedule = new_schedule facility.main_schedule = new_schedule
facility.save() facility.save()
self.message_user(request, "Set %s as the main schedule for %d facilities." % (name, num)) self.message_user(request,
"Set %s as the main schedule for %d facilities." % (name, num))
except ObjectDoesNotExist: except ObjectDoesNotExist:
self.message_user(request, "Unable to set schedule for %d facilities." % num) self.message_user(request,
"Unable to set a new main schedule for %d facilities." % num)
return HttpResponseRedirect(request.get_full_path()) return HttpResponseRedirect(request.get_full_path())
return render(request, return render(request,
'bulk_schedules_intermediate.html', 'bulk_schedules_intermediate.html',
context = {'facilities': queryset, context = {'facilities': queryset,
'schedules': Schedule.objects.all()}) 'schedules': Schedule.objects.all()})
assign_bulk_schedules.short_description = 'Assign a main schedule for multiple facilities' assign_bulk_schedules.short_description = 'Set a main schedule for multiple facilities'
def assign_bulk_special_schedules(self, request, queryset): def assign_bulk_special_schedules(self, request, queryset):
num = queryset.count() num = queryset.count()
...@@ -60,9 +63,11 @@ class FacilityAdmin(admin.ModelAdmin): ...@@ -60,9 +63,11 @@ class FacilityAdmin(admin.ModelAdmin):
for facility in queryset: for facility in queryset:
facility.special_schedules.add(new_special_schedule) facility.special_schedules.add(new_special_schedule)
facility.save() facility.save()
self.message_user(request, "Added %s as a special schedule to %d facilities." % (name, num)) self.message_user(request,
"Added %s as a special schedule to %d facilities." % (name, num))
except ObjectDoesNotExist: except ObjectDoesNotExist:
self.message_user(request, "Unable to add a special schedule to %d facilities." % num) self.message_user(request,
"Unable to add additional special schedule to %d facilities." % num)
return HttpResponseRedirect(request.get_full_path()) return HttpResponseRedirect(request.get_full_path())
return render(request, return render(request,
'bulk_special_schedules_intermediate.html', 'bulk_special_schedules_intermediate.html',
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
{% endfor %} {% endfor %}
</select> </select>
<p>Assign this as the main schedule for all of these facilities?</p> <p>Set this as the main schedule for all of these facilities?</p>
<ul> <ul>
{% for facility in facilities %} {% for facility in facilities %}
<li>{{ facility.facility_name }}</li> <li>{{ facility.facility_name }}</li>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment