diff --git a/src/components/Card/Common/event.css b/src/components/Card/Common/event.css
index e69de29bb..07dd6dbe5 100644
--- a/src/components/Card/Common/event.css
+++ b/src/components/Card/Common/event.css
@@ -0,0 +1,6 @@
+.add-event-section-col {
+ padding: 24px;
+ background-color: #ffffff;
+ padding-left: 24px;
+ padding-right: 24px;
+}
diff --git a/src/components/List/Events/list.css b/src/components/List/Events/list.css
index 5cf66226f..57f961eaa 100644
--- a/src/components/List/Events/list.css
+++ b/src/components/List/Events/list.css
@@ -31,7 +31,7 @@
display: flex;
flex-direction: column;
font-size: 16px;
- gap: 8px;
+ gap: 4px;
}
.event-list-wrapper .event-list-description-name {
diff --git a/src/components/List/ListItem.jsx/ListItem.jsx b/src/components/List/ListItem.jsx/ListItem.jsx
new file mode 100644
index 000000000..009516b01
--- /dev/null
+++ b/src/components/List/ListItem.jsx/ListItem.jsx
@@ -0,0 +1,113 @@
+import React from 'react';
+import './listItem.css';
+import { useTranslation } from 'react-i18next';
+import { List } from 'antd';
+import { LinkOutlined } from '@ant-design/icons';
+import moment from 'moment-timezone';
+import i18n from 'i18next';
+import Username from '../../Username/Username';
+
+import ArtsDataLink from '../../Tags/ArtsDataLink/ArtsDataLink';
+
+function ListItem(props) {
+ const {
+ id,
+ title,
+ description,
+ logo,
+ defaultLogo,
+ artsDataLink,
+ createdDate,
+ createdByFirstName,
+ createdByLastName,
+ updatedDate,
+ updatedByFirstName,
+ updatedByLastName,
+ scheduleTimezone,
+ listItemHandler,
+ actions,
+ } = props;
+ const { t } = useTranslation();
+ const dateFormat = 'DD-MMM-YYYY';
+ const lang = i18n.language;
+ return (
+
+
+ 
+
+ ) : (
+
+ {defaultLogo}
+
+ )
+ }
+ description={
+
+ {title}
+
+ {description}
+
+
+ }
+ />
+
+
+ {t('dashboard.events.list.createdBy')}
+ {moment
+ .tz(createdDate, scheduleTimezone ?? 'Canada/Eastern')
+ .locale(lang)
+ .format(dateFormat)
+ ?.toUpperCase()}
+
+ {t('dashboard.events.list.by')}
+
+ }
+ />
+
+ );
+}
+
+export default ListItem;
diff --git a/src/components/List/ListItem.jsx/index.js b/src/components/List/ListItem.jsx/index.js
new file mode 100644
index 000000000..741aed270
--- /dev/null
+++ b/src/components/List/ListItem.jsx/index.js
@@ -0,0 +1 @@
+export { default } from './ListItem';
diff --git a/src/components/List/ListItem.jsx/listItem.css b/src/components/List/ListItem.jsx/listItem.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/components/List/SelectionItem/SelectionItem.jsx b/src/components/List/SelectionItem/SelectionItem.jsx
index 272f6b543..cfec2c1fa 100644
--- a/src/components/List/SelectionItem/SelectionItem.jsx
+++ b/src/components/List/SelectionItem/SelectionItem.jsx
@@ -20,10 +20,10 @@ function SelectionItem(props) {
accessibility,
openingHours,
calendarContentLanguage,
+ artsDataLink,
} = props;
const { t } = useTranslation();
const { user } = useSelector(getUserDetails);
-
return (
- {postalAddress?.streetAddress && (
+ {(postalAddress?.streetAddress?.en || postalAddress?.streetAddress?.fr) && (
{contentLanguageBilingual({
en: postalAddress?.streetAddress?.en,
@@ -80,7 +80,7 @@ function SelectionItem(props) {
,
)}
-
+ {(postalAddress?.streetAddress?.en || postalAddress?.streetAddress?.fr) &&
} {postalAddress?.addressLocality && ( {contentLanguageBilingual({ @@ -156,6 +156,24 @@ function SelectionItem(props) { )} )} + {artsDataLink && ( +
);
}
diff --git a/src/components/List/SelectionItem/selectionItem.css b/src/components/List/SelectionItem/selectionItem.css
index 58cdff1f0..877475b7d 100644
--- a/src/components/List/SelectionItem/selectionItem.css
+++ b/src/components/List/SelectionItem/selectionItem.css
@@ -37,3 +37,29 @@
.selection-item-wrapper .open-hour-url-link {
text-decoration: underline;
}
+
+.selection-item-wrapper .arts-data-link {
+ justify-content: space-between;
+ display: flex;
+ align-items: center;
+ padding: 8px;
+ border-radius: 4px;
+ background: #e3e8ff;
+ color: #0f0e98;
+ font-family: Roboto;
+ font-size: 12px;
+ font-style: normal;
+ font-weight: 400;
+}
+
+.selection-item-wrapper .arts-data-link .arts-data-link-content {
+ display: grid;
+ grid-template-rows: auto auto;
+ grid-gap: 2px;
+}
+
+.selection-item-wrapper .arts-data-link .arts-data-link-first-line {
+ display: flex;
+ align-items: center;
+ gap: 4px;
+}
diff --git a/src/components/Modal/QuickCreateOrganization/QuickCreateOrganization.jsx b/src/components/Modal/QuickCreateOrganization/QuickCreateOrganization.jsx
index 49f7a0455..af2afd270 100644
--- a/src/components/Modal/QuickCreateOrganization/QuickCreateOrganization.jsx
+++ b/src/components/Modal/QuickCreateOrganization/QuickCreateOrganization.jsx
@@ -15,7 +15,7 @@ import './quickCreateOrganization.css';
import { treeEntitiesOption } from '../../TreeSelectOption/treeSelectOption.settings';
import { useSelector } from 'react-redux';
import { getUserDetails } from '../../../redux/reducer/userSlice';
-import { taxonomyClass } from '../../../constants/taxonomyClass';
+import { entitiesClass } from '../../../constants/entitiesClass';
const { TextArea } = Input;
@@ -30,6 +30,12 @@ function QuickCreateOrganization(props) {
interfaceLanguage,
selectedOrganizers,
setSelectedOrganizers,
+ selectedPerformers,
+ setSelectedPerformers,
+ selectedSupporters,
+ setSelectedSupporters,
+ selectedOrganizerPerformerSupporterType,
+ organizerPerformerSupporterTypes,
} = props;
const [form] = Form.useForm();
const { t } = useTranslation();
@@ -49,11 +55,27 @@ function QuickCreateOrganization(props) {
disambiguatingDescription: response?.disambiguatingDescription,
id: response?.id,
name: response?.name,
- type: taxonomyClass.ORGANIZATION,
+ type: entitiesClass.organization,
+ logo: response?.logo,
},
];
createdOrganizer = treeEntitiesOption(createdOrganizer, user, calendarContentLanguage);
- if (createdOrganizer?.length === 1) setSelectedOrganizers([...selectedOrganizers, createdOrganizer[0]]);
+ if (createdOrganizer?.length === 1) {
+ switch (selectedOrganizerPerformerSupporterType) {
+ case organizerPerformerSupporterTypes.organizer:
+ setSelectedOrganizers([...selectedOrganizers, createdOrganizer[0]]);
+ break;
+ case organizerPerformerSupporterTypes.performer:
+ setSelectedPerformers([...selectedPerformers, createdOrganizer[0]]);
+ break;
+ case organizerPerformerSupporterTypes.supporter:
+ setSelectedSupporters([...selectedSupporters, createdOrganizer[0]]);
+ break;
+
+ default:
+ break;
+ }
+ }
})
.catch((error) => console.log(error));
};
@@ -126,7 +148,6 @@ function QuickCreateOrganization(props) {
duration: 3,
});
setKeyword('');
- console.log(response);
getSelectedOrganizer(response?.id);
setOpen(false);
})
diff --git a/src/components/Modal/QuickCreatePerson/QuickCreatePerson.jsx b/src/components/Modal/QuickCreatePerson/QuickCreatePerson.jsx
new file mode 100644
index 000000000..a7007b800
--- /dev/null
+++ b/src/components/Modal/QuickCreatePerson/QuickCreatePerson.jsx
@@ -0,0 +1,313 @@
+import React, { useRef } from 'react';
+import './quickCreatePerson.css';
+import { CloseCircleOutlined } from '@ant-design/icons';
+import CustomModal from '../Common/CustomModal';
+import TextButton from '../../Button/Text/Text';
+import { useTranslation } from 'react-i18next';
+import PrimaryButton from '../../Button/Primary/Primary';
+import { Row, Col, Form, Input, notification } from 'antd';
+import ContentLanguageInput from '../../ContentLanguageInput/ContentLanguageInput';
+import { contentLanguage } from '../../../constants/contentLanguage';
+import BilingualInput from '../../BilingualInput/BilingualInput';
+import StyledInput from '../../Input/Common';
+import { treeEntitiesOption, treeTaxonomyOptions } from '../../TreeSelectOption/treeSelectOption.settings';
+import { useSelector } from 'react-redux';
+import { getUserDetails } from '../../../redux/reducer/userSlice';
+import { entitiesClass } from '../../../constants/entitiesClass';
+import { useAddPersonMutation, useLazyGetPersonQuery } from '../../../services/people';
+import { useGetAllTaxonomyQuery } from '../../../services/taxonomy';
+import { taxonomyClass } from '../../../constants/taxonomyClass';
+import { taxonomyDetails } from '../../../utils/taxonomyDetails';
+import NoContent from '../../NoContent/NoContent';
+import TreeSelectOption from '../../TreeSelectOption/TreeSelectOption';
+import Tags from '../../Tags/Common/Tags';
+
+const { TextArea } = Input;
+
+function QuickCreatePerson(props) {
+ const {
+ open,
+ setOpen,
+ calendarContentLanguage,
+ calendarId,
+ keyword,
+ setKeyword,
+ interfaceLanguage,
+ setSelectedOrganizers,
+ selectedOrganizers,
+ selectedPerformers,
+ setSelectedPerformers,
+ selectedSupporters,
+ setSelectedSupporters,
+ selectedOrganizerPerformerSupporterType,
+ organizerPerformerSupporterTypes,
+ } = props;
+ const [form] = Form.useForm();
+ const { t } = useTranslation();
+ const timestampRef = useRef(Date.now()).current;
+
+ const { user } = useSelector(getUserDetails);
+
+ const { currentData: allTaxonomyData, isLoading: taxonomyLoading } = useGetAllTaxonomyQuery({
+ calendarId,
+ search: '',
+ taxonomyClass: taxonomyClass.PERSON,
+ includeConcepts: true,
+ sessionId: timestampRef,
+ });
+ const [addPerson] = useAddPersonMutation();
+ const [getPerson] = useLazyGetPersonQuery();
+
+ const getSelectedPerson = (id) => {
+ getPerson({ personId: id, calendarId })
+ .unwrap()
+ .then((response) => {
+ let createdPerson = [
+ {
+ disambiguatingDescription: response?.disambiguatingDescription,
+ id: response?.id,
+ name: response?.name,
+ type: entitiesClass.person,
+ image: response?.image,
+ },
+ ];
+ createdPerson = treeEntitiesOption(createdPerson, user, calendarContentLanguage);
+ if (createdPerson?.length === 1) {
+ switch (selectedOrganizerPerformerSupporterType) {
+ case organizerPerformerSupporterTypes.organizer:
+ setSelectedOrganizers([...selectedOrganizers, createdPerson[0]]);
+ break;
+ case organizerPerformerSupporterTypes.performer:
+ setSelectedPerformers([...selectedPerformers, createdPerson[0]]);
+ break;
+ case organizerPerformerSupporterTypes.supporter:
+ setSelectedSupporters([...selectedSupporters, createdPerson[0]]);
+ break;
+
+ default:
+ break;
+ }
+ }
+ })
+ .catch((error) => console.log(error));
+ };
+ const createPersonHandler = () => {
+ form
+ .validateFields(['french', 'english'])
+ .then(() => {
+ var values = form.getFieldsValue(true);
+ let name = {},
+ url = {},
+ occupation = [],
+ personObj = {};
+
+ if (values?.english)
+ name = {
+ en: values?.english,
+ };
+
+ if (values?.french)
+ name = {
+ ...name,
+ fr: values?.french,
+ };
+
+ if (values?.contactWebsiteUrl)
+ url = {
+ uri: values?.contactWebsiteUrl,
+ };
+ if (values?.occupation) {
+ occupation = values?.occupation?.map((occupationId) => {
+ return {
+ entityId: occupationId,
+ };
+ });
+ }
+ personObj = {
+ name,
+ url,
+ occupation,
+ };
+ addPerson({ data: personObj, calendarId })
+ .unwrap()
+ .then((response) => {
+ notification.success({
+ description: t('dashboard.events.addEditEvent.quickCreate.quickCreatePerson.success'),
+ placement: 'top',
+ closeIcon: <>,
+ maxCount: 1,
+ duration: 3,
+ });
+ setKeyword('');
+ getSelectedPerson(response?.id);
+ setOpen(false);
+ })
+ .catch((error) => {
+ console.log(error);
+ });
+ })
+ .catch((error) => console.log(error));
+ };
+ return (
+ !taxonomyLoading && (
+ + {(postalAddress?.streetAddress?.en || postalAddress?.streetAddress?.fr) &&
} {postalAddress?.addressLocality && ( {contentLanguageBilingual({ @@ -156,6 +156,24 @@ function SelectionItem(props) { )} )} + {artsDataLink && ( +
+
+ )}
+
+
+
+ window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer')}>
+ Artsdata
+
+ {name && {name}}
+ {/* {description &&
+ {description && {description}}
+