]> git.menne-pb.de Git - pinpoint.git/commitdiff
Add a state to reports
authorJörn Menne <jmenne@fedora.de>
Mon, 2 Dec 2024 21:27:48 +0000 (22:27 +0100)
committerJörn Menne <jmenne@fedora.de>
Mon, 2 Dec 2024 21:27:48 +0000 (22:27 +0100)
georeport/migrations/0002_report_state.py [new file with mode: 0644]
georeport/models.py
georeport/templates/georeport/detail.html
georeport/templates/georeport/index.html

diff --git a/georeport/migrations/0002_report_state.py b/georeport/migrations/0002_report_state.py
new file mode 100644 (file)
index 0000000..506b77b
--- /dev/null
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.3 on 2024-12-02 09:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('georeport', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='report',
+            name='state',
+            field=models.IntegerField(choices=[(0, 'New'), (1, 'Finished')], default=0),
+        ),
+    ]
index bc83acf87028c6a647fd5e71a8dbf925ab008d35..73e9b9c405762e6f50ca292f4c8cc3b3df48d479 100644 (file)
@@ -5,6 +5,10 @@ from django.forms import ModelForm
 
 
 class Report(models.Model):
+    class State(models.IntegerChoices):
+        NEW = 0
+        FINISHED = 1
+
     title = models.CharField(max_length=80)
     creation_time = models.DateTimeField(auto_now_add=True)
     # TODO last change shall be set to creation_time at creation_time
@@ -14,6 +18,8 @@ class Report(models.Model):
     latitude = models.DecimalField(max_digits=8, decimal_places=6)
     longitude = models.DecimalField(max_digits=9, decimal_places=6)
 
+    state = models.IntegerField(choices=State, default=0)
+
     # TODO add status
     #
     def __str__(self):
index adeeea262190bbc49a2ec738003e92e159e312d8..99aa80feba19653743a50fb66247f0da040f03ba 100644 (file)
@@ -8,6 +8,7 @@
     <p>Geändert: {{ report.last_changed  }}</p>
     <p id="p-lat" data-lat="{{ report.latitude }}">Latitude: {{ report.latitude }}</p>
     <p id="p-lng" data-lng="{{ report.longitude }}">Longitude: {{ report.longitude }}</p>
+    <p>Status: {{ report.get_state_display }} </p>
     <a href="{% url 'index' %}">Back</a>
     <script src="{% static 'georeport/details.js' %}"></script>
 {% endblock %} 
index 2e3af8c0dba51d69b9b87ac51c8b361dac0f6b29..033a36d26b3e644e9d57660990d9dddd066b1a22 100644 (file)
@@ -8,6 +8,10 @@
 <ul>
     {% for report in report_list %}
         <li><a href="{{ report.id }}">{{ report.title }}</a></li>
+        <script>
+            let marker{{report.id}} = L.marker([{{report.latitude}},{{report.longitude}}]);
+            marker{{report.id}}.addTo(map);
+        </script>
     {% endfor %}
 </ul>