Cleanup

[wolnelektury.git] / src / funding / models.py

diff --git a/src/funding/models.py b/src/funding/models.py
index 7d0e742..3280d64 100644 (file)
--- a/src/funding/models.py
+++ b/src/funding/models.py
@@ -1,3 +1,4 @@
+

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -69,10 +70,7 @@ class Offer(models.Model):
 
     def clear_cache(self):
         clear_cached_renders(self.top_bar)
 
     def clear_cache(self):
         clear_cached_renders(self.top_bar)

-        clear_cached_renders(self.top_bar_2022)
-        clear_cached_renders(self.list_bar)

         clear_cached_renders(self.detail_bar)
         clear_cached_renders(self.detail_bar)

-        clear_cached_renders(self.detail_bar_2022)

         clear_cached_renders(self.status)
         clear_cached_renders(self.status_more)
 
         clear_cached_renders(self.status)
         clear_cached_renders(self.status_more)
 


@@ -204,39 +202,12 @@ class Offer(models.Model):
             'is_current': self.is_current(),
             'is_win': offer_sum >= self.target,
             'missing': self.target - offer_sum,
             'is_current': self.is_current(),
             'is_win': offer_sum >= self.target,
             'missing': self.target - offer_sum,

-            'percentage': 100 * offer_sum / self.target,
+            'percentage': min(100, 100 * offer_sum / self.target),

 
             'show_title': True,
             'show_title_calling': True,
         }
 
 
             'show_title': True,
             'show_title_calling': True,
         }
 

-    @cached_render('funding/includes/funding.html')
-    def top_bar(self):
-        ctx = self.basic_info()
-        ctx.update({
-            'link': True,
-            'closeable': True,
-            'add_class': 'funding-top-header',
-        })
-        return ctx
-
-    @cached_render('funding/includes/funding.html')
-    def list_bar(self):
-        ctx = self.basic_info()
-        ctx.update({
-            'link': True,
-            'show_title_calling': False,
-        })
-        return ctx
-
-    @cached_render('funding/includes/funding.html')
-    def detail_bar(self):
-        ctx = self.basic_info()
-        ctx.update({
-            'show_title': False,
-        })
-        return ctx
-

     @cached_render('funding/includes/offer_status.html')
     def status(self):
         return {'offer': self}
     @cached_render('funding/includes/offer_status.html')
     def status(self):
         return {'offer': self}


@@ -245,8 +216,8 @@ class Offer(models.Model):
     def status_more(self):
         return {'offer': self}
 
     def status_more(self):
         return {'offer': self}
 

-    @cached_render('funding/2022/includes/funding.html')
-    def top_bar_2022(self):
+    @cached_render('funding/includes/funding.html')
+    def top_bar(self):

         ctx = self.basic_info()
         ctx.update({
             'link': True,
         ctx = self.basic_info()
         ctx.update({
             'link': True,


@@ -255,8 +226,8 @@ class Offer(models.Model):
         })
         return ctx
 
         })
         return ctx
 

-    @cached_render('funding/2022/includes/funding.html')
-    def detail_bar_2022(self):
+    @cached_render('funding/includes/funding.html')
+    def detail_bar(self):

         ctx = self.basic_info()
         ctx.update({
             'show_title': False,
         ctx = self.basic_info()
         ctx.update({
             'show_title': False,