meta-edc 1.0.1__py3-none-any.whl → 1.0.2__py3-none-any.whl

{meta_edc-1.0.1.dist-info → meta_edc-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: meta-edc
-Version: 1.0.1
+Version: 1.0.2
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt

{meta_edc-1.0.1.dist-info → meta_edc-1.0.2.dist-info}/RECORD

@@ -491,7 +491,7 @@ meta_reports/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_reports/admin/__init__.py,sha256=om3lFa4YxsZSNlYIi2sZv8li2irOMoSeBtOpPk4V3lk,488
 meta_reports/admin/endpoints_admin.py,sha256=7wZCdC-D-QHI1bb_ucgyDZYlnYD7mWtcZpcH_LftkLs,514
 meta_reports/admin/endpoints_all_admin.py,sha256=_czdezZf9fSjwZJmO-3HbmdXrXP6nk8-HdiweqUzPRE,476
-meta_reports/admin/last_imp_refill_admin.py,sha256=w-0wIanAk7vXwUufd9v_ZEWhYJ3s8Q2fDP3csRRxgls,5946
+meta_reports/admin/last_imp_refill_admin.py,sha256=RKODpodLqQsKx1v4ybqVULo38s2bNXd1nsUpCdPlJ1A,6431
 meta_reports/admin/list_filters.py,sha256=pByBzz9-qGwqBfdZFlByxJUZDTJQXOTWfNLjmK8KF00,870
 meta_reports/admin/modeladmin_mixins.py,sha256=tEZYw0xNMfBvo2RLDrYfi_S9lbZU02dwtLxdRDZob4Q,3663
 meta_reports/admin/dbviews/__init__.py,sha256=2yPu0SO7ZX9yjan0OS9izzws14YYoXcGXmZhwJhax1I,675
@@ -1184,9 +1184,9 @@ tests/etc/user-rsa-restricted-private.pem,sha256=CUcHW9bznWdmmASN00hCzvxFPAFl4N2
 tests/etc/user-rsa-restricted-public.pem,sha256=mt84djoL-uHw6Wc5SJh0zml6VzXulnf8eQSFg7-fheg,450
 tests/etc/user-salt-local.key,sha256=x5anBw9fvbHurczouT3CjrkWb_xs7Ypm1htIJsgiuiw,256
 tests/etc/user-salt-restricted.key,sha256=pxmpcfBRNB-4C6wTvHXz-9fOfJgKIFOjaAF8ZFfa4q4,256
-meta_edc-1.0.1.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_edc-1.0.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-meta_edc-1.0.1.dist-info/METADATA,sha256=OcYKUsbo2PnuZveW1hIdmIxH8zc9s38qo-rQRCoAWFU,43527
-meta_edc-1.0.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-meta_edc-1.0.1.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
-meta_edc-1.0.1.dist-info/RECORD,,
+meta_edc-1.0.2.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+meta_edc-1.0.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-1.0.2.dist-info/METADATA,sha256=5KWkarvYtcSI6PzhZvKjGItS0aBzrrhQcttY4YtU1Cw,43527
+meta_edc-1.0.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+meta_edc-1.0.2.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
+meta_edc-1.0.2.dist-info/RECORD,,

meta_reports/admin/last_imp_refill_admin.py

@@ -1,3 +1,4 @@
+import pandas as pd
 from django.contrib import admin, messages
 from django.core.exceptions import FieldDoesNotExist
 from django.db import models
@@ -42,14 +43,24 @@ def update_report(modeladmin, request, queryset):
             modeladmin.model(
                 subject_identifier=row["subject_identifier"],
                 site_id=row["site_id"],
-                imp_visit_date=row["imp_visit_date"],
+                imp_visit_date=(
+                    None if pd.isna(row["imp_visit_date"]) else row["imp_visit_date"]
+                ),
                 imp_visit_code=row["imp_visit_code"],
-                next_appt_date=row["next_appt_datetime"],
-                next_visit_code=row["next_visit_code"],
+                next_appt_date=(
+                    None if pd.isna(row["next_appt_datetime"]) else row["next_appt_datetime"]
+                ),
+                next_visit_code=(
+                    None if pd.isna(row["next_visit_code"]) else row["next_visit_code"]
+                ),
                 days_since=row["days_since"].days,
-                days_until=row["days_until"].days,
-                visit_code=str(int(row["imp_visit_code"])),
-                visit_code_sequence=row["imp_visit_code"] % 1,
+                days_until=None if pd.isna(row["days_until"]) else row["days_until"].days,
+                visit_code=(
+                    None if pd.isna(row["imp_visit_code"]) else str(int(row["imp_visit_code"]))
+                ),
+                visit_code_sequence=(
+                    None if pd.isna(row["imp_visit_code"]) else row["imp_visit_code"] % 1
+                ),
                 report_model=modeladmin.model._meta.label_lower,
                 created=now,
             )