Merge pull request #1111 from TIP-Global-Health/develop

Developments starting April 3, 2024
TIP-Global-Health · Apr 21, 2024 · 136ebc4 · 136ebc4
2 parents 6024557 + d87cfd2
commit 136ebc4
Show file tree

Hide file tree

Showing 128 changed files with 11,773 additions and 660 deletions.
diff --git a/.ddev/config.local.yaml.example b/.ddev/config.local.yaml.example
@@ -59,4 +59,5 @@ hooks:
     - exec: drush vset hedley_admin_feature_tuberculosis_management_enabled 1
     - exec: drush vset hedley_admin_feature_group_education_enabled 1
     - exec: drush vset hedley_admin_feature_report_to_whatsapp_enabled 1
+    - exec: drush vset hedley_admin_feature_hiv_management_enabled 1
     - exec: drush uli
diff --git a/client/src/assets/scss/_dashboard.scss b/client/src/assets/scss/_dashboard.scss
@@ -104,10 +104,9 @@
     &.page-filters {
       background-color: transparent;
       min-height: 40px;
-      padding: 25px 0;
-      margin-bottom: 25px;
+      padding: 15px 0;
+      margin-bottom: 35px;
       display: flex;
-      border-bottom: solid 1px $color-white;
 
       button {
         background-color: $color-white;
@@ -133,16 +132,11 @@
       }
     }
 
-    &.page-filters.center {
-      justify-content: center;
-    }
-
-    &.page-filters.nurse {
-      border-bottom: none;
+    &.page-filters.top-row {
       margin-bottom: 0;
     }
 
-    &.page-filters.nurse.center {
+    &.page-filters.center {
       justify-content: center;
     }
 
@@ -721,3 +715,89 @@
     width: 100%;
   }
 }
+
+.dashboard.group-education {
+
+  ul.session-topics {
+    color: $color-white;
+    font-size: 24px;
+    font-weight: 700;
+  }
+
+  .sessions-table,
+  .patients-table {
+    padding: 20px;
+    width: 100%;
+
+    .entry {
+      background: $color-white;
+      border-bottom: 2px solid $color-gray-border;
+      display: flex;
+      font-size: 18px;
+      font-weight: 500;
+      padding: 20px;
+      text-align: center;
+    }
+
+    .entry.header {
+      font-weight: 700;
+    }
+
+    .entry:last-child {
+      border-bottom: none;
+    }
+  }
+
+  .sessions-table .entry {
+
+    .topics {
+      margin: 0;
+      padding-left: 10px;
+      text-align: left;
+      width: 380px;
+
+      li {
+        line-height: 24px;
+        margin-bottom: 0;
+      }
+    }
+
+    .date {
+      align-self: center;
+      margin-left: 20px;
+      text-align: left;
+      width: 120px;
+    }
+
+    .attendance {
+      align-self: center;
+      width: 120px;
+    }
+
+    .icon-forward {
+      align-self: center;
+      background: url(#{$img-path}icon-forward-blue.svg) center center no-repeat;
+      background-size: 45px 50px;
+      height: 50px;
+      width: 50px;
+    }
+
+    .icon-forward.hidden {
+      visibility: hidden;
+    }
+  }
+
+  .patients-table .entry {
+
+    .name,
+    .gender {
+      align-self: center;
+      text-align: left;
+    }
+
+    .name {
+      margin-left: 20px;
+      width: 65%;
+    }
+  }
+}
diff --git a/client/src/assets/scss/_new.scss b/client/src/assets/scss/_new.scss
@@ -2333,7 +2333,8 @@ div.page-activity.prenatal {
 
 div.page-activity.ncd,
 div.page-activity.well-child,
-div.page-activity.tuberculosis {
+div.page-activity.tuberculosis,
+div.page-activity.hiv {
 
   .ui.full.segment .full.content {
 
@@ -3557,12 +3558,7 @@ div.page-participant.group {
   }
 }
 
-div.page-participant.acute-illness,
-div.page-participant.nutrition,
-div.page-participant.home-visit,
-div.page-participant.well-child,
-div.page-participant.prenatal,
-div.page-participant.ncd {
+div.page-participant.individual {
     padding-bottom: 35px;
 
   p {
@@ -3885,7 +3881,11 @@ div.page-encounter.child-scoreboard,
 div.page-activity.child-scoreboard,
 div.page-report.child-scoreboard,
 div.page-encounter.tuberculosis,
-div.page-activity.tuberculosis {
+div.page-activity.tuberculosis,
+div.page-report.tuberculosis,
+div.page-encounter.hiv,
+div.page-activity.hiv,
+div.page-report.hiv {
 
   .details {
     padding-left: 25px;
@@ -4696,6 +4696,39 @@ div.page-activity.patient-record {
     margin: auto 0;
   }
 
+  .heading.group-education,
+  .entry.group-education {
+    display: grid;
+    grid-gap: 20px;
+    grid-template-columns: 60% auto;
+    text-align: center;
+  }
+
+  .entry.group-education {
+    background: $color-white;
+    border-bottom: 2px solid $color-gray-border;
+    font-size: 18px;
+    font-weight: 500;
+    text-align: left;
+  }
+
+  .entry.group-education.header {
+    font-weight: 700;
+  }
+
+  .entry.group-education:last-child {
+    border-bottom: none;
+  }
+  .entry.group-education .topics {
+    margin: 0;
+    padding-left: 20px;
+  }
+
+  .entry.group-education .date {
+    align-self: center;
+    text-align: center;
+  }
+
   .ui.unstackable.items .actions {
     margin-bottom: 30px;
   }
@@ -4816,6 +4849,7 @@ div.page-activity.ncd {
     }
   }
 }
+
 div.page-activity.wellbeing {
 
   .ui.button .counter {
@@ -5482,3 +5516,49 @@ div.page-activity.stock-management {
   }
 
 }
+
+div.page-activity.hiv {
+
+  .ui.full.segment {
+
+    .form.danger-signs {
+
+      .label {
+        font-weight: 500;
+      }
+
+      .label.header {
+        font-size: 24px;
+        font-weight: 700;
+      }
+
+      .form-input.date {
+        border: 2px solid $color-light-gray;
+        color: $color-text;
+        height: 2em;
+        padding: 5px;
+        text-align: center;
+        width: 80%;
+      }
+
+      input.checkbox,
+      input.checkbox:focus {
+        height: 3rem;
+        width: 100%;
+      }
+    }
+
+    .form.prescribed-medication {
+
+      .checkbox-select-input .section {
+        margin-bottom: 30px;
+        margin-top: 40px;
+
+        .label {
+          margin-left: 20px;
+        }
+      }
+    }
+
+  }
+}
diff --git a/client/src/elm/App/Fetch.elm b/client/src/elm/App/Fetch.elm
@@ -24,6 +24,9 @@ import Pages.EducationSession.Fetch
 import Pages.EducationSession.Model
 import Pages.GlobalCaseManagement.Fetch
 import Pages.GroupEncounterTypes.Fetch
+import Pages.HIV.Activity.Fetch
+import Pages.HIV.Encounter.Fetch
+import Pages.HIV.Participant.Fetch
 import Pages.HomeVisit.Activity.Fetch
 import Pages.HomeVisit.Encounter.Fetch
 import Pages.IndividualEncounterParticipants.Fetch
@@ -237,6 +240,15 @@ fetch model =
                         )
                     |> Maybe.withDefault []
 
+            UserPage (HIVParticipantPage personId) ->
+                getLoggedInData model
+                    |> Maybe.map
+                        (\_ ->
+                            Pages.HIV.Participant.Fetch.fetch personId model.indexedDb
+                                |> List.map MsgIndexedDb
+                        )
+                    |> Maybe.withDefault []
+
             UserPage (IndividualEncounterParticipantsPage encounterType) ->
                 getLoggedInData model
                     |> Maybe.map
@@ -379,6 +391,14 @@ fetch model =
                         )
                     |> Maybe.withDefault []
 
+            UserPage (HIVEncounterPage id) ->
+                Pages.HIV.Encounter.Fetch.fetch id model.indexedDb
+                    |> List.map MsgIndexedDb
+
+            UserPage (HIVActivityPage id activity) ->
+                Pages.HIV.Activity.Fetch.fetch id activity model.indexedDb
+                    |> List.map MsgIndexedDb
+
             UserPage (NutritionProgressReportPage id) ->
                 Pages.Nutrition.ProgressReport.Fetch.fetch id model.indexedDb
                     |> List.map MsgIndexedDb

diff --git a/client/src/elm/App/Model.elm b/client/src/elm/App/Model.elm
@@ -18,6 +18,7 @@ import AssocList as Dict exposing (Dict)
 import Backend.AcuteIllnessActivity.Model exposing (AcuteIllnessActivity)
 import Backend.ChildScoreboardActivity.Model exposing (ChildScoreboardActivity)
 import Backend.Entities exposing (..)
+import Backend.HIVActivity.Model exposing (HIVActivity)
 import Backend.HomeVisitActivity.Model exposing (HomeVisitActivity)
 import Backend.Measurement.Model exposing (LaboratoryTest)
 import Backend.Model
@@ -46,6 +47,8 @@ import Pages.Dashboard.Model
 import Pages.Device.Model
 import Pages.EducationSession.Model
 import Pages.GlobalCaseManagement.Model
+import Pages.HIV.Activity.Model
+import Pages.HIV.Encounter.Model
 import Pages.HomeVisit.Activity.Model
 import Pages.HomeVisit.Encounter.Model
 import Pages.IndividualEncounterParticipants.Model
@@ -309,6 +312,8 @@ type alias LoggedInModel =
     , tuberculosisEncounterPages : Dict TuberculosisEncounterId Pages.Tuberculosis.Encounter.Model.Model
     , tuberculosisActivityPages : Dict ( TuberculosisEncounterId, TuberculosisActivity ) Pages.Tuberculosis.Activity.Model.Model
     , educationSessionPages : Dict EducationSessionId Pages.EducationSession.Model.Model
+    , hivEncounterPages : Dict HIVEncounterId Pages.HIV.Encounter.Model.Model
+    , hivActivityPages : Dict ( HIVEncounterId, HIVActivity ) Pages.HIV.Activity.Model.Model
     , traceContactPages : Dict AcuteIllnessTraceContactId Pages.TraceContact.Model.Model
     , clinicalProgressReportPages : Dict PrenatalEncounterId Pages.Prenatal.ProgressReport.Model.Model
     , patientRecordPages : Dict PersonId Pages.PatientRecord.Model.Model
@@ -360,6 +365,8 @@ emptyLoggedInModel site villageId nurse =
     , tuberculosisEncounterPages = Dict.empty
     , tuberculosisActivityPages = Dict.empty
     , educationSessionPages = Dict.empty
+    , hivEncounterPages = Dict.empty
+    , hivActivityPages = Dict.empty
     , traceContactPages = Dict.empty
     , clinicalProgressReportPages = Dict.empty
     , patientRecordPages = Dict.empty
@@ -425,6 +432,7 @@ type MsgLoggedIn
     | MsgPageNCDRecurrentEncounter NCDEncounterId Pages.NCD.RecurrentEncounter.Model.Msg
     | MsgPageChildScoreboardEncounter ChildScoreboardEncounterId Pages.ChildScoreboard.Encounter.Model.Msg
     | MsgPageTuberculosisEncounter TuberculosisEncounterId Pages.Tuberculosis.Encounter.Model.Msg
+    | MsgPageHIVEncounter HIVEncounterId Pages.HIV.Encounter.Model.Msg
     | MsgPageEducationSession EducationSessionId Pages.EducationSession.Model.Msg
     | MsgPagePrenatalActivity PrenatalEncounterId PrenatalActivity Pages.Prenatal.Activity.Model.Msg
     | MsgPagePrenatalRecurrentActivity PrenatalEncounterId PrenatalRecurrentActivity Pages.Prenatal.RecurrentActivity.Model.Msg
@@ -437,6 +445,7 @@ type MsgLoggedIn
     | MsgPageNCDRecurrentActivity NCDEncounterId NCDRecurrentActivity Pages.NCD.RecurrentActivity.Model.Msg
     | MsgPageChildScoreboardActivity ChildScoreboardEncounterId ChildScoreboardActivity Pages.ChildScoreboard.Activity.Model.Msg
     | MsgPageTuberculosisActivity TuberculosisEncounterId TuberculosisActivity Pages.Tuberculosis.Activity.Model.Msg
+    | MsgPageHIVActivity HIVEncounterId HIVActivity Pages.HIV.Activity.Model.Msg
     | MsgPagePregnancyOutcome IndividualEncounterParticipantId Pages.Prenatal.Outcome.Model.Msg
     | MsgPageAcuteIllnessProgressReport AcuteIllnessEncounterId Pages.AcuteIllness.ProgressReport.Model.Msg
     | MsgPageNutritionProgressReport NutritionEncounterId Pages.Nutrition.ProgressReport.Model.Msg