meta-edc 1.2.1__py3-none-any.whl → 1.2.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of meta-edc might be problematic. Click here for more details.
- meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py +8 -4
- {meta_edc-1.2.1.dist-info → meta_edc-1.2.2.dist-info}/METADATA +5 -5
- {meta_edc-1.2.1.dist-info → meta_edc-1.2.2.dist-info}/RECORD +6 -6
- meta_reports/models/endpoints.py +4 -3
- {meta_edc-1.2.1.dist-info → meta_edc-1.2.2.dist-info}/WHEEL +0 -0
- {meta_edc-1.2.1.dist-info → meta_edc-1.2.2.dist-info}/licenses/LICENSE +0 -0
|
@@ -2,7 +2,7 @@ import numpy as np
|
|
|
2
2
|
import pandas as pd
|
|
3
3
|
from django.apps import apps as django_apps
|
|
4
4
|
from django.utils import timezone
|
|
5
|
-
from edc_constants.constants import YES
|
|
5
|
+
from edc_constants.constants import NULL_STRING, YES
|
|
6
6
|
|
|
7
7
|
from ..constants import (
|
|
8
8
|
CASE_EOS,
|
|
@@ -328,15 +328,19 @@ class GlucoseEndpointsByDate:
|
|
|
328
328
|
fbg_value=(None if pd.isna(row["fbg_value"]) else row["fbg_value"]),
|
|
329
329
|
ogtt_value=None if pd.isna(row["ogtt_value"]) else row["ogtt_value"],
|
|
330
330
|
fbg_date=(None if pd.isna(row["fbg_datetime"]) else row["fbg_datetime"]),
|
|
331
|
-
fasting=(
|
|
331
|
+
fasting=(NULL_STRING if pd.isna(row["fasted"]) else row["fasted"]),
|
|
332
332
|
endpoint_label=(
|
|
333
|
-
|
|
333
|
+
NULL_STRING
|
|
334
|
+
if pd.isna(row["endpoint_label"])
|
|
335
|
+
else row["endpoint_label"]
|
|
334
336
|
),
|
|
335
337
|
offstudy_date=(
|
|
336
338
|
None if pd.isna(row["offstudy_datetime"]) else row["offstudy_datetime"]
|
|
337
339
|
),
|
|
338
340
|
offstudy_reason=(
|
|
339
|
-
|
|
341
|
+
NULL_STRING
|
|
342
|
+
if pd.isna(row["offstudy_reason"])
|
|
343
|
+
else row["offstudy_reason"]
|
|
340
344
|
),
|
|
341
345
|
report_model=model,
|
|
342
346
|
created=now,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: meta-edc
|
|
3
|
-
Version: 1.2.
|
|
3
|
+
Version: 1.2.2
|
|
4
4
|
Summary: META Trial EDC (https://www.isrctn.com/ISRCTN76157257)
|
|
5
5
|
Keywords: django,clinicedc,META EDC,EDC,clinical trials,META Trial,ISRCTN76157257
|
|
6
6
|
Author: Erik van Widenfelt, Jonathan Willitts
|
|
@@ -15,7 +15,7 @@ Classifier: Intended Audience :: Science/Research
|
|
|
15
15
|
Classifier: Operating System :: OS Independent
|
|
16
16
|
Classifier: Programming Language :: Python :: 3.12
|
|
17
17
|
Classifier: Programming Language :: Python :: 3.13
|
|
18
|
-
Requires-Dist: clinicedc>=2.0.
|
|
18
|
+
Requires-Dist: clinicedc>=2.0.32
|
|
19
19
|
Requires-Dist: edc-he>=1.2.0
|
|
20
20
|
Requires-Dist: edc-microscopy>=1.2.0
|
|
21
21
|
Requires-Dist: edc-mnsi>=1.2.0
|
|
@@ -89,8 +89,8 @@ Assuming you are logged into the account ``myaccount``:
|
|
|
89
89
|
mkdir ~/edc && \
|
|
90
90
|
cd ~/edc && \
|
|
91
91
|
uv venv && \
|
|
92
|
-
uv pip install -U meta-edc==1.2.
|
|
93
|
-
wget https://raw.githubusercontent.com/meta-trial/meta-edc/1.2.
|
|
92
|
+
uv pip install -U meta-edc==1.2.1 && \
|
|
93
|
+
wget https://raw.githubusercontent.com/meta-trial/meta-edc/1.2.1/manage.py && \
|
|
94
94
|
uv pip freeze | grep meta-edc
|
|
95
95
|
|
|
96
96
|
Copy your ``.env`` file to ``~/.etc``.
|
|
@@ -140,7 +140,7 @@ From the above example:
|
|
|
140
140
|
|
|
141
141
|
cd ~/edc && \
|
|
142
142
|
uv venv --clear && \
|
|
143
|
-
uv pip install -U meta-edc==1.2.
|
|
143
|
+
uv pip install -U meta-edc==1.2.1 && \
|
|
144
144
|
wget -O manage.py https://raw.githubusercontent.com/meta-trial/meta-edc/1.1.10/manage.py && \
|
|
145
145
|
uv pip freeze | grep meta-edc && \
|
|
146
146
|
python manage.py check
|
|
@@ -90,7 +90,7 @@ meta_analytics/dataframes/get_glucose_fbg_ogtt_df.py,sha256=BfMU1sNj1a4dVOy7yKGE
|
|
|
90
90
|
meta_analytics/dataframes/get_last_imp_visits_df.py,sha256=N5tL6gANDr_g5AuNVv_cEN4U-QktLxJUAJaUIW2MiWs,3818
|
|
91
91
|
meta_analytics/dataframes/glucose_endpoints/__init__.py,sha256=C78zm7_ebYdAQBaldn7LpKlRHvK2ufdT7nFBGZdAMFw,163
|
|
92
92
|
meta_analytics/dataframes/glucose_endpoints/endpoint_by_date.py,sha256=BgX6nfBcEFYTMLLfSoMBp7UZJjCr_-ziQBY3CycgNZY,6435
|
|
93
|
-
meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py,sha256=
|
|
93
|
+
meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py,sha256=aflKAcq1zx8osSSrvRvrqJWq-cJTjaeRqaCYV96Z-bs,14112
|
|
94
94
|
meta_analytics/dataframes/screening/__init__.py,sha256=1SegmpN-ceginLsJUADqJzfhLVpAgBmMb53gnKRQsPw,176
|
|
95
95
|
meta_analytics/dataframes/screening/get_glucose_tested_only_df.py,sha256=jW8eCT2Nu2nBLwcxVg6ftnBk1SbCejSpiURORmi3Aso,648
|
|
96
96
|
meta_analytics/dataframes/screening/get_screening_df.py,sha256=QTzFHN7kVk_YXF5l0oqHgcbLi9iEV7ZVA1ksGVlD7fg,6233
|
|
@@ -585,7 +585,7 @@ meta_reports/models/dbviews/unattended_three_in_row2/view_definition.py,sha256=1
|
|
|
585
585
|
meta_reports/models/dbviews/unattended_two_in_row/__init__.py,sha256=V7TbHR9To9QXCRpHZ2jQWDzJupcO1AjQYA6vHxLlUGU,82
|
|
586
586
|
meta_reports/models/dbviews/unattended_two_in_row/unmanaged_model.py,sha256=2PAh86uDBbfTtMgmyOHHnhq1Yd4oSRDEe3UD4RTdS0M,869
|
|
587
587
|
meta_reports/models/dbviews/unattended_two_in_row/view_definition.py,sha256=fT-LngyxVBGVc5SIF5Fb2fUskvcC6-balydSkVDtueY,1379
|
|
588
|
-
meta_reports/models/endpoints.py,sha256=
|
|
588
|
+
meta_reports/models/endpoints.py,sha256=KJxP761hXGW9dgdXigFE2UBWGWDf1qu1YuJWb7Bf9EY,1102
|
|
589
589
|
meta_reports/models/endpoints_proxy.py,sha256=3h3JGaPmnJedFPVWGrk4idV4YtdihqiCI5W7QomwG4E,318
|
|
590
590
|
meta_reports/models/last_imp_refill.py,sha256=TmCU40iH3r6PaurxMCaE2xPVYWZo-NUQFpAq7uv7ghE,1003
|
|
591
591
|
meta_reports/pdf_report.py,sha256=pERB4ofnNPu5W4rQhGLmJm4jcmr8NhrvDjqKoUMsOeQ,2427
|
|
@@ -1144,7 +1144,7 @@ meta_visit_schedule/visit_schedules/phase_three/schedule.py,sha256=LU1HRaV6o1UeK
|
|
|
1144
1144
|
meta_visit_schedule/visit_schedules/phase_three/schedule_dm_referral.py,sha256=q12p5wXc2D7lSiJVBnoSQw8Q3vL6uDx1t3PuDJO-Z-U,1735
|
|
1145
1145
|
meta_visit_schedule/visit_schedules/phase_three/schedule_pregnancy.py,sha256=bEpbpCX3vfZmnsqudr0z8PU5kiaX4ws1sO5Im98Mo28,1106
|
|
1146
1146
|
meta_visit_schedule/visit_schedules/phase_three/visit_schedule.py,sha256=ak4qazeKlpIlvpqrK9hDDO0fwWuWyvb4Ec-JU31IJxc,654
|
|
1147
|
-
meta_edc-1.2.
|
|
1148
|
-
meta_edc-1.2.
|
|
1149
|
-
meta_edc-1.2.
|
|
1150
|
-
meta_edc-1.2.
|
|
1147
|
+
meta_edc-1.2.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
|
1148
|
+
meta_edc-1.2.2.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
|
|
1149
|
+
meta_edc-1.2.2.dist-info/METADATA,sha256=0XBU9Xu3XCiw4vx1GpbDR3npT5-syeO67pDL-Is0fSc,5163
|
|
1150
|
+
meta_edc-1.2.2.dist-info/RECORD,,
|
meta_reports/models/endpoints.py
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
from django.db import models
|
|
2
|
+
from edc_constants.constants import NULL_STRING
|
|
2
3
|
from edc_qareports.model_mixins import QaReportModelMixin, qa_reports_permissions
|
|
3
4
|
|
|
4
5
|
|
|
@@ -9,7 +10,7 @@ class Endpoints(QaReportModelMixin, models.Model):
|
|
|
9
10
|
|
|
10
11
|
visit_code = models.IntegerField(null=True)
|
|
11
12
|
|
|
12
|
-
fasting = models.CharField(max_length=10, default=
|
|
13
|
+
fasting = models.CharField(max_length=10, default=NULL_STRING)
|
|
13
14
|
|
|
14
15
|
fbg_date = models.DateField(null=True)
|
|
15
16
|
|
|
@@ -17,13 +18,13 @@ class Endpoints(QaReportModelMixin, models.Model):
|
|
|
17
18
|
|
|
18
19
|
ogtt_value = models.FloatField(null=True)
|
|
19
20
|
|
|
20
|
-
endpoint_label = models.CharField(max_length=250, default=
|
|
21
|
+
endpoint_label = models.CharField(max_length=250, default=NULL_STRING)
|
|
21
22
|
|
|
22
23
|
baseline_date = models.DateField(null=True)
|
|
23
24
|
|
|
24
25
|
offstudy_date = models.DateField(null=True)
|
|
25
26
|
|
|
26
|
-
offstudy_reason = models.CharField(max_length=250, default=
|
|
27
|
+
offstudy_reason = models.CharField(max_length=250, default=NULL_STRING)
|
|
27
28
|
|
|
28
29
|
def __str__(self):
|
|
29
30
|
return f"{self.subject_identifier} {self.visit_code} {self.endpoint_label}"
|
|
File without changes
|
|
File without changes
|