Information has no longer deadline field

src/collective/task/content/opinion.py

@@ -2,10 +2,10 @@ from zope.interface import implements
 
 from plone.dexterity.content import Item
 
-from collective.task.interfaces import IBaseTask
+from collective.task.interfaces import IBaseTask, IDeadline
 
 
-class IOpinion(IBaseTask):
+class IOpinion(IBaseTask, IDeadline):
     """Schema for opinion"""
     pass
 

src/collective/task/content/task.py

@@ -2,10 +2,10 @@ from zope.interface import implements
 
 from plone.dexterity.content import Container
 
-from collective.task.interfaces import IBaseTask
+from collective.task.interfaces import IBaseTask, IDeadline
 
 
-class ITask(IBaseTask):
+class ITask(IBaseTask, IDeadline):
     """Schema for task"""
     pass
 

src/collective/task/content/validation.py

@@ -2,10 +2,10 @@ from zope.interface import implements
 
 from plone.dexterity.content import Item
 
-from collective.task.interfaces import IBaseTask
+from collective.task.interfaces import IBaseTask, IDeadline
 
 
-class IValidation(IBaseTask):
+class IValidation(IBaseTask, IDeadline):
     """Schema for validation"""
     pass
 

src/collective/task/interfaces.py

@@ -40,10 +40,6 @@ class IBaseTask(model.Schema):
     title = schema.TextLine(title=_(u'Title'))
     note = schema.Text(title=_(u'Note'),
                        required=False)
-    deadline = schema.Datetime(title=_(u'Deadline'),
-                               defaultFactory=deadlineDefaultValue,
-                               required=False)
-    form.widget(deadline=DatetimeFieldWidget)
 
     enquirer = LocalRolesToPrincipals(
         title=_(u"Enquirer"),
@@ -71,3 +67,18 @@ class IBaseTask(model.Schema):
     form.widget(responsible=AjaxChosenMultiFieldWidget)
 
     form.order_after(note='responsible')
+
+
+class IDeadline(model.Schema):
+    deadline = schema.Datetime(title=_(u'Deadline'),
+                               defaultFactory=deadlineDefaultValue,
+                               required=False)
+    form.widget(deadline=DatetimeFieldWidget)
+
+
+@default_value(field=IDeadline['deadline'])
+def deadlineDefaultValue(data):
+    """Default value for deadline field today+3 days at 18:00"""
+    date = datetime.datetime.today() + datetime.timedelta(days=3)
+    hour = datetime.time(18, 0)
+    return datetime.datetime.combine(date, hour)

src/collective/task/tests/test_content.py

@@ -51,6 +51,7 @@ class TestContentTypes(IntegrationTestCase, BaseTest):
                                   id="my-info", title="My information",
                                   responsible=['bigboss'])
         self.assertIn('my-info', folder)
+        self.assertNotIn('deadline', info)
 
     def test_add_opinion(self):
         folder = self.folder