simo 2.10.7__py3-none-any.whl → 2.10.9__py3-none-any.whl

simo/core/controllers.py

@@ -290,12 +290,12 @@ class ControllerBase(ABC):
             actor = get_current_user()
 
         self.component.refresh_from_db()
-        if value != self.component.value:
+        if value != self.component.value and self.component.track_history:
             self.component.value_previous = self.component.value
             from .models import ComponentHistory
             ComponentHistory.objects.create(
                 component=self.component, type='value', value=value,
-                user=actor
+                user=actor, alive=self.component.alive
             )
             from actstream import action
             action.send(

simo/core/migrations/0050_componenthistory_alive.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2025-05-07 06:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0049_alter_gateway_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='componenthistory',
+            name='alive',
+            field=models.BooleanField(default=True),
+        ),
+    ]

simo/core/models.py

@@ -530,7 +530,8 @@ def is_in_alarm(self):
             if 'arm_status' in dirty_fields:
                 ComponentHistory.objects.create(
                     component=self, type='security',
-                    value=self.arm_status, user=actor
+                    value=self.arm_status, user=actor,
+                    alive=self.alive
                 )
                 action.send(
                     actor, target=self, verb="security event",
@@ -650,6 +651,7 @@ class ComponentHistory(models.Model):
         )
     )
     value = models.JSONField(null=True, blank=True)
+    alive = models.BooleanField(default=True)
     user = models.ForeignKey(User, null=True, on_delete=models.SET_NULL)
 
     class Meta:

simo/core/serializers.py

@@ -614,7 +614,7 @@ class ZoneSerializer(serializers.ModelSerializer):
 
 
 class ComponentHistorySerializer(serializers.ModelSerializer):
-    date = TimestampField()
+    date = TimestampField(read_only=True)
     user = serializers.StringRelatedField()
 
     class Meta:
@@ -623,7 +623,7 @@ class ComponentHistorySerializer(serializers.ModelSerializer):
 
 
 class ActionSerializer(serializers.ModelSerializer):
-    timestamp = TimestampField()
+    timestamp = TimestampField(read_only=True)
     actor = serializers.SerializerMethodField()
     target = serializers.SerializerMethodField()
     action_type = serializers.SerializerMethodField()

simo/core/tasks.py

@@ -234,7 +234,6 @@ def sync_with_remote():
         ).first()
         if weather_component:
             if weather:
-                weather_component.track_history = False
                 weather_component.alive = True
                 weather_component.controller.set(weather)
                 weather_component.save()

simo/core/templates/admin/component_history.html

@@ -1,8 +1,17 @@
+{% load static %}
 {% if value_history %}
   <h3>Value:</h3>
   <ul style="margin-left: 1.5em;">
   {% for history_item in value_history %}
-    <li>[{{ history_item.user }}] {{ history_item.date|date:"Y-m-d H:i:s" }} - <strong>{{ history_item.value }}</strong></li>
+    <li>
+      {% if history_item.alive %}
+        <img src="{% static 'admin/img/icon-yes.svg' %}" alt="True">
+      {% else %}
+        <img src="{% static 'admin/img/icon-no.svg' %}" alt="False">
+      {% endif %}
+      [{{ history_item.user }}] {{ history_item.date|date:"Y-m-d H:i:s" }} -
+      <strong>{{ history_item.value }}</strong>
+    </li>
   {% endfor %}
   </ul>
 {% endif %}
@@ -12,7 +21,14 @@
   <h3>Security:</h3>
   <ul style="margin-left: 1.5em;">
   {% for history_item in arm_status_history %}
-    <li>[{{ history_item.user }}] {{ history_item.date|date:"Y-m-d H:i:s" }} - <strong>{{ history_item.value }}</strong></li>
+    <li>
+      {% if history_item.alive %}
+        <img src="{% static 'admin/img/icon-yes.svg' %}" alt="True">
+      {% else %}
+        <img src="{% static 'admin/img/icon-no.svg' %}" alt="False">
+      {% endif %}
+      [{{ history_item.user }}] {{ history_item.date|date:"Y-m-d H:i:s" }} -
+      <strong>{{ history_item.value }}</strong></li>
   {% endfor %}
   </ul>
 {% endif %}