Bump to edc==0.5.40, ensure CRF show_order unique

CHANGES

@@ -6,9 +6,10 @@ unreleased
 - updates to Death Report form (#706)
     - add 'blurred_vision' question to Death Report (#706)
     - increase trial specific form validation
+- fix 'Already captured requisition forms showing as new/required' (#710)
 - fix Server error on clicking 'Add' Subject Visit in Subject admin (#531)
 - update forms reference doc
-- bump to edc 0.5.39
+- bump to edc 0.5.40
 - bump to edc-microbiology 0.3.1
 - bump to edc-csf 0.3.1
 - bump to effect-form-validators 0.1.36

effect_visit_schedule/visit_schedules/crfs.py

@@ -14,14 +14,14 @@
 crfs_prn = FormsCollection(
     Crf(show_order=50, model="effect_subject.studymedicationfollowup"),
     Crf(show_order=70, model="effect_subject.vitalsigns"),
-    Crf(show_order=100, model="effect_subject.bloodresultsfbc"),
-    Crf(show_order=240, model="effect_subject.bloodresultschem"),
-    Crf(show_order=300, model="effect_subject.chestxray"),
-    Crf(show_order=310, model="effect_subject.lpcsf"),
-    Crf(show_order=320, model="effect_subject.tbdiagnostics"),
+    Crf(show_order=200, model="effect_subject.bloodresultsfbc"),
+    Crf(show_order=210, model="effect_subject.bloodresultschem"),
+    Crf(show_order=230, model="effect_subject.chestxray"),
+    Crf(show_order=240, model="effect_subject.lpcsf"),
+    Crf(show_order=250, model="effect_subject.tbdiagnostics"),
     Crf(show_order=340, model="effect_subject.bloodculture"),
     Crf(show_order=360, model="effect_subject.histopathology"),
-    Crf(show_order=400, model="effect_subject.healtheconomicsevent"),
+    Crf(show_order=401, model="effect_subject.healtheconomicsevent"),
     Crf(show_order=500, model="effect_subject.clinicalnote"),
     name="prn",
 )
@@ -31,20 +31,20 @@
     Crf(show_order=80, model="effect_subject.mentalstatus"),
     Crf(show_order=90, model="effect_subject.signsandsymptoms"),
     Crf(show_order=100, model="effect_subject.diagnoses"),
-    Crf(show_order=400, model="effect_subject.healtheconomicsevent"),
+    Crf(show_order=401, model="effect_subject.healtheconomicsevent"),
     Crf(show_order=500, model="effect_subject.clinicalnote"),
     name="unscheduled",
 )
 
 crfs_unscheduled_lt_d14 = FormsCollection(
     *[crf for crf in crfs_unscheduled],
-    Crf(show_order=600, model="effect_subject.adherencestagetwo"),
+    Crf(show_order=602, model="effect_subject.adherencestagetwo"),
     name="unscheduled_lt_d14",
 )
 
 crfs_unscheduled_gte_d14 = FormsCollection(
     *[crf for crf in crfs_unscheduled],
-    Crf(show_order=600, model="effect_subject.adherencestagefour"),
+    Crf(show_order=604, model="effect_subject.adherencestagefour"),
     name="unscheduled_gte_d14",
 )
 
@@ -54,20 +54,20 @@
 )
 
 crfs_d01 = FormsCollection(
-    Crf(show_order=50, model="effect_subject.arvhistory"),
+    Crf(show_order=40, model="effect_subject.arvhistory"),
     Crf(show_order=60, model="effect_subject.participanthistory"),
     Crf(show_order=70, model="effect_subject.vitalsigns"),
     Crf(show_order=80, model="effect_subject.mentalstatus"),
     Crf(show_order=90, model="effect_subject.signsandsymptoms"),
-    Crf(show_order=100, model="effect_subject.studymedicationbaseline"),
+    Crf(show_order=99, model="effect_subject.studymedicationbaseline"),
     Crf(show_order=200, model="effect_subject.bloodresultsfbc"),
     Crf(show_order=210, model="effect_subject.bloodresultschem"),
     Crf(show_order=230, model="effect_subject.chestxray", required=False),
     Crf(show_order=240, model="effect_subject.lpcsf", required=False),
     Crf(show_order=250, model="effect_subject.tbdiagnostics", required=False),
     Crf(show_order=400, model="effect_subject.healtheconomics"),
     Crf(show_order=500, model="effect_subject.clinicalnote"),
-    Crf(show_order=600, model="effect_subject.adherencestageone"),
+    Crf(show_order=601, model="effect_subject.adherencestageone"),
     name=DAY01,
 )
 
@@ -81,7 +81,7 @@
     Crf(show_order=230, model="effect_subject.chestxray", required=False),
     Crf(show_order=240, model="effect_subject.lpcsf", required=False),
     Crf(show_order=250, model="effect_subject.tbdiagnostics", required=False),
-    Crf(show_order=600, model="effect_subject.adherencestagetwo"),
+    Crf(show_order=602, model="effect_subject.adherencestagetwo"),
     name=DAY03,
 )
 
@@ -93,7 +93,7 @@
     Crf(show_order=230, model="effect_subject.chestxray", required=False),
     Crf(show_order=240, model="effect_subject.lpcsf", required=False),
     Crf(show_order=250, model="effect_subject.tbdiagnostics", required=False),
-    Crf(show_order=600, model="effect_subject.adherencestagetwo"),
+    Crf(show_order=602, model="effect_subject.adherencestagetwo"),
     name=DAY09,
 )
 
@@ -110,7 +110,7 @@
     Crf(show_order=240, model="effect_subject.lpcsf", required=False),
     Crf(show_order=250, model="effect_subject.tbdiagnostics", required=False),
     Crf(show_order=500, model="effect_subject.clinicalnote"),
-    Crf(show_order=600, model="effect_subject.adherencestagethree"),
+    Crf(show_order=603, model="effect_subject.adherencestagethree"),
     name=DAY14,
 )
 
@@ -122,7 +122,7 @@
     Crf(show_order=230, model="effect_subject.chestxray", required=False),
     Crf(show_order=240, model="effect_subject.lpcsf", required=False),
     Crf(show_order=250, model="effect_subject.tbdiagnostics", required=False),
-    Crf(show_order=600, model="effect_subject.adherencestagefour"),
+    Crf(show_order=604, model="effect_subject.adherencestagefour"),
     name=WEEK04,
 )
 
@@ -135,7 +135,7 @@
     Crf(show_order=230, model="effect_subject.chestxray", required=False),
     Crf(show_order=240, model="effect_subject.lpcsf", required=False),
     Crf(show_order=250, model="effect_subject.tbdiagnostics", required=False),
-    Crf(show_order=600, model="effect_subject.adherencestagefour"),
+    Crf(show_order=604, model="effect_subject.adherencestagefour"),
     name=WEEK10,
 )
 
@@ -147,7 +147,7 @@
     Crf(show_order=230, model="effect_subject.chestxray", required=False),
     Crf(show_order=240, model="effect_subject.lpcsf", required=False),
     Crf(show_order=250, model="effect_subject.tbdiagnostics", required=False),
-    Crf(show_order=600, model="effect_subject.adherencestagefour"),
+    Crf(show_order=604, model="effect_subject.adherencestagefour"),
     name=WEEK16,
 )
 
@@ -161,6 +161,6 @@
     Crf(show_order=250, model="effect_subject.tbdiagnostics", required=False),
     Crf(show_order=400, model="effect_subject.healtheconomics"),
     # TODO: Termination Form CRF
-    Crf(show_order=600, model="effect_subject.adherencestagefour"),
+    Crf(show_order=604, model="effect_subject.adherencestagefour"),
     name=WEEK24,
 )

setup.cfg

@@ -26,7 +26,7 @@ zip_safe = False
 include_package_data = True
 packages = find:
 install_requires =
-    edc==0.5.39
+    edc==0.5.40
     edc-microbiology==0.3.1
     edc-csf==0.3.1
     beautifulsoup4