Merge pull request #308 from usnistgov/7.3.6.dev

7.3.6.dev

Author: rptmat57

NEMO/apps/kiosk/templates/kiosk/kiosk.html

@@ -226,7 +226,7 @@ <h1 style="color:lightgrey" id="badge_number"></h1>
         function load_pre_usage_questions(tool_id, customer_id, project_id)
         {
             let failure_dialog = ajax_complete_callback("Unable to load pre usage questions", "There was a problem loading pre usage questions.");
-            const resolved_url = build_django_url("{% url 'tool_usage_questions' 999 'pre' 888 777 'true' %}", ['999', '888', '777', 'true'], [tool_id, customer_id, project_id, virtual_inputs]);
+            const resolved_url = build_django_url("{% url 'kiosk_tool_usage_questions' 999 'pre' 888 777 'true' %}", ['999', '888', '777', 'true'], [tool_id, customer_id, project_id, virtual_inputs]);
             const note = $("#note");
             note.prop("disabled", false).parents("#usage_note").show();
             auto_size_textarea(note[0], 3);

NEMO/apps/kiosk/urls.py

@@ -1,5 +1,6 @@
 from django.urls import include, path, re_path
 from NEMO.apps.kiosk import views
+from NEMO.urls import tool_usage_question_types
 from NEMO.views import area_access, status_dashboard
 
 urlpatterns = [
@@ -38,6 +39,13 @@
                     name="kiosk_tool_reservation",
                 ),
                 path("tool_configuration/", views.kiosk_tool_configuration, name="kiosk_tool_configuration"),
+                re_path(
+                    r"^tool_usage_questions/(?P<tool_id>\d+)/"
+                    + tool_usage_question_types
+                    + "/(?P<user_id>\d+)/(?P<project_id>\d+)/(?P<virtual_inputs>(true|false))/$",
+                    views.kiosk_tool_usage_questions,
+                    name="kiosk_tool_usage_questions",
+                ),
                 path("enter_wait_list/", views.enter_wait_list, name="enter_wait_list_from_kiosk"),
                 path("exit_wait_list/", views.exit_wait_list, name="exit_wait_list_from_kiosk"),
                 path("logout_user/<int:tool_id>", views.logout_user, name="kiosk_logout_user"),

NEMO/apps/kiosk/views.py

@@ -51,6 +51,7 @@
     interlock_error,
     save_comment,
     tool_configuration,
+    tool_usage_questions,
 )
 
 
@@ -363,6 +364,15 @@ def kiosk_tool_configuration(request):
     return tool_configuration(request)
 
 
+@login_required
+@permission_required("NEMO.kiosk")
+@require_GET
+def kiosk_tool_usage_questions(
+    request, tool_id: int, question_type: str, user_id: int, project_id: int, virtual_inputs: str = None
+):
+    return tool_usage_questions(request, tool_id, question_type, user_id, project_id, virtual_inputs)
+
+
 @login_required
 @permission_required("NEMO.kiosk")
 @require_POST