From ea44436d9821185222c0e8a579fcb89b04bb0d40 Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Mon, 25 May 2020 20:36:28 +0530 Subject: [PATCH 1/9] updated some text related to signup event --- src/assets/languages/en.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/assets/languages/en.json b/src/assets/languages/en.json index 3d8263269..a4558b001 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,14 @@ "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" }, "eventSignupHistory": { "tabs": { -- GitLab From c0ecb25c044fd373e5164daf963162e012ba50db Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Mon, 25 May 2020 20:37:45 +0530 Subject: [PATCH 2/9] fix some bugs in ui and functionality --- .../SignupEventHistoryRightPanel.js | 3 +- .../SignupEventInvitationRightPanel.js | 131 +++++++++++------- .../EventSignupHistory/EventSignupHistory.js | 4 +- .../EventSignupInvitation.js | 4 +- .../EventSignupInvitation.styles.js | 37 +++++ 5 files changed, 122 insertions(+), 57 deletions(-) diff --git a/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryRightPanel/SignupEventHistoryRightPanel.js b/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryRightPanel/SignupEventHistoryRightPanel.js index 49af1c47c..47155abe4 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 856e1b405..9583f4d56 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')}
    - - - - - - - {(isShowEdit && currentEventInvitation.event.eventSlotsList.length > 1) && - - } - {/* */} - - - - {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 ( - - - + {currentEventInvitation.slotIdList.length === 0 ? + +
    +
      +
    • +
      +
      {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")}
      +
      +
    • +
    +
    + : +
    +
    {t('eventSignup.slotTable.title')}{t('eventSignup.eventSignupInvitation.dateTime')} ({currentEventInvitation.event.timezone}){t('eventSignup.slotTable.endDateTime')}
    {title}Start : {moment(startDate + " " + startTime).format("DD-MMM-YYYY hh:mm A")}
    - End : {moment(endDate + " " + endTime).format("DD-MMM-YYYY hh:mm A")}
    + + + + + {(isShowEdit && currentEventInvitation.event.eventSlotsList.length > 1) && - + } + {/* */} - ) - }) - } - -
    {t('eventSignup.slotTable.title')}{t('eventSignup.eventSignupInvitation.dateTime')} ({currentEventInvitation.event.timezone}) - { this.handleSlotSelection(e, slotId) }} - icon={} - checkedIcon={} - indeterminateIcon={} /> - {t('eventSignup.slotTable.endDateTime')}
    + + + {slotList.map((slot, index) => { + + console.log("slot ", slot); + console.log("slot details ", state.eventSlotDetails[slot]); + console.log(""); + + const title = isShowEdit2 ? slot.title : state.eventSlotDetails[slot].title; + const startDate = isShowEdit2 ? slot.startDate : state.eventSlotDetails[slot].startDate; + const startTime = isShowEdit2 ? slot.startTime : state.eventSlotDetails[slot].startTime; + const endDate = isShowEdit2 ? slot.endDate : state.eventSlotDetails[slot].endDate; + const endTime = isShowEdit2 ? slot.endTime : state.eventSlotDetails[slot].endTime; + const slotId = isShowEdit2 ? 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")} + {(isShowEdit && currentEventInvitation.event.eventSlotsList.length > 1) && + + { this.handleSlotSelection(e, slotId) }} + icon={} + checkedIcon={} + indeterminateIcon={} /> + + } + + ) + }) + } + + +
    + }
    diff --git a/src/layouts/EventSignupHistory/EventSignupHistory.js b/src/layouts/EventSignupHistory/EventSignupHistory.js index 3e9b7fd73..348613d2c 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 a4029fc6a..2c6b04dbd 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 b5c54886c..b1cba513b 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", -- GitLab From 65b9fb45ca7dcf222a00b063990ad77a835a5e76 Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Mon, 25 May 2020 20:38:10 +0530 Subject: [PATCH 3/9] fix location selection issue --- src/layouts/EventSignupNew/EventSignupNew.js | 62 +++++++++++++------ .../subcomponents/LocationUpload.js | 31 ++++++---- 2 files changed, 64 insertions(+), 29 deletions(-) diff --git a/src/layouts/EventSignupNew/EventSignupNew.js b/src/layouts/EventSignupNew/EventSignupNew.js index b717c4aec..71852673d 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 9d6387c62..0bdb8310e 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 { } - + -- GitLab From 5c5caeb6a612127325c5afa4f2aff8f012f93748 Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Mon, 25 May 2020 20:38:38 +0530 Subject: [PATCH 4/9] added some changes related to ui --- .../EventInvitation/InvitationScreen.js | 123 +++++++++++++++--- .../EventInvitation/InvitationScreenStyle.js | 42 +++++- 2 files changed, 138 insertions(+), 27 deletions(-) diff --git a/src/containers/EventInvitation/InvitationScreen.js b/src/containers/EventInvitation/InvitationScreen.js index ecc482d40..5313a1596 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,21 @@ 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(); + 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 +149,7 @@ class InvitationScreen extends PureComponent { // duration: 2000, // position: "bottom" // }); - + this.setState({ responseText: this.props.t("eventSignup.updateInvitationErrorMsg"), isEventSubmited: true @@ -146,6 +159,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 +175,7 @@ class InvitationScreen extends PureComponent { } else { this.props.actions.showToast({ text: this.props.t("eventSignup.updateInvitationErrorMsg"), - duration: 2000, + duration: 5000, position: "bottom" }); } @@ -165,6 +183,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 +242,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 +320,13 @@ class InvitationScreen extends PureComponent {
} {this.state.isEventSubmited ? -
+

{this.state.responseText}

+ {this.state.isUserLogin && + + {t('eventSignup.goToDashboard')} + + }
: @@ -328,11 +360,11 @@ class InvitationScreen extends PureComponent { - - - {eventProfileDetail.eventProfileDetail.eventSlotsList.length > 1 && + + + {/* {eventProfileDetail.eventProfileDetail.eventSlotsList.length > 1 && - } + } */} {/* */} @@ -344,6 +376,11 @@ class InvitationScreen extends PureComponent { :

{t('eventSignup.eventSignupInvitation.addNameCommentHeading')}

} + {this.state.isUpdateEvent && +
+ +
+ }
{/* */} {/*
{/* */} - - - + + +
: @@ -401,6 +459,7 @@ class InvitationScreen extends PureComponent { } + @@ -417,6 +476,7 @@ class InvitationScreen extends PureComponent { {this.state.msgText} + @@ -436,10 +496,33 @@ function TimeslotRows(props) { list = props.datalist.map(function (v, k) { return - - - {props.datalist.length > 1 && + + + {/* {props.datalist.length > 1 && - } + } */} }); diff --git a/src/containers/EventInvitation/InvitationScreenStyle.js b/src/containers/EventInvitation/InvitationScreenStyle.js index 5b23e5f89..d3c7d7d7a 100644 --- a/src/containers/EventInvitation/InvitationScreenStyle.js +++ b/src/containers/EventInvitation/InvitationScreenStyle.js @@ -256,18 +256,34 @@ export default ( 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)': { @@ -324,7 +341,7 @@ export default ( 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)", + } }); -- GitLab From caf0537720c83c148bf757abc9ffa7bf70225500 Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Mon, 25 May 2020 20:39:05 +0530 Subject: [PATCH 5/9] updated create event function --- src/core/resource/signupevent/SignupEventSagas.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/resource/signupevent/SignupEventSagas.js b/src/core/resource/signupevent/SignupEventSagas.js index 1ab0c78e5..0106aaa94 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); -- GitLab From db2220bcd7e99b7d3b244f5a35949029e6ab96dd Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Tue, 26 May 2020 14:24:15 +0530 Subject: [PATCH 6/9] fix ui related issue --- src/containers/EventInvitation/InvitationScreen.js | 8 +++++++- src/containers/EventInvitation/InvitationScreenStyle.js | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/containers/EventInvitation/InvitationScreen.js b/src/containers/EventInvitation/InvitationScreen.js index 5313a1596..95e36e326 100644 --- a/src/containers/EventInvitation/InvitationScreen.js +++ b/src/containers/EventInvitation/InvitationScreen.js @@ -119,7 +119,13 @@ class InvitationScreen extends PureComponent { }); } - let currentTime = moment().valueOf(); + 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); diff --git a/src/containers/EventInvitation/InvitationScreenStyle.js b/src/containers/EventInvitation/InvitationScreenStyle.js index d3c7d7d7a..9f7c41f0d 100644 --- a/src/containers/EventInvitation/InvitationScreenStyle.js +++ b/src/containers/EventInvitation/InvitationScreenStyle.js @@ -252,7 +252,7 @@ export default ( }, eventItem: { color: "#34373c", - padding: "4px 10px", + padding: "4px 10px 4px 0", textAlign: 'left', overflow: 'hidden', }, -- GitLab From 1434d862d8ad0758449e549772549e698fe81c6f Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Tue, 26 May 2020 15:21:43 +0530 Subject: [PATCH 7/9] updated signup invitation right panel --- .../SignupEventInvitationRightPanel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js index 9583f4d56..8e5b90b07 100644 --- a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js +++ b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js @@ -57,7 +57,7 @@ class SignupEventInvitationRightPanel extends React.Component {
{t('eventSignup.viewEventSlot')}
- {currentEventInvitation.slotIdList.length === 0 ? + {currentEventInvitation.slotIdList.length === 0 || currentEventInvitation.event.eventSlotsList.length === 1 ?
    -- GitLab From 3d6ea69239719f23831761ef06c1ca51ac8abced Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Tue, 26 May 2020 17:48:29 +0530 Subject: [PATCH 8/9] added some text for signup invitation --- src/assets/languages/en.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/assets/languages/en.json b/src/assets/languages/en.json index a4558b001..e0a407576 100644 --- a/src/assets/languages/en.json +++ b/src/assets/languages/en.json @@ -1589,7 +1589,12 @@ "heading": "Time Slots", "title": "Title", "startDateTime": "Start Date & Time", - "endDateTime": "End Date & Time" + "endDateTime": "End Date & Time", + "startTime":"Start Time", + "endTime":"End Time", + "eventName": "Title ", + "eventDec": "Description", + "eventLocation": "Location" }, "eventSignupHistory": { "tabs": { -- GitLab From 20e3eb27dc5fbb3ad3221a3cf22edc2c4fa20f1b Mon Sep 17 00:00:00 2001 From: Chetna Joshi Date: Tue, 26 May 2020 17:49:41 +0530 Subject: [PATCH 9/9] updated ui of event slot --- .../EventInvitation/InvitationScreen.js | 63 ++++++++++++++----- .../EventInvitation/InvitationScreenStyle.js | 6 +- 2 files changed, 51 insertions(+), 18 deletions(-) diff --git a/src/containers/EventInvitation/InvitationScreen.js b/src/containers/EventInvitation/InvitationScreen.js index 95e36e326..b9a11717a 100644 --- a/src/containers/EventInvitation/InvitationScreen.js +++ b/src/containers/EventInvitation/InvitationScreen.js @@ -343,39 +343,72 @@ 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}){t('eventSignup.slotTable.title')}{t('eventSignup.eventSignupInvitation.dateTime')} ({eventProfileDetail.eventProfileDetail.timezone}){t('eventSignup.slotTable.endDateTime')}
{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")}
{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={} /> +
+ } + +
+
Signup @@ -452,7 +535,7 @@ function TimeslotRows(props) { indeterminateIcon={} />
- - - - - {/* {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.title')}{t('eventSignup.eventSignupInvitation.dateTime')} ({eventProfileDetail.eventProfileDetail.timezone}){t('eventSignup.slotTable.endDateTime')}
+ {/* {t('eventSignup.slotTable.endDateTime')} */} + + + + + } {this.state.isUserLogin ?

{t('eventSignup.eventSignupInvitation.addCommentHeading')}

diff --git a/src/containers/EventInvitation/InvitationScreenStyle.js b/src/containers/EventInvitation/InvitationScreenStyle.js index 9f7c41f0d..c28547473 100644 --- a/src/containers/EventInvitation/InvitationScreenStyle.js +++ b/src/containers/EventInvitation/InvitationScreenStyle.js @@ -328,13 +328,13 @@ 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: { -- GitLab