Fix #246

Author: wasade

labman/db/plate.py

@@ -232,8 +232,9 @@ def list_plates(plate_types=None, only_quantified=False,
                 sql_studies = (', labman.get_plate_studies(p.plate_id) '
                                'AS studies')
 
-            sql = """SELECT p.plate_id, p.external_id {}
-                        FROM (SELECT DISTINCT plate_id, external_id
+            sql = """SELECT p.plate_id, p.external_id, p.creation_timestamp {}
+                        FROM (SELECT DISTINCT plate_id, external_id,
+                                              creation_timestamp
                               FROM labman.plate
                                 JOIN labman.well USING (plate_id)
                                 JOIN labman.composition USING (container_id)
@@ -290,6 +291,10 @@ def create(cls, external_id, plate_configuration):
             TRN.add(sql, [external_id, plate_configuration.id])
             return cls(TRN.execute_fetchlast())
 
+    @property
+    def creation_timestamp(self):
+        return self._get_attr('creation_timestamp')
+
     @property
     def external_id(self):
         """The plate external identifier"""

labman/db/support_files/db_patch.sql

@@ -118,6 +118,7 @@ CREATE TABLE labman.plate (
 	plate_configuration_id integer  NOT NULL,
 	discarded            bool DEFAULT 'False' NOT NULL,
 	notes                varchar(600)  ,
+    creation_timestamp        timestamp default now() NOT NULL,
 	CONSTRAINT pk_plate PRIMARY KEY ( plate_id ),
 	CONSTRAINT idx_plate UNIQUE ( external_id )
  );

labman/db/testing.py

@@ -54,6 +54,14 @@ def reset_test_db():
 
 
 class LabmanTestCase(TestCase):
+    _perform_reset = True
+
+    def do_not_reset_at_teardown(self):
+        self.__class__._perform_reset = False
+
     @classmethod
     def tearDownClass(cls):
-        reset_test_db()
+        if cls._perform_reset:
+            reset_test_db()
+        else:
+            cls._perform_reset = True

labman/db/tests/test_plate.py

@@ -8,6 +8,7 @@
 
 from unittest import main
 from types import GeneratorType
+import datetime
 
 from labman.db.testing import LabmanTestCase
 from labman.db.plate import PlateConfiguration, Plate
@@ -184,6 +185,23 @@ def test_list_plates(self):
                    'studies': ['Identification of the Microbiomes '
                                'for Cannabis Soils']}])
 
+    def test_plate_list_include_timestamp(self):
+        # ...limit pathological failures by testing within an hour of creation
+        exp = datetime.datetime.now()
+        exp = datetime.datetime(exp.year,
+                                exp.month,
+                                exp.day,
+                                exp.hour)
+
+        for i in Plate.list_plates():
+            obs = i['creation_timestamp']
+            obs = datetime.datetime(obs.year,
+                                    obs.month,
+                                    obs.day,
+                                    obs.hour)
+
+            self.assertEqual(obs, exp)
+
     def test_plate_list_discarded_functionality(self):
         # test case based on the test_list_plates
         obs = Plate.list_plates()
@@ -268,6 +286,15 @@ def test_create(self):
     def test_properties(self):
         # Plate 21 - Defined in the test DB
         tester = Plate(21)
+
+        obs = tester.creation_timestamp
+        obs = datetime.datetime(obs.year,
+                                obs.month,
+                                obs.day,
+                                obs.hour)
+        exp = datetime.datetime.now()
+        exp = datetime.datetime(exp.year, exp.month, exp.day, exp.hour)
+        self.assertEqual(obs, exp)
         self.assertEqual(tester.external_id, 'Test plate 1')
         self.assertEqual(tester.plate_configuration, PlateConfiguration(1))
         self.assertFalse(tester.discarded)

labman/gui/handlers/plate.py

@@ -81,7 +81,9 @@ def get(self):
                       if plate_type is not None else None)
         only_quantified = True if only_quantified == 'true' else False
 
-        rows_list = [[p['plate_id'], p['external_id'],
+        rows_list = [[p['plate_id'],
+                      p['external_id'],
+                      str(p['creation_timestamp']),
                       p['studies'] if p['studies'] is not None else []]
                      for p in Plate.list_plates(
                             plate_type, only_quantified=only_quantified,

labman/gui/templates/plate_list.html

@@ -105,9 +105,10 @@
           var deleteButton = '<button onclick="discardPlate(' + row[0] + ', this)" class="btn btn-danger">Discard Plate ' +
                                '<span class="glyphicon glyphicon-remove" data-toggle="tooltip" title="Discard plate"></span>' +
                              '</button> ';
-          // row[0] = plate id, row[1] = external id, row[2] = list of names of
-          // studies associated with any sample on plate (may be empty list)
-          newData.push([chBox, row[0], row[1], row[2].join('<br />'), deleteButton]);
+          // row[0] = plate id, row[1] = external id, row[2] = creation 
+          // timestamprow[3] = list of names of studies associated with any 
+          // sample on plate (may be empty list)
+          newData.push([chBox, row[0], row[1], row[2], row[3].join('<br />'), deleteButton]);
         }
         datatable.clear();
         datatable.rows.add(newData);
@@ -159,6 +160,7 @@
       <th></th>
       <th>Plate id</th>
       <th>Plate name</th>
+      <th>Creation timestamp</th>
       <th>Studies</th>
       <th></th>
     </tr>