diff --git a/copanier/models.py b/copanier/models.py index f01f184..66d559b 100644 --- a/copanier/models.py +++ b/copanier/models.py @@ -315,6 +315,7 @@ class Delivery(PersistedBase): NEED_PRICE_UPDATE = 1 OPEN = 2 ADJUSTMENT = 3 + WAITING_PRODUCTS = 4 name: str from_date: datetime_field @@ -343,6 +344,9 @@ class Delivery(PersistedBase): return self.OPEN if self.needs_adjustment: return self.ADJUSTMENT + if self.is_waiting_products: + return self.WAITING_PRODUCTS + return self.CLOSED def products_need_price_update(self, products=None): @@ -375,6 +379,15 @@ class Delivery(PersistedBase): @property def is_open(self): return datetime.now().date() <= self.order_before.date() + + @property + def is_waiting_products(self): + return ( + datetime.now().date() >= self.order_before.date() + and + datetime.now().date() <= self.from_date.date() + ) + @property def is_foreseen(self): diff --git a/copanier/static/app.css b/copanier/static/app.css index 18fce1c..bd04af8 100644 --- a/copanier/static/app.css +++ b/copanier/static/app.css @@ -728,4 +728,59 @@ small { .header { padding-bottom: 2em !important; +} + +@media screen and (max-width: 1100px) { + .progressbar { + display: none !important; + } +} + +.progressbar { + counter-reset: step; +} +.progressbar li { + list-style-type: none; + width: 13%; + float: left; + font-size: 12px; + position: relative; + text-align: center; + text-transform: uppercase; + color: #7d7d7d; +} +.progressbar li:before { + width: 32px; + height: 32px; + content: counter(step); + counter-increment: step; + line-height: 30px; + border: 2px solid #7d7d7d; + display: block; + text-align: center; + margin: 0 auto 10px auto; + border-radius: 50%; + background-color: white; +} +.progressbar li:after { + width: 100%; + height: 2px; + content: ''; + position: absolute; + background-color: #7d7d7d; + top: 15px; + left: -50%; + z-index: -1; +} +.progressbar li:first-child:after { + content: none; +} +.progressbar li.active { + color: green; +} +.progressbar li.active:before { + border-color: #55b776; +} +.progressbar li.active + li:after { + background-color: #55b776; } \ No newline at end of file diff --git a/copanier/templates/delivery/show_delivery.html b/copanier/templates/delivery/show_delivery.html index 94fb77f..7c9c2fd 100644 --- a/copanier/templates/delivery/show_delivery.html +++ b/copanier/templates/delivery/show_delivery.html @@ -4,6 +4,8 @@