Skip to content

Commit

Permalink
Merge branch 'develop' into 214700_fix_cycle_deletion_dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mmaciekk authored Oct 8, 2024
2 parents 5b37322 + 3af1ce2 commit def24e2
Show file tree
Hide file tree
Showing 13 changed files with 374 additions and 239 deletions.
2 changes: 1 addition & 1 deletion src/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"styled-components": "^6.1.8",
"ts-node": "^10.9.2",
"use-deep-compare-effect": "^1.8.1",
"vite": "^5.0.8",
"vite": "^5.2.14",
"vite-tsconfig-paths": "^4.3.1",
"waait": "^1.0.5",
"yup": "^1.3.3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,20 @@ export const IndividualAdditionalRegistrationInformation = ({
);
});
return (
<div>
<Overview>
<Title>
<Typography variant="h6">
{t('Additional Registration information')}
</Typography>
</Title>
<Grid container spacing={6}>
{fields.map((field, i) => (
/* eslint-disable-next-line react/no-array-index-key */
<Grid key={i} item xs={4}>
{field}
</Grid>
))}
</Grid>
</Overview>
</div>
<Overview>
<Title>
<Typography variant="h6">
{t('Additional Registration information')}
</Typography>
</Title>
<Grid container spacing={6}>
{fields.map((field, i) => (
/* eslint-disable-next-line react/no-array-index-key */
<Grid key={i} item xs={4}>
{field}
</Grid>
))}
</Grid>
</Overview>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,86 +2,84 @@

exports[`components/population/IndividualAdditionalRegistrationInformation should render 1`] = `
<div>
<div>
<div
class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 sc-fsYfdN ctuPcH css-1ps6pg7-MuiPaper-root"
>
<div
class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 sc-fsYfdN ctuPcH css-1ps6pg7-MuiPaper-root"
class="sc-dmyCSP ljiJAm"
>
<div
class="sc-dmyCSP ljiJAm"
<h6
class="MuiTypography-root MuiTypography-h6 css-1j53xw6-MuiTypography-root"
>
<h6
class="MuiTypography-root MuiTypography-h6 css-1j53xw6-MuiTypography-root"
>
Additional Registration information
</h6>
</div>
Additional Registration information
</h6>
</div>
<div
class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-6 css-zow5z4-MuiGrid-root"
>
<div
class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-6 css-zow5z4-MuiGrid-root"
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-4 css-gj1fbr-MuiGrid-root"
>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-4 css-gj1fbr-MuiGrid-root"
>
<div>
<div>
<span
class="sc-beySPh gbuZtJ"
color="textSecondary"
>
muac
</span>
<div
data-cy="label-muac"
>
<span
class="sc-beySPh gbuZtJ"
class="sc-guDLey cyWTlF"
color="textSecondary"
>
muac
334
</span>
<div
data-cy="label-muac"
>
<span
class="sc-guDLey cyWTlF"
color="textSecondary"
>
334
</span>
</div>
</div>
</div>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-4 css-gj1fbr-MuiGrid-root"
>
<div>
</div>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-4 css-gj1fbr-MuiGrid-root"
>
<div>
<span
class="sc-beySPh gbuZtJ"
color="textSecondary"
>
school enrolled
</span>
<div
data-cy="label-school enrolled"
>
<span
class="sc-beySPh gbuZtJ"
class="sc-guDLey cyWTlF"
color="textSecondary"
>
school enrolled
Yes
</span>
<div
data-cy="label-school enrolled"
>
<span
class="sc-guDLey cyWTlF"
color="textSecondary"
>
Yes
</span>
</div>
</div>
</div>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-4 css-gj1fbr-MuiGrid-root"
>
<div>
</div>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-4 css-gj1fbr-MuiGrid-root"
>
<div>
<span
class="sc-beySPh gbuZtJ"
color="textSecondary"
>
school enrolled before
</span>
<div
data-cy="label-school enrolled before"
>
<span
class="sc-beySPh gbuZtJ"
class="sc-guDLey cyWTlF"
color="textSecondary"
>
school enrolled before
No
</span>
<div
data-cy="label-school enrolled before"
>
<span
class="sc-guDLey cyWTlF"
color="textSecondary"
>
No
</span>
</div>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import { DividerLine } from '@components/core/DividerLine';
import { IndividualNode } from '@generated/graphql';
import { Grid, Paper, Typography } from '@mui/material';
import { Title } from '@core/Title';
import { t } from 'i18next';
import React from 'react';
import styled from 'styled-components';
import { LabelizedField } from '@components/core/LabelizedField';
import { renderSomethingOrDash } from '@utils/utils';
import { usePermissions } from '@hooks/usePermissions';
import { hasPermissions, PERMISSIONS } from 'src/config/permissions';

interface IndividualDeliveryMechanismsProps {
individual: IndividualNode;
}

const Overview = styled(Paper)`
padding: ${({ theme }) => theme.spacing(8)}
${({ theme }) => theme.spacing(11)};
margin-top: ${({ theme }) => theme.spacing(6)};
margin-bottom: ${({ theme }) => theme.spacing(4)};
`;

export const IndividualDeliveryMechanisms: React.FC<
IndividualDeliveryMechanismsProps
> = ({ individual }) => {
const permissions = usePermissions();
const canViewDeliveryMechanisms = hasPermissions(
PERMISSIONS.POPULATION_VIEW_INDIVIDUAL_DELIVERY_MECHANISMS_SECTION,
permissions,
);
if (!individual.deliveryMechanismsData.length || !canViewDeliveryMechanisms) {
return null;
}
return (
<Overview>
<Title>
<Typography variant="h6">
{t('Individual Delivery Mechanisms')}
</Typography>
</Title>
<Grid container spacing={6}>
{individual.deliveryMechanismsData.map((mechanism, index) => {
const tabData = JSON.parse(mechanism.individualTabData);
return (
<Grid item xs={12} key={index}>
<Typography variant="h6">{mechanism.name}</Typography>
<Grid container spacing={3}>
{Object.entries(tabData).map(([key, value], idx) => (
<Grid key={idx} item xs={3}>
<LabelizedField label={key.replace(/_/g, ' ')}>
{renderSomethingOrDash(value)}
</LabelizedField>
</Grid>
))}
</Grid>
{index < individual.deliveryMechanismsData.length - 1 && (
<DividerLine />
)}
</Grid>
);
})}
</Grid>
</Overview>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ import { Box, Grid, Typography } from '@mui/material';
import * as React from 'react';
import { useTranslation } from 'react-i18next';
import styled from 'styled-components';
import {
ProgrammeChoiceDataQuery,
ProgramPartnerAccess,
ProgramQuery,
} from '@generated/graphql';
import { ProgrammeChoiceDataQuery, ProgramQuery } from '@generated/graphql';
import { MiśTheme } from '../../../theme';
import { choicesToDict, programStatusToColor } from '@utils/utils';
import { ContainerColumnWithBorder } from '@core/ContainerColumnWithBorder';
Expand Down
2 changes: 2 additions & 0 deletions src/frontend/src/config/permissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ export const PERMISSIONS = {
POPULATION_VIEW_HOUSEHOLDS_DETAILS: 'POPULATION_VIEW_HOUSEHOLDS_DETAILS',
POPULATION_VIEW_INDIVIDUALS_LIST: 'POPULATION_VIEW_INDIVIDUALS_LIST',
POPULATION_VIEW_INDIVIDUALS_DETAILS: 'POPULATION_VIEW_INDIVIDUALS_DETAILS',
POPULATION_VIEW_INDIVIDUAL_DELIVERY_MECHANISMS_SECTION:
'POPULATION_VIEW_INDIVIDUAL_DELIVERY_MECHANISMS_SECTION',

// User Management
USER_MANAGEMENT_VIEW_LIST: 'USER_MANAGEMENT_VIEW_LIST',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { AdminButton } from '@core/AdminButton';
import { ProgrammeTimeSeriesFields } from '@components/population/ProgrammeTimeSeriesFields';
import { fetchPeriodicFields } from '@api/periodicDataUpdateApi';
import { useQuery } from '@tanstack/react-query';
import { IndividualDeliveryMechanisms } from '@components/population/IndividualDeliveryMechanisms';

const Container = styled.div`
padding: 20px;
Expand Down Expand Up @@ -130,6 +131,9 @@ export const PopulationIndividualsDetailsPage = (): React.ReactElement => {
choicesData={choicesData}
grievancesChoices={grievancesChoices}
/>
<IndividualDeliveryMechanisms
individual={individual as IndividualNode}
/>
<IndividualAdditionalRegistrationInformation
flexFieldsData={flexFieldsData}
individual={individual as IndividualNode}
Expand Down
3 changes: 2 additions & 1 deletion src/frontend/src/utils/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -907,5 +907,6 @@
"You cannot upload more than 10 files.": "You cannot upload more than 10 files.",
"File deleted successfully.": "File deleted successfully.",
"FX Rate Applied": "FX Rate Applied",
"If displayed exchange rate differs from Vision, please contact your designated focal point for resolutionIf displayed exchange rate differs from Vision, please contact your designated focal point for resolution": "If displayed exchange rate differs from Vision, please contact your designated focal point for resolution"
"If displayed exchange rate differs from Vision, please contact your designated focal point for resolutionIf displayed exchange rate differs from Vision, please contact your designated focal point for resolution": "If displayed exchange rate differs from Vision, please contact your designated focal point for resolution",
"Individual Delivery Mechanisms": "Individual Delivery Mechanisms"
}
Loading

0 comments on commit def24e2

Please sign in to comment.