Merge branch 'NES-1015' into dev

neuromat · May 4, 2020 · 398a403 · 398a403
2 parents 6aebdb0 + 0e83dd7
commit 398a403
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/patientregistrationsystem/qdc/experiment/portal.py b/patientregistrationsystem/qdc/experiment/portal.py
@@ -50,8 +50,7 @@ def __init__(self):
                   (
                       ':' + settings.PORTAL_API['PORT'] if
                       settings.PORTAL_API['PORT'] else ''
-                  ) \
-                  + '/api/schema/'
+                  ) + '/api/schema/'
 
             self.schema = self.client.get(url)
             self.active = True

diff --git a/patientregistrationsystem/qdc/experiment/views.py b/patientregistrationsystem/qdc/experiment/views.py
@@ -1006,6 +1006,12 @@ def experiment_schedule_of_sending(request, experiment_id,
             new_schedule.experiment = experiment
             new_schedule.responsible = request.user
             new_schedule.status = "scheduled"
+            # TODO: Error on sending "Enviar para o Portal":
+            #  After schedulling sending to portal and clicking on button
+            #  "Enviar para o Portal" gives error. Something like
+            #  "'on' must be True or False". Appears to get 'on' from 
+            #  'send_age' from form, and when saving new_schedule the value
+            #  end_participante_age shoud be True or False
             send_age = request.POST.get('send_age')
             new_schedule.send_participant_age = send_age if send_age else False
             new_schedule.save()
@@ -8554,7 +8560,7 @@ def get_experimental_protocol_image(experimental_protocol, tree, url=False):
     errors, path_complete = create_directory(settings.MEDIA_ROOT, "temp")
 
     try:
-        graph.write_svg(path.join(path_complete, file_name))
+        graph.write(path.join(path_complete, file_name), format='png')
     except:
         return None