projects
/
htsworkflow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
django provides django.utils.timezone.now to return a timezone aware timestamp if...
[htsworkflow.git]
/
htsworkflow
/
frontend
/
experiments
/
models.py
diff --git
a/htsworkflow/frontend/experiments/models.py
b/htsworkflow/frontend/experiments/models.py
index e3771cbde31be4f654fd44dc5b043ed847144257..600b9174258098488ecff81b2f75a4f61391a065 100644
(file)
--- a/
htsworkflow/frontend/experiments/models.py
+++ b/
htsworkflow/frontend/experiments/models.py
@@
-9,6
+9,7
@@
import uuid
from django.conf import settings
from django.core.exceptions import ObjectDoesNotExist
from django.core import urlresolvers
from django.conf import settings
from django.core.exceptions import ObjectDoesNotExist
from django.core import urlresolvers
+from django.utils import timezone
from django.db import models
from django.db.models.signals import post_init, pre_save
from django.db import models
from django.db.models.signals import post_init, pre_save
@@
-219,7
+220,7
@@
class FlowCell(models.Model):
def import_data_run(self, relative_pathname, run_xml_name, force=False):
"""Given a result directory import files"""
def import_data_run(self, relative_pathname, run_xml_name, force=False):
"""Given a result directory import files"""
- now =
datetime.datetim
e.now()
+ now =
timezon
e.now()
run_dir = get_absolute_pathname(relative_pathname)
run_xml_path = os.path.join(run_dir, run_xml_name)
run_dir = get_absolute_pathname(relative_pathname)
run_xml_path = os.path.join(run_dir, run_xml_name)
@@
-253,7
+254,7
@@
class FlowCell(models.Model):
run.alignment_software = run_xml_data.gerald.software
run.alignment_version = run_xml_data.gerald.version
run.alignment_software = run_xml_data.gerald.software
run.alignment_version = run_xml_data.gerald.version
- run.last_update_time =
datetime.datetim
e.now()
+ run.last_update_time =
timezon
e.now()
run.save()
run.update_result_files()
run.save()
run.update_result_files()
@@
-356,7
+357,7
@@
class DataRun(models.Model):
self.datafile_set.add(newfile)
self.datafile_set.add(newfile)
- self.last_update_time =
datetime.datetim
e.now()
+ self.last_update_time =
timezon
e.now()
def lane_files(self):
lanes = {}
def lane_files(self):
lanes = {}