tomtoolkit 2.31.7__tar.gz → 2.32.0__tar.gz

tomtoolkit-2.32.0/.git/FETCH_HEAD

@@ -0,0 +1 @@
+8e30f15557e778813e255d5378fe7c2387359093		'8e30f15557e778813e255d5378fe7c2387359093' of https://github.com/TOMToolkit/tom_base

tomtoolkit-2.32.0/.git/HEAD

@@ -0,0 +1 @@
+8e30f15557e778813e255d5378fe7c2387359093

{tomtoolkit-2.31.7 → tomtoolkit-2.32.0}/.git/config

@@ -9,4 +9,4 @@
 [gc]
 	auto = 0
 [http "https://github.com/"]
-	extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzX2NyRE9CYTdRSExrVUpyNHNyTjl5M0FIaXZraUY3QzJ6UzFGTA==
+	extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzX0dQNjA1NktBN2NpeFAzN1JkUzBMVDdhWG55eGg0cTFRU2k2Mw==

tomtoolkit-2.32.0/.git/logs/HEAD

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 8e30f15557e778813e255d5378fe7c2387359093 runner <runner@runnervmeorf1.ve0odadno2suxm2sbvaejm5i1a.yx.internal.cloudapp.net> 1776974622 +0000	checkout: moving from master to refs/tags/2.32.0

tomtoolkit-2.32.0/.git/refs/tags/2.32.0

@@ -0,0 +1 @@
+8e30f15557e778813e255d5378fe7c2387359093

tomtoolkit-2.32.0/.git/shallow

@@ -0,0 +1 @@
+8e30f15557e778813e255d5378fe7c2387359093

{tomtoolkit-2.31.7 → tomtoolkit-2.32.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tomtoolkit
-Version: 2.31.7
+Version: 2.32.0
 Summary: TOM Toolkit and base modules
 License-Expression: GPL-3.0-only
 License-File: LICENSE

{tomtoolkit-2.31.7 → tomtoolkit-2.32.0}/pyproject.toml

@@ -71,7 +71,7 @@ dependencies = [
     "importlib-resources >=6.4.5,<6.5.0",
     "django-tasks (>=0.6.1,<0.7.0)",
 ]
-version = "2.31.7"
+version = "2.32.0"
 
 [tool.poetry]
 packages = [ # tell poetry build that the repo is named tom_base (which != name, above)

{tomtoolkit-2.31.7 → tomtoolkit-2.32.0}/tom_base/__init__.py

@@ -1,2 +1,2 @@
 # this is a placeholder for poetry-dynamic-versioning (see pyproject.toml)
-__version__ = "2.31.7"
+__version__ = "2.32.0"

{tomtoolkit-2.31.7 → tomtoolkit-2.32.0}/tom_base/settings.py

@@ -62,6 +62,7 @@ INSTALLED_APPS = [
     'tom_observations',
     'tom_dataproducts',
     'tom_dataservices',
+    'tom_calendar',
 ]
 
 SITE_ID = 1

tomtoolkit-2.32.0/tom_calendar/admin.py

@@ -0,0 +1,5 @@
+from django.contrib import admin
+
+from .models import CalendarEvent
+
+admin.site.register(CalendarEvent)

tomtoolkit-2.32.0/tom_calendar/apps.py

@@ -0,0 +1,12 @@
+from django.apps import AppConfig
+
+
+class TomCalendarConfig(AppConfig):
+    name = 'tom_calendar'
+
+    def nav_items(self):
+        """Integration point for adding items to the navbar.
+        This method should return a list of partial templates to be included in the navbar.
+        """
+
+        return [{'partial': 'tom_calendar/partials/navbar_item.html'}]

tomtoolkit-2.32.0/tom_calendar/migrations/0001_initial.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.27 on 2026-02-27 22:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CalendarEvent',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('description', models.TextField(blank=True, default='')),
+                ('start_time', models.DateTimeField()),
+                ('end_time', models.DateTimeField()),
+                ('url', models.URLField(blank=True, default='')),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('modified', models.DateTimeField(auto_now=True)),
+            ],
+        ),
+    ]

tomtoolkit-2.32.0/tom_calendar/migrations/0002_calendarevent_target_list.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.27 on 2026-03-05 17:52
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tom_targets', '0030_alter_basetarget_slope'),
+        ('tom_calendar', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='calendarevent',
+            name='target_list',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='tom_targets.targetlist'),
+        ),
+    ]

tomtoolkit-2.32.0/tom_calendar/migrations/0003_calendarevent_proposal_calendarevent_telescope_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.27 on 2026-03-05 22:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tom_calendar', '0002_calendarevent_target_list'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='calendarevent',
+            name='proposal',
+            field=models.CharField(blank=True, default='', max_length=200),
+        ),
+        migrations.AddField(
+            model_name='calendarevent',
+            name='telescope',
+            field=models.CharField(blank=True, default='', max_length=200),
+        ),
+        migrations.AddField(
+            model_name='calendarevent',
+            name='user',
+            field=models.CharField(blank=True, default='', max_length=200),
+        ),
+    ]

tomtoolkit-2.32.0/tom_calendar/migrations/0004_eventtodo.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.27 on 2026-03-05 23:42
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tom_calendar', '0003_calendarevent_proposal_calendarevent_telescope_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='EventTodo',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('description', models.CharField(max_length=200)),
+                ('is_completed', models.BooleanField(default=False)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('modified', models.DateTimeField(auto_now=True)),
+                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='todos', to='tom_calendar.calendarevent')),
+            ],
+        ),
+    ]

tomtoolkit-2.32.0/tom_calendar/migrations/0005_calendarevent_instrument.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.27 on 2026-03-12 20:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tom_calendar', '0004_eventtodo'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='calendarevent',
+            name='instrument',
+            field=models.CharField(blank=True, default='', max_length=200),
+        ),
+    ]

tomtoolkit-2.32.0/tom_calendar/models.py

@@ -0,0 +1,57 @@
+from django.db import models
+
+from tom_targets.models import TargetList
+
+from .utils import BOOTSTRAP_COLORS
+
+
+class EventTodo(models.Model):
+    event = models.ForeignKey('CalendarEvent', on_delete=models.CASCADE, related_name='todos')
+    description = models.CharField(max_length=200)
+    is_completed = models.BooleanField(default=False)
+    created = models.DateTimeField(auto_now_add=True)
+    modified = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        app_label = 'tom_calendar'
+
+    def __str__(self):
+        return f'Todo for {self.event.title}: {self.description}'
+
+
+class CalendarEvent(models.Model):
+
+    """Class representing an event in the calendar.
+
+    Other applications can create calendar events by creating instances of this class.
+    """
+
+    title = models.CharField(max_length=200)
+    description = models.TextField(blank=True, default="")
+    start_time = models.DateTimeField()
+    end_time = models.DateTimeField()
+    url = models.URLField(blank=True, default="")
+    """The URL a user can visit for more information or associated object."""
+    target_list = models.ForeignKey(TargetList, on_delete=models.SET_NULL, null=True, blank=True)
+    user = models.CharField(max_length=200, blank=True, default="")
+    proposal = models.CharField(max_length=200, blank=True, default="")
+    telescope = models.CharField(max_length=200, blank=True, default="")
+    instrument = models.CharField(max_length=200, blank=True, default="")
+    created = models.DateTimeField(auto_now_add=True)
+    modified = models.DateTimeField(auto_now=True)
+
+    todos: models.Manager[EventTodo]
+
+    class Meta:
+        app_label = 'tom_calendar'
+
+    def __str__(self):
+        return self.title
+
+    @property
+    def color(self) -> str:
+        return BOOTSTRAP_COLORS[self.pk % len(BOOTSTRAP_COLORS)]
+
+    @property
+    def active_todos(self):
+        return self.todos.filter(is_completed=False)

tomtoolkit-2.32.0/tom_calendar/templates/tom_calendar/calendar_page.html

@@ -0,0 +1,30 @@
+{% extends 'tom_common/base.html' %}
+{% block title %}Calendar{% endblock %}
+{% block content %}
+  {% include 'tom_calendar/partials/calendar.html' %}
+  <!-- Modal -->
+  <div class="modal fade" id="cal-modal" tabindex="-1" aria-labelledby="calModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <div class="modal-body" id="cal-modal-body">
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock %}
+{% block extra_javascript %}
+<script>
+  document.body.addEventListener("calClose", function () {
+    $("#cal-modal").modal("hide");
+  });
+  document.body.addEventListener("calRefresh", function () {
+    const cal = document.getElementById("calendar-partial");
+    htmx.ajax("GET", cal.dataset.url, {target: "#calendar-partial", swap: "outerHTML"});
+  });
+</script>
+{% endblock %}

tomtoolkit-2.32.0/tom_calendar/templates/tom_calendar/partials/calendar.html

@@ -0,0 +1,205 @@
+<style>
+  .cal-grid {
+    display: grid;
+    grid-template-columns: repeat(7, 1fr);
+  }
+  .cal-day {
+    min-height: 110px;
+    background-color: var(--light);
+    color: var(--secondary);
+  }
+  .cal-day.is-current-month {
+    background-color: transparent;
+    color: inherit;
+  }
+  .cal-day:hover {
+    background-color: rgba(0, 0, 0, .06);
+  }
+  .cal-day.is-current-month:hover {
+    background-color: rgba(0, 0, 0, .04);
+  }
+  .day-num {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 1.6rem;
+    height: 1.6rem;
+    font-size: 0.80rem;
+    font-weight: 500;
+    border-radius: 50%;
+    margin-bottom: 0.15rem;
+  }
+  .cal-day.is-current-month.today .day-num {
+    background-color: var(--primary);
+    color: var(--white);
+    font-weight: 700;
+  }
+  .moon-phase {
+    font-size: 0.9rem;
+    cursor: default;
+    float: right;
+  }
+  .cal-event {
+    font-size: 0.75rem;
+    line-height: 1.3;
+    cursor: pointer;
+  }
+  .cal-event a {
+    color: inherit;
+  }
+  .cal-event-timed {
+    display: flex;
+    align-items: center;
+    gap: 2px;
+  }
+  .cal-event-timed .cal-event-title {
+    flex: 1;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .cal-event-timed .cal-event-bullet {
+    flex-shrink: 0;
+    font-size: 0.7rem;
+    line-height: 1;
+  }
+  .cal-event-timed .cal-event-time {
+    flex-shrink: 0;
+    white-space: nowrap;
+    opacity: 0.55;
+    font-size: 0.68rem;
+  }
+  .cal-event-all-day-row {
+    display: flex;
+    align-items: center;
+    gap: 2px;
+    margin-bottom: 2px;
+  }
+  .cal-event-all-day {
+    display: block;
+    flex: 1;
+    min-width: 0;
+    border-radius: 3px;
+    padding: 1px 5px;
+    color: #fff !important;
+    font-weight: 500;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    cursor: pointer;
+  }
+  .cal-event-all-day a {
+    color: #fff !important;
+    text-decoration: none;
+  }
+  .cal-event-all-day a:hover {
+    text-decoration: underline;
+  }
+</style>
+
+{% load tz calendar_tags %}
+
+<div id="calendar-partial"
+     data-url="{% url 'calendar:calendar' %}?month={{ month }}&year={{ year }}">
+  <div class="d-flex justify-content-between align-items-center mb-3">
+    <div>
+      <button class="btn btn-outline-secondary btn-sm"
+              hx-get="{% url 'calendar:calendar' %}?month={{ prev_month }}&year={{ prev_year }}"
+              hx-target="#calendar-partial"
+              hx-swap="outerHTML">
+        &laquo; Prev
+      </button>
+      <button class="btn btn-outline-secondary btn-sm"
+              hx-get="{% url 'calendar:calendar' %}?month={{ next_month }}&year={{ next_year }}"
+              hx-target="#calendar-partial"
+              hx-swap="outerHTML">
+        Next &raquo;
+      </button>
+      <button class="btn btn-outline-secondary btn-sm"
+              hx-get="{% url 'calendar:calendar' %}?month={% now "n" %}&year={% now "Y" %}"
+              hx-target="#calendar-partial"
+              hx-swap="outerHTML">
+        Today
+      </button>
+    </div>
+    <h4 class="mb-0">{{ month_name }}</h4>
+    <button class="btn btn-outline-secondary btn-sm"
+            hx-get="{% url 'calendar:create-event' %}"
+            hx-target="#cal-modal-body"
+            hx-on::after-request="$('#cal-modal').modal('show');"
+    >
+      + New Event
+    </button>
+  </div>
+
+  <div class="cal-grid border-top border-left">
+    {% for name in day_names %}
+      <div class="cal-day-header text-center bg-light font-weight-bold text-secondary border-right border-bottom p-2">{{ name }}</div>
+    {% endfor %}
+
+    {% for week in weeks %}
+      {% for day in week %}
+        <div class="cal-day{% if day.date.month == month %} is-current-month{% endif %}{% if day.date == today %} today{% endif %} border-right border-bottom p-1"
+             hx-get="{% url 'calendar:create-event' %}?date={{ day.date|date:'Y-m-d' }}"
+             hx-target="#cal-modal-body"
+             hx-on::after-request="$('#cal-modal').modal('show');"
+        >
+          <span class="day-num">{{ day.date.day }}</span>
+          <span class="moon-phase" title="{% widthratio day.moon.illumination 1 100 %}% illuminated">{{ day.moon.emoji }}</span>
+          <div hx-target="#cal-modal-body"
+               hx-on::after-request="$('#cal-modal').modal('show');"
+               hx-on:click="event.stopPropagation()">
+            {% for event in day.all_day_events %}
+              <div class="cal-event cal-event-all-day-row"
+                   hx-get="{% url 'calendar:update-event' event.id %}"
+              >
+                {% include 'tom_calendar/partials/target_list_block.html' with target_list=event.target_list %}
+                <div class="cal-event-all-day" style="background-color: {{ event.color }};">
+                  {{ event.title|truncatechars:18 }}
+                  {% if event.active_todos.count %}
+                  ({{ event.active_todos.count }})
+                  {% endif %}
+                </div>
+              </div>
+            {% endfor %}
+            {% for event in day.events %}
+              <div class="cal-event cal-event-timed"
+                   hx-get="{% url 'calendar:update-event' event.id %}"
+              >
+                {% include 'tom_calendar/partials/target_list_block.html' with target_list=event.target_list %}
+                <span class="cal-event-title">
+                  {{ event.title|truncatechars:16 }}
+                  {% if event.active_todos.count %}
+                  ({{ event.active_todos.count }})
+                  {% endif %}
+                </span>
+                <span class="cal-event-time">{{ event.start_time|offset_time:utc_offset|time:"H:i" }}</span>
+              </div>
+            {% endfor %}
+          </div>
+        </div>
+      {% endfor %}
+    {% endfor %}
+  </div>
+  <div class="d-flex justify-content-between align-items-center mt-1">
+    <div>
+      {% for target_list in target_lists %}
+        {% include 'tom_calendar/partials/target_list_block.html' with target_list=target_list %}
+        <a class="text-secondary mr-2" href="{% url 'targets:list' %}?targetlist__name={{ target_list.id }}">
+            <small>{{ target_list.name }}</small>
+        </a>
+      {% endfor %}
+    </div>
+    <select name="utc_offset"
+            hx-get="{% url 'calendar:calendar' %}"
+            hx-trigger="change"
+            hx-target="#calendar-partial"
+            hx-swap="outerHTML"
+            hx-vals='{"month": "{{ month }}", "year": "{{ year }}"}'>
+      {% for i in utc_offset_choices %}
+      <option value="{{ i }}" {% if i == utc_offset %}selected{% endif %}>UTC{% if i >= 0 %}+{% endif %}{{ i }}</option>
+      {% endfor %}
+    </select>
+  </div>
+</div>

tomtoolkit-2.32.0/tom_calendar/templates/tom_calendar/partials/event_form.html

@@ -0,0 +1,86 @@
+{% load bootstrap4 %}
+<form {% if action == "create" %}
+        hx-post="{% url 'calendar:create-event' %}"
+      {% else %}
+        hx-post="{% url 'calendar:update-event' event.id %}"
+      {% endif %}
+        hx-target="#calendar-partial">
+    {% csrf_token %}
+    <div class="form-row">
+      <div class="col">
+        {% bootstrap_field form.title %}
+      </div>
+    </div>
+    <div class="form-row">
+      <div class="col" style="min-width: 0;">
+        {% bootstrap_field form.start_time %}
+      </div>
+      <div class="col" style="min-width: 0;">
+        {% bootstrap_field form.end_time %}
+      </div>
+    </div>
+    <div class="form-row">
+      <div class="col">
+        {% bootstrap_field form.description %}
+      </div>
+    </div>
+    <div class="form-row">
+      <div class="col">
+        <label for="{{ form.url.id_for_label }}">
+          URL
+          {% if form.url.value %}
+            <small>
+              <a href="{{ form.url.value }}" target="_blank">View  ↗</a>
+            </small>
+          {% endif %}
+        </label>
+        {% bootstrap_field form.url show_label=False %}
+      </div>
+      <div class="col">
+        <label for="{{ form.target_list.id_for_label }}">
+          Target list
+          {% if form.target_list.value %}
+          <small>
+            <a href="{% url 'targets:list' %}?targetlist__name={{ form.target_list.value }}" target="_blank">View  ↗</a>
+          </small>
+          {% endif %}
+        </label>
+        {% bootstrap_field form.target_list show_label=False%}
+      </div>
+    </div>
+    <div class="form-row">
+      <div class="col">
+        {% bootstrap_field form.user %}
+      </div>
+      <div class="col">
+        {% bootstrap_field form.proposal %}
+      </div>
+      <div class="col">
+        {% bootstrap_field form.telescope %}
+      </div>
+      <div class="col">
+        {% bootstrap_field form.instrument %}
+      </div>
+    </div>
+    {% buttons %}
+    <button type="submit" class="btn btn-primary">Save</button>
+    {% if action == "create" %}
+    <button type="submit" name="save_and_edit" value="1" class="btn btn-primary">Save and edit</button>
+    {% else %}
+    <button type="button"
+            hx-post="{% url 'calendar:delete-event' event.id %}"
+            hx-target="#calendar-partial"
+            hx-confirm="Are you sure you want to delete this event?"
+            class="btn btn-danger">Delete</button>
+    {% endif %}
+    {% endbuttons %}
+</form>
+<h6 class="mb-2">Todo list</h6>
+<hr>
+<div id="cal-todos">
+{% if action == "update" %}
+  {% include 'tom_calendar/partials/todos.html' with event=event %}
+{% else %}
+  <p>Save the event to add TODOs</p>
+{% endif %}
+</div>

tomtoolkit-2.32.0/tom_calendar/templates/tom_calendar/partials/navbar_item.html

@@ -0,0 +1,3 @@
+<li class="nav-item">
+    <a class="nav-link" href="{% url 'tom_calendar:calendar' %}">Calendar</a>
+</li>

tomtoolkit-2.32.0/tom_calendar/templates/tom_calendar/partials/target_list_block.html

@@ -0,0 +1,7 @@
+{% load calendar_tags %}
+{% if target_list %}
+  {% target_list_color target_list as tl_color %}
+  <a href="{% url 'targets:list' %}?targetlist__name={{ target_list.id }}">
+    <span class="cal-event-bullet" style="color: {{ tl_color }};">▌</span>
+  </a>
+{% endif %}

tomtoolkit-2.32.0/tom_calendar/templates/tom_calendar/partials/todos.html

@@ -0,0 +1,33 @@
+{% for todo in event.todos.all %}
+  <form hx-post="{% url 'calendar:update-todo' todo.id %}"
+        hx-trigger="change"
+        hx-target="#cal-todos"
+        hx-swap="innerHTML"
+        class="mb-1">
+    {% csrf_token %}
+    <input type="hidden" name="description" value="{{ todo.description }}">
+    <div class="form-group form-check mb-0">
+      <input type="checkbox" class="form-check-input" name="is_completed" value="true"
+             id="todo-{{ todo.id }}" {% if todo.is_completed %}checked{% endif %}>
+      <label class="form-check-label" for="todo-{{ todo.id }}"
+             {% if todo.is_completed %}style="text-decoration: line-through; opacity: 0.6;"{% endif %}>
+        {{ todo.description }}
+      </label>
+    </div>
+  </form>
+{% empty %}
+  <p class="text-muted small">No todos yet.</p>
+{% endfor %}
+
+<form hx-post="{% url 'calendar:create-todo' event.id %}"
+      hx-target="#cal-todos"
+      hx-swap="innerHTML"
+      class="form-inline mt-2">
+  {% csrf_token %}
+  <div class="form-group mr-2">
+    <label for="new-todo-description" class="sr-only">New todo</label>
+    <input type="text" name="description" class="form-control form-control-sm"
+           id="new-todo-description" placeholder="Add a todo..." required>
+  </div>
+  <button type="submit" class="btn btn-sm btn-outline-primary">Add</button>
+</form>

tomtoolkit-2.32.0/tom_calendar/templatetags/calendar_tags.py

@@ -0,0 +1,17 @@
+from datetime import timedelta
+
+from django import template
+
+from tom_calendar.utils import target_list_color as _target_list_color
+
+register = template.Library()
+
+
+@register.simple_tag
+def target_list_color(target_list):
+    return _target_list_color(target_list)
+
+
+@register.filter
+def offset_time(dt, utc_offset):
+    return dt + timedelta(hours=int(utc_offset))