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

WIP: Developments starting July 28, 2024
TIP-Global-Health · Aug 11, 2024 · 2316cdd · 2316cdd
2 parents b03f1cb + e7e9dcb
commit 2316cdd
Show file tree

Hide file tree

Showing 89 changed files with 2,682 additions and 2,008 deletions.
diff --git a/client/src/assets/scss/_custom.scss b/client/src/assets/scss/_custom.scss
@@ -1391,6 +1391,23 @@ input::placeholder {
         margin-bottom: 1rem;
         text-align: center;
         text-transform: uppercase;
+
+        .message {
+          display: flex;
+          position: relative;
+          font-size: 25px;
+
+          .icon-up,
+          .icon-down {
+            display: block;
+            margin-left: auto;
+            right: 0;
+          }
+        }
+        .summary {
+          text-align: left;
+          font-size: 25px;
+        }
       }
 
       .popup-action {

diff --git a/client/src/assets/scss/_new.scss b/client/src/assets/scss/_new.scss
@@ -1148,12 +1148,11 @@ div.page-activity {
   }
 }
 
-// Prenatal Encounter, Nutrition Encounter and
-// Acute Illness Encounter pages
 div.page-encounter.nutrition,
 div.page-encounter.prenatal,
 div.page-encounter.acute-illness,
-div.page-encounter.ncd {
+div.page-encounter.ncd,
+div.page-encounter.tuberculosis {
 
   .ui.full.segment {
 
@@ -3872,6 +3871,130 @@ div.page-report.acute-illness {
   }
 }
 
+div.page-report.tuberculosis {
+
+  .pane .pane-content {
+    color: $color-text;
+    padding: 20px;
+  }
+
+  .pane .pane-content .heading {
+    border-bottom: 1px solid $color-text;
+    color: $color-dark-gray;
+    display: flex;
+    font-size: 20px;
+    font-weight: 600;
+    padding: 15px 30px;
+    width: 100%;
+  }
+
+  .pane .pane-content .entry {
+    display: flex;
+    line-height: 40px;
+  }
+
+  .pane.summary .pane-content .entry .label {
+    float: left;
+    width: 35%;
+  }
+
+  .pane.treatment-timeline .pane-content {
+    padding: 30px 10px;
+  }
+
+  .pane.treatment-timeline .pane-content .timeline {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .pane.treatment-timeline .pane-content .timeline div {
+    border-top: 10px solid $color-text;
+    font-size: 18px;
+    height: 40px;
+    padding-top: 10px;
+    text-align: center;
+    width: 15%;
+  }
+
+  .pane.treatment-timeline .pane-content .timeline div.green {
+    border-top: 10px solid $color-green-dark;
+  }
+
+  .pane.adverse-events .pane-content .entry .label {
+    float: left;
+    width: 70%;
+  }
+
+  .pane.encounters .pane-content .heading .date {
+    width: 80%;
+  }
+
+  .pane.encounters .pane-content .entry {
+    border-bottom: 1px solid $color-text;
+    padding: 15px 30px;
+  }
+
+  .pane.encounters .pane-content .entry:last-child {
+    border-bottom: none;
+  }
+
+  .pane.encounters .pane-content .entry .label {
+    float: left;
+    width: 80%;
+  }
+
+  .pane.encounters .pane-content .entry .icon .icon-forward {
+    align-self: center;
+    background: url(#{$img-path}icon-forward-blue.svg) center center no-repeat;
+    background-size: 45px 50px;
+    height: 50px;
+    margin-left: 20px;
+    width: 50px;
+  }
+
+  .pane.encounter-details .pane-content .entry {
+    border-bottom: 1px solid $color-text;
+    justify-content: space-between;
+    line-height: normal;
+    padding: 15px 0;
+  }
+
+  .pane.encounter-details .pane-content .entry:last-child {
+    border-bottom: none;
+  }
+
+
+  .pane.encounter-details .pane-content .entry .label {
+    float: left;
+    margin-bottom: auto;
+    margin-top: auto;
+    width: 35%;
+  }
+
+  .pane.encounter-details .pane-content .entry .confirmation {
+    float: left;
+    margin-bottom: auto;
+    margin-top: auto;
+    width: 15%;
+  }
+
+  .pane.encounter-details .pane-content .entry .value {
+    float: left;
+    font-size: 18px;
+    width: 50%;
+  }
+
+  .pane.encounter-details .pane-content .entry .value {
+    float: left;
+    font-size: 18px;
+    width: 50%;
+  }
+
+  .pane.encounter-details .pane-content .entry .value.long {
+    width: 65%;
+  }
+}
+
 div.page-report.acute-illness,
 div.page-activity.trace-contact,
 div.page-encounter.well-child,
@@ -4039,7 +4162,8 @@ div.page-report.clinical,
 div.page-report.demographics,
 div.page-activity.patient-record,
 div.page-report.child-scoreboard,
-div.page-report.ncd {
+div.page-report.ncd,
+div.page-report.tuberculosis {
   background: unset;
 
   .pane-heading {
@@ -4860,18 +4984,41 @@ div.page-activity.ncd {
 
 div.page-activity.wellbeing {
 
-  .ui.button .counter {
-    background-color: $color-velvet;
-    border-radius: 50%;
-    display: inline-block;
-    font-size: 16px;
-    font-weight: bold;
-    height: 30px;
-    left: 5px;
-    line-height: 30px;
-    position: relative;
-    top: -15px;
-    width: 30px;
+  .ui.button {
+    margin-bottom: 20px;
+
+    .counter {
+      background-color: $color-velvet;
+      border-radius: 50%;
+      display: inline-block;
+      font-size: 16px;
+      font-weight: bold;
+      height: 30px;
+      left: 5px;
+      line-height: 30px;
+      position: relative;
+      top: -15px;
+      width: 30px;
+    }
+  }
+}
+
+div.page-activity.messaging-guide {
+  height: auto;
+
+  .guide {
+    background: $color-white;
+    padding: 30px 25px;
+    color: $color-text;
+
+    .title {
+      font-weight: bold;
+      font-size: 25px;
+    }
+    .note {
+      font-style: italic;
+      font-weight: bold;
+    }
   }
 }
 
@@ -5136,7 +5283,7 @@ div.page-activity.messaging-center {
     }
   }
 
-  .ui.report.unstackable.items .guide-message {
+  .ui.report.unstackable.items .guide {
     background: $color-white;
     padding: 30px 25px 30px 25px;
     color: $color-text;

diff --git a/client/src/assets/scss/_variables.scss b/client/src/assets/scss/_variables.scss
@@ -19,6 +19,7 @@ $color-velvet:              #D4145A;
 $color-orange:              #FFB60D;
 $color-green:               #25D625;
 $color-green-alert:         #86A156;
+$color-green-dark:          #1DBDB3;
 $color-light-blue:          #29C2FF;
 $color-lighter-blue:        #E0E7FF;
 $color-white:               #FFFFFF;

diff --git a/client/src/elm/App/Fetch.elm b/client/src/elm/App/Fetch.elm
@@ -62,6 +62,7 @@ import Pages.TraceContact.Fetch
 import Pages.Tuberculosis.Activity.Fetch
 import Pages.Tuberculosis.Encounter.Fetch
 import Pages.Tuberculosis.Participant.Fetch
+import Pages.Tuberculosis.ProgressReport.Fetch
 import Pages.WellChild.Activity.Fetch
 import Pages.WellChild.Encounter.Fetch
 import Pages.WellChild.Participant.Fetch
@@ -411,6 +412,10 @@ fetch model =
                 Pages.WellChild.ProgressReport.Fetch.fetch id model.indexedDb
                     |> List.map MsgIndexedDb
 
+            UserPage (TuberculosisProgressReportPage id) ->
+                Pages.Tuberculosis.ProgressReport.Fetch.fetch id model.indexedDb
+                    |> List.map MsgIndexedDb
+
             UserPage (NCDProgressReportPage initiator) ->
                 let
                     encounterId =
@@ -466,6 +471,9 @@ fetch model =
                         )
                     |> Maybe.withDefault []
 
+            UserPage MessagingGuide ->
+                []
+
             UserPage StockManagementPage ->
                 getLoggedInData model
                     |> Maybe.map

diff --git a/client/src/elm/App/Model.elm b/client/src/elm/App/Model.elm
@@ -79,6 +79,7 @@ import Pages.StockManagement.Model
 import Pages.TraceContact.Model
 import Pages.Tuberculosis.Activity.Model
 import Pages.Tuberculosis.Encounter.Model
+import Pages.Tuberculosis.ProgressReport.Model
 import Pages.WellChild.Activity.Model
 import Pages.WellChild.Encounter.Model
 import Pages.WellChild.ProgressReport.Model
@@ -311,6 +312,7 @@ type alias LoggedInModel =
     , 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
+    , tuberculosisProgressReportPages : Dict TuberculosisEncounterId Pages.Tuberculosis.ProgressReport.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
@@ -364,6 +366,7 @@ emptyLoggedInModel site villageId nurse =
     , childScoreboardReportPages = Dict.empty
     , tuberculosisEncounterPages = Dict.empty
     , tuberculosisActivityPages = Dict.empty
+    , tuberculosisProgressReportPages = Dict.empty
     , educationSessionPages = Dict.empty
     , hivEncounterPages = Dict.empty
     , hivActivityPages = Dict.empty
@@ -386,6 +389,7 @@ type Msg
     | MsgPagePinCode Pages.PinCode.Model.Msg
     | TryPinCode String
     | SetLoggedIn (WebData ( NurseId, Nurse ))
+    | UpdateNurseData ( NurseId, Nurse )
       -- Manage device pairing
     | MsgPageDevice Pages.Device.Model.Msg
     | TryPairingCode String
@@ -452,6 +456,7 @@ type MsgLoggedIn
     | MsgPageWellChildProgressReport WellChildEncounterId Pages.WellChild.ProgressReport.Model.Msg
     | MsgPageNCDProgressReport NCDEncounterId Pages.NCD.ProgressReport.Model.Msg
     | MsgPageChildScoreboardReport ChildScoreboardEncounterId Pages.ChildScoreboard.ProgressReport.Model.Msg
+    | MsgPageTuberculosisProgressReport TuberculosisEncounterId Pages.Tuberculosis.ProgressReport.Model.Msg
     | MsgPageAcuteIllnessOutcome IndividualEncounterParticipantId Pages.AcuteIllness.Outcome.Model.Msg
     | MsgPageTraceContact AcuteIllnessTraceContactId Pages.TraceContact.Model.Msg
     | MsgPageClinicalProgressReport PrenatalEncounterId Pages.Prenatal.ProgressReport.Model.Msg