moved the Instrument class back to allow Process to handle it.

SciLifeLab · Feb 7, 2018 · 7b09f5f · 7b09f5f
1 parent e34234f
commit 7b09f5f
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/genologics/entities.py b/genologics/entities.py
@@ -325,6 +325,19 @@ def create(cls, lims, creation_tag=None, **kwargs):
         return instance
 
 
+class Instrument(Entity):
+    """Lab Instrument
+    """
+    _URI = "instruments"
+    _tag = "instrument"
+    _PREFIX = "inst"
+
+    name = StringDescriptor('name')
+    type = StringDescriptor('type')
+    serial_number = StringDescriptor('serial-number')
+    expiry_date = StringDescriptor('expiry-date')
+    archived = BooleanDescriptor('archived')
+
 class Lab(Entity):
     "Lab; container of researchers."
 
@@ -1056,19 +1069,6 @@ def __init__(self, lims, uri=None, id=None):
                         self.sequence = child.attrib.get("value")
 
 
-class Instrument(Entity):
-    """Lab Instrument
-    """
-    _URI = "instruments"
-    _tag = "instrument"
-    _PREFIX = "inst"
-
-    name = StringDescriptor('name')
-    type = StringDescriptor('type')
-    serial_number = StringDescriptor('serial-number')
-    expiry_date = StringDescriptor('expiry-date')
-    archived = BooleanDescriptor('archived')
-
 class Queue(Entity):
     """Queue of a given step"""
     _URI = "queues"