Merge pull request #35 from clavay/hmi_tmp

merge clavays changes

Author: trombastic

extras/service/systemd/pyscada_daemon.service

@@ -8,8 +8,10 @@ PIDFile=/tmp/pyscada_daemon.pid
 User=pyscada
 Group=pyscada
 WorkingDirectory=/var/www/pyscada/PyScadaServer/
+#ExecStartPre=/home/pyscada/pre_start_pyscada.sh
 ExecStart=/usr/bin/python3 /var/www/pyscada/PyScadaServer/manage.py pyscada_daemon start
 ExecStop=/usr/bin/python3 /var/www/pyscada/PyScadaServer/manage.py pyscada_daemon stop
+#ExecStopPost=/home/pyscada/post_stop_pyscada.sh
 Restart=always
 RestartSec=60
 

pyscada/admin.py

@@ -100,7 +100,7 @@ def queryset(self, request, queryset):
         `self.value()`.
         """
         if self.value() is not None:
-            if self.value() > 0:
+            if int(self.value()) > 0:
                 return queryset.filter(parent_process_id=self.value())
 
 

pyscada/export/migrations/0016_auto_20191004_0912.py

@@ -0,0 +1,33 @@
+# Generated by Django 2.2.6 on 2019-10-04 09:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('export', '0015_remove_exporttask_backgroundtask'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exporttask',
+            name='busy',
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name='exporttask',
+            name='done',
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name='exporttask',
+            name='failed',
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name='scheduledexporttask',
+            name='active',
+            field=models.BooleanField(blank=True, default=False, help_text='to activate scheduled export'),
+        ),
+    ]

pyscada/hmi/admin.py

@@ -19,6 +19,7 @@
 from pyscada.hmi.models import View
 from pyscada.hmi.models import ProcessFlowDiagram
 from pyscada.hmi.models import ProcessFlowDiagramItem
+from pyscada.hmi.models import Pie
 
 from django.contrib import admin
 from django import forms
@@ -76,14 +77,38 @@ def name(self, instance):
         return instance.variables.name
 
 
+class PieForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super(PieForm, self).__init__(*args, **kwargs)
+        wtf = Variable.objects.all()
+        w = self.fields['variables'].widget
+        choices = []
+        for choice in wtf:
+            choices.append((choice.id, choice.name + '( ' + choice.unit.description + ' )'))
+        w.choices = choices
+
+
+class PieAdmin(admin.ModelAdmin):
+    list_per_page = 100
+    # ordering = ['position',]
+    search_fields = ['name', ]
+    filter_horizontal = ('variables',)
+    List_display_link = ('title',)
+    list_display = ('id', 'title')
+    form = PieForm
+
+    def name(self, instance):
+        return instance.variables.name
+
+
 class DropDownAdmin(admin.ModelAdmin):
     list_display = ('id', 'title', 'empty', 'empty_value', 'items_list')
     filter_horizontal = ('items',)
     list_filter = ('controlpanel', 'dropdowns_form',)
 
 
 class DropDownItemAdmin(admin.ModelAdmin):
-    list_display = ('id', 'title',)
+    list_display = ('id', 'title', 'value')
     list_filter = ('dropdown',)
 
 
@@ -94,7 +119,7 @@ class FormAdmin(admin.ModelAdmin):
 
 class ControlItemAdmin(admin.ModelAdmin):
     list_display = ('id', 'position', 'label', 'type', 'variable', 'variable_property')
-    list_filter = ('controlpanel',)
+    list_filter = ('controlpanel', 'control_items_form',)
     raw_id_fields = ('variable',)
 
 
@@ -139,7 +164,7 @@ class ViewAdmin(admin.ModelAdmin):
 
 
 class CustomHTMLPanelAdmin(admin.ModelAdmin):
-    filter_horizontal = ('variables',)
+    filter_horizontal = ('variables', 'variable_properties')
 
 
 class PageAdmin(admin.ModelAdmin):
@@ -160,6 +185,7 @@ class ProcessFlowDiagramAdmin(admin.ModelAdmin):
 admin_site.register(ControlItem, ControlItemAdmin)
 admin_site.register(Chart, ChartAdmin)
 admin_site.register(XYChart, XYChartAdmin)
+admin_site.register(Pie, PieAdmin)
 admin_site.register(DropDown, DropDownAdmin)
 admin_site.register(DropDownItem, DropDownItemAdmin)
 admin_site.register(Form, FormAdmin)

pyscada/hmi/migrations/0001_initial.py

@@ -34,8 +34,8 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(serialize=False, primary_key=True)),
                 ('distribution', models.PositiveSmallIntegerField(default=0, choices=[(0, 'side by side (1/2)'), (1, 'side by side (2/3|1/3)'), (2, 'side by side (1/3|2/3)')])),
-                ('chart_1', models.ForeignKey(related_name='chart_1', verbose_name='left Chart', blank=True, to='hmi.Chart', null=True)),
-                ('chart_2', models.ForeignKey(related_name='chart_2', verbose_name='right Chart', blank=True, to='hmi.Chart', null=True)),
+                ('chart_1', models.ForeignKey(related_name='chart_1', verbose_name='left Chart', blank=True, to='hmi.Chart', null=True, on_delete=models.SET_NULL)),
+                ('chart_2', models.ForeignKey(related_name='chart_2', verbose_name='right Chart', blank=True, to='hmi.Chart', null=True, on_delete=models.SET_NULL)),
             ],
             options={
             },
@@ -98,7 +98,7 @@ class Migration(migrations.Migration):
                 ('charts', models.ManyToManyField(to='hmi.Chart', blank=True)),
                 ('control_items', models.ManyToManyField(to='hmi.ControlItem', blank=True)),
                 ('custom_html_panels', models.ManyToManyField(to='hmi.CustomHTMLPanel', blank=True)),
-                ('hmi_group', models.OneToOneField(to='auth.Group')),
+                ('hmi_group', models.OneToOneField(to='auth.Group', on_delete=models.SET_NULL)),
             ],
             options={
             },
@@ -111,7 +111,7 @@ class Migration(migrations.Migration):
                 ('short_name', models.CharField(default='', max_length=80, verbose_name='variable short name')),
                 ('chart_line_thickness', models.PositiveSmallIntegerField(default=3, choices=[(3, '3Px')])),
                 ('chart_line_color', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, default=None, to='hmi.Color', null=True)),
-                ('hmi_variable', models.OneToOneField(to='pyscada.Variable')),
+                ('hmi_variable', models.OneToOneField(to='pyscada.Variable', on_delete=models.SET_NULL)),
             ],
             options={
             },
@@ -137,7 +137,7 @@ class Migration(migrations.Migration):
                 ('title', models.CharField(default='', max_length=400)),
                 ('position', models.PositiveSmallIntegerField(default=0, choices=[(0, 'Control Menu'), (1, 'left'), (2, 'right')])),
                 ('visable', models.BooleanField(default=True)),
-                ('control_panel', models.ForeignKey(default=None, blank=True, to='hmi.ControlPanel', null=True)),
+                ('control_panel', models.ForeignKey(default=None, blank=True, to='hmi.ControlPanel', null=True, on_delete=models.SET_NULL)),
             ],
             options={
             },
@@ -170,10 +170,10 @@ class Migration(migrations.Migration):
                 ('col', models.PositiveSmallIntegerField(default=0, choices=[(0, '1. col'), (1, '2. col'), (2, '3. col'), (3, '4. col')])),
                 ('size', models.PositiveSmallIntegerField(default=4, choices=[(4, 'page width'), (3, '3/4 page width'), (2, '1/2 page width'), (1, '1/4 page width')])),
                 ('visable', models.BooleanField(default=True)),
-                ('chart', models.ForeignKey(default=None, blank=True, to='hmi.Chart', null=True)),
-                ('chart_set', models.ForeignKey(default=None, blank=True, to='hmi.ChartSet', null=True)),
-                ('control_panel', models.ForeignKey(default=None, blank=True, to='hmi.ControlPanel', null=True)),
-                ('custom_html_panel', models.ForeignKey(default=None, blank=True, to='hmi.CustomHTMLPanel', null=True)),
+                ('chart', models.ForeignKey(default=None, blank=True, to='hmi.Chart', null=True, on_delete=models.SET_NULL)),
+                ('chart_set', models.ForeignKey(default=None, blank=True, to='hmi.ChartSet', null=True, on_delete=models.SET_NULL)),
+                ('control_panel', models.ForeignKey(default=None, blank=True, to='hmi.ControlPanel', null=True, on_delete=models.SET_NULL)),
+                ('custom_html_panel', models.ForeignKey(default=None, blank=True, to='hmi.CustomHTMLPanel', null=True, on_delete=models.SET_NULL)),
                 ('page', models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, default=None, to='hmi.Page', null=True)),
             ],
             options={

pyscada/hmi/migrations/0002_auto_20151016_1932.py

@@ -34,7 +34,7 @@ class Migration(migrations.Migration):
                 ('width', models.PositiveIntegerField(default=0)),
                 ('height', models.PositiveIntegerField(default=0)),
                 ('visible', models.BooleanField(default=True)),
-                ('variable', models.ForeignKey(default=None, to='pyscada.Variable')),
+                ('variable', models.ForeignKey(default=None, to='pyscada.Variable', on_delete=models.SET_NULL)),
             ],
             options={
             },
@@ -55,7 +55,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='widget',
             name='process_flow_diagram',
-            field=models.ForeignKey(default=None, blank=True, to='hmi.ProcessFlowDiagram', null=True),
+            field=models.ForeignKey(default=None, blank=True, to='hmi.ProcessFlowDiagram', null=True, on_delete=models.SET_NULL),
             preserve_default=True,
         ),
     ]

pyscada/hmi/migrations/0003_auto_20151130_1456.py

@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='controlitem',
             name='variable',
-            field=models.ForeignKey(to='pyscada.Variable',default=1, null=True),
+            field=models.ForeignKey(to='pyscada.Variable',default=1, null=True, on_delete=models.SET_NULL),
         ),
         # migrations.AlterField(
         #     model_name='hmivariable',

pyscada/hmi/migrations/0004_auto_20151130_1502.py

@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='controlitem',
             name='variable',
-            field=models.ForeignKey(to='pyscada.Variable', null=True),
+            field=models.ForeignKey(to='pyscada.Variable', null=True, on_delete=models.SET_NULL),
         ),
         # migrations.AlterField(
         #     model_name='hmivariable',

pyscada/hmi/migrations/0005_auto_20160111_1822.py

@@ -15,6 +15,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='processflowdiagramitem',
             name='variable',
-            field=models.ForeignKey(default=None, blank=True, to='pyscada.Variable', null=True),
+            field=models.ForeignKey(default=None, blank=True, to='pyscada.Variable', null=True, on_delete=models.SET_NULL),
         ),
     ]

pyscada/hmi/migrations/0006_auto_20160111_1848.py

@@ -14,11 +14,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='hmivariable',
             name='chart_line_color',
-            field=models.ForeignKey(default=None, blank=True, to='hmi.Color', null=True),
+            field=models.ForeignKey(default=None, blank=True, to='hmi.Color', null=True, on_delete=models.SET_NULL),
         ),
         migrations.AlterField(
             model_name='widget',
             name='page',
-            field=models.ForeignKey(default=None, blank=True, to='hmi.Page', null=True),
+            field=models.ForeignKey(default=None, blank=True, to='hmi.Page', null=True, on_delete=models.SET_NULL),
         ),
     ]