Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
25
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'bug/even-more-fixes' into 'master'

Browse Source 
Hide some fields and fix datetime issue

Closes #168

See merge request framasoft/mobilizon!229
This commit is contained in:
Thomas Citharel 2019-10-09 13:54:45 +02:00
commit 502d6b6afd
2 changed files with 55 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/src/components/Event/DateTimePicker.vue
View File

@ -40,8 +40,12 @@ export default class DateTimePicker extends Vue {
date: Date = this.value;
time: string = '00:00';
created() {
let minutes = this.value.getHours() * 60 + this.value.getMinutes();
mounted() {
this.convertTime();
}
convertTime() {
let minutes = this.date.getHours() * 60 + this.date.getMinutes();
minutes = Math.ceil(minutes / this.step) * this.step;
this.time = [Math.floor(minutes / 60), minutes % 60].map((v) => { return v < 10 ? `0${v}` : v; }).join(':');
@ -57,15 +61,22 @@ export default class DateTimePicker extends Vue {
@Watch('date')
updateDate() {
this.updateDateTime();
this.updateTime(this.time);
}
@Watch('value')
updateValue() {
this.date = this.value;
this.convertTime();
}
updateDateTime() {
/**
* Returns the updated date
*
* @type {DateTime}
* @type {Date}
*/
console.log('updated this.date with', this.date);
this.$emit('input', this.date);
}
}

80
js/src/views/Event/Edit.vue
View File

@ -67,13 +67,13 @@ import {ParticipantRole} from "@/types/event.model";
{{ $t('Only accessible through link and search (private)') }}
</b-radio>
</div>
<div class="field">
<!-- <div class="field">
<b-radio v-model="event.visibility"
name="eventVisibility"
:native-value="EventVisibility.PRIVATE">
{{ $t('Page limited to my group (asks for auth)') }}
</b-radio>
</div>
</div> -->
<div class="field">
<label class="label">{{ $t('Participation approval') }}</label>
@ -83,16 +83,17 @@ import {ParticipantRole} from "@/types/event.model";
</div>
<div class="field">
<label class="label">{{ $t('Number of places') }}</label>
<b-switch v-model="limitedPlaces">
{{ $t('Limited places') }}
{{ $t('Limited number of places') }}
</b-switch>
</div>
<div class="box" v-if="limitedPlaces">
<b-field :label="$t('Number of places')">
<b-numberinput v-model="event.options.maximumAttendeeCapacity"></b-numberinput>
<b-numberinput controls-position="compact" min="0" v-model="event.options.maximumAttendeeCapacity"></b-numberinput>
</b-field>
<!--
<b-field>
<b-switch v-model="event.options.showRemainingAttendeeCapacity">
{{ $t('Show remaining number of places') }}
@ -103,10 +104,10 @@ import {ParticipantRole} from "@/types/event.model";
<b-switch v-model="event.options.showParticipationPrice">
{{ $t('Display participation price') }}
</b-switch>
</b-field>
</b-field> -->
</div>
<h2 class="subtitle">
<!-- <h2 class="subtitle">
{{ $t('Public comment moderation') }}
</h2>
@ -134,7 +135,7 @@ import {ParticipantRole} from "@/types/event.model";
:native-value="CommentModeration.CLOSED">
{{ $t('Close comments for all (except for admins)') }}
</b-radio>
</div>
</div> -->
<h2 class="subtitle">
{{ $t('Status') }}
@ -361,21 +362,22 @@ export default class EditEvent extends Vue {
}
async createEvent() {
try {
const { data } = await this.$apollo.mutate({
mutation: CREATE_EVENT,
variables: this.buildVariables(),
update: (store, { data: { createEvent } }) => this.postCreateOrUpdate(store, createEvent),
refetchQueries: ({ data: { createEvent } }) => this.postRefetchQueries(createEvent),
});
console.log(this.buildVariables());
// try {
// const { data } = await this.$apollo.mutate({
// mutation: CREATE_EVENT,
// variables: this.buildVariables(),
// update: (store, { data: { createEvent } }) => this.postCreateOrUpdate(store, createEvent),
// refetchQueries: ({ data: { createEvent } }) => this.postRefetchQueries(createEvent),
// });
await this.$router.push({
name: 'Event',
params: { uuid: data.createEvent.uuid },
});
} catch (err) {
console.error(err);
}
// await this.$router.push({
// name: 'Event',
// params: { uuid: data.createEvent.uuid },
// });
// } catch (err) {
// console.error(err);
// }
}
async updateEvent() {
@ -526,24 +528,22 @@ export default class EditEvent extends Vue {
return JSON.stringify(this.event.toEditJSON()) !== JSON.stringify(this.unmodifiedEvent);
}
// getAddressData(addressData) {
// if (addressData !== null) {
// this.event.address = {
// geom: {
// data: {
// latitude: addressData.latitude,
// longitude: addressData.longitude
// },
// type: "point"
// },
// addressCountry: addressData.country,
// addressLocality: addressData.locality,
// addressRegion: addressData.administrative_area_level_1,
// postalCode: addressData.postal_code,
// streetAddress: `${addressData.street_number} ${addressData.route}`
// };
// }
// }
get beginsOn() { return this.event.beginsOn; }
@Watch('beginsOn')
onBeginsOnChanged(beginsOn) {
console.log('beginsOnWatcher', beginsOn);
if (!this.event.endsOn) return;
const dateBeginsOn = new Date(beginsOn);
const dateEndsOn = new Date(this.event.endsOn);
if (dateEndsOn < dateBeginsOn) {
this.event.endsOn = dateBeginsOn;
this.event.endsOn.setUTCHours(dateEndsOn.getUTCHours());
}
if (dateEndsOn === dateBeginsOn) {
this.event.endsOn.setUTCHours(dateEndsOn.getUTCHours() + 1);
}
}
}
</script>