Auto stash before rebase of "dashboard" onto "origin/dashboard"
This commit is contained in:
Jens Cornelsen
@@ -29,6 +29,7 @@
|
||||
import DashboardNotification from "./DashboardNotification.svelte";
|
||||
import { notifications } from "#components/NotificationProvider/shared.js";
|
||||
import { Bell } from "radix-svelte-icons";
|
||||
import { A13BerechnungRechnerischeLaufzeitHeizung } from "#lib/Berechnungen/BedarfsausweisWohnen/A13BerechnungRechnerischeLaufzeitHeizung.js";
|
||||
const progress = ausweis.ausgestellt ? 100 : ausweis.bestellt ? 66 : 33;
|
||||
|
||||
const ausweisart = getAusweisartFromId(ausweis.id);
|
||||
@@ -408,7 +409,7 @@
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="mt-8">
|
||||
{#if ausweis.bestellt}
|
||||
{#if ausweis.ausweistyp === Enums.AusweisTyp.Beratung || ausweis.ausweistyp === Enums.AusweisTyp.BeratungXL}
|
||||
<p class="text-sm">Sie haben Hilfe zu diesem Ausweis angefordert. Sie werden <span class="font-bold">innerhalb der nächsten 48 Stunden</span> über die hinterlegte Telefonnummer vom IB Cornelsen kontaktiert.</p>
|
||||
@@ -594,11 +595,19 @@
|
||||
<div class="flex flex-row flex-wrap items-center gap-2">
|
||||
<div class="text-sm">
|
||||
<span class="font-bold">Rechnungsadresse</span><br>
|
||||
IB Cornelsen, Katendeich 5, 21035 Hamburg
|
||||
{rechnung.empfaenger},
|
||||
{#if rechnung.zusatzzeile !== null}
|
||||
{rechnung.zusatzzeile},
|
||||
{/if}
|
||||
{rechnung.strasse}, {rechnung.plz} {rechnung.ort}
|
||||
</div>
|
||||
<div class="text-sm mb-2">
|
||||
<span class="font-bold">Versandadresse</span><br>
|
||||
IB Cornelsen, Katendeich 5, 21035 Hamburg
|
||||
{rechnung.versand_empfaenger},
|
||||
{#if rechnung.versand_zusatzzeile !== null}
|
||||
{rechnung.versand_zusatzzeile},
|
||||
{/if}
|
||||
{rechnung.versand_strasse}, {rechnung.versand_plz} {rechnung.versand_ort}
|
||||
</div>
|
||||
<div class="text-lg font-semibold">Unterlagen</div>
|
||||
<div class="text-sm">
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
<div class="flex flex-col gap-2 mt-0 md:mt-8 px-0">
|
||||
<a class="button-tab" href="/dashboard">
|
||||
<Reader width={22} height={22} />
|
||||
Vorgänge
|
||||
Ausweise
|
||||
</a>
|
||||
|
||||
<hr class="border-gray-600" />
|
||||
@@ -64,96 +64,98 @@
|
||||
</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
<!-- Soll für den Aussteller sichtbar sein -->
|
||||
Telefon 0176 1234567
|
||||
Telefon {benutzer.telefon}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="border-gray-600" />
|
||||
|
||||
Mitwirkende
|
||||
<!--
|
||||
Mitwirkende
|
||||
|
||||
<div class="flex flex-row mb-1">
|
||||
<div class="item-center mr-4">
|
||||
<img src="../../images/profile-placeholder.svg" alt="profile icon" width="40" height="40" />
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
Ernie Energieberater
|
||||
<div class="flex flex-row mb-1">
|
||||
<div class="item-center mr-4">
|
||||
<img src="../../images/profile-placeholder.svg" alt="profile icon" width="40" height="40" />
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
Ernie Energieberater
|
||||
</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
Energieberater
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
Energieberater
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-row mb-1">
|
||||
<div class="item-center mr-4">
|
||||
<img src="../../images/profile-placeholder.svg" alt="profile icon" width="40" height="40" />
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
Peter Planer
|
||||
<div class="flex flex-row mb-1">
|
||||
<div class="item-center mr-4">
|
||||
<img src="../../images/profile-placeholder.svg" alt="profile icon" width="40" height="40" />
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
Peter Planer
|
||||
</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
Architekt
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
Architekt
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-row mb-1">
|
||||
<div class="item-center mr-4">
|
||||
<img src="../../images/profile-placeholder.svg" alt="profile icon" width="40" height="40" />
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
Hans Meier
|
||||
<div class="flex flex-row mb-1">
|
||||
<div class="item-center mr-4">
|
||||
<img src="../../images/profile-placeholder.svg" alt="profile icon" width="40" height="40" />
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
Hans Meier
|
||||
</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
Eigentümer
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
Eigentümer
|
||||
|
||||
<hr class="border-gray-600" />
|
||||
|
||||
Experten in der Nähe
|
||||
|
||||
<div class="flex flex-row mb-1">
|
||||
<div class="item-center mr-4">
|
||||
<img src="../../images/profile-placeholder.svg" alt="profile icon" width="40" height="40" />
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
Thorsten Maas
|
||||
</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
Energieberater
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="border-gray-600" />
|
||||
|
||||
Experten in der Nähe
|
||||
|
||||
<div class="flex flex-row mb-1">
|
||||
<div class="item-center mr-4">
|
||||
<img src="../../images/profile-placeholder.svg" alt="profile icon" width="40" height="40" />
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
Thorsten Maas
|
||||
<div class="flex flex-row mb-1">
|
||||
<div class="item-center mr-4">
|
||||
<img src="../../images/profile-placeholder.svg" alt="profile icon" width="40" height="40" />
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
Herbert Holm
|
||||
</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
Gutachter
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
Energieberater
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-row mb-1">
|
||||
<div class="item-center mr-4">
|
||||
<img src="../../images/profile-placeholder.svg" alt="profile icon" width="40" height="40" />
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
Herbert Holm
|
||||
</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
Gutachter
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr class="border-gray-600" />
|
||||
|
||||
<hr class="border-gray-600" />
|
||||
|
||||
<div class="flex justify-end mt-2 mb-2">
|
||||
<button class="button flex flex-row rounded-lg gap-2 bg-secondary text-white text-center">
|
||||
Einladen
|
||||
</button>
|
||||
</div>
|
||||
<div class="flex justify-end mt-2 mb-2">
|
||||
<button class="button flex flex-row rounded-lg gap-2 bg-secondary text-white text-center">
|
||||
Einladen
|
||||
</button>
|
||||
</div>
|
||||
-->
|
||||
|
||||
{#if benutzer.rolle === "ADMIN"}
|
||||
<li>
|
||||
|
||||
@@ -75,22 +75,22 @@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="my-4 grid grid-cols-[1fr] md:grid-cols-[7fr,16fr,5fr] lg:grid-cols-[7fr,16fr,5fr]">
|
||||
<div class="my-4 grid grid-cols-[1fr] md:grid-cols-[7fr,16fr,5fr] lg:grid-cols-[7fr,16fr,5fr] min-h-[600px]">
|
||||
<DashboardAusweis {benutzer} {ausweis} aufnahme={ausweis.aufnahme} objekt={ausweis.aufnahme.objekt} rechnung={ausweis.rechnung}></DashboardAusweis>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center justify-between">
|
||||
{#if page > 1}
|
||||
<a class="p-2 rounded-lg hover:bg-gray-200 cursor-pointer" href="/dashboard/objekte/{page - 1}">
|
||||
<CaretLeft size={24}></CaretLeft>
|
||||
<CaretLeft size={30}></CaretLeft>
|
||||
</a>
|
||||
{:else}
|
||||
<div></div>
|
||||
{/if}
|
||||
<div>{page} / {totalPageCount}</div>
|
||||
<div class="text-lg">Ausweis {page} / {totalPageCount}</div>
|
||||
{#if totalPageCount > page}
|
||||
<a class="p-2 rounded-lg hover:bg-gray-200 cursor-pointer" href="/dashboard/objekte/{page + 1}">
|
||||
<CaretRight size={24}></CaretRight>
|
||||
<CaretRight size={30}></CaretRight>
|
||||
</a>
|
||||
{:else}
|
||||
<div></div>
|
||||
|
||||
@@ -71,36 +71,6 @@
|
||||
<Person size={22} />
|
||||
Profil
|
||||
</Tab>
|
||||
<Tab>
|
||||
<Reader width={22} height={22} />
|
||||
Ausweise
|
||||
</Tab>
|
||||
<Tab>
|
||||
<EnvelopeClosed width={22} height={22} />
|
||||
Kontakt
|
||||
</Tab>
|
||||
<li>
|
||||
<details>
|
||||
<summary class="tab w-full outline-0 hover:outline-0">
|
||||
<Cube width={22} height={22} />
|
||||
Services</summary
|
||||
>
|
||||
<ul>
|
||||
<li>
|
||||
<Tab>
|
||||
<EnvelopeClosed width={22} height={22} />
|
||||
Kontakt
|
||||
</Tab>
|
||||
</li>
|
||||
<li>
|
||||
<Tab>
|
||||
<EnvelopeClosed width={22} height={22} />
|
||||
Kontakt
|
||||
</Tab>
|
||||
</li>
|
||||
</ul>
|
||||
</details>
|
||||
</li>
|
||||
</TabList>
|
||||
<div
|
||||
class="border border-base-300 w-full h-full rounded-lg bg-base-200 p-8"
|
||||
|
||||
Reference in New Issue
Block a user