Mercurial > public > scc_access / changeset

--- a/scc_access/scc_access.py	Thu Oct 05 15:41:41 2023 +0200
+++ b/scc_access/scc_access.py	Wed Nov 08 12:01:02 2023 +0100
@@ -899,8 +899,10 @@
         self.id = None
         self.num_id = None
         self.is_calibration = None
-        self.is_running = None
+        #self.is_running = None
+        self.is_being_processed = None
         self.is_queued = None
+        self.is_delayed = None
 
         self.resource_uri = None
         self.start = None
@@ -913,12 +915,10 @@
 
     @property
     def has_finished(self):
-        """ Temporary implementation for SCC version 5.2.0, until the API returns a flag indicating if the
-        processing measurement has finished. """
-        if (self.is_running is False) and (self.hirelpp != 0 or self.elpp != 0):
+        if self.is_being_processed is True or self.is_queued is True:
+            return False
+        else:
             return True
-        else:
-            return False
 
     def log_processing_status(self):
         """ Log module status. """