Change the NEST_AGE_DEFAULT from "unknown" to "fresh"

kustomize/overlays/prod/kustomization.yaml

@@ -25,5 +25,5 @@ patches:
   - path: service_patch.yaml
 images:
   - name: ghcr.io/dbca-wa/wastd
-    newTag: 2.1.1
+    newTag: 2.1.3
 

observations/lookups.py

@@ -405,12 +405,12 @@
 )
 NESTING_PRESENT = ("nest-with-eggs", "nest-unsure-of-eggs")
 
-NEST_AGE_DEFAULT = "unknown"
+NEST_AGE_DEFAULT = "fresh"
 NEST_AGE_CHOICES = (
-    ("fresh", "Fresh, made last night"),
+    (NEST_AGE_DEFAULT, "Fresh, made last night"),
     ("missed", "Missed turtle, made within past hours"),
     ("old", "Old, made before last night"),
-    (NEST_AGE_DEFAULT, "Unknown age"),
+    ("unknown", "Unknown age"),
 )
 
 NEST_TYPE_DEFAULT = "track-not-assessed"

observations/management/commands/automated_qa_checks.py

@@ -70,7 +70,7 @@ def handle(self, *args, **options):
             enc.save()
 
         # Check: Any turtle nest encounter with uncertain nest age.
-        nest_encounters = TurtleNestEncounter.objects.filter(nest_age=NEST_AGE_DEFAULT, status=Encounter.STATUS_IMPORTED)
+        nest_encounters = TurtleNestEncounter.objects.filter(nest_age="unknown", status=Encounter.STATUS_IMPORTED)
         if nest_encounters:
             logger.info(f'Flagging {nest_encounters.count()} turtle nest encounters for curation due to uncertain nest age')
         for enc in nest_encounters:

observations/tests/test_management_commands.py

@@ -181,7 +181,7 @@ def test_flag_nests_with_uncertain_nest_age(self, mock_get_logger):
         TurtleNestEncounter.objects.create(
             site=self.area,
             status=Encounter.STATUS_IMPORTED,
-            nest_age=NEST_AGE_DEFAULT,
+            nest_age="unknown",
             species=TURTLE_SPECIES,
             when=datetime.now(pytz.utc),
             where=Point(0.0, 0.0)

observations/tests/test_management_commands_auto_qa_checks.py

@@ -181,7 +181,7 @@ def test_flag_nests_with_uncertain_nest_age(self, mock_get_logger):
         TurtleNestEncounter.objects.create(
             site=self.area,
             status=Encounter.STATUS_IMPORTED,
-            nest_age=NEST_AGE_DEFAULT,
+            nest_age="unknown",
             species=TURTLE_SPECIES,
             when=datetime.now(pytz.utc),
             where=Point(0.0, 0.0)
@@ -258,25 +258,24 @@ def test_flag_nests_with_specific_species_in_ningaloo(self, mock_get_logger):
         call_command('automated_qa_checks')
         mock_logger.info.assert_any_call('Flagging 1 turtle nest encounters for curation: Dermochelys coriacea (Leatherback turtle) at Ningaloo')
 
-    # @patch('logging.getLogger')
-    # def test_flag_imported_nests_with_unknown_reporter(self, mock_get_logger):
-    #     mock_logger = MagicMock()
-    #     mock_get_logger.return_value = mock_logger
-
-    #     TurtleNestEncounter.objects.create(
-    #         site=self.area,
-    #         status=Encounter.STATUS_IMPORTED,
-    #         species=TURTLE_SPECIES,
-    #         nest_age=NEST_AGE,
-    #         nest_type=NEST_TYPE,
-    #         reporter=self.unknown_user,
-    #         when=datetime.now(pytz.utc),
-    #         where=Point(0.0, 0.0)
-    #     )
-
-    #     call_command('automated_qa_checks')
-    #     print(mock_logger.info.call_args_list)
-    #     mock_logger.info.assert_any_call('Flagging 1 turtle nest encounters for curation due to unknown reporter')
+    @patch('logging.getLogger')
+    def test_flag_imported_nests_with_unknown_reporter(self, mock_get_logger):
+        mock_logger = MagicMock()
+        mock_get_logger.return_value = mock_logger
+
+        TurtleNestEncounter.objects.create(
+            site=self.area,
+            status=Encounter.STATUS_IMPORTED,
+            species=TURTLE_SPECIES,
+            nest_age=NEST_AGE,
+            nest_type=NEST_TYPE,
+            reporter=self.unknown_user,
+            when=datetime.now(pytz.utc),
+            where=Point(0.0, 0.0)
+        )
+
+        call_command('automated_qa_checks')
+        mock_logger.info.assert_any_call('Flagging 1 turtle nest encounters for curation due to unknown reporter')
 
     @patch('logging.getLogger')
     def test_mark_imported_nests_as_curated(self, mock_get_logger):

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wastd"
-version = "2.1.1"
+version = "2.1.3"
 
 description = "Western Australian Sea Turtles Database"
 authors = ["Florian Mayer <florian.mayer@dbca.wa.gov.au>", "Ashley Felton <ashley.felton@dbca.wa.gov.au>","Evan Hallein <evan.hallein@dbca.wa.gov.au>", "Rick Wang <rick.wang@dbca.wa.gov.au>"]

wamtram2/admin.py

@@ -13,9 +13,10 @@
     TrtDataEntry,
     TrtEntryBatches,
     TrtTagOrders,
+    TrtNestingSeason
 )
 from import_export.admin import ImportExportModelAdmin
-from .forms import EnterUserModelForm, TrtObservationsForm, TrtPersonsForm
+from .forms import EnterUserModelForm, TrtObservationsForm, TrtPersonsForm, TrtNestingSeasonForm
 from django.urls import reverse
 from django.utils.html import format_html
 from django.db.models import Prefetch
@@ -272,4 +273,17 @@ class Media:
             'all': ('admin/css/custom_admin.css',)
         }
 
-
+@admin.register(TrtNestingSeason)
+class TrtNestingSeasonAdmin(admin.ModelAdmin):
+    form = TrtNestingSeasonForm
+    list_display = ['nesting_season', 'startdate', 'enddate']
+    search_fields = ['nesting_season']
+    list_filter = ['startdate', 'enddate']
+    class Media:
+        css = {
+            'all': ('https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css',)
+        }
+        js = (
+            'https://cdn.jsdelivr.net/npm/flatpickr',
+            'js/admin/custom_flatpickr.js',
+        )

wamtram2/forms.py

@@ -1,12 +1,20 @@
 from django import forms
 from easy_select2 import apply_select2
-from .models import TrtPersons, TrtDataEntry, TrtTags, TrtEntryBatches, TrtPlaces, TrtPitTags, Template, TrtObservations,TrtTagStates, TrtMeasurementTypes,TrtYesNo,SEX_CHOICES
+from .models import (
+    TrtPersons, TrtDataEntry, TrtTags, 
+    TrtEntryBatches, TrtPlaces, TrtPitTags, 
+    Template, TrtObservations,TrtTagStates, 
+    TrtMeasurementTypes,TrtYesNo,SEX_CHOICES,
+    TrtNestingSeason
+    )
 from django_select2.forms import ModelSelect2Widget
 from django.core.validators import RegexValidator
 from django.db.models import Case, When, IntegerField
 from datetime import timedelta
 from django.conf import settings
 from django.core.exceptions import ValidationError
+from django.contrib.admin import widgets
+
 
 
 
@@ -770,3 +778,26 @@ class TagRegisterForm(forms.Form):
     field_person_id = forms.CharField(widget=forms.HiddenInput(), required=False)
 
 
+class TrtNestingSeasonForm(forms.ModelForm):
+    class Meta:
+        model = TrtNestingSeason
+        fields = '__all__'
+        widgets = {
+            'startdate': forms.DateTimeInput(
+                attrs={
+                    'class': 'form-control flatpickr-datetime',
+                }
+            ),
+            'enddate': forms.DateTimeInput(
+                attrs={
+                    'class': 'form-control flatpickr-datetime',
+                }
+            ),
+            'nesting_season': forms.TextInput(
+                attrs={
+                    'class': 'form-control'
+                }
+            ),
+        }
+
+

wamtram2/static/css/grid.css

@@ -0,0 +1,103 @@
+.grid-container {
+    overflow-y: auto;
+    position: relative;
+    height: 40%;
+    margin: 1rem 0;
+    border: 1px solid #dee2e6;
+    border-radius: 0.25rem;
+    width: 100%;
+}
+
+.grid-table {
+    width: max-content;
+    min-width: 100%;
+    margin-bottom: 0;
+    color: #212529;
+    border-collapse: collapse;
+}
+
+.grid-table thead {
+    position: sticky;   
+    top:0;
+    background-color: #fff;
+    z-index: 1;
+}
+
+.grid-table th {
+    background: #f8f9fa;
+    font-weight: 500;
+    border-bottom: 2px solid #dee2e6;
+    padding: 0.75rem;
+    text-align: left;
+}
+
+.grid-table td {
+    padding: 0.75rem;
+    vertical-align: top;
+    border-top: 1px solid #dee2e6;
+    white-space: nowrap;
+    min-width: 100px;
+}
+
+.grid-table tbody tr:hover {
+    background-color: rgba(0,0,0,.075);
+    cursor: pointer;
+}
+
+.column-selector {
+    margin-bottom: 1rem;
+}
+
+.column-selector .list-group-item {
+    display: flex;
+    align-items: center;
+    padding: 0.5rem 1rem;
+}
+
+.column-selector .list-group-item input[type="checkbox"] {
+    margin-right: 1rem;
+}
+
+.flagged-row {
+    background-color: #fff3f3;
+}
+
+@media (max-width: 768px) {
+    .grid-table {
+        font-size: 0.875rem;
+    }
+
+    .grid-table th,
+    .grid-table td {
+        padding: 0.5rem;
+    }
+}
+
+.search-container {
+    max-width: 400px;
+    margin-bottom: 1rem;
+}
+
+.context-menu {
+    position: fixed;
+    background: white;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    box-shadow: 0 2px 5px rgba(0,0,0,0.2);
+    z-index: 1000;
+}
+
+.context-menu-list {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+.context-menu-item {
+    padding: 8px 12px;
+    cursor: pointer;
+}
+
+.context-menu-item:hover {
+    background-color: #f5f5f5;
+}

wamtram2/static/js/admin/custom_flatpickr.js

@@ -0,0 +1,8 @@
+document.addEventListener('DOMContentLoaded', function() {
+    flatpickr('.flatpickr-datetime', {
+        enableTime: true,
+        dateFormat: "Y-m-d H:i",
+        time_24hr: true,
+        allowInput: true,
+    });
+});

wamtram2/templates/wamtram2/admin_tools.html

@@ -198,6 +198,24 @@ <h3 class="tool-title">Observation Transfer</h3>
                 </div>
             </a>
         </div>
+
+
+        <!-- Nesting Season Management -->
+        <div class="col-md-4 mb-4">
+            <a href="{% url 'wamtram2:nesting_season_list' %}" class="text-decoration-none">
+                <div class="tool-card p-4 text-center">
+                    <div class="tool-icon">
+                        <i class="fas fa-calendar-alt"></i>
+                    </div>
+                    <h3 class="tool-title">Nesting Seasons</h3>
+                    <p class="tool-description">Manage nesting season time range</p>
+                    <button class="btn btn-primary">
+                        <i class="fas fa-arrow-right mr-2"></i>Access Tool
+                    </button>
+                </div>
+            </a>
+        </div>
+
     </div>
 </div>
 {% endblock %}