Merge minor edits from development.
All checks were successful
Build BAB Application Deployment Artifact / build (push) Successful in 2m30s
All checks were successful
Build BAB Application Deployment Artifact / build (push) Successful in 2m30s
This commit is contained in:
@@ -55,11 +55,13 @@
|
|||||||
v-model="selectedDate"
|
v-model="selectedDate"
|
||||||
:model-resources="boatStore.boats"
|
:model-resources="boatStore.boats"
|
||||||
resource-key="id"
|
resource-key="id"
|
||||||
resource-label="name"
|
resource-label="displayName"
|
||||||
:interval-start="12"
|
resource-width="32"
|
||||||
:interval-count="36"
|
:interval-start="6"
|
||||||
:interval-minutes="30"
|
:interval-count="18"
|
||||||
|
:interval-minutes="60"
|
||||||
cell-width="48"
|
cell-width="48"
|
||||||
|
style="--calendar-resources-width: 48px"
|
||||||
resource-min-height="40"
|
resource-min-height="40"
|
||||||
animated
|
animated
|
||||||
bordered
|
bordered
|
||||||
@@ -79,8 +81,8 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #resource-label="{ scope: { resource } }">
|
<template #resource-label="{ scope: { resource } }">
|
||||||
<div class="col-12">
|
<div class="col-12 .col-md-auto">
|
||||||
{{ resource.name }}
|
{{ resource.displayName }}
|
||||||
<q-icon v-if="resource.defects" name="warning" color="warning" />
|
<q-icon v-if="resource.defects" name="warning" color="warning" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -98,7 +100,6 @@
|
|||||||
><template v-slot:append><q-icon name="timelapse" /></template></q-select
|
><template v-slot:append><q-icon name="timelapse" /></template></q-select
|
||||||
></q-card-section>
|
></q-card-section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
import {
|
import {
|
||||||
@@ -114,6 +115,7 @@ import { Boat, useBoatStore } from 'src/stores/boat';
|
|||||||
import { useScheduleStore } from 'src/stores/schedule';
|
import { useScheduleStore } from 'src/stores/schedule';
|
||||||
import { date } from 'quasar';
|
import { date } from 'quasar';
|
||||||
import { computed } from 'vue';
|
import { computed } from 'vue';
|
||||||
|
import type { StatusTypes } from 'src/stores/schedule';
|
||||||
|
|
||||||
const durations = [1, 1.5, 2, 2.5, 3, 3.5, 4];
|
const durations = [1, 1.5, 2, 2.5, 3, 3.5, 4];
|
||||||
|
|
||||||
@@ -179,7 +181,7 @@ function getStyle(event: {
|
|||||||
left: number;
|
left: number;
|
||||||
width: number;
|
width: number;
|
||||||
title: string;
|
title: string;
|
||||||
status: 'tentative' | 'confirmed' | 'pending';
|
status: StatusTypes;
|
||||||
}) {
|
}) {
|
||||||
return {
|
return {
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { defineStore } from 'pinia';
|
|||||||
export interface Boat {
|
export interface Boat {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
|
displayName?: string;
|
||||||
class?: string;
|
class?: string;
|
||||||
year?: number;
|
year?: number;
|
||||||
imgsrc?: string;
|
imgsrc?: string;
|
||||||
@@ -27,6 +28,7 @@ const getSampleData = () => [
|
|||||||
{
|
{
|
||||||
id: 1,
|
id: 1,
|
||||||
name: 'ProjectX',
|
name: 'ProjectX',
|
||||||
|
displayName: 'PX',
|
||||||
class: 'J/27',
|
class: 'J/27',
|
||||||
year: 1981,
|
year: 1981,
|
||||||
imgsrc: '/tmpimg/j27.png',
|
imgsrc: '/tmpimg/j27.png',
|
||||||
@@ -52,6 +54,7 @@ and rough engine performance.`,
|
|||||||
{
|
{
|
||||||
id: 2,
|
id: 2,
|
||||||
name: 'Take5',
|
name: 'Take5',
|
||||||
|
displayName: 'T5',
|
||||||
class: 'J/27',
|
class: 'J/27',
|
||||||
year: 1985,
|
year: 1985,
|
||||||
imgsrc: '/tmpimg/j27.png',
|
imgsrc: '/tmpimg/j27.png',
|
||||||
@@ -60,6 +63,7 @@ and rough engine performance.`,
|
|||||||
{
|
{
|
||||||
id: 3,
|
id: 3,
|
||||||
name: 'WeeBeestie',
|
name: 'WeeBeestie',
|
||||||
|
displayName: 'WB',
|
||||||
class: 'Capri 25',
|
class: 'Capri 25',
|
||||||
year: 1989,
|
year: 1989,
|
||||||
imgsrc: '/tmpimg/capri25.png',
|
imgsrc: '/tmpimg/capri25.png',
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { Boat, useBoatStore } from './boat';
|
|||||||
import { date } from 'quasar';
|
import { date } from 'quasar';
|
||||||
import { DateOptions } from 'quasar';
|
import { DateOptions } from 'quasar';
|
||||||
|
|
||||||
|
export type StatusTypes = 'tentative' | 'confirmed' | 'pending' | undefined;
|
||||||
export interface Reservation {
|
export interface Reservation {
|
||||||
id: number;
|
id: number;
|
||||||
user: string;
|
user: string;
|
||||||
@@ -11,7 +12,7 @@ export interface Reservation {
|
|||||||
end: Date;
|
end: Date;
|
||||||
resource: Boat;
|
resource: Boat;
|
||||||
reservationDate: Date;
|
reservationDate: Date;
|
||||||
status?: string;
|
status?: StatusTypes;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getSampleData(): Reservation[] {
|
function getSampleData(): Reservation[] {
|
||||||
|
|||||||
Reference in New Issue
Block a user