From 5777104eb74eb66248c5405150190f7a02712f27 Mon Sep 17 00:00:00 2001 From: "Denis V. Dedkov" Date: Fri, 19 Jun 2015 19:58:23 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D1=81=D0=B2=D0=B5=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D1=8F=D1=87=D0=B5=D0=B9=D0=BA=D0=B8=20=D0=9E?= =?UTF-8?q?=D0=B1=D0=B7=D0=B2=D0=BE=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавил подсветку ячейки обзвон при отсутсвии в ней данных и условии что прошло 10 дней со времени согласования --- asuzr/models.py | 2 ++ asuzr/tables.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/asuzr/models.py b/asuzr/models.py index 8f571ea..885c3fc 100644 --- a/asuzr/models.py +++ b/asuzr/models.py @@ -101,6 +101,8 @@ class Order(models.Model): need_color=False if self.approved!=None: need_color = (date.today()-self.approved.date()>= timedelta(days = 10)) + need_color = need_color and (self.calls == '') + return need_color #Эскизы diff --git a/asuzr/tables.py b/asuzr/tables.py index 60c94fb..e94b15f 100644 --- a/asuzr/tables.py +++ b/asuzr/tables.py @@ -35,8 +35,9 @@ class ColoredEditableColumn(EditableColumn): self.condition_field = condition_field def render(self, record, **kwargs): + print eval('record.%s' % self.condition_field) if self.condition_field != None and eval('record.%s' % self.condition_field): - self.attrs = {'th': {'bgcolor': '#FFE4E1'}} + self.attrs = {'td': {'bgcolor': '#FFE4E1'}} else: self.attrs = {}