remodeled infoinstances and infoitems

infoscreen/admin.py

@@ -1,9 +1,10 @@
 from django.contrib import admin
-from infoscreen.models import Rotation, InfoItem, InfoInstance, InfoOption
+from infoscreen.models import Rotation, InfoItem, InfoInstance, ImageInfoItem, ExternalImageInfoItem, ABBInfoItem
 
 # Register your models here.
-
 admin.site.register(Rotation)
 admin.site.register(InfoItem)
+admin.site.register(ImageInfoItem)
+admin.site.register(ExternalImageInfoItem)
+admin.site.register(ABBInfoItem)
 admin.site.register(InfoInstance)
-admin.site.register(InfoOption)

infoscreen/migrations/0005_auto_20160921_1252.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2016-09-21 12:52
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('infoscreen', '0004_auto_20160914_1747'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='infoinstance',
+            name='item',
+        ),
+        migrations.RemoveField(
+            model_name='infoinstance',
+            name='rotation',
+        ),
+        migrations.RemoveField(
+            model_name='infooption',
+            name='item',
+        ),
+        migrations.DeleteModel(
+            name='InfoInstance',
+        ),
+        migrations.DeleteModel(
+            name='InfoItem',
+        ),
+        migrations.DeleteModel(
+            name='InfoOption',
+        ),
+    ]

infoscreen/migrations/0006_abbinfoitem_externalimageinfoitem_imageinfoitem_infoinstance_infoitem.py

@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2016-09-21 12:54
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('infoscreen', '0005_auto_20160921_1252'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='InfoInstance',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('duration', models.FloatField(default=15.0)),
+                ('item_id', models.PositiveIntegerField()),
+                ('item_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
+                ('rotation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='instances', to='infoscreen.Rotation')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='InfoItem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('expire_date', models.DateTimeField(blank=True, null=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ABBInfoItem',
+            fields=[
+                ('infoitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='infoscreen.InfoItem')),
+            ],
+            bases=('infoscreen.infoitem',),
+        ),
+        migrations.CreateModel(
+            name='ExternalImageInfoItem',
+            fields=[
+                ('infoitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='infoscreen.InfoItem')),
+                ('url', models.TextField()),
+            ],
+            bases=('infoscreen.infoitem',),
+        ),
+        migrations.CreateModel(
+            name='ImageInfoItem',
+            fields=[
+                ('infoitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='infoscreen.InfoItem')),
+                ('img', models.ImageField(upload_to='infoimages/')),
+            ],
+            bases=('infoscreen.infoitem',),
+        ),
+    ]

infoscreen/models.py

@@ -1,28 +1,71 @@
 from django.db import models
 from django.utils import timezone
+from django.contrib.contenttypes.fields import GenericForeignKey
+from django.contrib.contenttypes.models import ContentType
 
 class InfoItem(models.Model):
+    class __meta__:
+        abstract = True
     name = models.CharField(max_length=255)
-    template_url = models.CharField(max_length=512)
     expire_date = models.DateTimeField(blank=True,null=True) # None means never expiring item
 
+    def get_template_url(self):
+        raise NotImplementedError("inheriting classes must implement get_template_url")
+    def get_edit_template_url(self):
+        raise NotImplementedError("inheriting classes must implement get_template_url")
+
     def get_dict(self):
-        # fetch options
-        opts = {}
-        for o in self.options.all():
-            opts[o.key] = o.value
-        # parse dict
         return {
             'name': self.name,
-            'template_url': self.template_url,
+            'template_url': self.get_template_url(),
-            'options': opts
+            'edit_template_url': self.get_edit_template_url(),
+            'options': {}
         }
     def __str__(self):
         return self.name
+
+class ABBInfoItem(InfoItem):
+    def get_template_url(self):
+        return "/static/html/abb.html"
+    def get_edit_template_url(self):
+        return "/static/html/generic_edit.html"
+
+class ImageInfoItem(InfoItem):
+    img = models.ImageField(upload_to="infoimages/")
+
+    def get_template_url(self):
+        #get param to avoid angular from optimizing same template with different options
+        return "/static/html/generic_image.html?img={}".format(self.name) 
+
+    def get_edit_template_url(self):
+        return "/static/html/generic_image_edit.html"
+
+    def get_dict(self):
+        d = super().get_dict()
+        d["options"] = {'img': self.img.url}
+        return d
+    
+class ExternalImageInfoItem(InfoItem):
+    url = models.TextField()
+
+    def get_template_url(self):
+        return "/static/html/generic_image.html?img={}".format(self.name)
+
+    def get_edit_template_url(self):
+        return "/static/html/generic_external_image_edit.html"
+
+    def get_dict(self):
+        d = super().get_dict()
+        d["options"] = {'img': self.url}
+        return d
+
 class InfoInstance(models.Model):
     rotation = models.ForeignKey('Rotation', related_name='instances')
-    item = models.ForeignKey('InfoItem')
     duration = models.FloatField(default=15.0) # seconds
+    # generic relation to somekind of InfoItem
+    item_id = models.PositiveIntegerField()
+    item_type = models.ForeignKey(ContentType,on_delete=models.CASCADE)
+    item = GenericForeignKey('item_type','item_id')
 
     def get_dict(self):
         return {
@@ -32,24 +75,15 @@ class InfoInstance(models.Model):
     def __str__(self):
         return "{}: {} ({}s)".format(self.rotation.name, self.item.name, self.duration)
 
-class InfoOption(models.Model):
-    class __meta__:
-        unique_together = ("item", "key")
-
-    item = models.ForeignKey('InfoItem', related_name='options')
-    key = models.CharField(max_length=255)
-    value = models.CharField(max_length=255)
-
-    def __str__(self):
-        return "{}: {} -> {}".format(self.item.name, self.key, self.value)
-
 class Rotation(models.Model):
     name = models.CharField(max_length=255)
     
     def get_dict(self):
-        # exclude expired items from rotation (note: using filter would exclude items with no expide_date)
+        # exclude expired items from rotation (note: using tricky syntax to avoid excluding items with no expire_date)
-        instances = self.instances.exclude(item__expire_date__lt=timezone.now())
+        now = timezone.now()
-        instance_list = list(map(lambda i:i.get_dict(), instances))
+        instances = self.instances.all()
+        filtered = filter(lambda i: (i.item.expire_date or now) >= now, list(instances))
+        instance_list = list(map(lambda i:i.get_dict(), filtered))
 
         return {
             'name': self.name,

infoscreen/views.py

@@ -5,7 +5,6 @@ from infoscreen.models import ABBJob, Rotation
 from django.utils import timezone
 from datetime import datetime, timedelta
 import json
-
 def index(request,idx, *args, **kwargs):
     return render(request, 'infoscreen_index.html',{'rotation':idx})