Merge pull request #76 from UMCUGenetics/hotfix/v1.8.4

Hotfix/v1.8.4 to develop
UMCUGenetics · Jan 8, 2024 · ee4b19e · ee4b19e
2 parents 24cd76a + e10a158
commit ee4b19e
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/clarity_epp/upload/samples.py b/clarity_epp/upload/samples.py
@@ -152,7 +152,7 @@ def from_helix(lims, email_settings, input_file):
         elif udf_data['Dx Onderzoeksreden'] == 'Informativiteitstest':
             udf_data['Dx Familie status'] = 'Ouder'
         else:
-            udf_data['Dx Import warning'] = '; '.join([
+            udf_data['Dx Import warning'] = ';'.join([
                 'Onbekende onderzoeksreden, familie status niet ingevuld.',
                 udf_data['Dx Import warning']
             ])
@@ -168,7 +168,7 @@ def from_helix(lims, email_settings, input_file):
 
         # Check 'Dx Familienummer' and correct
         if '/' in udf_data['Dx Familienummer']:
-            udf_data['Dx Import warning'] = '; '.join([
+            udf_data['Dx Import warning'] = ';'.join([
                 'Meerdere familienummers, laatste wordt gebruikt. ({0})'.format(udf_data['Dx Familienummer']),
                 udf_data['Dx Import warning']
             ])
@@ -205,12 +205,12 @@ def from_helix(lims, email_settings, input_file):
                     duplo_sample.put()
                     # Check Dx Monsternummer
                     if duplo_sample.udf['Dx Monsternummer'] == udf_data['Dx Monsternummer']:
-                        udf_data['Dx Import warning'] = '; '.join([
+                        udf_data['Dx Import warning'] = ';'.join([
                             'WES en WES_duplo zelfde monster ({sample}).'.format(sample=duplo_sample.name),
                             udf_data['Dx Import warning']
                         ])
             else:  # Set import warning if no WES samples found
-                udf_data['Dx Import warning'] = '; '.join(['Alleen WES_duplo aangemeld.', udf_data['Dx Import warning']])
+                udf_data['Dx Import warning'] = ';'.join(['Alleen WES_duplo aangemeld.', udf_data['Dx Import warning']])
 
         elif udf_data['Dx Stoftest code'] == config.stoftestcode_wes:
             # Find WES_duplo sample(s)
@@ -226,12 +226,12 @@ def from_helix(lims, email_settings, input_file):
                     if 'Dx Import warning' in duplo_sample.udf and 'Alleen WES_duplo aangemeld.' in duplo_sample.udf['Dx Import warning']:
                         import_warning = duplo_sample.udf['Dx Import warning'].split(';')
                         import_warning.remove('Alleen WES_duplo aangemeld.')
-                        duplo_sample.udf['Dx Import warning'] = '; '.join(import_warning)
+                        duplo_sample.udf['Dx Import warning'] = ';'.join(import_warning)
                         duplo_sample.put()
 
                     # Check Dx Monsternummer
                     if duplo_sample.udf['Dx Monsternummer'] == udf_data['Dx Monsternummer']:
-                        udf_data['Dx Import warning'] = '; '.join([
+                        udf_data['Dx Import warning'] = ';'.join([
                             'WES en WES_duplo zelfde monster ({sample}).'.format(sample=duplo_sample.name),
                             udf_data['Dx Import warning']
                         ])
@@ -246,12 +246,12 @@ def from_helix(lims, email_settings, input_file):
                     sample.udf['Dx Protocolomschrijving'] in udf_data['Dx Protocolomschrijving']
                     and sample.udf['Dx Foetus'] == udf_data['Dx Foetus']
                 ):
-                    udf_data['Dx Import warning'] = '; '.join([
+                    udf_data['Dx Import warning'] = ';'.join([
                         'Herhaling of dubbele indicatie, beide monsters ingeladen ({sample}).'.format(sample=sample.name),
                         udf_data['Dx Import warning']
                     ])
                 elif 'Dx Mengfractie' not in sample.udf or not sample.udf['Dx Mengfractie']:
-                    udf_data['Dx Import warning'] = '; '.join([
+                    udf_data['Dx Import warning'] = ';'.join([
                         'Eerder onderzoek met protocolomschrijving {protocol} ({sample}).'.format(
                             protocol=sample.udf['Dx Protocolomschrijving'], sample=sample.name
                         ),
@@ -261,7 +261,7 @@ def from_helix(lims, email_settings, input_file):
                 sample.udf['Dx Protocolomschrijving'] in udf_data['Dx Protocolomschrijving']
                 and sample.udf['Dx Foetus'] == udf_data['Dx Foetus']
             ):
-                udf_data['Dx Import warning'] = '; '.join([
+                udf_data['Dx Import warning'] = ';'.join([
                     'Herhaling of dubbele indicatie, beide monsters ingeladen ({sample}).'.format(sample=sample.name),
                     udf_data['Dx Import warning']
                 ])