flohoss/cafe-plaetschwiesle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix swagger deps

Browse source
This commit is contained in:
Florian Hoss 2023-07-04 23:18:05 +02:00
parent 28f068c890
commit f63210272d
28 changed files with 307 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/components/Tables/OrderAmountChange.vue
View file

@ -12,12 +12,12 @@
<script lang="ts">
import { defineComponent, PropType } from "vue";
import { service_Order } from "@/services/openapi";
import { controller_Order } from "@/services/openapi";
export default defineComponent({
name: "OrderAmountChange",
props: {
order: { type: Object as PropType<service_Order>, required: true },
order: { type: Object as PropType<controller_Order>, required: true },
isDisabled: { type: Boolean, default: false },
},
emits: ["incrementOrder", "decrementOrder"],

8
frontend/src/components/Tables/OverviewPerType.vue
View file

@ -13,7 +13,7 @@
<script lang="ts">
import { computed, defineComponent, inject, PropType, ref } from "vue";
import { OrdersService, service_Order } from "@/services/openapi";
import { OrdersService, controller_Order } from "@/services/openapi";
import { convertToEur, generalItemTypeString, generalItemTypeIcon } from "@/utils";
import BaseToolbar from "@/components/UI/BaseToolbar.vue";
import TableOrderCard from "@/components/Tables/TableOrderCard.vue";
@ -24,7 +24,7 @@ export default defineComponent({
name: "OverviewPerType",
components: { TableOrderCard, BaseToolbar, OrderAmountChange },
props: {
orders: { type: Array as PropType<service_Order[]>, default: () => [] },
orders: { type: Array as PropType<controller_Order[]>, default: () => [] },
type: { type: Array as PropType<number[]>, required: true },
},
emits: ["openModal", "getData"],
@ -32,12 +32,12 @@ export default defineComponent({
const OrdersForType = computed(() => props.orders.filter((order) => props.type.includes(order.order_item.item_type)));
const isLoading = inject(loading, ref(false));
function incrementOrder(order: service_Order) {
function incrementOrder(order: controller_Order) {
isLoading.value = true;
OrdersService.postOrders(order.order_item_id, order.table_id).finally(() => emit("getData"));
}
function decrementOrder(order: service_Order) {
function decrementOrder(order: controller_Order) {
isLoading.value = true;
OrdersService.deleteOrders(order.order_item_id, order.table_id).finally(() => emit("getData"));
}

4
frontend/src/components/Tables/TableCard.vue
View file

@ -13,7 +13,7 @@
<script lang="ts">
import { defineComponent, onMounted, onUnmounted, PropType, ref } from "vue";
import { service_Table } from "@/services/openapi";
import { controller_Table } from "@/services/openapi";
import moment from "moment";
import { convertToEur, getCurrentTimeSince } from "@/utils";
import TheBadge from "@/components/UI/TheBadge.vue";
@ -22,7 +22,7 @@ import SmallCard from "@/components/UI/SmallCard.vue";
export default defineComponent({
name: "TableCard",
components: { TheBadge, SmallCard },
props: { table: { type: Object as PropType<service_Table>, required: true } },
props: { table: { type: Object as PropType<controller_Table>, required: true } },
setup(props) {
moment.locale("de");
// eslint-disable-next-line

6
frontend/src/components/Tables/TableOrderCard.vue
View file

@ -11,7 +11,7 @@
<script lang="ts">
import { computed, defineComponent, PropType } from "vue";
import { service_Order, types_ItemType } from "@/services/openapi";
import { controller_Order, controller_ItemType } from "@/services/openapi";
import { convertToEur } from "@/utils";
import SmallCard from "@/components/UI/SmallCard.vue";
@ -19,12 +19,12 @@ export default defineComponent({
name: "TableOrderCard",
components: { SmallCard },
props: {
order: { type: Object as PropType<service_Order>, required: true },
order: { type: Object as PropType<controller_Order>, required: true },
},
emits: ["decrementOrder", "incrementOrder"],
setup(props) {
const showTotal = computed(() => props.order.order_item.price !== props.order.total);
return { convertToEur, types_ItemType, showTotal };
return { convertToEur, controller_ItemType, showTotal };
},
});
</script>

19
frontend/src/components/Tables/TableOverview.vue
View file

@ -3,8 +3,13 @@
<Transition>
<WaveSpinner v-if="initialLoading" />
<div v-else>
<OverviewPerType :type="[types_ItemType.Food]" :orders="orders" @getData="getData" @openModal="(t) => addBeverage(t)" />
<OverviewPerType :type="[types_ItemType.ColdDrink, types_ItemType.HotDrink]" :orders="orders" @getData="getData" @openModal="(t) => addBeverage(t)" />
<OverviewPerType :type="[controller_ItemType.Food]" :orders="orders" @getData="getData" @openModal="(t) => addBeverage(t)" />
<OverviewPerType
:type="[controller_ItemType.ColdDrink, controller_ItemType.HotDrink]"
:orders="orders"
@getData="getData"
@openModal="(t) => addBeverage(t)"
/>
<div class="h-4rem"></div>
<BottomNavigation>
@ -56,7 +61,7 @@
import { computed, defineComponent, provide, ref } from "vue";
import BaseCard from "@/components/UI/BaseCard.vue";
import { useStore } from "vuex";
import { OrdersService, service_Order, service_OrderItem, types_ItemType } from "@/services/openapi";
import { OrdersService, controller_Order, controller_OrderItem, controller_ItemType } from "@/services/openapi";
import BottomNavigation from "@/components/UI/BottomNavigation.vue";
import Button from "primevue/button";
import { convertToEur } from "@/utils";
@ -82,7 +87,7 @@ export default defineComponent({
const total = ref(0);
const orderItems = computed(() => store.getters.getOrderItems);
const options = ref();
const orders = ref<service_Order[]>([]);
const orders = ref<controller_Order[]>([]);
store.dispatch("getAllOrderItems");
@ -110,13 +115,13 @@ export default defineComponent({
total.value = temp;
}
function addBeverage(itemType: types_ItemType[]) {
function addBeverage(itemType: controller_ItemType[]) {
newOrderModal.value = true;
options.value = [];
itemType.forEach((type) => {
options.value = options.value.concat(orderItems.value.get(type));
});
options.value.sort((a: service_OrderItem, b: service_OrderItem) => {
options.value.sort((a: controller_OrderItem, b: controller_OrderItem) => {
const x = a.description.toLowerCase();
const y = b.description.toLowerCase();
if (x < y) return -1;
@ -142,7 +147,7 @@ export default defineComponent({
total,
convertToEur,
addBeverage,
types_ItemType,
controller_ItemType,
postOrder,
orders,
getData,