- added sounds and background color when logging out of an area

Dockerfile.splash_pad

@@ -10,6 +10,7 @@ WORKDIR /nemo
 
 COPY resources/icons/* /nemo/media/
 COPY resources/people/* /nemo/media/
+COPY resources/media/* /nemo/media/
 COPY resources/splash_pad_settings.py /nemo/
 COPY NEMO/fixtures/splash_pad.json /nemo/
 

NEMO/static/nemo.css

@@ -289,4 +289,16 @@ Twitter Typeahead autocomplete dropdown menu isn't chopped off. */
 .navbar-preferences > a > img {
 	width: 19px;
 	height: 19px;
+}
+
+body.logout-error {
+	background-color: red;
+}
+
+body.logout-warning {
+	background-color: orange;
+}
+
+body.logout-success {
+	background-color: green;
 }

NEMO/templates/area_access/badge_not_found.html

@@ -1,4 +1,6 @@
+<script>$('body').removeClass().addClass('logout-error')</script>
 <h1>Your badge wasn't recognized.</h1>
 <h2>If you got a new one recently then we'll need to update your account.</h2>
 <h2>Please visit the NanoFab user office to resolve the problem.</h2>
+<audio src="{% url 'media' 'error.mp3' %}" autoplay></audio>
 <script>revert(15);</script>

NEMO/templates/area_access/base.html

@@ -32,7 +32,7 @@
 		{% endblock %}
 		<div id="occupancy"></div>
 	</div>
-	<div id="error" style="display: none"><h1>There was a problem communicating with the web server. Please visit the user office for assistance.</h1></div>
+	<div id="error" style="display: none"><h1>There was a problem communicating with the web server. Please visit the user office for assistance.</h1><audio id="error-sound" src="{% url 'media' 'error.mp3' %}"></audio></div>
 	<div id="status" style="display: none"></div>
 	<div><h1 style="color:lightgrey" id="badge_number"></h1></div>
 	<script type="text/javascript">
@@ -76,9 +76,11 @@
 		{
 			if(status === "error")
 			{
+				document.getElementById('error-sound').play();
 				$("#default_content").hide();
 				$("#status").hide();
 				$("#error").show();
+				$('body').removeClass().addClass('logout-error');
 				revert(15);
 			}
 		}
@@ -90,6 +92,7 @@
 		}
 		function revert_to_default_content()
 		{
+			$('body').removeClass();
 			fetch_occupancy();
 			clear_timeout();
 			$("#status").hide();

NEMO/templates/area_access/logout_success.html

@@ -1,2 +1,4 @@
+<script>$('body').removeClass().addClass('logout-success')</script>
 <h1>You're now logged out of the {{ area|lower }}, {{ name }}.</h1>
+<audio src="{% url 'media' 'success.mp3' %}" autoplay></audio>
 <script>revert(7);</script>

NEMO/templates/area_access/logout_warning.html

@@ -0,0 +1,12 @@
+<script>$('body').removeClass().addClass('logout-warning')</script>
+<h1>You're now logged out of the {{ area|lower }}, {{ name }}.</h1>
+<audio src="{% url 'media' 'warning.mp3' %}" autoplay></audio>
+<h2 style="color:red">
+	<p>You are currently still logged in to the following tools:</p>
+	<ul>
+		{% for usage_event in tools_in_use %}
+			<li>{{ usage_event.tool.name }}</li>
+		{% endfor %}
+	</ul>
+</h2>
+<script>revert(15);</script>

NEMO/templates/area_access/not_logged_in.html

@@ -1,3 +1,5 @@
+<script>$('body').removeClass().addClass('logout-warning')</script>
 <h1>According to our records, you're not logged in to any access controlled areas.</h1>
 <h2>Please visit the NanoFab user office if you believe this is an error.</h2>
+<audio src="{% url 'media' 'warning.mp3' %}" autoplay></audio>
 <script>revert(15);</script>

NEMO/views/area_access.py

@@ -10,7 +10,7 @@
 from django.utils.http import urlencode
 from django.views.decorators.http import require_GET, require_POST, require_http_methods
 
-from NEMO.models import Area, AreaAccessRecord, Door, PhysicalAccessLog, PhysicalAccessType, Project, User
+from NEMO.models import Area, AreaAccessRecord, Door, PhysicalAccessLog, PhysicalAccessType, Project, User, UsageEvent
 from NEMO.tasks import postpone
 from NEMO.utilities import parse_start_and_end_date
 from NEMO.views.customization import get_customization
@@ -193,7 +193,11 @@ def logout_of_area(request, door_id):
 	if record:
 		record.end = timezone.now()
 		record.save()
-		return render(request, 'area_access/logout_success.html', {'area': record.area, 'name': user.first_name})
+		busy_tools = UsageEvent.objects.filter(end=None, user=user)
+		if busy_tools:
+			return render(request, 'area_access/logout_warning.html', {'area': record.area, 'name': user.first_name, 'tools_in_use': busy_tools})
+		else:
+			return render(request, 'area_access/logout_success.html', {'area': record.area, 'name': user.first_name})
 	else:
 		return render(request, 'area_access/not_logged_in.html')
 

setup.py

@@ -2,7 +2,7 @@
 
 setup(
 	name='NEMO',
-	version='1.16.2',
+	version='1.17.0',
 	python_requires='>=3.6',
 	packages=find_packages(exclude=['NEMO.tests']),
 	include_package_data=True,