Developments starting August 11, 2024

.ddev/config.yaml

@@ -10,7 +10,7 @@ additional_hostnames: []
 additional_fqdns: []
 database:
     type: mariadb
-    version: "10.2"
+    version: "10.5"
 use_dns_when_possible: true
 composer_version: "1"
 web_environment: []

ci-scripts/circleci_wait.sh

@@ -3,7 +3,7 @@
 
 CMD="$*"
 
-TIMEOUT=3700
+TIMEOUT=4300
 INTERVAL=240
 $CMD &
 CMD_PID=$!

client/src/assets/scss/_new.scss

@@ -455,7 +455,7 @@ div.page-pincode {
     background: $color-light-background;
     border: 2px solid $color-white;
     margin-bottom: 0;
-    margin-top: auto;
+    margin-top: 25px;
     width: 100%;
   }
 
@@ -644,26 +644,36 @@ button.ui.primary.button.individual-assessment {
   }
 }
 
-button.ui.primary.button.group-assessment .icon {
-  background-image: url(#{$img-path}icon-group-encounter.svg);
-}
-
+button.ui.primary.button.group-assessment,
 button.ui.primary.button.individual-assessment {
 
-  .icon {
-    background-image: url(#{$img-path}icon-individual-encounter.svg);
-    background-size: 40px 40px;
-    margin-left: 55px;
-    margin-top: 8px;
-    height: 40px;
-    width: 40px;
+  img {
+    float: left;
+    margin-left: 20px;
+  }
+
+  .text {
+    width: 57%;
   }
 
   .icon-back {
     margin-left: 57px;
   }
 }
 
+button.ui.primary.button.group-assessment img {
+  height: 40px;
+  width: 50px;
+  margin-top: 8px;
+}
+
+button.ui.primary.button.individual-assessment img {
+  height: 40px;
+  width: 40px;
+  margin-right: 10px;
+  margin-top: 10px;
+}
+
 div.page-person-create {
   margin: 0 auto;
   padding: 0 35px 35px 35px;
@@ -1911,17 +1921,20 @@ div.page-activity.stock-management {
         }
       }
 
-      .label.successive-abortions {
-        margin-top: 30px
-      }
-
       &.medical,
       &.social {
 
         .alert img {
           margin-top: -10px;
         }
       }
+
+      &.medical {
+
+        .checkbox-select-input {
+          margin-bottom: 50px;
+        }
+      }
     }
 
     .form.examination {
@@ -3071,6 +3084,13 @@ div.page-report.clinical .ui.unstackable.items {
     }
   }
 
+  .vaccination-history {
+
+    .pane-content {
+      padding-left: 0;
+    }
+  }
+
   .chw-activities {
 
     .heading,
@@ -4041,7 +4061,8 @@ div.page-activity.well-child,
 div.page-report.acute-illness,
 div.page-report.well-child,
 div.page-report.child-scoreboard,
-div.page-activity.patient-record {
+div.page-activity.patient-record,
+div.page-report.clinical {
 
   .heading {
     border-bottom: 1px solid $color-text;

client/src/elm/Activity/Utils.elm

@@ -454,34 +454,14 @@ expectMotherActivity currentDate offlineSession motherId activity =
                         case participant.adultActivities of
                             MotherActivities ->
                                 if List.member offlineSession.session.clinicType [ Achi, Fbf ] then
-                                    let
-                                        isBreastfeeding =
-                                            getMotherMeasurementData2 motherId offlineSession
-                                                |> LocalData.map
-                                                    (.current
-                                                        >> .lactation
-                                                        >> Maybe.map (Tuple.second >> .value >> EverySet.member Breastfeeding)
-                                                        >> Maybe.withDefault False
-                                                    )
-                                                |> LocalData.withDefault False
-
-                                        entitledByUbudehe =
-                                            Dict.get motherId offlineSession.mothers
-                                                |> Maybe.map
-                                                    (\mother ->
-                                                        case mother.ubudehe of
-                                                            Just Ubudehe1 ->
-                                                                True
-
-                                                            Just Ubudehe2 ->
-                                                                True
-
-                                                            _ ->
-                                                                False
-                                                    )
-                                                |> Maybe.withDefault False
-                                    in
-                                    isBreastfeeding && entitledByUbudehe
+                                    getMotherMeasurementData2 motherId offlineSession
+                                        |> LocalData.map
+                                            (.current
+                                                >> .lactation
+                                                >> Maybe.map (Tuple.second >> .value >> EverySet.member Breastfeeding)
+                                                >> Maybe.withDefault False
+                                            )
+                                        |> LocalData.withDefault False
 
                                 else
                                     False

client/src/elm/Backend/Measurement/Decoder.elm

@@ -458,6 +458,12 @@ decodePrenatalHealthEducationSign =
                     "mastitis" ->
                         succeed EducationMastitis
 
+                    "grief" ->
+                        succeed EducationGrief
+
+                    "hiv-partner-presence" ->
+                        succeed EducationHIVPartnerPresence
+
                     "none" ->
                         succeed NoPrenatalHealthEducationSigns
 
@@ -641,6 +647,7 @@ decodePartnerHIVTestValue =
             )
             (Just prerequisitesDefaultRDT)
         |> optional "test_result" (nullable decodeTestResult) Nothing
+        |> optional "hiv_signs" (nullable (decodeEverySet decodePrenatalHIVSign)) Nothing
 
 
 decodeViralLoadStatus : Decoder ViralLoadStatus
@@ -950,6 +957,9 @@ decodeTestExecutionNote =
                     "run-confirmed-by-lab-tech" ->
                         succeed TestNoteRunConfirmedByLabTech
 
+                    "not-present" ->
+                        succeed TestNoteNotPresent
+
                     _ ->
                         fail <|
                             note
@@ -1919,57 +1929,68 @@ decodeLmpDateNotConfidentReason =
             )
 
 
+decodeMedicalHistory : Decoder MedicalHistory
+decodeMedicalHistory =
+    decodePrenatalMeasurement decodeMedicalHistoryValue
+
+
+decodeMedicalHistoryValue : Decoder MedicalHistoryValue
+decodeMedicalHistoryValue =
+    succeed MedicalHistoryValue
+        |> required "medical_history" (decodeEverySet decodeMedicalHistorySign)
+        |> optional "physical_condition_history"
+            (decodeEverySet decodeMedicalHistoryPhysicalCondition)
+            (EverySet.singleton MigrateMedicalHistoryPhysicalCondition)
+        |> optional "infectious_disease_history"
+            (decodeEverySet decodeMedicalHistoryInfectiousDisease)
+            (EverySet.singleton NoMedicalHistoryInfectiousDisease)
+        |> optional "mental_health_issues"
+            (decodeEverySet decodeMedicalHistoryMentalHealthIssue)
+            (EverySet.singleton NoMedicalHistoryMentalHealthIssue)
+
+
 decodeMedicalHistorySign : Decoder MedicalHistorySign
 decodeMedicalHistorySign =
     string
         |> andThen
             (\s ->
-                case s of
-                    "uterine-myonma" ->
-                        succeed UterineMyoma
-
-                    "diabetes" ->
-                        succeed Diabetes
-
-                    "cardiac-disease" ->
-                        succeed CardiacDisease
-
-                    "renal-disease" ->
-                        succeed RenalDisease
-
-                    "hypertension-before-pregnancy" ->
-                        succeed HypertensionBeforePregnancy
-
-                    "tuberculosis-past" ->
-                        succeed TuberculosisPast
-
-                    "tuberculosis-present" ->
-                        succeed TuberculosisPresent
-
-                    "asthma" ->
-                        succeed Asthma
-
-                    "bowed-legs" ->
-                        succeed BowedLegs
+                medicalHistorySignFromString s
+                    |> Maybe.map succeed
+                    |> Maybe.withDefault (s ++ " is not a recognized MedicalHistorySign" |> fail)
+            )
 
-                    "hiv" ->
-                        succeed HIV
 
-                    "mental-health-history" ->
-                        succeed MentalHealthHistory
+decodeMedicalHistoryPhysicalCondition : Decoder MedicalHistoryPhysicalCondition
+decodeMedicalHistoryPhysicalCondition =
+    string
+        |> andThen
+            (\s ->
+                medicalHistoryPhysicalConditionFromString s
+                    |> Maybe.map succeed
+                    |> Maybe.withDefault (s ++ " is not a recognized MedicalHistoryPhysicalCondition" |> fail)
+            )
 
-                    "none" ->
-                        succeed NoMedicalHistorySigns
 
-                    _ ->
-                        fail <| s ++ " is not a recognized MedicalHistorySign"
+decodeMedicalHistoryInfectiousDisease : Decoder MedicalHistoryInfectiousDisease
+decodeMedicalHistoryInfectiousDisease =
+    string
+        |> andThen
+            (\s ->
+                medicalHistoryInfectiousDiseaseFromString s
+                    |> Maybe.map succeed
+                    |> Maybe.withDefault (s ++ " is not a recognized MedicalHistoryInfectiousDisease" |> fail)
             )
 
 
-decodeMedicalHistory : Decoder MedicalHistory
-decodeMedicalHistory =
-    field "medical_history" (decodeEverySet decodeMedicalHistorySign)
-        |> decodePrenatalMeasurement
+decodeMedicalHistoryMentalHealthIssue : Decoder MedicalHistoryMentalHealthIssue
+decodeMedicalHistoryMentalHealthIssue =
+    string
+        |> andThen
+            (\s ->
+                medicalHistoryMentalHealthIssueFromString s
+                    |> Maybe.map succeed
+                    |> Maybe.withDefault (s ++ " is not a recognized MedicalHistoryMentalHealthIssue" |> fail)
+            )
 
 
 decodeMedicationSign : Decoder MedicationSign
@@ -2316,6 +2337,9 @@ decodePreviousDeliverySign =
         |> andThen
             (\s ->
                 case s of
+                    "c-section-in-past" ->
+                        succeed CSectionInPast
+
                     "c-section-in-previous-delivery" ->
                         succeed CSectionInPreviousDelivery
 
@@ -2377,14 +2401,28 @@ decodeObstetricHistorySign =
             )
 
 
+decodeObstetricHistoryStep2Sign : Decoder ObstetricHistoryStep2Sign
+decodeObstetricHistoryStep2Sign =
+    string
+        |> andThen
+            (\sign ->
+                obstetricHistoryStep2SignFromString sign
+                    |> Maybe.map succeed
+                    |> Maybe.withDefault (sign ++ " is not a recognized ObstetricHistoryStep2Sign" |> fail)
+            )
+
+
 decodeObstetricHistoryStep2 : Decoder ObstetricHistoryStep2
 decodeObstetricHistoryStep2 =
     succeed ObstetricHistoryStep2Value
-        |> required "c_sections" decodeInt
+        |> optional "c_sections" decodeInt -1
         |> optional "c_section_reason" (nullable (decodeEverySet decodeCSectionReason)) Nothing
         |> required "previous_delivery" (decodeEverySet decodePreviousDeliverySign)
         |> required "previous_delivery_period" (decodeEverySet decodePreviousDeliveryPeriod)
         |> required "obstetric_history" (decodeEverySet decodeObstetricHistorySign)
+        |> optional "obstetric_history_step2"
+            (decodeEverySet decodeObstetricHistoryStep2Sign)
+            (EverySet.singleton MigrateObstetricHistoryStep2Sign)
         |> decodePrenatalMeasurement