Merge branch 'master' into stable

instedd · Oct 30, 2019 · 7a03cd3 · 7a03cd3
2 parents 57a9d2b + 6116363
commit 7a03cd3
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 5 deletions.
diff --git a/app/components/AntibioticConsumptionStatsList.js b/app/components/AntibioticConsumptionStatsList.js
@@ -21,7 +21,14 @@ type ComponentProps = {
   dispatch: Dispatch,
   antibioticConsumptionStatsList: {
     antibioticName: string,
-    antibioticConsumptionStats: Page
+    antibioticConsumptionStats: Page,
+    antibiotic?: {
+      strength: string,
+      form: string,
+      name: string,
+      packSize: string,
+      brand: string
+    }
   },
   antibioticId: string,
   site: {
@@ -99,6 +106,10 @@ class AntibioticConsumptionStatsList extends Component<Props, State> {
       recipientFacility,
       recipientUnit
     } = this.state;
+    const { strength, form, name, packSize, brand } =
+      (antibioticConsumptionStatsList &&
+        antibioticConsumptionStatsList.antibiotic) ||
+      {};
 
     return (
       <div>
@@ -109,9 +120,13 @@ class AntibioticConsumptionStatsList extends Component<Props, State> {
                 <MaterialIcon icon="arrow_back" />
               </Link>
               {antibioticConsumptionStatsList &&
-                antibioticConsumptionStatsList.antibioticName}
+                `${name || ''} ${packSize || ''}`}
             </>
           }
+          subtitle={
+            antibioticConsumptionStatsList &&
+            `${strength || ''} ${form || ''} ${(brand && `(${brand})`) || ''}`
+          }
           pagination
           items={antibioticConsumptionStats.items}
           totalCount={antibioticConsumptionStats.totalCount}

diff --git a/app/components/Table.js b/app/components/Table.js
@@ -31,6 +31,7 @@ type ComponentProps = {
   entityName?: string,
   onClick?: () => void,
   title?: string,
+  subtitle?: string,
   rowClassName?: () => [string],
   lastRow?: typeof Component,
   pagination?: boolean,
@@ -61,7 +62,8 @@ class Table extends Component<Props, State> {
     prevPage: null,
     nextPage: null,
     search: null,
-    filters: null
+    filters: null,
+    subtitle: null
   };
 
   render() {
@@ -83,7 +85,8 @@ class Table extends Component<Props, State> {
       history,
       onReload,
       search,
-      filters
+      filters,
+      subtitle
     } = this.props;
     const { searchText, searchTimeout } = this.state;
     return (
@@ -98,6 +101,15 @@ class Table extends Component<Props, State> {
                 {title || `${totalCount} ${entityName}`}
               </h2>
             </Cell>
+            {subtitle && (
+              <Cell
+                columns={12 - (search ? 3 : 0) - (filters ? 6 : 0)}
+                align="middle"
+              >
+                <h3 className={styles.tableSubtitle}>{subtitle}</h3>
+              </Cell>
+            )}
+
             {filters && (
               <Cell columns={6} align="middle">
                 {filters}

diff --git a/app/components/Table.scss b/app/components/Table.scss
@@ -31,6 +31,11 @@ tbody tr:hover {
   color: var(--black);
 }
 
+.tableSubtitle,
+.tableSubtitle a {
+  color: var(--medium-gray);
+}
+
 .filters {
   text-align: right;
 }

diff --git a/app/reducers/antibioticConsumptionStatsList.js b/app/reducers/antibioticConsumptionStatsList.js
@@ -9,6 +9,13 @@ import type { Action, State } from './types';
 
 const initialState = {
   antibioticName: null,
+  antibiotic: {
+    strength: null,
+    form: null,
+    name: null,
+    packSize: null,
+    brand: null
+  },
   antibioticConsumptionStats: {
     items: [],
     totalCount: 0,
@@ -25,7 +32,11 @@ export default function(state: State = initialState, action: Action) {
   let newItems;
   switch (action.type) {
     case FETCHED_ANTIBIOTIC:
-      return { ...state, antibioticName: action.antibiotic.name };
+      return {
+        ...state,
+        antibioticName: action.antibiotic.name,
+        antibiotic: action.antibiotic
+      };
     case FETCH_ANTIBIOTIC_CONSUMPTION_STATS_LIST_SUCCEEDED:
       return { ...state, antibioticConsumptionStats: action };
     case ADD_CREATED_ANTIBIOTIC_CONSUMPTION_STAT_TO_LIST: