sipo/Teren-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Last commit before showcase.

Browse Source
This commit is contained in:
Simon Pocrnjič
2024-11-14 21:02:10 +01:00
parent 953ff38d64
commit ad8b3c07e1
16 changed files with 302 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/Pages/Cases/Partials/ActivityDrawer.vue
+7 -7
View File
@@ -72,16 +72,16 @@ const store = () => {
:show="show"
@close="close"
>
<template #title>Add activity</template>
<template #title>Dodaj aktivnost</template>
<template #content>
<form @submit.prevent="store">
<SectionTitle class="mt-4 border-b mb-4">
<template #title>
Activity
Aktivnost
</template>
</SectionTitle>
<div class="col-span-6 sm:col-span-4">
<InputLabel for="activityDueDate" value="Due date"/>
<InputLabel for="activityDueDate" value="Datum zapadlosti"/>
<vue-date-picker
id="activityDueDate"
:enable-time-picker="false"
@@ -91,7 +91,7 @@ const store = () => {
/>
</div>
<div class="col-span-6 sm:col-span-4">
<InputLabel for="activityAmount" value="Amount"/>
<InputLabel for="activityAmount" value="Znesek"/>
<TextInput
id="activityAmount"
ref="activityAmountinput"
@@ -102,7 +102,7 @@ const store = () => {
/>
</div>
<div class="col-span-6 sm:col-span-4">
<InputLabel for="activityAction" value="Action"/>
<InputLabel for="activityAction" value="Akcija"/>
<select
class="block w-full border-gray-300 focus:border-indigo-500 focus:ring-indigo-500 rounded-md shadow-sm"
id="activityAction"
@@ -114,7 +114,7 @@ const store = () => {
</select>
</div>
<div class="col-span-6 sm:col-span-4">
<InputLabel for="activityDecision" value="Decision"/>
<InputLabel for="activityDecision" value="Odločitev"/>
<select
class="block w-full border-gray-300 focus:border-indigo-500 focus:ring-indigo-500 rounded-md shadow-sm"
id="activityDecision"
@@ -127,7 +127,7 @@ const store = () => {
</div>
<div class="col-span-6 sm:col-span-4">
<FwbTextarea
label="Note"
label="Opomba"
id="activityNote"
ref="activityNoteTextarea"
v-model="form.note"
resources/js/Pages/Cases/Partials/ActivityTable.vue
+6 -6
View File
@@ -10,12 +10,12 @@ const props = defineProps({
let header = [
C_TD.make('Date', 'header'),
C_TD.make('Action', 'header'),
C_TD.make('Decision', 'header'),
C_TD.make('Note', 'header'),
C_TD.make('Due date', 'header'),
C_TD.make('Amount', 'header')
C_TD.make('Datum', 'header'),
C_TD.make('Akcija', 'header'),
C_TD.make('Odločitev', 'header'),
C_TD.make('Opomba', 'header'),
C_TD.make('Datum zapadlosti', 'header'),
C_TD.make('Znesek obljube', 'header')
];
const createBody = (data) => {
resources/js/Pages/Cases/Partials/ContractDrawer.vue
+7 -7
View File
@@ -52,16 +52,16 @@ const storeContract = () => {
:show="show"
@close="close"
>
<template #title>Add contract</template>
<template #title>Dodaj pogodbo</template>
<template #content>
<form @submit.prevent="storeContract">
<SectionTitle class="mt-4 border-b mb-4">
<template #title>
Contract
Pogodba
</template>
</SectionTitle>
<div class="col-span-6 sm:col-span-4">
<InputLabel for="contractRef" value="Reference"/>
<InputLabel for="contractRef" value="Referenca"/>
<TextInput
id="contractRef"
ref="contractRefInput"
@@ -72,11 +72,11 @@ const storeContract = () => {
/>
</div>
<div class="col-span-6 sm:col-span-4">
<InputLabel for="contractStartDate" value="Start date"/>
<InputLabel for="contractStartDate" value="Datum pričetka"/>
<vue-date-picker id="contractStartDate" :enable-time-picker="false" format="dd.MM.yyyy" class="mt-1 block w-full" v-model="formContract.start_date"></vue-date-picker>
</div>
<div class="col-span-6 sm:col-span-4">
<InputLabel for="contractTypeSelect" value="Contract type"/>
<InputLabel for="contractTypeSelect" value="Tip"/>
<select
class="block w-full border-gray-300 focus:border-indigo-500 focus:ring-indigo-500 rounded-md shadow-sm"
id="contractTypeSelect"
@@ -88,11 +88,11 @@ const storeContract = () => {
</div>
<div class="flex justify-end mt-4">
<ActionMessage :on="formContract.recentlySuccessful" class="me-3">
Saved.
Shranjuje.
</ActionMessage>
<PrimaryButton :class="{ 'opacity-25': formContract.processing }" :disabled="formContract.processing">
Save
Shrani
</PrimaryButton>
</div>
</form>
resources/js/Pages/Cases/Partials/ContractTable.vue
+4 -4
View File
@@ -12,8 +12,8 @@ const props = defineProps({
//Contract table
let tableContractHeader = [
C_TD.make('Ref.', 'header'),
C_TD.make('Start date', 'header'),
C_TD.make('Type', 'header')
C_TD.make('Datum začetka', 'header'),
C_TD.make('Tip', 'header')
];
const tableOptions = {
@@ -34,7 +34,7 @@ const tableOptions = {
ref: 'contractRefUInput',
bind: 'reference',
type: 'text',
label: 'Reference',
label: 'Referenca',
autocomplete: 'contract-reference'
},
{
@@ -42,7 +42,7 @@ const tableOptions = {
ref: 'contractTypeSelectU',
bind: 'type_id',
type: 'select',
label: 'Type',
label: 'Tip',
selectOptions: props.contract_types.map(item => new Object({val: item.id, desc: item.name}))
}
]
resources/js/Pages/Cases/Show.vue
+21 -11
View File
@@ -21,14 +21,23 @@ const props = defineProps({
console.log(props.actions);
//Client and case person info card
const clientMainAddress = props.client.person.addresses.filter( a => a.type.id === 1 )[0] ?? '';
const personMainAddress = props.client_case.person.addresses.filter( a => a.type.id === 1 )[0] ?? '';
const getMainAddress = (adresses) => {
const addr = adresses.filter( a => a.type.id === 1 )[0] ?? '';
const country = addr.country !== '' ? ` - ${addr.country}` : '';
return addr.address !== '' ? addr.address + country : '';
}
const getMainPhone = (phones) => {
const pho = phones.filter( a => a.type.id === 1 )[0] ?? '';
const countryCode = pho.country_code !== null ? `+${pho.country_code} ` : '';
return pho.nu !== '' ? countryCode + pho.nu: '';
}
const clientInfo = new Object({
nu: props.client.person.nu,
full_name: props.client.person.full_name,
main_address: (clientMainAddress.country !== '') ? `${clientMainAddress.address} - ${clientMainAddress.country}` : clientMainAddress.address,
main_address: getMainAddress(props.client.person.addresses),
main_phone: getMainPhone(props.client.person.phones),
tax_number: props.client.person.tax_number,
social_security_number: props.client.person.social_security_number,
description: props.client.person.description
@@ -37,7 +46,8 @@ const clientInfo = new Object({
const casePersonInfo = new Object({
nu: props.client_case.person.nu,
full_name: props.client_case.person.full_name,
main_address: (personMainAddress.country !== '') ? `${personMainAddress.address} - ${personMainAddress.country}` : personMainAddress.address,
main_address: getMainAddress(props.client_case.person.addresses),
main_phone: getMainPhone(props.client_case.person.phones),
tax_number: props.client_case.person.tax_number,
social_security_number: props.client_case.person.social_security_number,
description: props.client_case.person.description
@@ -77,7 +87,7 @@ const closeDrawer = () => {
<SectionTitle>
<template #title>
<FwbA class= "hover:text-blue-500" :href="route('client.show', client)">
Client
{{ clientInfo.full_name }}
</FwbA>
</template>
@@ -101,7 +111,7 @@ const closeDrawer = () => {
<div class="mx-auto max-w-4x1 p-3">
<SectionTitle>
<template #title>
Case
Primer - oseba
</template>
</SectionTitle>
@@ -125,10 +135,10 @@ const closeDrawer = () => {
<div class="flex justify-between p-3">
<SectionTitle>
<template #title>
Contracts
Pogodbe
</template>
</SectionTitle>
<FwbButton @click="openDrawerCreateContract">Add new</FwbButton>
<FwbButton @click="openDrawerCreateContract">Nova</FwbButton>
</div>
<ContractTable
:client_case="client_case"
@@ -146,10 +156,10 @@ const closeDrawer = () => {
<div class="flex justify-between p-3">
<SectionTitle>
<template #title>
Activities
Aktivnosti
</template>
</SectionTitle>
<FwbButton @click="openDrawerAddActivity">Add new</FwbButton>
<FwbButton @click="openDrawerAddActivity">Nova</FwbButton>
</div>
<ActivityTable
:client_case="client_case"