merge from upstream

package.json

@@ -16,7 +16,6 @@
     "highcharts-react-official": "^3.0.0",
     "lodash": "^4.17.20",
     "moment": "^2.27.0",
-    "node-sass": "^4.13.1",
     "oidc-client": "^1.10.1",
     "proj4": "^2.6.3",
     "prop-types": "^15.7.2",
@@ -37,6 +36,7 @@
     "redux-persist": "^6.0.0",
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
+    "sass": "^1.43.4",
     "semantic-ui-calendar-react": "^0.15.3",
     "semantic-ui-css": "^2.4.1",
     "semantic-ui-react": "^1.2.1",

src/actions/CT/AdverseEvents/adverseEventsProportionOfPlHivAeRelatedToArtActions.js

@@ -5,7 +5,7 @@ import { getAll } from '../../../views/Shared/Api';
 
 export const loadAdverseEventsProportionOfPlHivAeRelatedToArt = () => async (dispatch, getState) => {
     const diffInMinutes = moment().diff(
-        moment(getState().adverseEventsProportionOfPlHivWithAeByCausativeDrugs.lastFetch),
+        moment(getState().adverseEventsProportionOfPlHivAeRelatedToArtDrugs.lastFetch),
         'minutes'
     );
     if (getState().ui.ctTab !== 'advEv') {

src/actions/CT/Covid/covidAdmissionOverallActions.js

@@ -0,0 +1,43 @@
+import * as actionTypes from '../../types';
+import moment from 'moment';
+import { getAll } from '../../../views/Shared/Api';
+import { CACHING, PAGES } from '../../../constants';
+
+export const loadCovidOverallAdmission = () => async (dispatch, getState) => {
+    if (getState().filters.noCache === true) {
+        await dispatch(fetchCovidOverallAdmission());
+    } else {
+        const diffInMinutes = moment().diff(
+            moment(getState().CovidOverallAdmission.lastFetch),
+            'minutes'
+        );
+        if (
+            getState().ui.ctTab !== 'covid' &&
+            getState().ui.currentPage !== PAGES.home
+        ) {
+            return;
+        }
+        else if ((diffInMinutes < CACHING.LONG) && getState().filters.filtered === false) {
+            return;
+        } else {
+            await dispatch(fetchCovidOverallAdmission());
+        }
+    }
+};
+
+export const fetchCovidOverallAdmission = () => async (dispatch, getState) => {
+    dispatch({ type: actionTypes.CT_COVID_ADMISSION_OVERALL_REQUEST });
+    const params = {
+        county: getState().filters.counties,
+        subCounty: getState().filters.subCounties,
+        facility: getState().filters.facilities,
+        partner: getState().filters.partners,
+        agency: getState().filters.agencies,
+        project: getState().filters.projects,
+        year: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("YYYY") : '',
+        month: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("MM") : '',
+    };
+    const response = await getAll('care-treatment/getCovidOverallAdmission', params);
+    dispatch({ type: actionTypes.CT_COVID_ADMISSION_OVERALL_FETCH, payload: { filtered: getState().filters.filtered, list: response }});
+};
+

src/actions/CT/Covid/covidAdmissionOverallFemaleActions.js

@@ -0,0 +1,43 @@
+import * as actionTypes from '../../types';
+import moment from 'moment';
+import { getAll } from '../../../views/Shared/Api';
+import { CACHING, PAGES } from '../../../constants';
+
+export const loadCovidOverallAdmissionFemales = () => async (dispatch, getState) => {
+    if (getState().filters.noCache === true) {
+        await dispatch(fetchCovidOverallAdmissionFemales());
+    } else {
+        const diffInMinutes = moment().diff(
+            moment(getState().CovidOverallAdmissionFemale.lastFetch),
+            'minutes'
+        );
+        if (
+            getState().ui.ctTab !== 'covid' &&
+            getState().ui.currentPage !== PAGES.home
+        ) {
+            return;
+        }
+        else if ((diffInMinutes < CACHING.LONG) && getState().filters.filtered === false) {
+            return;
+        } else {
+            await dispatch(fetchCovidOverallAdmissionFemales());
+        }
+    }
+};
+
+export const fetchCovidOverallAdmissionFemales = () => async (dispatch, getState) => {
+    dispatch({ type: actionTypes.CT_COVID_ADMISSION_OVERALL_FEMALE_REQUEST });
+    const params = {
+        county: getState().filters.counties,
+        subCounty: getState().filters.subCounties,
+        facility: getState().filters.facilities,
+        partner: getState().filters.partners,
+        agency: getState().filters.agencies,
+        project: getState().filters.projects,
+        year: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("YYYY") : '',
+        month: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("MM") : '',
+    };
+    const response = await getAll('care-treatment/getCovidOverallAdmissionFemales', params);
+    dispatch({ type: actionTypes.CT_COVID_ADMISSION_OVERALL_FEMALE_FETCH, payload: { filtered: getState().filters.filtered, list: response }});
+};
+

src/actions/CT/Covid/covidAdmissionOverallMaleActions.js

@@ -0,0 +1,42 @@
+import * as actionTypes from '../../types';
+import moment from 'moment';
+import { getAll } from '../../../views/Shared/Api';
+import { CACHING, PAGES } from '../../../constants';
+
+export const loadCovidOverallAdmissionMales = () => async (dispatch, getState) => {
+    if (getState().filters.noCache === true) {
+        await dispatch(fetchCovidOverallAdmissionMales());
+    } else {
+        const diffInMinutes = moment().diff(
+            moment(getState().CovidOverallAdmissionMale.lastFetch),
+            'minutes'
+        );
+        if (
+            getState().ui.ctTab !== 'covid' &&
+            getState().ui.currentPage !== PAGES.home
+        ) {
+            return;
+        }
+        else if ((diffInMinutes < CACHING.LONG) && getState().filters.filtered === false) {
+            return;
+        } else {
+            await dispatch(fetchCovidOverallAdmissionMales());
+        }
+    }
+};
+
+export const fetchCovidOverallAdmissionMales = () => async (dispatch, getState) => {
+    dispatch({ type: actionTypes.CT_COVID_ADMISSION_OVERALL_MALE_REQUEST });
+    const params = {
+        county: getState().filters.counties,
+        subCounty: getState().filters.subCounties,
+        facility: getState().filters.facilities,
+        partner: getState().filters.partners,
+        agency: getState().filters.agencies,
+        project: getState().filters.projects,
+        year: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("YYYY") : '',
+        month: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("MM") : '',
+    };
+    const response = await getAll('care-treatment/getCovidOverallAdmissionMales', params);
+    dispatch({ type: actionTypes.CT_COVID_ADMISSION_OVERALL_MALE_FETCH, payload: { filtered: getState().filters.filtered, list: response }});
+};

src/actions/CT/Covid/covidAdultPLHIVCurrentOnTreatmentActions.js

@@ -0,0 +1,42 @@
+import * as actionTypes from '../../types';
+import moment from 'moment';
+import { getAll } from '../../../views/Shared/Api';
+import { CACHING, PAGES } from '../../../constants';
+
+export const loadCovidAdultPLHIVCurrentOnTreatment = () => async (dispatch, getState) => {
+    if (getState().filters.noCache === true) {
+        await dispatch(fetchCovidAdultPLHIVCurrentOnTreatment());
+    } else {
+        const diffInMinutes = moment().diff(
+            moment(getState().CovidAdultPLHIVCurrentOnTreatment.lastFetch),
+            'minutes'
+        );
+        if (
+            getState().ui.ctTab !== 'covid' &&
+            getState().ui.currentPage !== PAGES.home
+        ) {
+            return;
+        }
+        else if ((diffInMinutes < CACHING.LONG) && getState().filters.filtered === false) {
+            return;
+        } else {
+            await dispatch(fetchCovidAdultPLHIVCurrentOnTreatment());
+        }
+    }
+};
+
+export const fetchCovidAdultPLHIVCurrentOnTreatment = () => async (dispatch, getState) => {
+    dispatch({ type: actionTypes.CT_COVID_ADULT_PLHIV_CURRENT_ON_TREATMENT_REQUEST });
+    const params = {
+        county: getState().filters.counties,
+        subCounty: getState().filters.subCounties,
+        facility: getState().filters.facilities,
+        partner: getState().filters.partners,
+        agency: getState().filters.agencies,
+        project: getState().filters.projects,
+        year: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("YYYY") : '',
+        month: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("MM") : '',
+    };
+    const response = await getAll('care-treatment/getCovidAdultPLHIVCurrentOnTreatment', params);
+    dispatch({ type: actionTypes.CT_COVID_ADULT_PLHIV_CURRENT_ON_TREATMENT_FETCH, payload: { filtered: getState().filters.filtered, list: response }});
+};

src/actions/CT/Covid/covidAdultPLHIVCurrentOnTreatmentByAgeGroupActions.js

@@ -0,0 +1,42 @@
+import * as actionTypes from '../../types';
+import moment from 'moment';
+import { getAll } from '../../../views/Shared/Api';
+import { CACHING, PAGES } from '../../../constants';
+
+export const loadCovidAdultPLHIVCurrentOnTreatmentByAgeGroup = () => async (dispatch, getState) => {
+    if (getState().filters.noCache === true) {
+        await dispatch(fetchCovidAdultPLHIVCurrentOnTreatmentByAgeGroup());
+    } else {
+        const diffInMinutes = moment().diff(
+            moment(getState().CovidAdultPLHIVCurrentOnTreatmentByAgeGroup.lastFetch),
+            'minutes'
+        );
+        if (
+            getState().ui.ctTab !== 'covid' &&
+            getState().ui.currentPage !== PAGES.home
+        ) {
+            return;
+        }
+        else if ((diffInMinutes < CACHING.LONG) && getState().filters.filtered === false) {
+            return;
+        } else {
+            await dispatch(fetchCovidAdultPLHIVCurrentOnTreatmentByAgeGroup());
+        }
+    }
+};
+
+export const fetchCovidAdultPLHIVCurrentOnTreatmentByAgeGroup = () => async (dispatch, getState) => {
+    dispatch({ type: actionTypes.CT_COVID_ADULT_PLHIV_CURRENT_ON_TREATMENT_BY_AGE_GROUP_REQUEST });
+    const params = {
+        county: getState().filters.counties,
+        subCounty: getState().filters.subCounties,
+        facility: getState().filters.facilities,
+        partner: getState().filters.partners,
+        agency: getState().filters.agencies,
+        project: getState().filters.projects,
+        year: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("YYYY") : '',
+        month: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("MM") : '',
+    };
+    const response = await getAll('care-treatment/getCovidAdultPLHIVCurrentOnTreatmentByAgeGroup', params);
+    dispatch({ type: actionTypes.CT_COVID_ADULT_PLHIV_CURRENT_ON_TREATMENT_BY_AGE_GROUP_FETCH, payload: { filtered: getState().filters.filtered, list: response }});
+};

src/actions/CT/Covid/covidAdultPLHIVCurrentOnTreatmentByCountyActions.js

@@ -0,0 +1,42 @@
+import * as actionTypes from '../../types';
+import moment from 'moment';
+import { getAll } from '../../../views/Shared/Api';
+import { CACHING, PAGES } from '../../../constants';
+
+export const loadCovidAdultPLHIVCurrentOnTreatmentByCounty = () => async (dispatch, getState) => {
+    if (getState().filters.noCache === true) {
+        await dispatch(fetchCovidAdultPLHIVCurrentOnTreatmentByCounty());
+    } else {
+        const diffInMinutes = moment().diff(
+            moment(getState().CovidAdultPLHIVCurrentOnTreatmentByCounty.lastFetch),
+            'minutes'
+        );
+        if (
+            getState().ui.ctTab !== 'covid' &&
+            getState().ui.currentPage !== PAGES.home
+        ) {
+            return;
+        }
+        else if ((diffInMinutes < CACHING.LONG) && getState().filters.filtered === false) {
+            return;
+        } else {
+            await dispatch(fetchCovidAdultPLHIVCurrentOnTreatmentByCounty());
+        }
+    }
+};
+
+export const fetchCovidAdultPLHIVCurrentOnTreatmentByCounty = () => async (dispatch, getState) => {
+    dispatch({ type: actionTypes.CT_COVID_ADULT_PLHIV_CURRENT_ON_TREATMENT_BY_COUNTY_REQUEST });
+    const params = {
+        county: getState().filters.counties,
+        subCounty: getState().filters.subCounties,
+        facility: getState().filters.facilities,
+        partner: getState().filters.partners,
+        agency: getState().filters.agencies,
+        project: getState().filters.projects,
+        year: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("YYYY") : '',
+        month: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("MM") : '',
+    };
+    const response = await getAll('care-treatment/getCovidAdultPLHIVCurrentOnTreatmentByCounty', params);
+    dispatch({ type: actionTypes.CT_COVID_ADULT_PLHIV_CURRENT_ON_TREATMENT_BY_COUNTY_FETCH, payload: { filtered: getState().filters.filtered, list: response }});
+};

src/actions/CT/Covid/covidAdultPLHIVCurrentOnTreatmentByGenderActions.js

@@ -0,0 +1,42 @@
+import * as actionTypes from '../../types';
+import moment from 'moment';
+import { getAll } from '../../../views/Shared/Api';
+import { CACHING, PAGES } from '../../../constants';
+
+export const loadCovidAdultPLHIVCurrentOnTreatmentByGender = () => async (dispatch, getState) => {
+    if (getState().filters.noCache === true) {
+        await dispatch(fetchCovidAdultPLHIVCurrentOnTreatmentByGender());
+    } else {
+        const diffInMinutes = moment().diff(
+            moment(getState().CovidAdultPLHIVCurrentOnTreatmentByGender.lastFetch),
+            'minutes'
+        );
+        if (
+            getState().ui.ctTab !== 'covid' &&
+            getState().ui.currentPage !== PAGES.home
+        ) {
+            return;
+        }
+        else if ((diffInMinutes < CACHING.LONG) && getState().filters.filtered === false) {
+            return;
+        } else {
+            await dispatch(fetchCovidAdultPLHIVCurrentOnTreatmentByGender());
+        }
+    }
+};
+
+export const fetchCovidAdultPLHIVCurrentOnTreatmentByGender = () => async (dispatch, getState) => {
+    dispatch({ type: actionTypes.CT_COVID_ADULT_PLHIV_CURRENT_ON_TREATMENT_BY_GENDER_REQUEST });
+    const params = {
+        county: getState().filters.counties,
+        subCounty: getState().filters.subCounties,
+        facility: getState().filters.facilities,
+        partner: getState().filters.partners,
+        agency: getState().filters.agencies,
+        project: getState().filters.projects,
+        year: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("YYYY") : '',
+        month: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("MM") : '',
+    };
+    const response = await getAll('care-treatment/getCovidAdultPLHIVCurrentOnTreatmentByGender', params);
+    dispatch({ type: actionTypes.CT_COVID_ADULT_PLHIV_CURRENT_ON_TREATMENT_BY_GENDER_FETCH, payload: { filtered: getState().filters.filtered, list: response }});
+};

src/actions/CT/Covid/covidAdultPLHIVCurrentOnTreatmentByPartnerActions.js

@@ -0,0 +1,42 @@
+import * as actionTypes from '../../types';
+import moment from 'moment';
+import { getAll } from '../../../views/Shared/Api';
+import { CACHING, PAGES } from '../../../constants';
+
+export const loadCovidAdultPLHIVCurrentOnTreatmentByPartner = () => async (dispatch, getState) => {
+    if (getState().filters.noCache === true) {
+        await dispatch(fetchCovidAdultPLHIVCurrentOnTreatmentByPartner());
+    } else {
+        const diffInMinutes = moment().diff(
+            moment(getState().CovidAdultPLHIVCurrentOnTreatmentByPartner.lastFetch),
+            'minutes'
+        );
+        if (
+            getState().ui.ctTab !== 'covid' &&
+            getState().ui.currentPage !== PAGES.home
+        ) {
+            return;
+        }
+        else if ((diffInMinutes < CACHING.LONG) && getState().filters.filtered === false) {
+            return;
+        } else {
+            await dispatch(fetchCovidAdultPLHIVCurrentOnTreatmentByPartner());
+        }
+    }
+};
+
+export const fetchCovidAdultPLHIVCurrentOnTreatmentByPartner = () => async (dispatch, getState) => {
+    dispatch({ type: actionTypes.CT_COVID_ADULT_PLHIV_CURRENT_ON_TREATMENT_BY_PARTNER_REQUEST });
+    const params = {
+        county: getState().filters.counties,
+        subCounty: getState().filters.subCounties,
+        facility: getState().filters.facilities,
+        partner: getState().filters.partners,
+        agency: getState().filters.agencies,
+        project: getState().filters.projects,
+        year: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("YYYY") : '',
+        month: getState().filters.fromDate ? moment(getState().filters.fromDate, "MMM YYYY").format("MM") : '',
+    };
+    const response = await getAll('care-treatment/getCovidAdultPLHIVCurrentOnTreatmentByPartner', params);
+    dispatch({ type: actionTypes.CT_COVID_ADULT_PLHIV_CURRENT_ON_TREATMENT_BY_PARTNER_FETCH, payload: { filtered: getState().filters.filtered, list: response }});
+};