NEMO-CE 7.3.5__tar.gz → 7.3.6__tar.gz

{nemo_ce-7.3.5 → nemo_ce-7.3.6}/NEMO/templates/calendar/calendar.html

@@ -646,7 +646,7 @@ function create_calendar()
 	{
 		"header":
 		{
-			left: "prev,next today{% if user.is_staff or user.is_tool_staff %} proxyReservation scheduledOutage{% endif %}{% if customizations|get_item:"training_module_enabled" == "enabled" %}{% if user|is_trainer %} scheduleTraining{% endif %} requestTraining{% endif %} login logout",
+			left: "prev,next today{% if user.is_staff or user.is_tool_staff %} proxyReservation scheduledOutage{% endif %}{% if customizations|get_item:"training_module_enabled" == "enabled" %}{% if user|is_trainer %} scheduleTraining{% endif %} {% if customizations|get_item:"training_requests_enabled" == "enabled" %}requestTraining{% endif %}{% endif %} login logout",
 			center: "title",
 			right: "agendaDay,agendaWeek,month"
 		},
@@ -752,6 +752,7 @@ function reserve_for_someone_else_callback(response, status, xml_http_request)
 
 function request_training()
 {
+	{% if customizations|get_item:"training_requests_enabled" == "enabled" %}
 	let item = get_selected_item();
 	if (item && item !== "personal_schedule" && item !== "all_tools" && item !== "all_areas" && item !== "all_areastools")
 	{
@@ -779,6 +780,7 @@ function request_training()
 		}
 		ajax_get(url, event_changes, function(response, status, xml_http_request) { return event_creation_success_callback(response, status, xml_http_request, post_data, callback) }, [ajax_failure_callback("Training request creation failed")])
 	}
+    {% endif %}
 }
 
 function login_to_area()

{nemo_ce-7.3.5 → nemo_ce-7.3.6}/NEMO/templates/customizations/customizations_training.html

@@ -82,6 +82,15 @@
                         Enable training requests/sessions scheduling
                     </label>
                     <br />
+                    <input type="hidden" name="training_requests_enabled" value="off" />
+                    <label>
+                        <input type="checkbox"
+                               name="training_requests_enabled"
+                               {% if training_requests_enabled == "enabled" %}checked{% endif %}
+                               value="enabled">
+                        Allow users to request training (via calendar or training module)
+                    </label>
+                    <br />
                     <label>
                         <input type="checkbox"
                                name="training_show_in_user_requests"

{nemo_ce-7.3.5 → nemo_ce-7.3.6}/NEMO/templates/training_new/training_base.html

@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load training_tags %}
+{% load custom_tags_and_filters %}
 {% block extrahead %}
     {% load static %}
     <script type="text/javascript" src="{% static "datetimepicker/bootstrap-datetimepicker.js" %}"></script>
@@ -13,14 +14,16 @@
 {% block content %}
     <h1 style="margin-top: 0; margin-bottom: 25px">Training dashboard</h1>
     <ul class="nav nav-tabs">
-        {% url 'training_requests' as training_requests_url %}
-        <li class="nav-item{% if training_requests_url in request.path %} active{% endif %}">
-            <a class="nav-link" href="{{ training_requests_url }}">My training requests
-                {% if training_invitation_notification_count %}
-                    <span class="badge badge-tab-top">{{ training_invitation_notification_count }}</span>
-                {% endif %}
-            </a>
-        </li>
+        {% if customizations|get_item:"training_requests_enabled" == "enabled" %}
+            {% url 'training_requests' as training_requests_url %}
+            <li class="nav-item{% if training_requests_url in request.path %} active{% endif %}">
+                <a class="nav-link" href="{{ training_requests_url }}">My training requests
+                    {% if training_invitation_notification_count %}
+                        <span class="badge badge-tab-top">{{ training_invitation_notification_count }}</span>
+                    {% endif %}
+                </a>
+            </li>
+        {% endif %}
         {% url 'training_history' as training_history_url %}
         <li class="nav-item{% if training_history_url in request.path %} active{% endif %}">
             <a class="nav-link" href="{{ training_history_url }}">Training history</a>

{nemo_ce-7.3.5 → nemo_ce-7.3.6}/NEMO/views/customization.py

@@ -763,6 +763,7 @@ class RemoteWorkCustomization(CustomizationBase):
 class TrainingCustomization(CustomizationBase):
     variables = {
         "training_module_enabled": "enabled",
+        "training_requests_enabled": "enabled",
         "training_technique_empty_label": "Basic training",
         "training_request_default_availability_allowed": "",
         "training_request_default_message_required": "",

{nemo_ce-7.3.5 → nemo_ce-7.3.6}/NEMO/views/training_new.py

@@ -72,6 +72,8 @@ def requests(request):
     mark_training_objects_expired()
     if not TrainingCustomization.get_bool("training_module_enabled"):
         return redirect("landing")
+    if not TrainingCustomization.get_bool("training_requests_enabled"):
+        return redirect("upcoming_training_events")
     user: User = request.user
     training_requests = TrainingRequest.objects.filter(
         user=user, status__in=[TrainingRequestStatus.SENT, TrainingRequestStatus.REVIEWED]
@@ -88,6 +90,8 @@ def requests(request):
 @login_required
 @require_http_methods(["GET", "POST"])
 def create_request(request, tool_id=None):
+    if not TrainingCustomization.get_bool("training_requests_enabled"):
+        return redirect("upcoming_training_events")
     training_request_form = TrainingRequestForm(request.POST or None)
     selected_tool = Tool.objects.filter(pk=training_request_form.data.get("tool") or tool_id).first()
     time_forms = []

{nemo_ce-7.3.5 → nemo_ce-7.3.6}/NEMO_CE.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NEMO-CE
-Version: 7.3.5
+Version: 7.3.6
 Summary: NEMO Community Edition is a laboratory logistics web application based of NEMO. Use it to schedule reservations, control tool access, track maintenance issues, and more.
 Author-email: Atlantis Labs LLC <atlantis@atlantislabs.io>
 License: MIT License

{nemo_ce-7.3.5 → nemo_ce-7.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NEMO-CE
-Version: 7.3.5
+Version: 7.3.6
 Summary: NEMO Community Edition is a laboratory logistics web application based of NEMO. Use it to schedule reservations, control tool access, track maintenance issues, and more.
 Author-email: Atlantis Labs LLC <atlantis@atlantislabs.io>
 License: MIT License

{nemo_ce-7.3.5 → nemo_ce-7.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "NEMO-CE"
-version = '7.3.5'
+version = '7.3.6'
 description = "NEMO Community Edition is a laboratory logistics web application based of NEMO. Use it to schedule reservations, control tool access, track maintenance issues, and more."
 keywords = ["NEMO", "NEMO-CE"]
 readme = "README.md"