From aa2ffc88fc902017d81f09238e282624c7432027 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Fri, 29 Jan 2021 07:41:46 +0100
Subject: [PATCH] combine end_time and start_time into timestamp in Logentry
---
.../migrations/0002_auto_20210129_0739.py | 22 +++++++++++++++++++
atdb/taskdatabase/models.py | 3 +--
2 files changed, 23 insertions(+), 2 deletions(-)
create mode 100644 atdb/taskdatabase/migrations/0002_auto_20210129_0739.py
diff --git a/atdb/taskdatabase/migrations/0002_auto_20210129_0739.py b/atdb/taskdatabase/migrations/0002_auto_20210129_0739.py
new file mode 100644
index 00000000..0d187f8b
--- /dev/null
+++ b/atdb/taskdatabase/migrations/0002_auto_20210129_0739.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.1.4 on 2021-01-29 06:39
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('taskdatabase', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='logentry',
+ old_name='end_time',
+ new_name='timestamp',
+ ),
+ migrations.RemoveField(
+ model_name='logentry',
+ name='start_time',
+ ),
+ ]
diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index eb775c2a..6ecf5323 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -60,8 +60,7 @@ class LogEntry(models.Model):
wall_clock_time = models.IntegerField(null=True,blank=True)
url_to_log_file = models.CharField(max_length=100, blank=True, null=True)
step_name = models.CharField(max_length=30, blank=True, null=True)
- start_time = models.DateTimeField(blank=True, null=True)
- end_time = models.DateTimeField(blank=True, null=True)
+ timestamp = models.DateTimeField(blank=True, null=True)
status = models.CharField(max_length=50,default="defined", blank=True, null=True)
description = models.CharField(max_length=100, blank=True, null=True)
--
GitLab