Fixed some stuff

amiibofindr/apps/amiibo/management/commands/xls_import.py

@@ -34,12 +34,6 @@ class AmiiboSheet(object):
     SERIES_STRING_EU = 'Collection'
     SERIES_STRING_JP = 'シリーズ'
 
-    # Relations from links from shops with out slugs
-    SHOP_HEADS = {
-        # Amazon Spain
-        'ES ASIN': 'amazon-es',
-    }
-
     LINK_REGEX = r'\=HYPERLINK\(\"(.*)\",\"(.*)\"\)'
 
     SHEETS = {
@@ -123,17 +117,13 @@ class AmiiboSheet(object):
                                 matches = re.match(
                                     self.LINK_REGEX, cell.internal_value)
                                 if matches:
-                                    shop_id = None
                                     cell_name = 'id'
                                     if cell_head == 'amiibo':
                                         cell_name = 'name'
-                                    elif cell_head in self.SHOP_HEADS:
-                                        shop_id = self.SHOP_HEADS[cell_head]
 
                                     amiibo[cell_head] = {
                                         'link': matches.group(1),
                                         cell_name: matches.group(2),
-                                        'shop': shop_id
                                     }
                             else:
                                 amiibo[cell_head] = unicode(

amiibofindr/apps/amiibo/migrations/0011_auto_20150622_2358.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('amiibo', '0010_auto_20150622_2326'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='amiibopricehistory',
+            options={'ordering': ('-date',)},
+        ),
+        migrations.AlterField(
+            model_name='amiiboprice',
+            name='amiibo_shop',
+            field=models.ForeignKey(related_name='price_set', to='amiibo.AmiiboShop'),
+        ),
+        migrations.AlterField(
+            model_name='amiibopricehistory',
+            name='amiibo_shop',
+            field=models.ForeignKey(related_name='price_history_set', to='amiibo.AmiiboShop'),
+        ),
+        migrations.AlterField(
+            model_name='amiiboshop',
+            name='url',
+            field=models.CharField(max_length=1000),
+        ),
+    ]

amiibofindr/apps/amiibo/migrations/0012_auto_20150623_0003.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('amiibo', '0011_auto_20150622_2358'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='amiiboshop',
+            name='url',
+            field=models.TextField(),
+        ),
+    ]

amiibofindr/apps/amiibo/models.py

@@ -92,18 +92,22 @@ class Amiibo(models.Model):
 class AmiiboShop(models.Model):
     amiibo = models.ForeignKey(Amiibo, related_name='shops_set')
     shop = models.ForeignKey('shop.Shop', related_name='amiibos_set')
-    url = models.CharField(max_length=255)
+    url = models.TextField()
     item_id = models.CharField(max_length=64)
 
     class Meta:
         ordering = ('shop__name', )
 
+    @property
+    def last_price(self):
+        return self.price_set.first()
+
     def __unicode__(self):
         return u'{} in {}'.format(self.amiibo.name, self.shop.name)
 
 
 class AmiiboPrice(models.Model):
-    amiibo_shop = models.ForeignKey(AmiiboShop)
+    amiibo_shop = models.ForeignKey(AmiiboShop, related_name='price_set')
     price = models.DecimalField(max_digits=6, decimal_places=2)
     currency = models.CharField(default='EUR', max_length=3)
     date = models.DateTimeField(auto_now_add=True)
@@ -131,12 +135,16 @@ class AmiiboPrice(models.Model):
 
 
 class AmiiboPriceHistory(models.Model):
-    amiibo_shop = models.ForeignKey(AmiiboShop)
+    amiibo_shop = models.ForeignKey(AmiiboShop,
+                                    related_name='price_history_set')
     price = models.DecimalField(max_digits=6, decimal_places=2)
     currency = models.CharField(default='EUR', max_length=3)
     date = models.DateTimeField(auto_now_add=True)
     diff = models.DecimalField(max_digits=6, decimal_places=2)
 
+    class Meta:
+        ordering = ('-date', )
+
     def __unicode__(self):
         return u'{} price for {}: {}{} [{}{}] ({})'.format(
             self.amiibo.name,

amiibofindr/templates/amiibo/amiibo.html

@@ -23,6 +23,9 @@
         <!-- <i class="right floated like icon"></i> -->
         <!-- <i class="right floated star icon"></i> -->
         <div class="header">{{ amiibo.name }}</div>
+        <div class="meta">
+          <a href="{{ amiibo.collection.get_absolute_url }}">{{ amiibo.collection.name }}</a>
+        </div>
         <!-- <div class="description">
           <p>asd</p>
         </div> -->