Skip to content

Commit 7ef8165

Browse files
kushthedudeabhinavk96
authored andcommitted
Problem with time selector after TimeZone (#3490)
1 parent 5ca6f29 commit 7ef8165

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

app/components/forms/wizard/basic-details-step.js

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ import Component from '@ember/component';
22
import { later } from '@ember/runloop';
33
import { observer, computed } from '@ember/object';
44
import moment from 'moment';
5-
import { merge } from 'lodash-es';
5+
import { merge, orderBy, filter, find } from 'lodash-es';
66
import { licenses } from 'open-event-frontend/utils/dictionary/licenses';
77
import { timezones } from 'open-event-frontend/utils/dictionary/date-time';
88
import { paymentCountries, paymentCurrencies } from 'open-event-frontend/utils/dictionary/payment';
99
import { countries } from 'open-event-frontend/utils/dictionary/demography';
1010
import FormMixin from 'open-event-frontend/mixins/form';
11-
import { orderBy, filter, find } from 'lodash-es';
1211
import { inject as service } from '@ember/service';
1312
import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
1413
import { protocolLessValidUrlPattern } from 'open-event-frontend/utils/validators';
@@ -87,6 +86,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
8786
}
8887
});
8988
}
89+
9090
return validationRules;
9191
}),
9292

@@ -99,6 +99,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
9999
if (!this.get('data.event.topic')) {
100100
return [];
101101
}
102+
102103
return this.get('data.event.topic.subTopics');
103104
}),
104105

@@ -130,6 +131,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
130131
let endDatetime = moment(this.get('data.event.endsAt'));
131132
return (endDatetime.diff(startDatetime, 'minutes') > 0);
132133
};
134+
133135
let validationRules = {
134136
inline : true,
135137
delay : false,
@@ -446,6 +448,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
446448
if (!this.isCreate && isNewTax) {
447449
this.set('data.event.tax', this.store.createRecord('tax'));
448450
}
451+
449452
this.set('taxModalIsOpen', true);
450453
},
451454

@@ -465,6 +468,7 @@ export default Component.extend(FormMixin, EventWizardMixin, {
465468
this.set('discountCodeValue', '25%');
466469
this.set('discountCodePeriod', '5');
467470
}
471+
468472
this.set('validatingDiscountCode', false);
469473
}, 1000);
470474
},
@@ -479,15 +483,16 @@ export default Component.extend(FormMixin, EventWizardMixin, {
479483
});
480484
},
481485

482-
updateDates() {
483-
const { startsAtDate, endsAtDate, startsAtTime, endsAtTime, timezone } = this.get('data.event');
484-
let startsAtConcatenated = moment(startsAtDate.concat(' ', startsAtTime));
485-
let endsAtConcatenated = moment(endsAtDate.concat(' ', endsAtTime));
486-
this.get('data.event').setProperties({
487-
startsAt : moment.tz(startsAtConcatenated, timezone),
488-
endsAt : moment.tz(endsAtConcatenated, timezone)
489-
});
490-
},
486+
// 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.
487+
// updateDates() {
488+
// const { startsAtDate, endsAtDate, startsAtTime, endsAtTime, timezone } = this.get('data.event');
489+
// let startsAtConcatenated = moment(startsAtDate.concat(' ', startsAtTime));
490+
// let endsAtConcatenated = moment(endsAtDate.concat(' ', endsAtTime));
491+
// this.get('data.event').setProperties({
492+
// startsAt : moment.tz(startsAtConcatenated, timezone),
493+
// endsAt : moment.tz(endsAtConcatenated, timezone)
494+
// });
495+
// },
491496

492497
async updateCopyright(name) {
493498
const event = this.get('data.event');

app/templates/components/forms/wizard/basic-details-step.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</div>
5959
<div class="five wide field">
6060
<label class="required" for="timezone">{{t 'Timezone'}}</label>
61-
{{#ui-dropdown class='search selection' selected=data.event.timezone onChange=(action 'updateDates') forceSelection=false fullTextSearch=true}}
61+
{{#ui-dropdown class='search selection' selected=data.event.timezone forceSelection=false fullTextSearch=true}}
6262
{{input type='hidden' id='timezone' value=data.event.timezone}}
6363
<i class="dropdown icon"></i>
6464
<div class="default text">{{t 'Select timezone'}}</div>

0 commit comments

Comments
 (0)