Auto stash before merge of "dev" and "origin/dev"
This commit is contained in:
@@ -15,10 +15,11 @@
|
|||||||
BenutzerClient,
|
BenutzerClient,
|
||||||
ObjektKomplettClient,
|
ObjektKomplettClient,
|
||||||
} from "#components/Ausweis/types.js";
|
} from "#components/Ausweis/types.js";
|
||||||
import { RechnungSchema } from "src/generated/zod/rechnung.js";
|
import { Benutzer } from "#lib/server/prisma.js";
|
||||||
|
|
||||||
export let lightTheme: boolean;
|
export let lightTheme: boolean;
|
||||||
export let benutzer: BenutzerClient;
|
export let benutzer: Benutzer;
|
||||||
|
export let besteller: Benutzer;
|
||||||
|
|
||||||
let id: string;
|
let id: string;
|
||||||
</script>
|
</script>
|
||||||
@@ -70,14 +71,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<div>
|
<div>
|
||||||
{benutzer.vorname} {benutzer.name}
|
{besteller.vorname} {besteller.name}
|
||||||
</div>
|
</div>
|
||||||
<div class="text-xs text-gray-500">
|
<div class="text-xs text-gray-500">
|
||||||
Eigentümer oder im Auftrag
|
Eigentümer oder im Auftrag
|
||||||
</div>
|
</div>
|
||||||
<div class="text-xs text-gray-500">
|
<div class="text-xs text-gray-500">
|
||||||
<!-- Soll für den Aussteller sichtbar sein -->
|
<!-- Soll für den Aussteller sichtbar sein -->
|
||||||
Telefon {benutzer.telefon}
|
Telefon {besteller.telefon}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -3,14 +3,15 @@
|
|||||||
import "../style/global.css";
|
import "../style/global.css";
|
||||||
import "../../svelte-dialogs.config.js";
|
import "../../svelte-dialogs.config.js";
|
||||||
import DashboardSidebar from "../components/Dashboard/DashboardSidebar.svelte";
|
import DashboardSidebar from "../components/Dashboard/DashboardSidebar.svelte";
|
||||||
import { BenutzerClient } from "#components/Ausweis/types";
|
import { Benutzer } from "#lib/server/prisma";
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
title: string;
|
title: string;
|
||||||
user: BenutzerClient;
|
user: Benutzer;
|
||||||
|
besteller: Benutzer;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { title, user } = Astro.props;
|
const { title, user, besteller } = Astro.props;
|
||||||
|
|
||||||
if (!user) {
|
if (!user) {
|
||||||
Astro.redirect("/auth/login", 302);
|
Astro.redirect("/auth/login", 302);
|
||||||
@@ -121,6 +122,7 @@ let lightTheme = Astro.cookies.get("theme")?.value === "light";
|
|||||||
<DashboardSidebar
|
<DashboardSidebar
|
||||||
lightTheme={lightTheme}
|
lightTheme={lightTheme}
|
||||||
benutzer={user}
|
benutzer={user}
|
||||||
|
besteller={besteller}
|
||||||
client:load
|
client:load
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|||||||
@@ -56,7 +56,7 @@
|
|||||||
{#if ausweis.aufnahme.bilder.length > 0}
|
{#if ausweis.aufnahme.bilder.length > 0}
|
||||||
<Carousel perPage={1}>
|
<Carousel perPage={1}>
|
||||||
{#each ausweis.aufnahme.bilder as bild, i (i)}
|
{#each ausweis.aufnahme.bilder as bild, i (i)}
|
||||||
<img src="/bilder/{bild.id}.jpg" alt={bild.kategorie} class="max-h-[15vh] h-full w-full object-contain">
|
<img src="/bilder/{bild.id}.jpg" alt={bild.kategorie} loading="lazy" class="max-h-[15vh] h-full w-full object-contain">
|
||||||
{/each}
|
{/each}
|
||||||
<span slot="left-control" class="p-2.5 bg-opacity-50 bg-white block rounded-full"><ChevronLeft size={24}></ChevronLeft></span>
|
<span slot="left-control" class="p-2.5 bg-opacity-50 bg-white block rounded-full"><ChevronLeft size={24}></ChevronLeft></span>
|
||||||
<span slot="right-control" class="p-2.5 bg-opacity-50 bg-white block rounded-full"><ChevronRight size={24}></ChevronRight></span>
|
<span slot="right-control" class="p-2.5 bg-opacity-50 bg-white block rounded-full"><ChevronRight size={24}></ChevronRight></span>
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ if (user.rolle === Enums.BenutzerRolle.USER) {
|
|||||||
},
|
},
|
||||||
include: {
|
include: {
|
||||||
rechnung: true,
|
rechnung: true,
|
||||||
|
benutzer: true,
|
||||||
aufnahme: {
|
aufnahme: {
|
||||||
include: {
|
include: {
|
||||||
bilder: true,
|
bilder: true,
|
||||||
@@ -53,6 +54,7 @@ if (user.rolle === Enums.BenutzerRolle.USER) {
|
|||||||
},
|
},
|
||||||
include: {
|
include: {
|
||||||
rechnung: true,
|
rechnung: true,
|
||||||
|
benutzer: true,
|
||||||
aufnahme: {
|
aufnahme: {
|
||||||
include: {
|
include: {
|
||||||
bilder: true,
|
bilder: true,
|
||||||
@@ -70,7 +72,7 @@ if (!ausweis) {
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
<UserLayout title="Objekte" {user}>
|
<UserLayout title="Objekte" {user} besteller={ausweis.benutzer}>
|
||||||
<DashboardAufnahmeModule
|
<DashboardAufnahmeModule
|
||||||
{ausweis}
|
{ausweis}
|
||||||
benutzer={user}
|
benutzer={user}
|
||||||
|
|||||||
@@ -54,3 +54,5 @@ if (!result) {
|
|||||||
|
|
||||||
return Astro.redirect(`/dashboard/objekte/${result[0].id}?p=${page}`)
|
return Astro.redirect(`/dashboard/objekte/${result[0].id}?p=${page}`)
|
||||||
---
|
---
|
||||||
|
|
||||||
|
<script></script>
|
||||||
Reference in New Issue
Block a user