Skip to content

fix: Problem with time selector after TimeZone #3490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 31, 2019
Merged

fix: Problem with time selector after TimeZone #3490

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db327a3
Problem with time selector after TimeZone
kushthedude Aug 29, 2019
0de48af
Merge branch 'development' into time
kushthedude Aug 29, 2019
b62a223
Merge branch 'development' into time
kushthedude Aug 29, 2019
959823f
Merge branch 'development' into time
abhinavk96 Aug 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions app/components/forms/wizard/basic-details-step.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ import Component from '@ember/component';
import { later } from '@ember/runloop';
import { observer, computed } from '@ember/object';
import moment from 'moment';
import { merge } from 'lodash-es';
import { merge, orderBy, filter, find } from 'lodash-es';
import { licenses } from 'open-event-frontend/utils/dictionary/licenses';
import { timezones } from 'open-event-frontend/utils/dictionary/date-time';
import { paymentCountries, paymentCurrencies } from 'open-event-frontend/utils/dictionary/payment';
import { countries } from 'open-event-frontend/utils/dictionary/demography';
import FormMixin from 'open-event-frontend/mixins/form';
import { orderBy, filter, find } from 'lodash-es';
import { inject as service } from '@ember/service';
import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
import { protocolLessValidUrlPattern } from 'open-event-frontend/utils/validators';
Expand Down Expand Up @@ -87,6 +86,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
}
});
}

return validationRules;
}),

Expand All @@ -99,6 +99,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
if (!this.get('data.event.topic')) {
return [];
}

return this.get('data.event.topic.subTopics');
}),

Expand Down Expand Up @@ -130,6 +131,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
let endDatetime = moment(this.get('data.event.endsAt'));
return (endDatetime.diff(startDatetime, 'minutes') > 0);
};

let validationRules = {
inline : true,
delay : false,
Expand Down Expand Up @@ -446,6 +448,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
if (!this.isCreate && isNewTax) {
this.set('data.event.tax', this.store.createRecord('tax'));
}

this.set('taxModalIsOpen', true);
},

Expand All @@ -465,6 +468,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
this.set('discountCodeValue', '25%');
this.set('discountCodePeriod', '5');
}

this.set('validatingDiscountCode', false);
}, 1000);
},
Expand All @@ -479,15 +483,16 @@ export default Component.extend(FormMixin, EventWizardMixin, {
});
},

updateDates() {
const { startsAtDate, endsAtDate, startsAtTime, endsAtTime, timezone } = this.get('data.event');
let startsAtConcatenated = moment(startsAtDate.concat(' ', startsAtTime));
let endsAtConcatenated = moment(endsAtDate.concat(' ', endsAtTime));
this.get('data.event').setProperties({
startsAt : moment.tz(startsAtConcatenated, timezone),
endsAt : moment.tz(endsAtConcatenated, timezone)
});
},
// leaving these comments.. because someday we might want the time validation to change it's values according to its start counterpart, removed it for now because it sort of broke the UI.
// updateDates() {
// const { startsAtDate, endsAtDate, startsAtTime, endsAtTime, timezone } = this.get('data.event');
// let startsAtConcatenated = moment(startsAtDate.concat(' ', startsAtTime));
// let endsAtConcatenated = moment(endsAtDate.concat(' ', endsAtTime));
// this.get('data.event').setProperties({
// startsAt : moment.tz(startsAtConcatenated, timezone),
// endsAt : moment.tz(endsAtConcatenated, timezone)
// });
// },

async updateCopyright(name) {
const event = this.get('data.event');
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/forms/wizard/basic-details-step.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</div>
<div class="five wide field">
<label class="required" for="timezone">{{t 'Timezone'}}</label>
{{#ui-dropdown class='search selection' selected=data.event.timezone onChange=(action 'updateDates') forceSelection=false fullTextSearch=true}}
{{#ui-dropdown class='search selection' selected=data.event.timezone forceSelection=false fullTextSearch=true}}
{{input type='hidden' id='timezone' value=data.event.timezone}}
<i class="dropdown icon"></i>
<div class="default text">{{t 'Select timezone'}}</div>
Expand Down