Browse Source

Updating iraemmBrowser to allow multiuser segmentation and adverse effect detection review

Andrej 4 years ago
parent
commit
82177d2c7a
1 changed files with 9 additions and 6 deletions
  1. 9 6
      slicerModule/iraemmBrowser.py

+ 9 - 6
slicerModule/iraemmBrowser.py

@@ -542,7 +542,7 @@ class iraemmBrowserLogic(ScriptedLoadableModuleLogic):
 
       #see if we have already done a review
       rows=self.getUniqueRows(self.parent.project,self.parent.reviewDataset,\
-              [self.participantField,'visitCode','Segmentation'],currentRow)
+              [self.participantField,'visitCode','Segmentation','ModifiedBy'],currentRow)
 
       if len(rows)==0:
           return
@@ -559,7 +559,7 @@ class iraemmBrowserLogic(ScriptedLoadableModuleLogic):
 
   #submit review to labkey
   def submitReview(self,currentRow,comment):
-      fields=[self.participantField,'visitCode','Segmentation']
+      fields=[self.participantField,'visitCode','Segmentation','ModifiedBy']
       rows=self.getUniqueRows(self.parent.project,self.parent.reviewDataset,\
               fields,currentRow)
 
@@ -617,7 +617,7 @@ class iraemmBrowserLogic(ScriptedLoadableModuleLogic):
 
 
   def loadAE(self,currentRow):
-      fields=[self.participantField,'petResampled']
+      fields=[self.participantField,'petResampled','ModifiedBy']
       rows=self.getUniqueRows(self.parent.project,self.parent.aeDataset,\
               fields,currentRow)
       
@@ -626,7 +626,7 @@ class iraemmBrowserLogic(ScriptedLoadableModuleLogic):
 
       print("Found {} rows".format(len(rows)))
       row=rows[0]
-      
+     
       for seg in self.segmentList:
           name=seg+'AE'
           try:
@@ -637,7 +637,7 @@ class iraemmBrowserLogic(ScriptedLoadableModuleLogic):
               continue
 
   def submitAE(self,currentRow):
-      fields=[self.participantField,'petResampled']
+      fields=[self.participantField,'petResampled','ModifiedBy']
       rows=self.getUniqueRows(self.parent.project,self.parent.aeDataset,\
               fields,currentRow)
       
@@ -648,7 +648,10 @@ class iraemmBrowserLogic(ScriptedLoadableModuleLogic):
           for f in fields:
               row[f]=currentRow[f]
           
-          row['SequenceNum']=currentRow['SequenceNum']
+          frows=self.getUniqueRows(self.parent.project,self.parent.aeDataset,\
+                  [self.participantField,'visitCode'],currentRow)
+
+          row['SequenceNum']=currentRow['SequenceNum']+0.01*len(frows)
       
       else:
           mode='update'