Skip to content

Commit 1a504ea

Browse files
committed
style: rearrange focalpeople list columns
#208
1 parent 79198e5 commit 1a504ea

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

src/Stakeholders/components/FocalPeople/List/index.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@ import FocalPersonsListItem from '../ListItem';
2323
const nameSpan = { xxl: 3, xl: 3, lg: 3, md: 5, sm: 10, xs: 10 };
2424
const phoneSpan = { xxl: 2, xl: 2, lg: 3, md: 4, sm: 9, xs: 9 };
2525
const emailSpan = { xxl: 3, xl: 4, lg: 5, md: 7, sm: 0, xs: 0 };
26-
const agencySpan = { xxl: 5, xl: 4, lg: 3, md: 0, sm: 0, xs: 0 };
27-
const roleSpan = { xxl: 5, xl: 4, lg: 4, md: 0, sm: 0, xs: 0 };
26+
const roleSpan = { xxl: 10, xl: 8, lg: 7, md: 0, sm: 0, xs: 0 };
2827
const areaSpan = { xxl: 5, xl: 5, lg: 4, md: 5, sm: 0, xs: 0 };
28+
2929
const headerLayout = [
3030
{ ...nameSpan, header: 'Name' },
31-
{ ...phoneSpan, header: 'Mobile Number' },
32-
{ ...emailSpan, header: 'Email Address' },
33-
{ ...agencySpan, header: 'Agency' },
34-
{ ...roleSpan, header: 'Role' },
31+
{ ...roleSpan, header: 'Title & Organization' },
32+
{ ...phoneSpan, header: 'Phone Number' },
33+
{ ...emailSpan, header: 'Email' },
3534
{ ...areaSpan, header: 'Area' },
3635
];
3736
const { getFocalPeopleExportUrl } = httpActions;
@@ -69,7 +68,7 @@ class FocalPersonsList extends Component {
6968
* @name handleOnSelectFocalPerson
7069
* @description Handle select a single focalPerson action
7170
*
72-
* @param {Object} focalPerson selected focalPerson object
71+
* @param {object} focalPerson selected focalPerson object
7372
*
7473
* @version 0.1.0
7574
* @since 0.1.0
@@ -157,7 +156,7 @@ class FocalPersonsList extends Component {
157156
* @name handleOnDeselectFocalPerson
158157
* @description Handle deselect a single focalPerson action
159158
*
160-
* @param {Object} focalPerson focalPerson to be removed from selected focalPeople
159+
* @param {object} focalPerson focalPerson to be removed from selected focalPeople
161160
* @returns {undefined} undefined
162161
*
163162
* @version 0.1.0

src/Stakeholders/components/FocalPeople/ListItem/index.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class FocalPeopleListItem extends Component {
6868
* @name handleToggleSelect
6969
* @description Handle Toggling List Item checkbox
7070
*
71-
* @param {Object} event - Event object
71+
* @param {object} event - Event object
7272
*
7373
* @version 0.1.0
7474
* @since 0.1.0
@@ -111,9 +111,10 @@ class FocalPeopleListItem extends Component {
111111
const nameSpan = { xxl: 3, xl: 3, lg: 3, md: 5, sm: 10, xs: 10 };
112112
const phoneSpan = { xxl: 2, xl: 2, lg: 3, md: 4, sm: 9, xs: 9 };
113113
const emailSpan = { xxl: 3, xl: 4, lg: 5, md: 7, sm: 0, xs: 0 };
114-
const agencySpan = { xxl: 4, xl: 3, lg: 3, md: 0, sm: 0, xs: 0 };
115-
const roleSpan = { xxl: 5, xl: 5, lg: 4, md: 0, sm: 0, xs: 0 };
114+
const roleSpan = { xxl: 9, xl: 8, lg: 7, md: 0, sm: 0, xs: 0 };
116115
const areaSpan = { xxl: 5, xl: 5, lg: 4, md: 5, sm: 0, xs: 0 };
116+
const isHoveredSpan = { xxl: 1, xl: 1, lg: 1, md: 1, sm: 2, xs: 2 };
117+
117118
const {
118119
abbreviation,
119120
mobile,
@@ -162,14 +163,13 @@ class FocalPeopleListItem extends Component {
162163
<Row>
163164
<Col {...sideSpan}>{sideComponent}</Col>
164165
<Col {...nameSpan}>{name}</Col>
166+
<Col {...roleSpan} title={agency}>
167+
{role}, {agencyAbbreviation}
168+
</Col>
165169
<Col {...phoneSpan}>{mobile}</Col>
166170
<Col {...emailSpan}>{email}</Col>
167-
<Col {...agencySpan} title={agency}>
168-
{agencyAbbreviation}
169-
</Col>
170-
<Col {...roleSpan}>{role}</Col>
171171
<Col {...areaSpan}>{location}</Col>
172-
<Col xxl={1} xl={1} lg={1} md={1} sm={2} xs={2}>
172+
<Col {...isHoveredSpan}>
173173
{isHovered && (
174174
<ListItemActions
175175
edit={{

0 commit comments

Comments
 (0)