Merge pull request #11 from michel4j/add-track-stages

Add track stages

Author: michel4j

.dockerignore

@@ -84,4 +84,7 @@ venv.bak/
 .idea/
 junk/
 temp/
+deploy/*
+!deploy/*.conf
+!deploy/*.sh
 

Dockerfile

@@ -7,6 +7,7 @@ COPY deploy/run-server.sh /
 COPY deploy/wait-for-it.sh /
 ADD . /usonline
 
+
 RUN set -ex && \
     apk add --no-cache --virtual libpq apache2-ssl apache2-mod-wsgi openssl bash sed py3-pip && \
     /usr/bin/python3 -m venv /venv && source /venv/bin/activate && \

VERSION

@@ -1 +1 @@
-v1.0.1-22-g12d86ce
+v1.0.1-154-g72ce514

apps/agreements/fixtures/initial-data.yml

@@ -2,63 +2,24 @@
   pk: 1
   fields:
     created: 2016-07-21 16:15:43+00:00
-    modified: 2024-12-01 19:25:13.272220+00:00
+    modified: 2025-03-06 04:43:04.466828+00:00
     start_date: null
     end_date: null
     code: 80ae507a-d622-4792-b376-f9f5b4b02ae0
-    name: CLSI User Agreement
+    name: User Agreement
     state: enabled
-    description: All users wishing to perform experiments at the CLSI must read and
-      accept the terms of this agreement. It outlines the conditions under which the
-      CLSI provides access to it's facilities to the user.
-    content: '<h4>Canadian Light Source Inc. (“CLSI”), in accordance with the AGREEMENT
-      TO USE THE CANADIAN LIGHT SOURCE FACILITY between Canadian Light Source Inc.
-      and your institution, permits you &nbsp;access to use of the Canadian Light
-      Source. &nbsp;</h4><p><strong>As a condition of access</strong> to the Canadian
-      Light Source Facility and its Services I agree to the following: &nbsp;</p><ul><li>I
-      am an employee or authorized representative of the institution identified in
-      my user profile.</li><li>I am requesting access to the Canadian Light Source
-      in accordance with CLS User Access Policy.&nbsp;</li><li>I understands that
-      I am are bound by the terms and conditions of the Agreement to Use the Canadian
-      Light Source facility. &nbsp;</li><li>I will comply with the terms and conditions
-      of each User Proposal Submission and Beam Time Request, including limiting access
-      at the Facility to those persons for whom access is specified in such proposal.&nbsp;</li><li>I
-      will comply with CLSI policies and procedures including those pertaining to
-      Health, Safety and the Environment. &nbsp;</li><li>I will Inform CLSI in writing
-      of the nature of the samples, materials and equipment, and the extent to which
-      the same constitute a hazard including but not limited to biohazards, compressed
-      gas, corrosiveness, dangerous reactive materials, flammability, oxidizer, radioactivity,
-      toxicity or other hazards.</li><li>I will pay to CLSI the Fees pertaining to
-      access and Services provided in the course of conduct of each User Proposal
-      Submission and Beam Time Request.&nbsp;</li><li>That the User Institution’s
-      policies regarding intellectual property apply to the activities conducted under
-      the User Proposal Submissions and Beam Time Requests. &nbsp;</li><li><span style="line-height:
-      1.4em; background-color: initial;">These policies do not extend to any technology,
-      software, equipment, information, techniques, documentation or other materials
-      relating to the Facility or its operation.</span><br></li><li><span style="line-height:
-      1.4em; background-color: initial;">CLSI retains proportionate ownership of any
-      Intellectual Property in the nature of the Services performed, analytical methods
-      contributed to or conceived of by CLSI (but excluding resulting data), and other
-      products generated by CLSI in performance of the Services for the User. &nbsp;</span><br></li><li><span
-      style="line-height: 1.4em; background-color: initial;">The User warrants that,
-      to the best of its knowledge, the activities contemplated under a User Proposal
-      Submission and Beam Time Request will not infringe any Intellectual Property
-      rights of third parties. &nbsp;</span><br></li><li>I will acknowledge CLSI in
-      publications and report these publications to CLSI for public use.  Publications
-      should include the following acknowledgements:</li><li>1. “Research described
-      in this paper was performed at the Canadian Light Source, which is supported
-      by the Canadian Foundation for Innovation, Natural Sciences and Engineering
-      Research Council of Canada, the University of Saskatchewan, the Government of
-      Saskatchewan, Western Economic Diversification Canada, the National Research
-      Council Canada, and the Canadian Institutes of Health Research.&nbsp;</li><li>I
-      will provide to CLSI, summaries of research results that lead to knowledge transfer
-      or technology transfer, including but not limited to: dissemination of best
-      practices (e.g., in healthcare, education), improvements in professional practice
-      (e.g., better teaching methods), disclosures of inventions, new product/process
-      development, and patent applications/awards.&nbsp;</li><li>CLSI does not assume
-      responsibility for delays that may arise in access to the Facility, reliance
-      on Services or CLSI personnel and subsequent use of results and data generated
-      by the research.</li><li>Both CLSI and the User agree to protect all information,
-      that is identified as Confidential Information, and that has been disclosed
-      by the other.&nbsp;</li></ul>'
+    description: All users wishing to use this facility must accept the terms of this
+      agreement. It outlines the conditions under which we provide access to you.
+    content: "<p>By using this facility, you agree to:</p><ul><li><strong>Eligibility</strong>:
+      You are authorized by your organization to use the facility.</li><li><strong>Rules</strong>:
+      Follow all facility rules, including safety and proposal guidelines.</li><li><strong>Safety</strong>:
+      Provide details of any hazardous materials you bring.</li><li><strong>Fees</strong>:
+      Pay any applicable fees.</li><li><strong>Intellectual Property:</strong> Your
+      organization's IP policies apply, except for facility-owned technology. Facility
+      retains IP for its services and methods.</li><li><strong>No Infringement</strong>:
+      Ensure your activities don't violate others' IP rights.</li><li><strong>Acknowledgement</strong>:
+      Credit the facility in publications.</li><li><strong>Results</strong>: Share
+      summaries of research results for knowledge transfer.</li><li><strong>No Liability</strong>:
+      The facility is not liable for delays or research outcomes.</li><li><strong>Confidentiality</strong>:
+      Protect confidential information.</li></ul>"
     roles: <reviewer><user>

apps/agreements/templates/agreements/blocks/agreements.html

@@ -3,50 +3,57 @@
 {% block panel_classes %}bg-paper{% endblock %}
 
 {% block panel_content %}
-    {% for agreement in agreements %}
+    {% if agreements %}
         <ul class="list-unstyled">
-            <li class="tinytron bg-transparent">
-                <h4 class="text-condensed"><strong>{{ agreement.name }}</strong></h4>
-                <p>{{ agreement.description }}</p>
-                <div class="row">
+            {% for agreement in agreements %}
+                <li class="bg-transparent row">
                     <div class="col-xs-12">
+                        <div style="padding: 0 1em;">
+                        <h4 class="text-condensed"><strong>{{ agreement.name }}</strong></h4>
+                        <div>{{ agreement.description }}</div>
                         <a href="{% url "accept-agreement" pk=agreement.pk %}"
                            class="btn btn-primary btn-sm pull-right">View</a>
+                        </div>
                     </div>
-                </div>
-                {% if not forloop.last %}
-                    <hr class="hr-xxs"/>
-                {% endif %}
-            </li>
+                    {% if not forloop.last %}
+                        <hr class="hr-xxs"/>
+                    {% endif %}
+                </li>
+            {% endfor %}
         </ul>
-    {% endfor %}
+    {% endif %}
     {% if no_institution %}
-        <div class="tinytron">
+        <div class="tinytron alert-danger">
             <h5>Institution Required</h5>
             <hr class="hr-xs"/>
             <p>In order to use the facility, all users must be affiliated with an institution which has a valid
                 Institutional Agreement. You have not selected an institution. Please update your profile.</p>
         </div>
     {% endif %}
     {% if request_contact %}
-        <div class="tinytron bg-transparent">
-            <h5>Institutional Agreement Required</h5>
-            <hr class="hr-xs"/>
-            <p>In order to use the facility, all users must be affiliated with an institution which has a valid
-                Institutional Agreement. The institution you have selected in your profile "{{ user.institution }}" does not have
-                the appropriate agreement.
-            </p>
-            <p>
-                To assist us in initiating the process, please provide the contact information of the person at your
-                institution who is responsible for such matters.
-
-            </p>
-            {% if user.institution %}
-            <a href="#0" data-url="{% url 'request-institution-contact' user.institution.pk %}"
-               class="btn btn-sm btn-default pull-right">
-                <i class="bi-pencil icon-fw"></i>&nbsp;Institutional Contact
-            </a>
-            {% endif %}
+        <div class="alert-warning" style="padding: 0.5em;">
+            <div class="row">
+                <div class="col-xs-12">
+                    <h5>Institutional Agreement Required</h5>
+                    <hr class="hr-xs"/>
+                    <p>In order to use the facility, all users must be affiliated with an institution which has a valid
+                        Institutional Agreement. The institution you have selected in your profile
+                        "{{ user.institution }}" does not have
+                        the appropriate agreement.
+                    </p>
+                    <p>
+                        To assist us in initiating the process, please provide the contact information of the person at
+                        your
+                        institution who is responsible for such matters.
+                    </p>
+                    {% if user.institution %}
+                        <a href="#0" data-url="{% url 'request-institution-contact' user.institution.pk %}"
+                           class="btn btn-sm btn-default pull-right">
+                            <i class="bi-pencil icon-fw"></i>&nbsp;Institutional Contact
+                        </a>
+                    {% endif %}
+                </div>
+            </div>
         </div>
     {% endif %}
 

apps/beamlines/blocks.py

@@ -0,0 +1,46 @@
+import copy
+import itertools
+import operator
+import re
+from functools import reduce
+
+from django.conf import settings
+from misc.blocktypes import BaseBlock, BLOCK_TYPES
+
+
+USO_FACILITY_STAFF_ROLE = getattr(settings, "USO_FACILITY_STAFF_ROLE", "staff:+")
+USO_FACILITY_ADMIN_ROLE = getattr(settings, "USO_FACILITY_ADMIN_ROLE", "admin:-")
+
+
+class MyFacilities(BaseBlock):
+    block_type = BLOCK_TYPES.dashboard
+    template_name = "beamlines/blocks/facilities.html"
+    priority = 10
+
+    def render(self, context):
+        from . import models
+        ctx = copy.copy(context)
+        user = context['request'].user
+        # generate filters for staff and admin roles
+        staff_pattern = re.compile(re.sub(r'[+-]$', '(?P<acronym>.+)$', USO_FACILITY_STAFF_ROLE))
+        admin_pattern = re.compile(re.sub(r'[+-]$', '(?P<acronym>.+)$', USO_FACILITY_ADMIN_ROLE))
+        staff_acronyms = list(itertools.chain(*[
+            staff_pattern.findall(role) for role in user.get_all_roles() if staff_pattern.match(role)
+        ]))
+        admin_acronyms = list(itertools.chain(*[
+            admin_pattern.findall(role) for role in user.get_all_roles() if admin_pattern.match(role)
+        ]))
+        acronyms = staff_acronyms + admin_acronyms
+        if acronyms:
+            filters = reduce(operator.__or__, [
+                models.Q(acronym__iexact=acronym) for acronym in staff_acronyms
+            ], models.Q(pk__isnull=True))
+        else:
+            return None
+
+        facilities = models.Facility.objects.filter(filters)
+        if facilities.exists():
+            ctx.update({
+                "facilities": facilities,
+            })
+            return super().render(ctx)

apps/beamlines/dynfields.py

@@ -25,9 +25,8 @@ class TechnicalTags(FieldType):
     options = ['required', 'hide', 'nolabel']
     settings = ['label', 'options']
 
-    def clean(self, value, multi=False, validate=True):
-        if not isinstance(value, dict):
-            return {}
-        if isinstance(value.get('facility'), list):
-            value['facility'] = value['facility'][0]
-        return value
+    def clean(self, val, multi=False, validate=True):
+        val = super().clean(val, multi=multi, validate=validate)
+        if isinstance(val, str):
+            val = int(val.strip())
+        return val

apps/beamlines/migrations/0004_alter_facility_parent.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.11 on 2025-03-06 16:44
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('beamlines', '0003_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='facility',
+            name='parent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='children', to='beamlines.facility', verbose_name='Parent Facility'),
+        ),
+    ]

apps/beamlines/models.py

@@ -56,7 +56,7 @@ class Facility(TimeStampedModel):
     source = models.CharField("Source Type", max_length=255, null=True, blank=True)
     state = models.CharField(max_length=20, choices=STATES, default=STATES.design)
     parent = models.ForeignKey(
-        "Facility", null=True, related_name="children", verbose_name="Parent Facility", on_delete=models.SET_NULL
+        "Facility", null=True, blank=True, related_name="children", verbose_name="Parent Facility", on_delete=models.SET_NULL
     )
     flex_schedule = models.BooleanField("Allocation Not Required", default=False)
     shift_size = models.IntegerField("Shift Size (hrs)", choices=SIZES, default=SIZES.eight)
@@ -126,7 +126,6 @@ def is_staff(self, user):
         return user.has_any_role(*_roles)
 
     def is_admin(self, user):
-
         _roles = self.expand_role(USO_FACILITY_ADMIN_ROLE)
         return user.has_any_role(*_roles)
 

apps/beamlines/templates/beamlines/blocks/facilities.html

@@ -0,0 +1,29 @@
+{% extends "misc/blocks/panel.html" %}
+{% load cycle_tags %}
+{% load beamline_tags %}
+{% block panel_title %}My Facilities{% endblock %}
+{% block panel_content %}
+    {% if facilities.exists %}
+        <div class="pad-wrapper">
+            <div class="row scroll-box" style="max-height: 200px;">
+                <ul class="list-unstyled list-ruled col-xs-12">
+                    {% for fac in facilities %}
+                        <li class="text-condensed" >
+                            <span class="pull-right">
+                                {% if user|is_admin:fac %}
+                                    <span class="label label-info">Admin</span>
+                                {% elif user|is_staff:fac %}
+                                    <span class="label label-success">Staff</span>
+                                {% endif %}
+                            </span>
+                            <a href='{% url "facility-detail" fac=fac.acronym %}' data-toggle="tooltip">
+                                <strong title="{{ fac.name }}">{{ fac.acronym }}</strong><span class="hidden-xs">&nbsp;&ndash;&nbsp;{{ fac.name }}</span>
+                            </a>
+                        </li>
+                    {% endfor %}
+                </ul>
+            </div>
+        </div>
+    {% endif %}
+{% endblock %}
+