From 33067d74390b1e53f538f9fc3c690a649c72f83e Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Tue, 2 Jun 2020 10:38:07 +0530 Subject: [PATCH 1/3] added some text for singup event --- src/assets/languages/en.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/assets/languages/en.json b/src/assets/languages/en.json index 927e25280..bfc2ec19a 100644 --- a/src/assets/languages/en.json +++ b/src/assets/languages/en.json @@ -1538,10 +1538,13 @@ "requireEmail": "Email is required", "invalidEmail": "Email is invalid", "emptyLocation": "Location is required", - "selectTimeslot": "Please select at least 1 timeslot", + "selectTimeslot": "Please select at least 2 timeslot", "userName": "Please enter your name", "reminderBefore": "Please select reminder", - "addMultipleSlots": "Event time is not editable. Some users have signed up the event" + "addMultipleSlots": "Event time is not editable. Some users have signed up the event", + "participantsReq": "Partcipants are required", + "scheduleDateErr": "Schedule time can't be greater than event start time", + "scheduleDateInvalid": "Schedule time should be greater than current time of selected timezone" }, "modalTitleSave": "Event has been saved successfully", "modalTitlePublish": "Event has been published successfully", @@ -1572,6 +1575,7 @@ "viewRespondedParticipants": "Signup Response", "settings": "Settings", "setReminder": "Send reminder to participants", + "eventReminderMsg": "At time of event", "timezone": "Time Zone", "location": "Location", "scheduledDateTime": "Scheduled Date & Time", -- GitLab From 7cc724ea73006ef16dc483d39a91595199f3f883 Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Tue, 2 Jun 2020 10:38:41 +0530 Subject: [PATCH 2/3] updated history middle panel --- .../SignupEventHistoryMiddlePanel.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryMiddlePanel/SignupEventHistoryMiddlePanel.js b/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryMiddlePanel/SignupEventHistoryMiddlePanel.js index ace233b55..0f8526564 100644 --- a/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryMiddlePanel/SignupEventHistoryMiddlePanel.js +++ b/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryMiddlePanel/SignupEventHistoryMiddlePanel.js @@ -215,16 +215,22 @@ class SignupEventHistoryMiddlePanel extends React.Component { - {(currentEventProfile.eventProfile.remindBefore !== 0 || currentEventProfile.eventProfile.scheduledTs !== 0) && + {(currentEventProfile.eventProfile.remindBefore !== 0 || currentEventProfile.eventProfile.scheduledTs !== 0 || currentEventProfile.eventProfile.reminderTs > 0) &&
{t('eventSignup.settings')}
    - {currentEventProfile.eventProfile.remindBefore !== 0 && + {(currentEventProfile.eventProfile.remindBefore !== 0 || currentEventProfile.eventProfile.reminderTs > 0) &&
  • {t('eventSignup.setReminder')}
    -
    {this.secondsToHms(currentEventProfile.eventProfile.remindBefore)} {'before'}
    + + {currentEventProfile.eventProfile.remindBefore !== 0 && +
    {this.secondsToHms(currentEventProfile.eventProfile.remindBefore)} {'before'}
    + } + {(currentEventProfile.eventProfile.reminderTs > 0 && currentEventProfile.eventProfile.remindBefore === 0) && +
    {t('eventSignup.eventReminderMsg')}
    + }
  • } -- GitLab From 47f8a57cf012979dfd60c1f6c8a70e5668a05540 Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Tue, 2 Jun 2020 10:39:55 +0530 Subject: [PATCH 3/3] added some validation and conditions --- src/layouts/EventSignupNew/EventSignupNew.js | 35 ++++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/src/layouts/EventSignupNew/EventSignupNew.js b/src/layouts/EventSignupNew/EventSignupNew.js index da9c48ea6..9334d358e 100644 --- a/src/layouts/EventSignupNew/EventSignupNew.js +++ b/src/layouts/EventSignupNew/EventSignupNew.js @@ -90,6 +90,7 @@ class EventSignupNew extends Component { calendar: "", isTitleEmptyErr: false, //add by Bheem + isPageLoad: false, isLoader: false, editMode: false, editModeInternalUse: false, @@ -186,8 +187,10 @@ class EventSignupNew extends Component { if (editMode) { if (!isEventProfilePending) { if (eventProfileDetail !== null && eventProfileDetail !== undefined) { - this.setState({ isLoader: false }); - this.setEditData(eventProfileDetail); + this.setState({ isLoader: false, isPageLoad: true }); + if(!this.state.isPageLoad){ + this.setEditData(eventProfileDetail); + } } } return; @@ -1130,7 +1133,7 @@ class EventSignupNew extends Component { error = true; } else if ( this.state.isMultiTimeSlot && - this.state.timeSlotArr.length == 0 + this.state.timeSlotArr.length === 1 ) { actions.showToast({ text: t("eventSignup.validateion.selectTimeslot"), @@ -1140,6 +1143,14 @@ class EventSignupNew extends Component { error = true; } } else if (this.state.eventAddFormStep == 2) { + if (this.state.inviteNumbers.length === 0 && this.state.inviteEmails.length === 0 && this.state.inviteUsers.length === 0 && this.state.inviteGroups.length === 0) { + actions.showToast({ + text: t("eventSignup.validateion.participantsReq"), + duration: 5000, + position: "top" + }); + error = true; + } } else if (this.state.eventAddFormStep == 3) { if (this.state.isReminder) { if (this.state.reminder.value == '' || this.state.reminder.value == null || this.state.reminder.value == 'no') { @@ -1160,6 +1171,7 @@ class EventSignupNew extends Component { countryValue: this.state.scheduleTimezone.value, vMode: this.state.scheduleTimeMode }); + const isScheduleDateValid1 = currentTimeStamp.timeStamp - scheduleTimeStamp.timeStamp <= convertToMs(0, 0, 0); const isScheduleDateValid = scheduleTimeStamp.timeStamp - timeStamp <= convertToMs(0, 15, 0); if (this.state.scheduleTimezone.value == "") { @@ -1169,9 +1181,16 @@ class EventSignupNew extends Component { duration: 5000, position: "top" }); + } else if (!isScheduleDateValid1) { + actions.showToast({ + text: t("eventSignup.validateion.scheduleDateInvalid"), + duration: 5000, + position: "top" + }); + error = true; } else if (!isScheduleDateValid) { actions.showToast({ - text: t("scheduleDateErr"), + text: t("eventSignup.validateion.scheduleDateErr"), duration: 5000, position: "top" }); @@ -1297,9 +1316,11 @@ class EventSignupNew extends Component { //eventSlots = data.eventSlotsList; } - /* ***** start set riminderBefore Obj ***** */ + /* ***** start set reminderBefore Obj ***** */ + let isReminderFlag = false; let reminderObj = { value: "", label: "", ms: 0 }; - if (data.remindBefore > 0) { + if (data.reminderTs > 0 && data.remindBefore >= 0) { + isReminderFlag = true; const reminderMs = data.remindBefore * 1000; this.state.remindMeArr.map(function (v, k) { if (reminderMs == v.ms) { @@ -1380,7 +1401,7 @@ class EventSignupNew extends Component { inviteGroupsTmp: inviteGroups, // step 3 - isReminder: data.remindBefore > 0 ? true : false, + isReminder: isReminderFlag, reminder: reminderObj, isSchedule: scheduleObj.isSchedule, scheduleDate: scheduleObj.scheduleDate, -- GitLab