diff --git a/src/assets/languages/en.json b/src/assets/languages/en.json
index 3d8263269bbdf7c45ef1affb9bee6bbcbf880ec0..e0a407576a242494dab7db78d3a5b47f7b1e7e74 100644
--- a/src/assets/languages/en.json
+++ b/src/assets/languages/en.json
@@ -579,7 +579,7 @@
"createHeader": "Create Group",
"maxAlias": "Max 65 symbols",
"maxIntro": "Max $1 symbols",
- "minSymbols": "Min $1 symbols",
+ "minSymbols": "Min $1 symbols",
"maxSymbols": "Max 32 symbols",
"noSearchResult": "Sorry, no search result"
},
@@ -1487,6 +1487,7 @@
"mayBe": "Maybe",
"pending": "Pending",
"eventSignup": {
+ "goToDashboard": "Go to dashboard",
"anonymousUserText": "Anonymous User",
"eventSignupHistoryTitle": "Event Signup History",
"eventSignupInvitationTitle": "Event Signup Invitation",
@@ -1573,7 +1574,7 @@
"setReminder": "Send reminder to participants",
"timezone": "Time Zone",
"location": "Location",
- "scheduledDateTime": "Scheduled Date&Time",
+ "scheduledDateTime": "Scheduled Date & Time",
"scheduledTimeZone": "Scheduled Time Zone",
"eventTime": "Event Time",
"timeSlot": "Time Slots",
@@ -1581,13 +1582,19 @@
"deleteEventMsg": "Event has been deleted",
"cancelEventMsg": "Event has been canceled",
"updateInvitationErrorMsg": "Internal server error",
- "invitationAdminMsg": "You are admin of this event 'event_name'. So, you cannot signup this event",
- "invitationCancelMsg":"Event 'event_name' has been canceled. So you can signup this event.",
+ "invitationAdminMsg": "You can't signup the event \"event_name\" as you are the host.",
+ "invitationCancelMsg": "Event \"event_name\" has been canceled by the host.",
+ "eventStartedMsg": "Event \"event_name\" is already started.",
"slotTable": {
"heading": "Time Slots",
"title": "Title",
- "startDateTime": "Start Date&Time",
- "endDateTime": "End Date&Time"
+ "startDateTime": "Start Date & Time",
+ "endDateTime": "End Date & Time",
+ "startTime":"Start Time",
+ "endTime":"End Time",
+ "eventName": "Title ",
+ "eventDec": "Description",
+ "eventLocation": "Location"
},
"eventSignupHistory": {
"tabs": {
diff --git a/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryRightPanel/SignupEventHistoryRightPanel.js b/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryRightPanel/SignupEventHistoryRightPanel.js
index 49af1c47c8f7c9590ac036a49503efbaf76b0d26..47155abe4b339b420a0a58fef979684d5a06ce54 100644
--- a/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryRightPanel/SignupEventHistoryRightPanel.js
+++ b/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryRightPanel/SignupEventHistoryRightPanel.js
@@ -157,7 +157,7 @@ class SignupEventHistoryRightPanel extends React.Component {
}
{/* {participant.note} */}
- {slotTitleText !== "" &&
+ {(slotTitleText !== "" && event.eventProfile.eventSlotsList.length !== 1) &&
Slot :
{slotTitleText}
@@ -214,7 +214,6 @@ class SignupEventHistoryRightPanel extends React.Component {
{currentEventProfile.eventProfile.eventSlotsList.length === 1 ?
-
-
diff --git a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js
index 856e1b405a9a00cde282b813f5d433a2b0c26c02..8e5b90b07ba2e73c7e9c6c1b7363c890b699c99c 100644
--- a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js
+++ b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js
@@ -43,67 +43,96 @@ class SignupEventInvitationRightPanel extends React.Component {
if (currentEventInvitation.rsvp !== 1 || isShowEdit) {
- const slotList = isShowEdit ? currentEventInvitation.event.eventSlotsList : currentEventInvitation.slotIdList;
+ const isShowEdit2 = currentEventInvitation.slotIdList.length === 0 ? true : isShowEdit;
+ const slotList = isShowEdit ? currentEventInvitation.event.eventSlotsList : currentEventInvitation.slotIdList.length === 0 ? currentEventInvitation.event.eventSlotsList : currentEventInvitation.slotIdList;
- console.log("");
- console.log("eventSlotsList ", currentEventInvitation.event.eventSlotsList);
- console.log("slotIdList ", currentEventInvitation.slotIdList);
- console.log("slotList ", slotList);
- console.log("");
+ console.log("");
+ console.log("eventSlotsList ", currentEventInvitation.event.eventSlotsList);
+ console.log("slotIdList ", currentEventInvitation.slotIdList);
+ console.log("slotList ", slotList);
+ console.log("");
return (
{t('eventSignup.viewEventSlot')}
-
-
-
-
- | {t('eventSignup.slotTable.title')} |
- {t('eventSignup.eventSignupInvitation.dateTime')} ({currentEventInvitation.event.timezone}) |
- {(isShowEdit && currentEventInvitation.event.eventSlotsList.length > 1) &&
- |
- }
- {/* {t('eventSignup.slotTable.endDateTime')} | */}
-
-
-
- {slotList.map((slot, index) => {
-
- console.log("slot ", slot);
- console.log("slot details ", state.eventSlotDetails[slot]);
- console.log("");
-
- const title = isShowEdit ? slot.title : state.eventSlotDetails[slot].title;
- const startDate = isShowEdit ? slot.startDate : state.eventSlotDetails[slot].startDate;
- const startTime = isShowEdit ? slot.startTime : state.eventSlotDetails[slot].startTime;
- const endDate = isShowEdit ? slot.endDate : state.eventSlotDetails[slot].endDate;
- const endTime = isShowEdit ? slot.endTime : state.eventSlotDetails[slot].endTime;
- const slotId = isShowEdit ? slot.eventSlotId : state.eventSlotDetails[slot].eventSlotId;
-
- return (
-
- | {title} |
- Start : {moment(startDate + " " + startTime).format("DD-MMM-YYYY hh:mm A")}
- End : {moment(endDate + " " + endTime).format("DD-MMM-YYYY hh:mm A")} |
+ {currentEventInvitation.slotIdList.length === 0 || currentEventInvitation.event.eventSlotsList.length === 1 ?
+
+
+
+ -
+
+
{t('eventSignup.timezone')}
+
{currentEventInvitation.event.timezone}
+
+
+ -
+
+
{t('eventSignup.slotTable.startDateTime')}
+
{moment(slotList[0].startDate + " " + slotList[0].startTime).format("DD-MMM-YYYY hh:mm A")}
+
+
+ -
+
+
{t('eventSignup.slotTable.endDateTime')}
+
{moment(slotList[0].endDate + " " + slotList[0].endTime).format("DD-MMM-YYYY hh:mm A")}
+
+
+
+
+ :
+
+
+ }
diff --git a/src/containers/EventInvitation/InvitationScreen.js b/src/containers/EventInvitation/InvitationScreen.js
index ecc482d40707fe1779dac1994324e1cab5a94bcf..b9a11717a1cb99103e5df23261d5116385666f6b 100644
--- a/src/containers/EventInvitation/InvitationScreen.js
+++ b/src/containers/EventInvitation/InvitationScreen.js
@@ -72,7 +72,10 @@ class InvitationScreen extends PureComponent {
userName: "",
msgText: "",
isUserLogin: false,
- responseText: ""
+ responseText: "",
+ isUpdateEvent: false,
+ isInvBtnDisable: false,
+ // isShowDashboardBtn: false
};
}
@@ -107,11 +110,27 @@ class InvitationScreen extends PureComponent {
});
}
- if(nextProps.eventProfileDetail.eventProfileDetail.savedPhase === 5){
- let invitationAdminMsg = this.props.t("eventSignup.invitationCancelMsg").toString();
- invitationAdminMsg = invitationAdminMsg.replace("event_name", nextProps.eventProfileDetail.eventProfileDetail.title);
+ if (nextProps.eventProfileDetail.eventProfileDetail.savedPhase === 5) {
+ let invitationCancelMsg = this.props.t("eventSignup.invitationCancelMsg").toString();
+ invitationCancelMsg = invitationCancelMsg.replace("event_name", nextProps.eventProfileDetail.eventProfileDetail.title);
this.setState({
- responseText: invitationAdminMsg,
+ responseText: invitationCancelMsg,
+ isEventSubmited: true
+ });
+ }
+
+ let currentTime = (moment().valueOf()) / 1000;
+ currentTime = parseInt(currentTime);
+
+ console.log("currentTime");
+ console.log(currentTime);
+ console.log("");
+
+ if (currentTime > nextProps.eventProfileDetail.eventProfileDetail.startTs) {
+ let eventStartedMsg = this.props.t("eventSignup.eventStartedMsg").toString();
+ eventStartedMsg = eventStartedMsg.replace("event_name", nextProps.eventProfileDetail.eventProfileDetail.title);
+ this.setState({
+ responseText: eventStartedMsg,
isEventSubmited: true
});
}
@@ -136,7 +155,7 @@ class InvitationScreen extends PureComponent {
// duration: 2000,
// position: "bottom"
// });
-
+
this.setState({
responseText: this.props.t("eventSignup.updateInvitationErrorMsg"),
isEventSubmited: true
@@ -146,6 +165,11 @@ class InvitationScreen extends PureComponent {
if (nextProps.updateInvitationResError !== null) {
+ this.setState({
+ isUpdateEvent: false,
+ isInvBtnDisable: false
+ })
+
if (nextProps.updateInvitationResError.data && nextProps.updateInvitationResError.data.error) {
// ${i18n.t('err')}: ${res.data.error.message}
@@ -157,7 +181,7 @@ class InvitationScreen extends PureComponent {
} else {
this.props.actions.showToast({
text: this.props.t("eventSignup.updateInvitationErrorMsg"),
- duration: 2000,
+ duration: 5000,
position: "bottom"
});
}
@@ -165,6 +189,9 @@ class InvitationScreen extends PureComponent {
if (nextProps.updateInvitationRes !== null) {
this.setState({
+ isUpdateEvent: false,
+ isInvBtnDisable: false,
+ // isShowDashboardBtn: true,
responseText: this.props.t('eventSignup.eventSignupInvitation.invitationMsg'),
isEventSubmited: true
});
@@ -221,6 +248,12 @@ class InvitationScreen extends PureComponent {
// });
} else {
+
+ this.setState({
+ isUpdateEvent: true,
+ isInvBtnDisable: true
+ })
+
console.log("this.state.selectedSlot");
console.log(this.state.selectedSlot);
console.log("");
@@ -293,8 +326,13 @@ class InvitationScreen extends PureComponent {
}
{this.state.isEventSubmited ?
-
+
{this.state.responseText}
+ {this.state.isUserLogin &&
+
+ {t('eventSignup.goToDashboard')}
+
+ }
:
@@ -305,45 +343,83 @@ class InvitationScreen extends PureComponent {
-
- {t('eventSignup.eventSignupInvitation.eventName')}
+ {t('eventSignup.slotTable.eventName')}
+ :
{eventProfileDetail.eventProfileDetail.title}
-
- {t('eventSignup.eventSignupInvitation.eventDec')}
+ {t('eventSignup.slotTable.eventDec')}
+ :
{eventProfileDetail.eventProfileDetail.description}
-
- {t('eventSignup.eventSignupInvitation.eventLocation')}
+ {t('eventSignup.slotTable.eventLocation')}
+ :
{eventProfileDetail.eventProfileDetail.location.address}
+ {eventProfileDetail.eventProfileDetail.eventSlotsList.length === 1 &&
+ <>
+ -
+
+ {t('eventSignup.timezone')}
+ :
+ {eventProfileDetail.eventProfileDetail.timezone}
+
+
+ -
+
+ {t('eventSignup.slotTable.startTime')}
+ :
+
+ {moment(eventProfileDetail.eventProfileDetail.eventSlotsList[0].startDate + " " + eventProfileDetail.eventProfileDetail.eventSlotsList[0].startTime).format("DD-MMM-YYYY hh:mm A")}
+
+
+
+ -
+
+ {t('eventSignup.slotTable.endTime')}
+ :
+
+ {moment(eventProfileDetail.eventProfileDetail.eventSlotsList[0].endDate + " " + eventProfileDetail.eventProfileDetail.eventSlotsList[0].endTime).format("DD-MMM-YYYY hh:mm A")}
+
+
+
+ >
+ }
- {/*
{t('eventSignup.eventSignupInvitation.eventSlotHeading')}
*/}
-
-
-
- | {t('eventSignup.slotTable.title')} |
- {t('eventSignup.eventSignupInvitation.dateTime')} ({eventProfileDetail.eventProfileDetail.timezone}) |
- {eventProfileDetail.eventProfileDetail.eventSlotsList.length > 1 &&
+ {eventProfileDetail.eventProfileDetail.eventSlotsList.length > 1 &&
+
+
+
+ | {t('eventSignup.slotTable.title')} |
+ {t('eventSignup.eventSignupInvitation.dateTime')} ({eventProfileDetail.eventProfileDetail.timezone}) |
+ {/* {eventProfileDetail.eventProfileDetail.eventSlotsList.length > 1 &&
|
- }
- {/* {t('eventSignup.slotTable.endDateTime')} | */}
-
-
-
-
+ } */}
+ {/* {t('eventSignup.slotTable.endDateTime')} | */}
+
+
+
+
+ }
{this.state.isUserLogin ?
{t('eventSignup.eventSignupInvitation.addCommentHeading')}
:
{t('eventSignup.eventSignupInvitation.addNameCommentHeading')}
}
+ {this.state.isUpdateEvent &&
+
+
+
+ }
{/*
*/}
{/*
{/* */}
-
-
-
+
+
+
:
@@ -401,6 +498,7 @@ class InvitationScreen extends PureComponent {
}
+
@@ -417,6 +515,7 @@ class InvitationScreen extends PureComponent {
{this.state.msgText}
+
@@ -436,10 +535,33 @@ function TimeslotRows(props) {
list = props.datalist.map(function (v, k) {
return
- | {v.title} |
- Start : {moment(v.startDate + " " + v.startTime).format("DD-MMM-YYYY hh:mm A")}
- End : {moment(v.endDate + " " + v.endTime).format("DD-MMM-YYYY hh:mm A")} |
- {props.datalist.length > 1 &&
+ {v.title} |
+
+
+
+ Start : {moment(v.startDate + " " + v.startTime).format("DD-MMM-YYYY hh:mm A")}
+
+ End :
+ {moment(v.endDate + " " + v.endTime).format("DD-MMM-YYYY hh:mm A")}
+
+
+
+ {props.datalist.length > 1 &&
+
+ Signup
+ { props.handleSlotSelection(e, v.eventSlotId) }}
+ icon={ }
+ checkedIcon={ }
+ indeterminateIcon={ } />
+
+ }
+
+
+ |
+ {/* {props.datalist.length > 1 &&
Signup
@@ -452,7 +574,7 @@ function TimeslotRows(props) {
indeterminateIcon={  } />
|
- }
+ } */}
});
diff --git a/src/containers/EventInvitation/InvitationScreenStyle.js b/src/containers/EventInvitation/InvitationScreenStyle.js
index 5b23e5f895764f82c9096627cc6bd9888a228396..c2854747344eb6ae945a2139db5cf78645db61ad 100644
--- a/src/containers/EventInvitation/InvitationScreenStyle.js
+++ b/src/containers/EventInvitation/InvitationScreenStyle.js
@@ -252,22 +252,38 @@ export default (
},
eventItem: {
color: "#34373c",
- padding: "4px 10px",
+ padding: "4px 10px 4px 0",
textAlign: 'left',
overflow: 'hidden',
},
+ absoluteLoaderWrap: {
+ position: 'absolute',
+ top: '50%',
+ left: '50%',
+ margin: '-83px 0 0 -35px'
+ },
+ loadingSpinner: {
+ marginTop: 180
+ },
+ msgContentBox: {
+ textAlign: "center",
+ position: "absolute",
+ right: 0,
+ left: 0,
+ margin: "auto",
+ top: 0,
+ overflow: "hidden",
+ height: "90px",
+ transform: "translateY(35vh)",
+ },
tableStriped: {
- display: "block",
- // width: "100%",
borderCollapse: "collapse",
borderSpacing: "2px",
fontSize: "13px",
color: theme.palette.themeColors.table.color,
border: "1px solid #454d55",
overflowX: 'auto',
- // display:'block',
- width: ' fit-content',
- maxWidth: '100%',
+ width: '100%',
borderBottom: 'none',
margin: "20px auto 0",
'& tr': {
@@ -296,7 +312,8 @@ export default (
backgroundColor: theme.palette.themeColors.audioVideo.callHeaderColor,
textAlign: "left",
fontSize: '12px',
- color: '#fff',
+ // color: '#fff',
+ color: theme.palette.themeColors.table.color,
fontWeight: '400'
},
'&:nth-of-type(odd)': {
@@ -311,20 +328,20 @@ export default (
fontSize: "14px",
// marginRight: "10px",
display: 'inline-block',
- width: '18%',
+ width: '16%',
float: 'left',
'@media (max-width: 460px)': {
- width: '35%',
+ width: '33%',
},
'@media (min-width: 460px) and (max-width: 600px)': {
- width: '30%',
+ width: '27%',
}
},
eventDes: {
fontSize: "14px",
fontWeight: "600",
display: 'inline-block',
- wordBreak: 'break-all',
+ wordBreak: 'break-word',
verticalAlign: 'top',
width: '81%',
float: 'right',
@@ -438,4 +455,15 @@ export default (
backgroundColor: theme.palette.themeColors.audioVideo.callHeaderColor,
lineHeight: '2.3',
},
+ msgContentBox: {
+ textAlign: "center",
+ position: "absolute",
+ right: 0,
+ left: 0,
+ margin: "auto",
+ top: 0,
+ overflow: "hidden",
+ height: "90px",
+ transform: "translateY(35vh)",
+ }
});
diff --git a/src/core/resource/signupevent/SignupEventSagas.js b/src/core/resource/signupevent/SignupEventSagas.js
index 1ab0c78e597462a910f71970fe978157b8a93503..0106aaa949d5150b589fff603610aaf39246616b 100644
--- a/src/core/resource/signupevent/SignupEventSagas.js
+++ b/src/core/resource/signupevent/SignupEventSagas.js
@@ -88,7 +88,7 @@ function* handleAddparticipantRequest() {
if (res && res.error && !res.data) {
console.error(' ERROR_1: ', res.status);
- yield put(openMessageModalDuration({ text: `${i18n.t('err')}: ${res.status}`, duration: 2000 }));
+ yield put(openMessageModalDuration({ text: `${i18n.t('err')}: ${res.status}`, duration: 5000 }));
yield put(actions.addParticipantsError());
} else if (res && res.data.error) {
console.error('ERROR_2: ', res.data.error, res.data.error.message);
@@ -125,7 +125,7 @@ function* handleRemoveparticipantRequest() {
if (res && res.error && !res.data) {
console.error(' ERROR_1: ', res.status);
- yield put(openMessageModalDuration({ text: `${i18n.t('err')}: ${res.status}`, duration: 2000 }));
+ yield put(openMessageModalDuration({ text: `${i18n.t('err')}: ${res.status}`, duration: 5000 }));
yield put(actions.removeParticipantsError());
} else if (res && res.data.error) {
console.error('ERROR_2: ', res.data.error, res.data.error.message);
diff --git a/src/layouts/EventSignupHistory/EventSignupHistory.js b/src/layouts/EventSignupHistory/EventSignupHistory.js
index 3e9b7fd735f46f28b8a1fe8c9c9b131d78e0b0a5..348613d2cf7ab2a57a382ae0cdb047ecba0bbdf8 100644
--- a/src/layouts/EventSignupHistory/EventSignupHistory.js
+++ b/src/layouts/EventSignupHistory/EventSignupHistory.js
@@ -254,13 +254,13 @@ class EventSignupHistory extends Component {
if (nextProps.removeEventProfileResError.data && nextProps.removeEventProfileResError.data.error) {
this.props.actions.showToast({
text: this.props.t("err") + ":" + nextProps.removeEventProfileResError.data.error.message,
- duration: 2000,
+ duration: 5000,
position: "bottom"
});
} else {
this.props.actions.showToast({
text: this.props.t("err") + ":" + nextProps.removeEventProfileResError.error.status,
- duration: 2000,
+ duration: 5000,
position: "bottom"
});
}
diff --git a/src/layouts/EventSignupInvitation/EventSignupInvitation.js b/src/layouts/EventSignupInvitation/EventSignupInvitation.js
index a4029fc6a1f064d3cffe432b320f6aa05ab046ff..2c6b04dbdfb547ccb2c8923f756edcfd8cb9b8e9 100644
--- a/src/layouts/EventSignupInvitation/EventSignupInvitation.js
+++ b/src/layouts/EventSignupInvitation/EventSignupInvitation.js
@@ -174,14 +174,14 @@ class EventSignupInvitation extends React.Component {
this.props.actions.showToast({
text: this.props.t("err") + ":" + nextProps.updateInvitationResError.data.error.message,
- duration: 2000,
+ duration: 5000,
position: "bottom"
});
} else {
this.props.actions.showToast({
text: this.props.t("err") + ":" + nextProps.updateInvitationResError.error.status,
- duration: 2000,
+ duration: 5000,
position: "bottom"
});
}
diff --git a/src/layouts/EventSignupInvitation/EventSignupInvitation.styles.js b/src/layouts/EventSignupInvitation/EventSignupInvitation.styles.js
index b5c54886cf889adf97144407d21729039d535813..b1cba513b6d3ad7c44d2597eb1cd8ee3a99f819a 100644
--- a/src/layouts/EventSignupInvitation/EventSignupInvitation.styles.js
+++ b/src/layouts/EventSignupInvitation/EventSignupInvitation.styles.js
@@ -292,7 +292,44 @@ export default (theme, contactAvatarImg) => ({
},
+ historyInfoList: {
+ padding: "10px 5px",
+ borderBottom: "1px solid #494949",
+ textOverflow: "ellipsis",
+ cursor:'pointer',
+ '& .historyInfoItem': {
+ display: "flex",
+ justifyContent: "space-between",
+ alignItems: "center",
+ color: theme.palette.themeColors.contactList.personNameColor,
+ fontSize: "12px",
+ '& .leftIcon':{
+ color: "#4c4e52",
+ '& i':{
+ transform: "rotate(-92deg)",
+ marginRight: '3px',
+ fontSize: '6px',
+ }
+ },
+ },
+ '&:hover': {
+ background: theme.palette.themeColors.contactList.hoverBackground
+ },
+ '&.active': {
+ background:theme.palette.themeColors.selectedContent.darkActive,
+ '& .historyInfoItem': {
+ '& .leftIcon':{
+ color:"#fff",
+ },
+ },
+ }
+ },
+ historyInfoContent: {
+ fontWeight: "600",
+ color: "#777",
+ fontSize: "11px",
+ },
invitationInfoItem: {
padding: "10px 5px",
diff --git a/src/layouts/EventSignupNew/EventSignupNew.js b/src/layouts/EventSignupNew/EventSignupNew.js
index b717c4aec600101442307acc1aa9368bfa0a41ae..71852673d8b02f0a776a5ff68fb35d8e200067b3 100644
--- a/src/layouts/EventSignupNew/EventSignupNew.js
+++ b/src/layouts/EventSignupNew/EventSignupNew.js
@@ -579,7 +579,7 @@ class EventSignupNew extends Component {
//check number field isBlank
actions.showToast({
text: t("eventSignup.validateion.requireNumber"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
return;
@@ -602,14 +602,14 @@ class EventSignupNew extends Component {
//check email field isBlank
actions.showToast({
text: t("eventSignup.validateion.requireEmail"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
} else if (!isEmailValid) {
//check email field isValid
actions.showToast({
text: t("eventSignup.validateion.invalidEmail"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
} else {
@@ -892,6 +892,29 @@ class EventSignupNew extends Component {
false
);
} else if (this.state.eventAddFormStep === 3) {
+ console.log('notifyOnUpdate::',this.state,
+ action,
+ eventId,
+ "",
+ "",
+ "",
+ "",
+ [],
+ phase,
+ active,
+ [],
+ [],
+ [],
+ [],
+ scheduleDate,
+ scheduleTime,
+ isSendReminder,
+ isNotifyAdmin,
+ updateSchedule,
+ updateReminder,
+ scheduleTimezone,
+ remindBefore,
+ notifyOnUpdate);
this.saveEventApiCall(
action,
eventId,
@@ -1026,7 +1049,7 @@ class EventSignupNew extends Component {
error = true;
actions.showToast({
text: t("eventSignup.validateion.emptyTitle"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
} else if (
@@ -1036,21 +1059,21 @@ class EventSignupNew extends Component {
error = true;
actions.showToast({
text: t("eventSignup.validateion.lengthTitle"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
} else if (this.state.timezone.value == "") {
error = true;
actions.showToast({
text: t("eventSignup.validateion.emptyTimezone"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
} else if (this.state.location.address == "") {
error = true;
actions.showToast({
text: t("eventSignup.validateion.emptyLocation"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
} else if (this.state.isMultiTimeSlot && fromFunc == "addSlot") {
@@ -1058,7 +1081,7 @@ class EventSignupNew extends Component {
error = true;
actions.showToast({
text: t("eventSignup.validateion.emptySlotTitle"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
} else if (
@@ -1068,20 +1091,20 @@ class EventSignupNew extends Component {
error = true;
actions.showToast({
text: t("eventSignup.validateion.lengthTitleTimeslot"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
} else if (!isStartDateValid) {
actions.showToast({
text: t("correctTime"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
error = true;
} else if (!isEndDateValid) {
actions.showToast({
text: t("endDateErr"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
error = true;
@@ -1089,14 +1112,14 @@ class EventSignupNew extends Component {
} else if (!isStartDateValid) {
actions.showToast({
text: t("correctTime"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
error = true;
} else if (!isEndDateValid) {
actions.showToast({
text: t("endDateErr"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
error = true;
@@ -1106,7 +1129,7 @@ class EventSignupNew extends Component {
) {
actions.showToast({
text: t("eventSignup.validateion.selectTimeslot"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
error = true;
@@ -1117,7 +1140,7 @@ class EventSignupNew extends Component {
if (this.state.reminder.value == '' || this.state.reminder.value == null || this.state.reminder.value == 'no') {
actions.showToast({
text: t("eventSignup.validateion.reminderBefore"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
return true;
@@ -1138,13 +1161,13 @@ class EventSignupNew extends Component {
error = true;
actions.showToast({
text: t("eventSignup.validateion.emptyTimezone"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
} else if (!isScheduleDateValid) {
actions.showToast({
text: t("scheduleDateErr"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
error = true;
@@ -1589,7 +1612,7 @@ class EventSignupNew extends Component {
if (this.state.isDisabledTimes && e.target.checked == undefined) {
actions.showToast({
text: t("eventSignup.validateion.addMultipleSlots"),
- duration: 2000,
+ duration: 5000,
position: "top"
});
} else {
@@ -1905,6 +1928,7 @@ class EventSignupNew extends Component {
isDisabled={isDisabledTimes}
/>
+
({
phase,
active,
nynjaAccountIds,
+ nynjaGroupIds,
emailIds,
mobileNoArr,
scheduleDate,
@@ -2764,6 +2789,7 @@ const mapDispatchToProps = dispatch => ({
phase,
active,
nynjaAccountIds,
+ nynjaGroupIds,
emailIds,
mobileNoArr,
scheduleDate,
diff --git a/src/layouts/EventSignupNew/subcomponents/LocationUpload.js b/src/layouts/EventSignupNew/subcomponents/LocationUpload.js
index 9d6387c62b16127ec4821eb3a76e0b8f0eb1ff0c..0bdb8310e6fa281ad102476d8a53afae248909e6 100644
--- a/src/layouts/EventSignupNew/subcomponents/LocationUpload.js
+++ b/src/layouts/EventSignupNew/subcomponents/LocationUpload.js
@@ -28,7 +28,8 @@ class LocationUpload extends Component {
places: {},
selectedPlace: '',
searchedPlace: '',
- latlng: {lat: '', lng: ''}
+ latlng: {lat: '', lng: ''},
+ myLocLatlng: {lat: '', lng: ''},
};
this.coordinates = defaultCoords;
this.myLocation;
@@ -88,6 +89,7 @@ class LocationUpload extends Component {
this.myLocation = this.coordinates;
}
//this.myLocation = this.coordinates;
+ this.setState({ latlng: this.myLocation, myLocLatlng: { lat: crd.coords.latitude, lng: crd.coords.longitude } });
this.placeMarkerAndPanTo(this.myLocation);
this.map.setZoom(locationEnabledZoom);
}
@@ -97,7 +99,7 @@ class LocationUpload extends Component {
}
initMap = (latLng) => {
- console.log('CCC',latLng);
+ console.log('Default Latlng',latLng);
const mapZoom = this.myLocation ? locationEnabledZoom : defaultZoom;
this.geocoder = new google.maps.Geocoder;
this.map = new google.maps.Map(document.getElementById('googleMaps'), {
@@ -116,6 +118,10 @@ class LocationUpload extends Component {
});
this.mapDragEndListener = this.map.addListener('dragend', () => {
+ console.log(
+ 'dragend',
+ {lat: this.map.center.lat(), lng: this.map.center.lng()},
+ );
this.setState({ latlng: {lat: this.map.center.lat(), lng: this.map.center.lng()} });
this.placeMarkerAndPanTo({ lat: this.map.center.lat(), lng: this.map.center.lng() });
});
@@ -250,26 +256,27 @@ class LocationUpload extends Component {
this.setMarker(this.coordinates);
}
- handleSend = () => {
+ handleSend = (type) => {
const { actions, pageFrom, handleClick } = this.props;
- const { selectedPlace, places, latlng } = this.state;
+ const { selectedPlace, places, latlng, myLocLatlng } = this.state;
const placeToSend = places[selectedPlace];
if(placeToSend){
handleClick(placeToSend);
} else {
+ const locLatLng = (type=='select') ? {lat: parseFloat(latlng.lat), lng: parseFloat(latlng.lng)} : {lat: parseFloat(myLocLatlng.lat), lng: parseFloat(myLocLatlng.lng)};
this.geocoder.geocode({
- 'location': {lat: parseFloat(latlng.lat), lng: parseFloat(latlng.lng)}
+ 'location': locLatLng
}, function (results, status) {
console.log('--RESULT--');
console.log(results);
- console.log(latlng);
+ console.log(locLatLng);
console.log('--RESULT--');
if (status === 'OK') {
- if (results[1]) {
+ if (results[0]) {
const placeObj = {
- placeId: results[1].place_id,
+ placeId: results[0].place_id,
placeName: '',
- placeAddress: results[1].formatted_address,
+ placeAddress: results[0].formatted_address,
placeIcon: '',
placeLat: latlng.lat,
placeLng: latlng.lng,
@@ -340,7 +347,7 @@ class LocationUpload extends Component {
}