New project layout.

The individual applications are still part of an ecs super-app. With
time some of them should be moved outside and converted to be standalone.

Author: natano

__init__.py renamed to ecs/__init__.py

@@ -3,6 +3,7 @@
 from datetime import datetime
 from dbtemplates.models import Template
 
+from django.conf import settings
 from django.contrib.auth.models import Group, Permission
 from django.contrib.sites.models import Site
 from django.utils import timezone
@@ -63,7 +64,7 @@ def sites():
 
 @bootstrap.register(depends_on=('ecs.core.bootstrap.sites',))
 def templates():
-    basedir = os.path.join(os.path.dirname(__file__), '..', 'templates')
+    basedir = os.path.join(settings.PROJECT_DIR, 'templates')
 
     sites = list(Site.objects.all())
 
@@ -349,15 +350,15 @@ def auth_user_testusers():
         ('investigator', None, {}),
         ('office', u'EC-Office', {'is_internal': True,}),
         ('internal.rev', u'EC-Internal Review Group', {'is_internal': True,}),
-        ('executive', u'EC-Executive Board Group', {'is_internal': True, 'is_executive_board_member': True),
-        ('thesis.executive', u'EC-Thesis Executive Group', {'is_internal': False, 'is_executive_board_member': False),
+        ('executive', u'EC-Executive Board Group', {'is_internal': True, 'is_executive_board_member': True, }),
+        ('thesis.executive', u'EC-Thesis Executive Group', {'is_internal': False, 'is_executive_board_member': False, }),
         ('signing', u'EC-Signing Group', {'is_internal': True, }),
         ('signing_fail', u'EC-Signing Group', {'is_internal': True }),
         ('signing_mock', u'EC-Signing Group', {'is_internal': True }),
         ('statistic.rev', u'EC-Statistic Group', {'is_internal': False}),
         ('notification.rev', u'EC-Notification Review Group', {'is_internal': True, }),
         ('insurance.rev', u'EC-Insurance Reviewer', {'is_internal': False, 'is_insurance_reviewer': True}),
-        ('thesis.rev', u'EC-Thesis Review Group', {'is_internal': False, 'is_thesis_reviewer': True),
+        ('thesis.rev', u'EC-Thesis Review Group', {'is_internal': False, 'is_thesis_reviewer': True, }),
         ('external.reviewer', None, {}),
         ('gcp.reviewer', u'GCP Review Group', {'is_internal': False}),
         ('localec.rev', u'Local-EC Review Group', {'is_internal': True}),

auth_conf.py renamed to ecs/auth_conf.py

@@ -8,6 +8,7 @@
 from django.core.files.base import ContentFile
 from django.utils.datastructures import SortedDict
 from django.contrib.contenttypes import generic
+from django.utils import timezone
 
 from ecs.core.models import SubmissionForm, Submission, EthicsCommission, Investigator, InvestigatorEmployee, Measure, ForeignParticipatingCenter, NonTestedUsedDrug
 from ecs.documents.models import Document, DocumentType
@@ -226,7 +227,9 @@ def load_field(self, fieldname, val, zf, version):
         deferr = False
         if field:
             if isinstance(field, models.DateTimeField):
-                val = datetime.datetime.strptime(val, DATETIME_FORMAT)
+                val = timezone.make_aware(
+                    datetime.datetime.strptime(val, DATETIME_FORMAT),
+                    timezone.utc)
             elif isinstance(field, models.DateField):
                 val = datetime.date.strptime(val, DATE_FORMAT)
             elif isinstance(field, models.ManyToManyField):
@@ -448,7 +451,7 @@ def dump_model_instance(obj, zf):
 class _JsonEncoder(json.JSONEncoder):
     def default(self, obj):
         if isinstance(obj, datetime.datetime):
-            return obj.strftime(DATETIME_FORMAT)
+            return obj.astimezone(timezone.utc).strftime(DATETIME_FORMAT)
         elif isinstance(obj, datetime.date):
             return obj.strftime(DATE_FORMAT)
         return super(Encoder, self).default(obj)

authorization/__init__.py renamed to ecs/authorization/__init__.py

@@ -68,7 +68,7 @@ def test_attachments(self):
         that data attached is not altered.
         '''
 
-        attachment_name = os.path.join(settings.PROJECT_DIR, "core", "tests", "data", "menschenrechtserklaerung.pdf")
+        attachment_name = os.path.join(settings.PROJECT_DIR, "ecs", "core", "tests", "data", "menschenrechtserklaerung.pdf")
         attachment_data = open(attachment_name, "rb").read()
 
         # make two attachments, first attachment via a filename, second attachment via data supplied inline
@@ -89,7 +89,7 @@ def test_text_and_html_and_attachment(self):
         Further checks that attached data is not altered during sending.
         '''
 
-        attachment_name = os.path.join(settings.PROJECT_DIR, "core", "tests", "data", "menschenrechtserklaerung.pdf")
+        attachment_name = os.path.join(settings.PROJECT_DIR, "ecs", "core", "tests", "data", "menschenrechtserklaerung.pdf")
         attachment_data = open(attachment_name, "rb").read()
 
         self.deliver("another subject", "another attachment", 
@@ -104,4 +104,4 @@ def test_text_and_html_and_attachment(self):
 
         ok_(re.search("<b>bold attachment</b>", html_data))
         eq_(attachment_data, pdf_data)
-        
+