Fix missing fields

2 files changed, 82 insertions, 44 deletions

diff --git a/modern/src/settings/GeofencePage.js b/modern/src/settings/GeofencePage.js
index f372adb6..d7d1c50c 100644
--- a/modern/src/settings/GeofencePage.js
+++ b/modern/src/settings/GeofencePage.js
@@ -11,6 +11,7 @@ import EditAttributesView from './components/EditAttributesView';
 import { useTranslation } from '../common/components/LocalizationProvider';
 import useGeofenceAttributes from '../common/attributes/useGeofenceAttributes';
 import SettingsMenu from './components/SettingsMenu';
+import SelectField from '../common/components/SelectField';
 
 const useStyles = makeStyles((theme) => ({
   details: {
@@ -59,6 +60,26 @@ const GeofencePage = () => {
           <Accordion>
             <AccordionSummary expandIcon={<ExpandMoreIcon />}>
               <Typography variant="subtitle1">
+                {t('sharedExtra')}
+              </Typography>
+            </AccordionSummary>
+            <AccordionDetails className={classes.details}>
+              <TextField
+                value={item.description || ''}
+                onChange={(event) => setItem({ ...item, description: event.target.value })}
+                label={t('sharedDescription')}
+              />
+              <SelectField
+                value={item.calendarId || 0}
+                onChange={(event) => setItem({ ...item, calendarId: Number(event.target.value) })}
+                endpoint="/api/calendars"
+                label={t('sharedCalendar')}
+              />
+            </AccordionDetails>
+          </Accordion>
+          <Accordion>
+            <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+              <Typography variant="subtitle1">
                 {t('sharedAttributes')}
               </Typography>
             </AccordionSummary>
diff --git a/modern/src/settings/NotificationPage.js b/modern/src/settings/NotificationPage.js
index 6784671e..4aa318ae 100644
--- a/modern/src/settings/NotificationPage.js
+++ b/modern/src/settings/NotificationPage.js
@@ -49,54 +49,71 @@ const NotificationPage = () => {
       breadcrumbs={['settingsTitle', 'sharedNotification']}
     >
       {item && (
-        <Accordion defaultExpanded>
-          <AccordionSummary expandIcon={<ExpandMoreIcon />}>
-            <Typography variant="subtitle1">
-              {t('sharedRequired')}
-            </Typography>
-          </AccordionSummary>
-          <AccordionDetails className={classes.details}>
-            <SelectField
-              value={item.type}
-              emptyValue={null}
-              onChange={(e) => setItem({ ...item, type: e.target.value })}
-              endpoint="/api/notifications/types"
-              keyGetter={(it) => it.type}
-              titleGetter={(it) => t(prefixString('event', it.type))}
-              label={t('sharedType')}
-            />
-            <SelectField
-              multiple
-              value={item.notificators ? item.notificators.split(/[, ]+/) : []}
-              onChange={(e) => setItem({ ...item, notificators: e.target.value.join() })}
-              endpoint="/api/notifications/notificators"
-              keyGetter={(it) => it.type}
-              titleGetter={(it) => t(prefixString('notificator', it.type))}
-              label={t('notificationNotificators')}
-            />
-            {item.type === 'alarm' && (
+        <>
+          <Accordion defaultExpanded>
+            <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+              <Typography variant="subtitle1">
+                {t('sharedRequired')}
+              </Typography>
+            </AccordionSummary>
+            <AccordionDetails className={classes.details}>
+              <SelectField
+                value={item.type}
+                emptyValue={null}
+                onChange={(e) => setItem({ ...item, type: e.target.value })}
+                endpoint="/api/notifications/types"
+                keyGetter={(it) => it.type}
+                titleGetter={(it) => t(prefixString('event', it.type))}
+                label={t('sharedType')}
+              />
               <SelectField
                 multiple
-                value={item.attributes && item.attributes.alarms ? item.attributes.alarms.split(/[, ]+/) : []}
-                onChange={(e) => setItem({ ...item, attributes: { ...item.attributes, alarms: e.target.value.join() } })}
-                data={alarms}
-                keyGetter={(it) => it.key}
-                label={t('sharedAlarms')}
+                value={item.notificators ? item.notificators.split(/[, ]+/) : []}
+                onChange={(e) => setItem({ ...item, notificators: e.target.value.join() })}
+                endpoint="/api/notifications/notificators"
+                keyGetter={(it) => it.type}
+                titleGetter={(it) => t(prefixString('notificator', it.type))}
+                label={t('notificationNotificators')}
               />
-            )}
-            <FormGroup>
-              <FormControlLabel
-                control={(
-                  <Checkbox
-                    checked={item.always}
-                    onChange={(event) => setItem({ ...item, always: event.target.checked })}
-                  />
-                  )}
-                label={t('notificationAlways')}
+              {item.type === 'alarm' && (
+                <SelectField
+                  multiple
+                  value={item.attributes && item.attributes.alarms ? item.attributes.alarms.split(/[, ]+/) : []}
+                  onChange={(e) => setItem({ ...item, attributes: { ...item.attributes, alarms: e.target.value.join() } })}
+                  data={alarms}
+                  keyGetter={(it) => it.key}
+                  label={t('sharedAlarms')}
+                />
+              )}
+              <FormGroup>
+                <FormControlLabel
+                  control={(
+                    <Checkbox
+                      checked={item.always}
+                      onChange={(event) => setItem({ ...item, always: event.target.checked })}
+                    />
+                    )}
+                  label={t('notificationAlways')}
+                />
+              </FormGroup>
+            </AccordionDetails>
+          </Accordion>
+          <Accordion>
+            <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+              <Typography variant="subtitle1">
+                {t('sharedExtra')}
+              </Typography>
+            </AccordionSummary>
+            <AccordionDetails className={classes.details}>
+              <SelectField
+                value={item.calendarId || 0}
+                onChange={(event) => setItem({ ...item, calendarId: Number(event.target.value) })}
+                endpoint="/api/calendars"
+                label={t('sharedCalendar')}
               />
-            </FormGroup>
-          </AccordionDetails>
-        </Accordion>
+            </AccordionDetails>
+          </Accordion>
+        </>
       )}
     </EditItemView>
   );