Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion resources/tailwind-app/components/ActiveStatusCard.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { trans } from 'laravel-vue-i18n';
import { DateTime } from 'luxon';
import { computed, onMounted, onUnmounted, ref } from 'vue';
import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
import { useRouter } from 'vue-router';
import { StopoverResource } from '../../types/Api.gen';
import LineIndicator from '../../vue/components/LineIndicator.vue';
Expand Down Expand Up @@ -50,6 +50,8 @@ function getNextStation() {
}
}

watch(() => state.status, getNextStation);

function format(dateTime: DateTime | null): string {
return dateTime ? dateTime.toFormat('HH:mm') : '';
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { Notyf } from 'notyf';
import { computed, inject, ref } from 'vue';
import { useRouter } from 'vue-router';
import { Api, StatusResource, TripResource } from '../../../types/Api.gen';
import { useActiveCheckin } from '../../../vue/stores/activeCheckin';
import { useUserStore } from '../../../vue/stores/user';
import ReportModal from '../ReportModal.vue';
import TripCopyModal from '../Trip/TripCopyModal.vue';
Expand All @@ -36,6 +37,7 @@ const emit = defineEmits<{
const api = new Api({ baseUrl: window.location.origin + '/api' });
const notyf = inject('notyf') as Notyf;
const userStore = useUserStore();
const activeCheckin = useActiveCheckin();
const router = useRouter();

const busyDepartureNow = ref(false);
Expand Down Expand Up @@ -113,6 +115,7 @@ async function departureNow() {
busyDepartureNow.value = true;
try {
const res = await api.status.updateSingleStatus({ manualDeparture: getNowIso() } as never, props.status.id);
activeCheckin.updateStatus(res.data.data as StatusResource);
emit('status-updated', res.data.data as StatusResource);
} finally {
busyDepartureNow.value = false;
Expand All @@ -123,6 +126,7 @@ async function arrivalNow() {
busyArrivalNow.value = true;
try {
const res = await api.status.updateSingleStatus({ manualArrival: getNowIso() } as never, props.status.id);
activeCheckin.updateStatus(res.data.data as StatusResource);
emit('status-updated', res.data.data as StatusResource);
} finally {
busyArrivalNow.value = false;
Expand Down
3 changes: 3 additions & 0 deletions resources/tailwind-app/components/Status/StatusEditModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
StopoverResource,
} from '../../../types/Api.gen';
import { getDepartureForStatus } from '../../../vue/helpers/DateTimeHelper';
import { useActiveCheckin } from '../../../vue/stores/activeCheckin';
import { ALL_VISIBILITIES, VISIBILITY_ICONS } from '../../helpers/visibility';

const props = defineProps<{
Expand All @@ -28,6 +29,7 @@ const emit = defineEmits<{

const api = new Api({ baseUrl: window.location.origin + '/api' });
const notyf = inject('notyf') as Notyf;
const activeCheckin = useActiveCheckin();

const loading = ref(false);
const stopovers = ref<StopoverResource[]>([]);
Expand Down Expand Up @@ -120,6 +122,7 @@ async function save() {
}

const res = await api.status.updateSingleStatus(updateBody, props.status.id);
activeCheckin.updateStatus(res.data.data as StatusResource);
emit('saved', res.data.data as StatusResource);
} catch {
notyf?.error(trans('generic.error'));
Expand Down
7 changes: 7 additions & 0 deletions resources/vue/stores/activeCheckin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ export const useActiveCheckin = defineStore(
stopovers.value = null;
}

function updateStatus(updated: StatusResource): void {
if (status.value?.id === updated.id) {
status.value = updated;
}
}

async function fetchStopovers(trip: number): Promise<void> {
const response = await api.stopovers.getStopOvers(trip.toString());
if (Object.prototype.hasOwnProperty.call(response.data.data, trip)) {
Expand Down Expand Up @@ -70,6 +76,7 @@ export const useActiveCheckin = defineStore(
error,
refreshed,
reset,
updateStatus,
fetchStopovers,
fetchActiveStatus,
};
Expand Down
Loading