X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/298a2c3414d84d57ec9e691cfbc6d084530af278..0188fd570c9698cf2e3a3ee41df142f33329cb38:/src/annoy/models.py?ds=sidebyside

diff --git a/src/annoy/models.py b/src/annoy/models.py
index 92b8184dd..097872b40 100644
--- a/src/annoy/models.py
+++ b/src/annoy/models.py
@@ -8,12 +8,21 @@ from django.utils.timezone import now
 from .places import PLACES, PLACE_CHOICES, STYLES
 
 
+class Campaign(models.Model):
+    name = models.CharField(max_length=255, help_text='Dla zespołu')
+    image = models.FileField('obraz', upload_to='annoy/banners/', blank=True)
+
+    def __str__(self):
+        return self.name
+
+
 class Banner(models.Model):
     place = models.SlugField('miejsce', choices=PLACE_CHOICES)
+    campaign = models.ForeignKey(Campaign, models.PROTECT, null=True, blank=True)
+
     style = models.CharField(
         'styl', max_length=255, blank=True,
         choices=STYLES,
-        help_text='Dotyczy blackoutu.'
     )
     smallfont = models.BooleanField('mały font', default=False)
     text_color = models.CharField(max_length=10, blank=True)
@@ -33,6 +42,8 @@ class Banner(models.Model):
         help_text='Bannery z wyższym priorytetem mają pierwszeństwo.')
     since = models.DateTimeField('od', null=True, blank=True)
     until = models.DateTimeField('do', null=True, blank=True)
+    books = models.ManyToManyField('catalogue.Book', blank=True)
+
     target = models.IntegerField('cel', null=True, blank=True)
     progress = models.IntegerField('postęp', null=True, blank=True)
     show_members = models.BooleanField('widoczny dla członków klubu', default=False)
@@ -50,8 +61,14 @@ class Banner(models.Model):
     def get_text(self):
         return Template(self.text).render(Context())
 
+    def get_image(self):
+        if self.campaign and self.campaign.image:
+            return self.campaign.image
+        else:
+            return self.image
+    
     @classmethod
-    def choice(cls, place, request, exemptions=True):
+    def choice(cls, place, request, exemptions=True, book=None):
         Membership = apps.get_model('club', 'Membership')
 
         if exemptions and hasattr(request, 'annoy_banner_exempt'):
@@ -69,6 +86,12 @@ class Banner(models.Model):
             until__lt=n
         ).order_by('-priority', '?')
 
+        if book is None:
+            banners = banners.filter(books=None)
+        else:
+            banners = banners.filter(models.Q(books=None) | models.Q(books=book))
+            
+        
         if not request.user.is_authenticated:
             banners = banners.filter(only_authenticated=False)
 
@@ -86,6 +109,10 @@ class Banner(models.Model):
             return 0
         return (self.progress or 0) / self.target * 100
 
+    @property
+    def progress_percent_pretty(self):
+        return int(self.progress_percent)
+
     def update_progress(self):
         # Total of new payments during the action.
         # This definition will need to change for longer timespans.