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

WIP: Developments starting March 10, 2024
TIP-Global-Health · Mar 21, 2024 · a4b28a5 · a4b28a5
2 parents c63e65e + 15f94b8
commit a4b28a5
Show file tree

Hide file tree

Showing 148 changed files with 12,018 additions and 1,428 deletions.
diff --git a/.ddev/config.local.yaml.example b/.ddev/config.local.yaml.example
@@ -53,4 +53,8 @@ hooks:
     - exec: "cd .. && rm -f hedley/modules/custom/hedley_migrate/csv/health_center.csv"
     - exec: "cd .. && rm -f hedley/modules/custom/hedley_migrate/csv/person.csv"
     - exec: "cd .. && rm -f hedley/modules/custom/hedley_migrate/csv/village.csv"
+    # Enabling features:
+    - exec: drush vset hedley_admin_feature_ncda_enabled 1
+    - exec: drush vset hedley_admin_feature_stock_management_enabled 1
+    - exec: drush vset hedley_admin_feature_tuberculosis_management_enabled 1
     - exec: drush uli
diff --git a/client/src/assets/images/icon-dot-gray.svg b/client/src/assets/images/icon-dot-gray.svg
diff --git a/client/src/assets/images/icon-dot-white.svg b/client/src/assets/images/icon-dot-white.svg
diff --git a/client/src/assets/scss/_custom.scss b/client/src/assets/scss/_custom.scss
@@ -579,6 +579,11 @@ h3.ui.header {
   background-size: 92px 92px;
 }
 
+.icon-task-diagnostics {
+  background-image: url(#{$img-path}icon-medication-distribution-white.svg);
+  background-size: 86px 86px;
+}
+
 // Tasks horizontal scroll
 
 .ui.task.segment {
@@ -2984,6 +2989,20 @@ input::placeholder {
   }
 }
 
+.icon-dot {
+  .active &:after {
+    background-image: url(#{$img-path}icon-dot-white.svg);
+  }
+
+  .completed &:after {
+    background-image: url(#{$img-path}icon-dot-white.svg), url(#{$img-path}icon-completed-circle.svg);
+  }
+
+  &:after {
+    background-image: url(#{$img-path}icon-dot-gray.svg);
+  }
+}
+
 // Lists
 
 .ui.list {

diff --git a/client/src/assets/scss/_new.scss b/client/src/assets/scss/_new.scss
@@ -1273,6 +1273,10 @@ div.page-activity.trace-contact  {
       min-height: 210px;
     }
 
+    .symptoms-form.respiratory .cough-period label {
+      font-size: 22px;
+    }
+
     .symptoms-form.gi .symptoms {
       margin-bottom: 30px;
     }
@@ -2328,7 +2332,8 @@ div.page-activity.prenatal {
 }
 
 div.page-activity.ncd,
-div.page-activity.well-child {
+div.page-activity.well-child,
+div.page-activity.tuberculosis {
 
   .ui.full.segment .full.content {
 
@@ -2477,6 +2482,58 @@ div.page-activity.child-scoreboard {
   }
 }
 
+div.page-activity.tuberculosis {
+
+  .ui.full.segment .full.content {
+
+    .ui.form.dot .prescribed-medications {
+      padding: 20px;
+
+      p {
+        margin-bottom: 5px;
+      }
+    }
+
+    .ui.form.health-education .follow-up-testing-table {
+      border: 1px solid black;
+      margin-bottom: 20px;
+
+      .row {
+        border-bottom: 1px solid black;
+        display: flex;
+        justify-content: center;
+
+        .item {
+          float: left;
+          font-size: 18px;
+          line-height: 24px;
+          padding: 10px;
+        }
+
+        .item.label {
+          border-right: 1px solid black;
+          margin-bottom: 0;
+          width: 14%;
+        }
+
+        .item.test {
+          border-right: 1px solid black;
+          width: 30%;
+        }
+
+        .item.guidance {
+          width: 55%;
+        }
+      }
+
+      .row:last-child {
+        border-bottom: none;
+      }
+    }
+  }
+
+}
+
 div.page-outcome {
 
   .tasks-count {
@@ -3770,7 +3827,9 @@ div.page-encounter.ncd,
 div.page-activity.ncd,
 div.page-encounter.child-scoreboard,
 div.page-activity.child-scoreboard,
-div.page-report.child-scoreboard {
+div.page-report.child-scoreboard,
+div.page-encounter.tuberculosis,
+div.page-activity.tuberculosis {
 
   .details {
     padding-left: 25px;
@@ -4198,9 +4257,10 @@ div.page-report.child-scoreboard {
       background-color: $color-white;
       border-radius: 3px;
       color: $color-dark-gray;
-      font-size: 24px;
+      font-size: 20px;
       font-weight: 600;
-      padding: 15px;
+      margin-right: 0;
+      padding: 10px;
       text-transform: none;
     }
 

diff --git a/client/src/elm/App/Fetch.elm b/client/src/elm/App/Fetch.elm
@@ -53,6 +53,9 @@ import Pages.Relationship.Fetch
 import Pages.Session.Fetch
 import Pages.StockManagement.Fetch
 import Pages.TraceContact.Fetch
+import Pages.Tuberculosis.Activity.Fetch
+import Pages.Tuberculosis.Encounter.Fetch
+import Pages.Tuberculosis.Participant.Fetch
 import Pages.WellChild.Activity.Fetch
 import Pages.WellChild.Encounter.Fetch
 import Pages.WellChild.Participant.Fetch
@@ -222,6 +225,15 @@ fetch model =
                         )
                     |> Maybe.withDefault []
 
+            UserPage (TuberculosisParticipantPage personId) ->
+                getLoggedInData model
+                    |> Maybe.map
+                        (\_ ->
+                            Pages.Tuberculosis.Participant.Fetch.fetch personId model.indexedDb
+                                |> List.map MsgIndexedDb
+                        )
+                    |> Maybe.withDefault []
+
             UserPage (IndividualEncounterParticipantsPage encounterType) ->
                 getLoggedInData model
                     |> Maybe.map
@@ -338,6 +350,14 @@ fetch model =
                 Pages.ChildScoreboard.Activity.Fetch.fetch encounterId model.indexedDb
                     |> List.map MsgIndexedDb
 
+            UserPage (TuberculosisEncounterPage id) ->
+                Pages.Tuberculosis.Encounter.Fetch.fetch id model.indexedDb
+                    |> List.map MsgIndexedDb
+
+            UserPage (TuberculosisActivityPage id _) ->
+                Pages.Tuberculosis.Activity.Fetch.fetch id 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
@@ -25,6 +25,7 @@ import Backend.NCDActivity.Model exposing (NCDActivity, NCDRecurrentActivity)
 import Backend.Nurse.Model exposing (Nurse)
 import Backend.NutritionActivity.Model exposing (NutritionActivity)
 import Backend.PrenatalActivity.Model exposing (PrenatalActivity, PrenatalRecurrentActivity)
+import Backend.TuberculosisActivity.Model exposing (TuberculosisActivity)
 import Backend.WellChildActivity.Model exposing (WellChildActivity)
 import Browser
 import Browser.Navigation as Nav
@@ -72,6 +73,8 @@ import Pages.Relationship.Model
 import Pages.Session.Model
 import Pages.StockManagement.Model
 import Pages.TraceContact.Model
+import Pages.Tuberculosis.Activity.Model
+import Pages.Tuberculosis.Encounter.Model
 import Pages.WellChild.Activity.Model
 import Pages.WellChild.Encounter.Model
 import Pages.WellChild.ProgressReport.Model
@@ -302,6 +305,8 @@ type alias LoggedInModel =
     , childScoreboardEncounterPages : Dict ChildScoreboardEncounterId Pages.ChildScoreboard.Encounter.Model.Model
     , childScoreboardActivityPages : Dict ( ChildScoreboardEncounterId, ChildScoreboardActivity ) Pages.ChildScoreboard.Activity.Model.Model
     , childScoreboardReportPages : Dict ChildScoreboardEncounterId Pages.ChildScoreboard.ProgressReport.Model.Model
+    , tuberculosisEncounterPages : Dict TuberculosisEncounterId Pages.Tuberculosis.Encounter.Model.Model
+    , tuberculosisActivityPages : Dict ( TuberculosisEncounterId, TuberculosisActivity ) Pages.Tuberculosis.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
@@ -350,6 +355,8 @@ emptyLoggedInModel site villageId nurse =
     , childScoreboardEncounterPages = Dict.empty
     , childScoreboardActivityPages = Dict.empty
     , childScoreboardReportPages = Dict.empty
+    , tuberculosisEncounterPages = Dict.empty
+    , tuberculosisActivityPages = Dict.empty
     , traceContactPages = Dict.empty
     , clinicalProgressReportPages = Dict.empty
     , patientRecordPages = Dict.empty
@@ -413,6 +420,7 @@ type MsgLoggedIn
     | MsgPageNCDEncounter NCDEncounterId Pages.NCD.Encounter.Model.Msg
     | MsgPageNCDRecurrentEncounter NCDEncounterId Pages.NCD.RecurrentEncounter.Model.Msg
     | MsgPageChildScoreboardEncounter ChildScoreboardEncounterId Pages.ChildScoreboard.Encounter.Model.Msg
+    | MsgPageTuberculosisEncounter TuberculosisEncounterId Pages.Tuberculosis.Encounter.Model.Msg
     | MsgPagePrenatalActivity PrenatalEncounterId PrenatalActivity Pages.Prenatal.Activity.Model.Msg
     | MsgPagePrenatalRecurrentActivity PrenatalEncounterId PrenatalRecurrentActivity Pages.Prenatal.RecurrentActivity.Model.Msg
     | MsgPagePrenatalLabsHistory PrenatalEncounterId PrenatalEncounterId LaboratoryTest Pages.Prenatal.RecurrentActivity.Model.Msg
@@ -423,6 +431,7 @@ type MsgLoggedIn
     | MsgPageNCDActivity NCDEncounterId NCDActivity Pages.NCD.Activity.Model.Msg
     | MsgPageNCDRecurrentActivity NCDEncounterId NCDRecurrentActivity Pages.NCD.RecurrentActivity.Model.Msg
     | MsgPageChildScoreboardActivity ChildScoreboardEncounterId ChildScoreboardActivity Pages.ChildScoreboard.Activity.Model.Msg
+    | MsgPageTuberculosisActivity TuberculosisEncounterId TuberculosisActivity Pages.Tuberculosis.Activity.Model.Msg
     | MsgPagePregnancyOutcome IndividualEncounterParticipantId Pages.Prenatal.Outcome.Model.Msg
     | MsgPageAcuteIllnessProgressReport AcuteIllnessEncounterId Pages.AcuteIllness.ProgressReport.Model.Msg
     | MsgPageNutritionProgressReport NutritionEncounterId Pages.Nutrition.ProgressReport.Model.Msg

diff --git a/client/src/elm/App/Update.elm b/client/src/elm/App/Update.elm
@@ -102,6 +102,10 @@ import Pages.Session.Update
 import Pages.StockManagement.Update
 import Pages.TraceContact.Model
 import Pages.TraceContact.Update
+import Pages.Tuberculosis.Activity.Model
+import Pages.Tuberculosis.Activity.Update
+import Pages.Tuberculosis.Encounter.Model
+import Pages.Tuberculosis.Encounter.Update
 import Pages.WellChild.Activity.Model
 import Pages.WellChild.Activity.Update
 import Pages.WellChild.Encounter.Model
@@ -558,6 +562,19 @@ update msg model =
                             , extraMsgs
                             )
 
+                        MsgPageTuberculosisEncounter id subMsg ->
+                            let
+                                ( subModel, subCmd, extraMsgs ) =
+                                    data.tuberculosisEncounterPages
+                                        |> Dict.get id
+                                        |> Maybe.withDefault Pages.Tuberculosis.Encounter.Model.emptyModel
+                                        |> Pages.Tuberculosis.Encounter.Update.update subMsg
+                            in
+                            ( { data | tuberculosisEncounterPages = Dict.insert id subModel data.tuberculosisEncounterPages }
+                            , Cmd.map (MsgLoggedIn << MsgPageTuberculosisEncounter id) subCmd
+                            , extraMsgs
+                            )
+
                         MsgPagePrenatalActivity id activity subMsg ->
                             let
                                 ( subModel, subCmd, extraMsgs ) =
@@ -699,6 +716,19 @@ update msg model =
                             , extraMsgs
                             )
 
+                        MsgPageTuberculosisActivity id activity subMsg ->
+                            let
+                                ( subModel, subCmd, extraMsgs ) =
+                                    data.tuberculosisActivityPages
+                                        |> Dict.get ( id, activity )
+                                        |> Maybe.withDefault Pages.Tuberculosis.Activity.Model.emptyModel
+                                        |> Pages.Tuberculosis.Activity.Update.update currentDate id model.indexedDb subMsg
+                            in
+                            ( { data | tuberculosisActivityPages = Dict.insert ( id, activity ) subModel data.tuberculosisActivityPages }
+                            , Cmd.map (MsgLoggedIn << MsgPageTuberculosisActivity id activity) subCmd
+                            , extraMsgs
+                            )
+
                         MsgPagePregnancyOutcome id subMsg ->
                             let
                                 ( subModel, subCmd, appMsgs ) =