From c69fb699ca7e78513fd5575f9b9f375ba881c1ea Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Tue, 29 May 2018 12:45:23 +0300
Subject: [PATCH] Fix initial data in task creation

---
 taskapp/forms.py  | 12 ++++++------
 taskapp/models.py |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/taskapp/forms.py b/taskapp/forms.py
index e8bf8ef..3235b8e 100644
--- a/taskapp/forms.py
+++ b/taskapp/forms.py
@@ -1,12 +1,15 @@
 from django.utils.translation import ugettext as _
 from django import forms
-from .models import Task, ExtraComment, _delta_add_days
+from .models import Task, ExtraComment, delta_add_days
 from accounts_app.models import UserProfile
 from taskapp.handle import TaskException
 
 
 class TaskFrm(forms.ModelForm):
     def __init__(self, initial_abon=None, *args, **kwargs):
+        kwargs.update({'initial': {
+            'out_date': delta_add_days().strftime("%Y-%m-%d")
+        }})
         super(TaskFrm, self).__init__(*args, **kwargs)
         self.fields['recipients'].queryset = UserProfile.objects.filter(is_admin=True)
 
@@ -26,7 +29,7 @@ class TaskFrm(forms.ModelForm):
 
     class Meta:
         model = Task
-        exclude = ['time_of_create', 'author', 'device']
+        exclude = ('time_of_create', 'author', 'device')
         widgets = {
             'descr': forms.TextInput(attrs={
                 'placeholder': _('Short description'),
@@ -38,9 +41,6 @@ class TaskFrm(forms.ModelForm):
             'out_date': forms.DateInput(attrs={'class': 'form-control'}),
             'abon': forms.Select(attrs={'class': 'form-control'})
         }
-        initials = {
-            'out_date': _delta_add_days()
-        }
 
 
 class ExtraCommentForm(forms.ModelForm):
@@ -55,4 +55,4 @@ class ExtraCommentForm(forms.ModelForm):
 
     class Meta:
         model = ExtraComment
-        fields = ['text']
+        fields = ('text',)
diff --git a/taskapp/models.py b/taskapp/models.py
index 929264f..e27e143 100644
--- a/taskapp/models.py
+++ b/taskapp/models.py
@@ -6,7 +6,7 @@ from django.conf import settings
 from django.utils import timezone
 from django.utils.translation import ugettext as _
 from abonapp.models import Abon
-from .handle import handle as task_handle
+# from .handle import handle as task_handle
 
 TASK_PRIORITIES = (
     ('A', _('Higher')),
@@ -54,7 +54,7 @@ class ChangeLog(models.Model):
         return self.get_act_type_display()
 
 
-def _delta_add_days():
+def delta_add_days():
     return timezone.now() + timedelta(days=3)
 
 
@@ -65,7 +65,7 @@ class Task(models.Model):
     author = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='+', on_delete=models.SET_NULL, null=True,
                                blank=True, verbose_name=_('Task author'))
     priority = models.CharField(_('A priority'), max_length=1, choices=TASK_PRIORITIES, default=TASK_PRIORITIES[2][0])
-    out_date = models.DateField(_('Reality'), null=True, blank=True, default=_delta_add_days)
+    out_date = models.DateField(_('Reality'), null=True, blank=True, default=delta_add_days)
     time_of_create = models.DateTimeField(_('Date of create'), auto_now_add=True)
     state = models.CharField(_('Condition'), max_length=1, choices=TASK_STATES, default=TASK_STATES[0][0])
     attachment = models.ImageField(_('Attached image'), upload_to='task_attachments/%Y.%m.%d', blank=True, null=True)