RocketChat#755 [FIX] Правка отображения в мероприятии

sibdigital · Nov 11, 2020 · b17c06f · b17c06f
1 parent dce8218
commit b17c06f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/app/councils/client/views/Participants/AddParticipant.js b/app/councils/client/views/Participants/AddParticipant.js
@@ -117,7 +117,7 @@ export function AddParticipant({ councilId, onChange, close, invitedUsers, onNew
 		onChange();
 	};
 
-	return <Scrollable>
+	return <>
 		<Field mbe='x8'>
 			<Label fontScale='p1'>{t('Selected')}: {countSelectedUsers}</Label>
 			<ButtonGroup marginInlineStart='auto'>
@@ -144,7 +144,7 @@ export function AddParticipant({ councilId, onChange, close, invitedUsers, onNew
 				<UsersTable invitedUsers={ usersWithoutCurrentCouncil } usersIdToAdd={ usersIdToAdd } handleAddUser={ onAddClick }/>
 			</>
 		}
-	</Scrollable>;
+	</>;
 }
 
 const style = { textOverflow: 'ellipsis', overflow: 'hidden' };
@@ -194,7 +194,7 @@ function UsersTable({ invitedUsers, usersIdToAdd, handleAddUser }) {
 		return <Table.Row key={iu._id} style={styleTableRow} onClick={handleAddUser(iu._id)} backgroundColor={getBackgroundColor(invitedUser)} tabIndex={0} role='link' action>
 			<Table.Cell fontScale='p1' style={style} color='default'>{iu.surname} {iu.name} {iu.patronymic}</Table.Cell>
 			<Table.Cell fontScale='p1' style={style} color='default'>{iu.organization}</Table.Cell>
-			<Table.Cell fontScale='p1' style={style} color='default'>{iu.position}</Table.Cell>
+			{ mediaQuery && <Table.Cell fontScale='p1' style={style} color='default'>{iu.position}</Table.Cell>}
 			{ mediaQuery && <Table.Cell fontScale='p1' style={style} color='default'>{iu.phone}</Table.Cell>}
 			{ mediaQuery && <Table.Cell fontScale='p1' style={style} color='default'>{email}</Table.Cell>}
 		</Table.Row>;

diff --git a/app/councils/client/views/Participants/CreateParticipant.js b/app/councils/client/views/Participants/CreateParticipant.js
@@ -40,7 +40,7 @@ export function CreateParticipant({ goTo, close, ...props }) {
 
 	const availableRoles = useMemo(() => (roleData && roleData.roles ? roleData.roles.map(({ _id, description }) => [_id, description || _id]) : []), [roleData]);
 
-	const append = useMemo(() => <Field>
+	const append = useMemo(() => <Field width='98%'>
 		<Field.Row>
 			<Box display='flex' flexDirection='row' justifyContent='space-between' w='full'>
 				<Button flexGrow={1} onClick={close('participants')} mie='x4'>{t('Cancel')}</Button>

diff --git a/app/councils/client/views/Participants/ParticipantForm.js b/app/councils/client/views/Participants/ParticipantForm.js
@@ -46,49 +46,49 @@ export default function ParticipantForm({ formValues, formHandlers, availableRol
 
 	return <Scrollable is='form' onSubmit={useCallback((e) => e.preventDefault(), [])} { ...props }>
 		<Field mb='x16'>
-			{useMemo(() => <Field mb='x4'>
+			{useMemo(() => <Field mb='x4' width='98%'>
 				<Field.Label>{t('Surname')}</Field.Label>
 				<Field.Row>
 					<TextInput flexGrow={1} value={surname} onChange={handleSurname}/>
 				</Field.Row>
 			</Field>, [t, surname, handleSurname])}
-			{useMemo(() => <Field mb='x4'>
+			{useMemo(() => <Field mb='x4' width='98%'>
 				<Field.Label>{t('Name')}</Field.Label>
 				<Field.Row>
 					<TextInput flexGrow={1} value={name} onChange={handleName}/>
 				</Field.Row>
 			</Field>, [t, name, handleName])}
-			{useMemo(() => <Field mb='x4'>
+			{useMemo(() => <Field mb='x4' width='98%'>
 				<Field.Label>{t('Patronymic')}</Field.Label>
 				<Field.Row>
 					<TextInput flexGrow={1} value={patronymic} onChange={handlePatronymic}/>
 				</Field.Row>
 			</Field>, [t, patronymic, handlePatronymic])}
-			{useMemo(() => <Field mb='x4'>
+			{useMemo(() => <Field mb='x4' width='98%'>
 				<Field.Label>{t('Organization')}</Field.Label>
 				<Field.Row>
 					<TextInput flexGrow={1} value={organization} onChange={handleOrganization}/>
 				</Field.Row>
 			</Field>, [t, organization, handleOrganization])}
-			{useMemo(() => <Field mb='x4'>
+			{useMemo(() => <Field mb='x4' width='98%'>
 				<Field.Label>{t('Position')}</Field.Label>
 				<Field.Row>
 					<TextInput flexGrow={1} value={position} onChange={handlePosition}/>
 				</Field.Row>
 			</Field>, [t, position, handlePosition])}
-			{useMemo(() => <Field mb='x4'>
+			{useMemo(() => <Field mb='x4' width='98%'>
 				<Field.Label>{t('Phone_number')}</Field.Label>
 				<Field.Row>
 					<TextInput flexGrow={1} value={phone} onChange={handlePhone}/>
 				</Field.Row>
 			</Field>, [t, phone, handlePhone])}
-			{useMemo(() => <Field mb='x4'>
+			{useMemo(() => <Field mb='x4' width='98%'>
 				<Field.Label>{t('Email')}</Field.Label>
 				<Field.Row>
 					<TextInput flexGrow={1} value={email} error={!isEmail(email) && email.length > 0 ? 'error' : undefined} onChange={handleEmail} addon={<Icon name='mail' size='x20'/>}/>
 				</Field.Row>
 			</Field>, [t, email, handleEmail])}
-			{useMemo(() => <Field mbe='x8'>
+			{useMemo(() => <Field mbe='x8' width='98%'>
 				<Field.Label flexGrow={0}>{t('Working_group')}</Field.Label>
 				<Field.Row>
 					<Select options={workingGroupOptions} onChange={handleWorkingGroup} value={workingGroup} selected={workingGroup}/>