Merge branch '335-import-of-serology-data' into 'master'

serology for follow up visits were not imported

Closes #335

See merge request NCER-PD/scheduling-system!254

smash/web/redcap_connector.py

@@ -465,6 +465,22 @@ class RedcapConnector(object):
                                     visit.virus = False
                                 elif row.get(self.virus_field) == "Positive":
                                     visit.virus = True
+                                elif row.get(self.virus_field) == "Inconclusive":
+                                    visit.virus_inconclusive = True
+                            if self.sample_date_field != "":
+                                date_str = row.get(self.sample_date_field)
+                                if date_str is not None and date_str != "" and date_str != "Not done" and date_str != "Not known":
+                                    try:
+                                        visit.virus_collection_date = datetime.datetime.strptime(row.get(self.sample_date_field),
+                                                                                     "%Y-%m-%d")
+                                    except ValueError:
+                                        logger.warn("Invalid date: " + row.get(self.sample_date_field))
+                                        visit.virus_collection_date = None
+
+                            if self.iga_status_field != "":
+                                visit.iga_status = row.get(self.iga_status_field)
+                            if self.igg_status_field != "":
+                                visit.igg_status = row.get(self.igg_status_field)
                             if self.sample_kit_id_field != "":
                                 if row.get(self.sample_kit_id_field) != "":
                                     redcap_subject.visits.append(visit)