Lots of changes

This commit is contained in:
Simon Pocrnjič
2024-11-13 22:11:07 +01:00
parent 90a5858320
commit 953ff38d64
76 changed files with 2822 additions and 427 deletions
+31 -15
View File
@@ -1,23 +1,22 @@
<script setup>
import { ref } from 'vue';
import { ref, watch } from 'vue';
import AppLayout from '@/Layouts/AppLayout.vue';
import List from '@/Components/List.vue';
import ListItem from '@/Components/ListItem.vue';
import PrimaryButton from '@/Components/PrimaryButton.vue';
import InputLabel from '@/Components/InputLabel.vue';
import TextInput from '@/Components/TextInput.vue';
import { useForm } from '@inertiajs/vue3';
import { Link, useForm } from '@inertiajs/vue3';
import ActionMessage from '@/Components/ActionMessage.vue';
import Drawer from '@/Components/Drawer.vue';
import Pagination from '@/Components/Pagination.vue';
import SearchInput from '@/Components/SearchInput.vue';
const props = defineProps({
persons: Array,
create_url: String,
person_types: Array
clients: Object,
filters: Object
});
const drawerCreateClient = ref(false);
const Address = {
address: '',
country: '',
@@ -31,14 +30,29 @@ const formClient = useForm({
address: Address
});
//Create client drawer
const drawerCreateClient = ref(false);
//Search input
const search = {
search: props.filters.search,
route: {
link: 'client'
}
}
//Open drawer create client
const openDrawerCreateClient = () => {
drawerCreateClient.value = true
}
//Close any drawer on page
const closeDrawer = () => {
drawerCreateClient.value = false
}
//Ajax call post to store new client
const storeClient = () => {
formClient.post(route('client.store'), {
onBefore: () => {
@@ -50,10 +64,8 @@ const storeClient = () => {
}
});
};
</script>
<template>
@@ -67,26 +79,30 @@ const storeClient = () => {
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
<div class="px-3 bg-white overflow-hidden shadow-xl sm:rounded-lg">
<div class="mx-auto max-w-4x1 py-3">
<PrimaryButton @click="openDrawerCreateClient" class="bg-blue-400">Add client</PrimaryButton>
<div class="flex justify-between">
<PrimaryButton @click="openDrawerCreateClient" class="bg-blue-400">Add client</PrimaryButton>
<SearchInput :options="search" />
</div>
<List class="mt-2">
<ListItem v-for="person in persons">
<ListItem v-for="client in clients.data">
<div class="flex justify-between shadow rounded border-solid border-l-4 border-blue-400 p-3">
<div class="flex min-w-0 gap-x-4">
<div class="min-w-0 flex-auto">
<p class="text-sm font-semibold leading-6 text-gray-900"><a :href="route('client.show', { uuid: person.uuid })">{{ person.full_name }}</a></p>
<p class="mt-1 truncate text-xs leading-5 text-gray-500">{{ person.nu }}</p>
<p class="text-sm font-semibold leading-6 text-gray-900"><Link :href="route('client.show', {uuid: client.uuid})">{{ client.person.full_name }}</Link></p>
<p class="mt-1 truncate text-xs leading-5 text-gray-500">{{ client.person.nu }}</p>
</div>
</div>
<div class="hidden shrink-0 sm:flex sm:flex-col sm:items-end">
<p class="text-sm leading-6 text-gray-900">{{ person.tax_number }}</p>
<p class="text-sm leading-6 text-gray-900">{{ client.person.tax_number }}</p>
<div class="mt-1 flex items-center gap-x-1.5">
<p class="text-xs leading-5 text-gray-500">{{ person.group.name }}</p>
<p class="text-xs leading-5 text-gray-500">Client</p>
</div>
</div>
</div>
</ListItem>
</List>
</div>
<Pagination :links="clients.links" :from="clients.from" :to="clients.to" :total="clients.total" />
</div>
</div>
</div>
+75 -92
View File
@@ -3,21 +3,26 @@ import AppLayout from '@/Layouts/AppLayout.vue';
import List from '@/Components/List.vue';
import ListItem from '@/Components/ListItem.vue';
import PrimaryButton from '@/Components/PrimaryButton.vue';
import ItemGrid from '@/Components/ItemGrid.vue';
import { Item } from '@/Shared/AppObjects';
import Drawer from '@/Components/Drawer.vue';
import InputLabel from '@/Components/InputLabel.vue';
import TextInput from '@/Components/TextInput.vue';
import { ref } from 'vue';
import { useForm } from '@inertiajs/vue3';
import { Link, useForm } from '@inertiajs/vue3';
import ActionMessage from '@/Components/ActionMessage.vue';
import SectionTitle from '@/Components/SectionTitle.vue';
import { de } from 'date-fns/locale'
import PersonInfoGrid from '@/Components/PersonInfoGrid.vue';
import Pagination from '@/Components/Pagination.vue';
import SearchInput from '@/Components/SearchInput.vue';
const props = defineProps({
client: Object
client: Object,
client_cases: Object,
urlPrev: String,
filters: Object
});
console.log(props.client_cases)
const Address = {
address: '',
country: '',
@@ -31,47 +36,46 @@ const Person = {
address: Address
}
const Contract = {
reference: '',
start_date: new Date(),
type_id: 3
}
const formCreateContract = useForm({
const formCreateCase = useForm({
client_uuid: props.client.uuid,
person: Person,
contract: Contract
person: Person
});
const drawerCreateContract = ref(false);
const search = {
search: props.filters.search,
route: {
link: 'client.show',
options: {uuid: props.client.uuid}
}
}
const openDrawerCreateContract = () => {
drawerCreateContract.value = true;
const drawerCreateCase = ref(false);
const openDrawerCreateCase = () => {
drawerCreateCase.value = true;
}
const closeDrawer = () => {
drawerCreateContract.value = false
drawerCreateCase.value = false
}
const mainAddress = props.client.addresses.filter( a => a.type.id === 1 )[0] ?? '';
const mainAddress = props.client.person.addresses.filter( a => a.type.id === 1 )[0] ?? '';
const clientInfo = [
Item.make('nu', 'Nu.', 'number', props.client.nu),
Item.make('full_name', 'Name', 'string', props.client.full_name),
Item.make('main_address', 'Address', 'string', mainAddress.address),
Item.make('tax_number', 'Tax NU.', 'string', props.client.tax_number),
Item.make('social_security_number', 'Social security NU.', 'string', props.client.social_security_number),
Item.make('description', 'Description', 'string', props.client.description)
]
const clientInfo = new Object({
nu: props.client.person.nu,
full_name: props.client.person.full_name,
main_address: (mainAddress.country !== '') ? `${mainAddress.address} - ${mainAddress.country}` : mainAddress.address,
tax_number: props.client.person.tax_number,
social_security_number: props.client.person.social_security_number,
description: props.client.person.description
});
const storeContract = () => {
formCreateContract.post(route('contract.store'), {
onBefore: () => {
formCreateContract.contract.start_date = formCreateContract.contract.start_date.toISOString();
},
const storeCase = () => {
formCreateCase.post(route('clientCase.store'), {
onSuccess: () => {
closeDrawer();
formCreateContract.reset();
formCreateCase.reset();
console.log(props.client_cases)
}
});
};
@@ -81,17 +85,26 @@ const storeContract = () => {
<template>
<AppLayout title="Client">
<template #header>
<h2 class="font-semibold text-xl text-gray-800 leading-tight">
{{ client.full_name.toUpperCase() }}
</h2>
</template>
<template #header></template>
<div class="pt-12">
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
<div class="bg-white overflow-hidden shadow-xl sm:rounded-lg border-l-4 border-blue-400">
<div class="mx-auto max-w-4x1 p-3">
<ItemGrid :items="clientInfo"></ItemGrid>
<SectionTitle>
<template #title>
{{ client.person.full_name }} - client
</template>
</SectionTitle>
</div>
</div>
</div>
</div>
<div class="pt-1">
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
<div class="bg-white overflow-hidden shadow-xl sm:rounded-lg border-l-4 border-blue-400">
<div class="mx-auto max-w-4x1 p-3">
<PersonInfoGrid :person="clientInfo"></PersonInfoGrid>
</div>
</div>
</div>
@@ -101,37 +114,41 @@ const storeContract = () => {
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
<div class="px-3 bg-white overflow-hidden shadow-xl sm:rounded-lg">
<div class="mx-auto max-w-4x1 py-3">
<PrimaryButton @click="openDrawerCreateContract" class="bg-blue-400">Add contract</PrimaryButton>
<div class="flex justify-between">
<PrimaryButton @click="openDrawerCreateCase" class="bg-blue-400">Add Case</PrimaryButton>
<SearchInput :options="search" />
</div>
<List class="mt-2">
<ListItem v-for="contract in client.contracts">
<ListItem v-for="clientCase in client_cases.data">
<div class="flex justify-between shadow rounded border-solid border-l-4 border-red-400 p-2">
<div class="flex min-w-0 gap-x-4">
<div class="min-w-0 flex-auto">
<p class="text-sm font-semibold leading-6 text-gray-900">{{ contract.debtor.full_name }}</p>
<p class="mt-1 truncate text-xs leading-5 text-gray-500">{{ contract.reference }}</p>
<p class="text-sm font-semibold leading-6 text-gray-900"><Link :href="route('clientCase.show', {uuid: clientCase.uuid})">{{ clientCase.person.full_name }}</Link></p>
<p class="mt-1 truncate text-xs leading-5 text-gray-500"></p>
</div>
</div>
<div class="hidden shrink-0 sm:flex sm:flex-col sm:items-end">
<p class="text-sm leading-6 text-gray-900">{{ contract.debtor.nu }}</p>
<p class="text-sm leading-6 text-gray-900">{{ clientCase.person.nu }}</p>
<div class="mt-1 flex items-center gap-x-1.5">
<p class="text-xs leading-5 text-gray-500">{{ contract.debtor.group.name }}</p>
<p class="text-xs leading-5 text-gray-500">Client case</p>
</div>
</div>
</div>
</ListItem>
</List>
</div>
<Pagination :links="client_cases.links" :from="client_cases.from" :to="client_cases.to" :total="client_cases.total" />
</div>
</div>
</div>
</AppLayout>
<Drawer
:show="drawerCreateContract"
@close="drawerCreateContract = false">
:show="drawerCreateCase"
@close="drawerCreateCase = false">
<template #title>Add contract</template>
<template #title>Add case</template>
<template #content>
<form @submit.prevent="storeContract">
<form @submit.prevent="storeCase">
<SectionTitle class="border-b mb-4">
<template #title>
Person
@@ -142,7 +159,7 @@ const storeContract = () => {
<TextInput
id="firstname"
ref="firstnameInput"
v-model="formCreateContract.person.first_name"
v-model="formCreateCase.person.first_name"
type="text"
class="mt-1 block w-full"
autocomplete="first-name"
@@ -154,7 +171,7 @@ const storeContract = () => {
<TextInput
id="lastname"
ref="lastnameInput"
v-model="formCreateContract.person.last_name"
v-model="formCreateCase.person.last_name"
type="text"
class="mt-1 block w-full"
autocomplete="last-name"
@@ -166,7 +183,7 @@ const storeContract = () => {
<TextInput
id="fullname"
ref="fullnameInput"
v-model="formCreateContract.person.full_name"
v-model="formCreateCase.person.full_name"
type="text"
class="mt-1 block w-full"
autocomplete="full-name"
@@ -178,7 +195,7 @@ const storeContract = () => {
<TextInput
id="address"
ref="addressInput"
v-model="formCreateContract.person.address.address"
v-model="formCreateCase.person.address.address"
type="text"
class="mt-1 block w-full"
autocomplete="address"
@@ -190,7 +207,7 @@ const storeContract = () => {
<TextInput
id="addressCountry"
ref="addressCountryInput"
v-model="formCreateContract.person.address.country"
v-model="formCreateCase.person.address.country"
type="text"
class="mt-1 block w-full"
autocomplete="address-country"
@@ -202,53 +219,19 @@ const storeContract = () => {
<select
class="block w-full border-gray-300 focus:border-indigo-500 focus:ring-indigo-500 rounded-md shadow-sm"
id="addressType"
v-model="formCreateContract.person.address.type_id"
v-model="formCreateCase.person.address.type_id"
>
<option value="1">Permanent</option>
<option value="2">Temporary</option>
<!-- ... -->
</select>
</div>
<SectionTitle class="mt-4 border-b mb-4">
<template #title>
Contract
</template>
</SectionTitle>
<div class="col-span-6 sm:col-span-4">
<InputLabel for="contractRef" value="Reference"/>
<TextInput
id="contractRef"
ref="contractRefInput"
v-model="formCreateContract.contract.reference"
type="text"
class="mt-1 block w-full"
autocomplete="contract-reference"
/>
</div>
<div class="col-span-6 sm:col-span-4">
<InputLabel for="contractStartDate" value="Start date"/>
<vue-date-picker id="contractStartDate" :format-locale="de" :enable-time-picker="false" format="dd.MM.yyyy" class="mt-1 block w-full" v-model="formCreateContract.contract.start_date"></vue-date-picker>
</div>
<div class="col-span-6 sm:col-span-4">
<InputLabel for="contractTypeSelect" value="Contract type"/>
<select
class="block w-full border-gray-300 focus:border-indigo-500 focus:ring-indigo-500 rounded-md shadow-sm"
id="contractTypeSelect"
v-model="formCreateContract.person.address.type_id"
>
<option value="1">Early</option>
<option value="2">Hard</option>
<option value="3">Delivery</option>
<option value="4">Leasing</option>
<!-- ... -->
</select>
</div>
<div class="flex justify-end mt-4">
<ActionMessage :on="formCreateContract.recentlySuccessful" class="me-3">
<ActionMessage :on="formCreateCase.recentlySuccessful" class="me-3">
Saved.
</ActionMessage>
<PrimaryButton :class="{ 'opacity-25': formCreateContract.processing }" :disabled="formCreateContract.processing">
<PrimaryButton :class="{ 'opacity-25': formCreateCase.processing }" :disabled="formCreateCase.processing">
Save
</PrimaryButton>
</div>