+
+
+
+
+
+ {{tag.name}}
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+ Öffnen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Dokument zuweisen:
+
+
{
:disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
/>
{
{
@updateContent="(i) => contentChanged(i,datapoint)"
:preloadedContent="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].html"
/>
-
-
+
+
{
:disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
/>
{
{
@updateContent="(i) => contentChanged(i,datapoint)"
:preloadedContent="item[datapoint.key].html"
/>
-
+
+
@@ -387,7 +422,7 @@ const contentChanged = (content, datapoint) => {
+
{
:disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
/>
{
{
@updateContent="(i) => contentChanged(i,datapoint)"
:preloadedContent="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].html"
/>
-
-
+
+
{
:disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
/>
{
{
@updateContent="(i) => contentChanged(i,datapoint)"
:preloadedContent="item[datapoint.key].html"
/>
-
+
+
diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 970a3c0..ad072ff 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -1,6 +1,5 @@
-
diff --git a/composables/useFiles.js b/composables/useFiles.js
new file mode 100644
index 0000000..b79346a
--- /dev/null
+++ b/composables/useFiles.js
@@ -0,0 +1,210 @@
+import index from "v-calendar";
+
+export const useFiles = () => {
+ const supabase = useSupabaseClient()
+ const toast = useToast()
+
+ let bucket = "filesdev"
+
+ const profileStore = useProfileStore()
+
+ const uploadFiles = async (formData, files,tags, upsert) => {
+ const uploadSingleFile = async (file) => {
+ //Create File Entry to Get ID for Folder
+ const {data:createdFileData,error:createdFileError} = await supabase
+ .from("files")
+ .insert({
+ tenant: profileStore.currentTenant,
+ })
+ .select()
+ .single()
+
+ if(createdFileError){
+ console.log(createdFileError)
+ toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+ } else if(createdFileData) {
+ //Upload File to ID Folder
+ const {data:uploadData, error: uploadError} = await supabase
+ .storage
+ .from(bucket)
+ .upload(`${profileStore.currentTenant}/filesbyid/${createdFileData.id}/${file.name}`, file, {upsert: upsert})
+
+ if(uploadError) {
+ console.log(uploadError)
+ console.log(uploadError.statusCode)
+
+ if(uploadError.statusCode === '400') {
+ console.log("is 400")
+ toast.add({title: "Hochladen fehlgeschlagen", description: "Die Datei enthält ungültige Zeichen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+ } else if(uploadError.statusCode === '409') {
+ console.log("is 409")
+ toast.add({title: "Hochladen fehlgeschlagen", description: "Es existiert bereits eine Datei mit diesem Namen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+ } else {
+ toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+
+ }
+ } else if(uploadData) {
+ //Update File with Corresponding Path
+ const {data:updateFileData, error:updateFileError} = await supabase
+ .from("files")
+ .update({
+ ...formData,
+ path: uploadData.path,
+ })
+ .eq("id", createdFileData.id)
+
+ if(updateFileError) {
+ console.log(updateFileError)
+ toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+ } else {
+ const {data:tagData, error:tagError} = await supabase
+ .from("filetagmembers")
+ .insert(tags.map(tag => {
+ return {
+ file_id: createdFileData.id,
+ tag_id: tag
+ }
+ }))
+
+
+
+ toast.add({title: "Hochladen erfolgreich"})
+
+ }
+ }
+ }
+ }
+
+ if(files.length === 1) {
+ await uploadSingleFile(files[0])
+ } else if( files.length > 1) {
+
+ for(let i = 0; i < files.length; i++){
+ await uploadSingleFile(files[i])
+ }
+
+ }
+ }
+
+ const selectDocuments = async (sortColumn = null, folder = null) => {
+ let data = null
+
+ if(sortColumn !== null ) {
+ data = (await supabase
+ .from("files")
+ .select('*, filetags(*)')
+ .eq("tenant", profileStore.currentTenant)
+ .not("path","is",null)
+ .order(sortColumn, {ascending: true})).data
+ } else {
+ data = (await supabase
+ .from("files")
+ .select('*, filetags(*)')
+ .eq("tenant", profileStore.currentTenant)
+ .not("path","is",null)).data
+
+ }
+
+ if(data.length > 0){
+ let paths = []
+ data.forEach(doc => {
+ paths.push(doc.path)
+ })
+
+ const {data: supabaseData,error} = await supabase.storage.from(bucket).createSignedUrls(paths,3600)
+
+ data = data.map((doc,index) => {
+
+ return {
+ ...doc,
+ url: supabaseData[index].signedUrl
+ }
+ })
+ }
+
+ //console.log(data)
+
+ return data
+ }
+
+ const selectSomeDocuments = async (documentIds, sortColumn = null, folder = null) => {
+ let data = null
+
+ if(sortColumn !== null ) {
+ data = (await supabase
+ .from("files")
+ .select('*, filetags(*)')
+ .in("id",documentIds)
+ .eq("tenant", profileStore.currentTenant)
+ .not("path","is",null)
+ .order(sortColumn, {ascending: true})).data
+ } else {
+ data = (await supabase
+ .from("files")
+ .select('*, filetags(*)')
+ .in("id",documentIds)
+ .not("path","is",null)
+ .eq("tenant", profileStore.currentTenant)).data
+
+ }
+
+ if(data.length > 0){
+ let paths = []
+ data.forEach(doc => {
+ paths.push(doc.path)
+ })
+
+ const {data: supabaseData,error} = await supabase.storage.from(bucket).createSignedUrls(paths,3600)
+
+ data = data.map((doc,index) => {
+
+ return {
+ ...doc,
+ url: supabaseData[index].signedUrl
+ }
+ })
+ }
+
+ //console.log(data)
+
+ return data
+ }
+
+ const selectDocument = async (id) => {
+ const {data,error} = await supabase
+ .from("files")
+ .select('*, filetags(*)')
+ .eq("id",id)
+ .single()
+
+ const {data: supabaseData,error:supabaseError} = await supabase.storage.from(bucket).createSignedUrl(data.path,3600)
+
+ return {
+ ...data,
+ url: supabaseData.signedUrl
+ }
+/*
+ if(data.length > 0){
+ let paths = []
+ data.forEach(doc => {
+ paths.push(doc.path)
+ })
+
+ const {data: supabaseData,error} = await supabase.storage.from(bucket).createSignedUrls(paths,3600)
+
+ data = data.map((doc,index) => {
+
+ return {
+ ...doc,
+ url: supabaseData[index].signedUrl
+ }
+ })
+ }
+
+ //console.log(data)
+
+ return data[0]*/
+ }
+
+ return {uploadFiles, selectDocuments, selectSomeDocuments, selectDocument}
+}
\ No newline at end of file
diff --git a/composables/useSupabase.js b/composables/useSupabase.js
index 350d46f..b45e94e 100644
--- a/composables/useSupabase.js
+++ b/composables/useSupabase.js
@@ -22,97 +22,6 @@ export const useSupabaseSelect = async (relation,select = '*', sortColumn = null
return data
}
-export const useSupabaseSelectDocuments = async (select = '*', sortColumn = null, folderPath = "_") => {
- const supabase = useSupabaseClient()
- const profileStore = useProfileStore()
-
- let data = null
-
-
- if(sortColumn !== null ) {
- data = (await supabase
- .from("documents")
- .select(select)
- .eq("tenant", profileStore.currentTenant)
- .order(sortColumn, {ascending: true})).data
- } else {
- data = (await supabase
- .from("documents")
- .select(select)
- .eq("tenant", profileStore.currentTenant)).data
-
- }
-
- if(data.length > 0){
- let paths = []
- data.forEach(doc => {
- paths.push(doc.path)
- })
-
- const {data: supabaseData,error} = await supabase.storage.from('files').createSignedUrls(paths,3600)
-
- data = data.map((doc,index) => {
-
- return {
- ...doc,
- url: supabaseData[index].signedUrl
- }
- })
-
-
- }
-
- //console.log(data)
-
- return data
-}
-
-export const useSupabaseSelectSomeDocuments = async (documentIds, select = '*', sortColumn = null, folderPath = "_") => {
- const supabase = useSupabaseClient()
- const profileStore = useProfileStore()
-
- let data = null
-
- if(sortColumn !== null ) {
- data = (await supabase
- .from("documents")
- .select(select)
- .in("id",documentIds)
- .eq("tenant", profileStore.currentTenant)
- .order(sortColumn, {ascending: true})).data
- } else {
- data = (await supabase
- .from("documents")
- .select(select)
- .in("id",documentIds)
- .eq("tenant", profileStore.currentTenant)).data
-
- }
-
- if(data.length > 0){
- let paths = []
- data.forEach(doc => {
- paths.push(doc.path)
- })
-
- const {data: supabaseData,error} = await supabase.storage.from('files').createSignedUrls(paths,3600)
-
- data = data.map((doc,index) => {
-
- return {
- ...doc,
- url: supabaseData[index].signedUrl
- }
- })
-
-
- }
-
- //console.log(data)
-
- return data
-}
-
export const useSupabaseSelectSingle = async (relation,idToEq,select = '*' ) => {
const supabase = useSupabaseClient()
const profileStore = useProfileStore()
diff --git a/layouts/default.vue b/layouts/default.vue
index 68f5edb..9448b76 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -125,18 +125,8 @@ const footerLinks = [/*{
+
- Entwurf
+ Entwurf speichern
{
v-model="itemInfo.type"
value-attribute="type"
option-attribute="label"
- @input="setDocumentTypeConfig"
+ @change="setDocumentTypeConfig"
class="flex-auto"
>
diff --git a/pages/createDocument/show/[id].vue b/pages/createDocument/show/[id].vue
index 2b52db2..9e058c0 100644
--- a/pages/createDocument/show/[id].vue
+++ b/pages/createDocument/show/[id].vue
@@ -21,9 +21,16 @@ const linkedDocument =ref({})
const currentTenant = ref({})
const setupPage = async () => {
if(route.params) {
- if(route.params.id) itemInfo.value = await useSupabaseSelectSingle("createddocuments",route.params.id,"*")
- const {data,error} = await supabase.from("documents").select("id").eq("createdDocument", route.params.id).order("id",{ascending:true})
- linkedDocument.value = data[data.length -1]
+ if(route.params.id) itemInfo.value = await useSupabaseSelectSingle("createddocuments",route.params.id,"*, files(*)")
+
+ console.log(itemInfo.value)
+
+ linkedDocument.value = await useFiles().selectDocument(itemInfo.value.files[0].id)
+
+
+
+ //const {data,error} = await supabase.from("files").select("id").eq("createddocument", route.params.id).order("id",{ascending:true})
+ //linkedDocument.value = data[data.length -1]
}
@@ -72,11 +79,19 @@ const openEmail = () => {
>
E-Mail
+
+ Projekt
+
diff --git a/pages/documents.vue b/pages/files/index.vue
similarity index 53%
rename from pages/documents.vue
rename to pages/files/index.vue
index 9753c16..a461500 100644
--- a/pages/documents.vue
+++ b/pages/files/index.vue
@@ -2,22 +2,66 @@
import {BlobReader, BlobWriter, ZipWriter} from "@zip.js/zip.js";
-import {useSupabaseSelectDocuments, useSupabaseSelectSingle} from "~/composables/useSupabase.js";
+import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
+import DocumentDisplayModal from "~/components/DocumentDisplayModal.vue";
+import dayjs from "dayjs";
definePageMeta({
middleware: "auth"
})
+
+defineShortcuts({
+ /*'/': () => {
+ //console.log(searchinput)
+ //searchinput.value.focus()
+ document.getElementById("searchinput").focus()
+ },*/
+ '+': () => {
+ //Hochladen
+ uploadModalOpen.value = true
+ },
+ 'Enter': {
+ usingInput: true,
+ handler: () => {
+ let entry = renderedFileList.value[selectedFileIndex.value]
+
+ if(entry.type === "file") {
+ showFile(entry.id)
+ console.log(entry)
+ } else {
+ changeFolder(currentFolders.value.find(i => i.id === entry.id))
+ }
+
+ }
+ },
+ 'arrowdown': () => {
+ if(selectedFileIndex.value < renderedFileList.value.length - 1) {
+ selectedFileIndex.value += 1
+ } else {
+ selectedFileIndex.value = 0
+ }
+ },
+ 'arrowup': () => {
+ if(selectedFileIndex.value === 0) {
+ selectedFileIndex.value = renderedFileList.value.length - 1
+ } else {
+ selectedFileIndex.value -= 1
+ }
+ }
+})
+
const dataStore = useDataStore()
const profileStore = useProfileStore()
const supabase = useSupabaseClient()
-const user = useSupabaseUser()
-const toast = useToast()
const router = useRouter()
const route = useRoute()
+const slideover = useSlideover()
+const modal = useModal()
dataStore.fetchDocuments()
const uploadModalOpen = ref(false)
+const createFolderModalOpen = ref(false)
const uploadInProgress = ref(false)
const fileUploadFormData = ref({
tags: ["Eingang"],
@@ -26,11 +70,18 @@ const fileUploadFormData = ref({
folder: null
})
+const files = useFiles()
let tags = dataStore.getDocumentTags
+const displayMode = ref("list")
+const displayModes = ref([{label: 'Liste',key:'list', icon: 'i-heroicons-list-bullet'},{label: 'Kacheln',key:'rectangles', icon: 'i-heroicons-squares-2x2'}])
+
+
+
const documents = ref([])
const folders = ref([])
+const filetags = ref([])
const currentFolder = ref(null)
@@ -39,11 +90,12 @@ const isDragTarget = ref(false)
const setupPage = async () => {
folders.value = await useSupabaseSelect("folders")
- documents.value = await useSupabaseSelectDocuments("*",null)
+ documents.value = await files.selectDocuments()
+
+ filetags.value = await useSupabaseSelect("filetags")
if(route.query) {
if(route.query.folder) {
- console.log(route.query.folder)
currentFolder.value = await useSupabaseSelectSingle("folders", route.query.folder)
}
}
@@ -135,10 +187,6 @@ const breadcrumbLinks = computed(() => {
}
})
-
-
-
-
const filteredDocuments = computed(() => {
return documents.value.filter(i => currentFolder.value ? i.folder === currentFolder.value.id : !i.folder)
@@ -151,20 +199,38 @@ const changeFolder = async (newFolder) => {
if(newFolder) {
fileUploadFormData.value.folder = newFolder.id
- await router.push(`/documents?folder=${newFolder.id}`)
+ await router.push(`/files?folder=${newFolder.id}`)
} else {
fileUploadFormData.value.folder = null
- await router.push(`/documents`)
+ await router.push(`/files`)
}
setupPage()
}
+const createFolderData = ref({})
+const createFolder = async () => {
+ const {data,error} = await supabase
+ .from("folders")
+ .insert({
+ tenant: profileStore.currentTenant,
+ parent: currentFolder.value ? currentFolder.value.id : undefined,
+ name: createFolderData.value.name,
+
+ })
+
+ createFolderModalOpen.value = false
+
+ setupPage()
+
+}
+
const uploadFiles = async (files) => {
uploadInProgress.value = true;
if(files) {
- await dataStore.uploadFiles({tags: ["Ablage"],tenant: profileStore.currentTenant,folder: currentFolder.value.id}, files, true)
+ //await dataStore.uploadFiles({tags: ["Ablage"],tenant: profileStore.currentTenant,folder: currentFolder.value.id}, files, true)
+ await dataStore.uploadFiles({tags: ["Ablage"],tenant: profileStore.currentTenant}, files, true)
} else {
await dataStore.uploadFiles(fileUploadFormData.value, document.getElementById("fileUploadInput").files, true)
@@ -237,37 +303,46 @@ const downloadSelected = async () => {
link.click();
}
+const renderedFileList = computed(() => {
+ let files = filteredDocuments.value.map(i => {
+ return {
+ label: i.path.split("/")[i.path.split("/").length -1],
+ id: i.id,
+ type: "file"
+ }
+ })
+
+ let folders = currentFolders.value.map(i => {
+ return {
+ label: i.name,
+ id: i.id,
+ type: "folder"
+ }
+ })
+
+ return [...folders,...files]
+
+})
+const selectedFileIndex = ref(0)
+
+const showFile = (fileId) => {
+ console.log(fileId)
+ modal.open(DocumentDisplayModal,{
+ documentData: documents.value.find(i => i.id === fileId),
+ })
+}
+
+
-
{
/>
- Hochladen
+
+
+
+
+ + Hochladen
+ + Ordner
+
+
+
+ Ordner Erstellen
+
+
+
+
+
+
+
+
+
+ Erstellen
+
+
+
+
+
+
-
-
+ {
multiple
searchable
searchable-placeholder="Suchen..."
- :options="tags"
+ option-attribute="name"
+ value-attribute="id"
+ :options="filetags"
v-model="fileUploadFormData.tags"
/>
@@ -382,8 +535,6 @@ const downloadSelected = async () => {
-
-
\ No newline at end of file
diff --git a/pages/historyitems/index.vue b/pages/historyitems/index.vue
new file mode 100644
index 0000000..b44d9dd
--- /dev/null
+++ b/pages/historyitems/index.vue
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/settings/emailAccounts.vue b/pages/settings/emailAccounts.vue
index 37357c4..1911a44 100644
--- a/pages/settings/emailAccounts.vue
+++ b/pages/settings/emailAccounts.vue
@@ -96,11 +96,15 @@ const columns = computed(() => templateColumns.filter((column) => selectedColumn
-
- + E-Mail Konto
-
+
+
+ + E-Mail Konto
+
+
+
{
numberRangeHolder: "customerNumber",
historyItemHolder: "customer",
supabaseSortColumn: "customerNumber",
- supabaseSelectWithInformation: "*, projects(*), plants(*), contracts(*), contacts(*), createddocuments(*), documents(*)",
+ supabaseSelectWithInformation: "*, projects(*), plants(*), contracts(*), contacts(*), createddocuments(*), files(*)",
filters: [],
templateColumns: [
{
@@ -228,7 +228,7 @@ export const useDataStore = defineStore('data', () => {
component: profiles
},
],
- showTabs: [{label: 'Informationen'},{label: 'Dokumente'},{label: 'Ausgangsbelege'},{label: 'Projekte'},{label: 'Objekte'},{label: 'Verträge'}]
+ showTabs: [{label: 'Informationen'},{label: 'Dateien'},{label: 'Ausgangsbelege'},{label: 'Projekte'},{label: 'Objekte'},{label: 'Verträge'}]
},
contacts: {
label: "Kontakte",
@@ -329,23 +329,30 @@ export const useDataStore = defineStore('data', () => {
isStandardEntity: true,
redirect:true,
filters:[],
- supabaseSelectWithInformation: "*, customer(*), documents(*)",
+ inputColumns: [
+ "Allgemeines",
+ "Abrechnung"
+ ],
+ supabaseSelectWithInformation: "*, customer(*), files(*)",
templateColumns: [
{
key: "name",
label: "Name",
title: true,
- inputType: "text"
+ inputType: "text",
+ inputColumn: "Allgemeines"
},{
key: "active",
label: "Aktiv",
component: active,
- inputType: "bool"
+ inputType: "bool",
+ inputColumn: "Allgemeines"
},{
key: "recurring",
label: "Wiederkehrend",
component: recurring,
- inputType: "bool"
+ inputType: "bool",
+ inputColumn: "Allgemeines"
},{
key: 'customer',
label: "Kunde",
@@ -354,6 +361,7 @@ export const useDataStore = defineStore('data', () => {
selectDataType: "customers",
selectOptionAttribute: "name",
selectSearchAttributes: ['name'],
+ inputColumn: "Allgemeines"
},{
key: 'contact',
label: "Ansprechpartner",
@@ -365,64 +373,91 @@ export const useDataStore = defineStore('data', () => {
},
selectOptionAttribute: "fullName",
selectSearchAttributes: ['fullName'],
+ inputColumn: "Allgemeines"
},{
key: 'duration',
label: "mindest Vertragslaufzeit",
inputType: "select",
- selectManualOptions: ['12 Monate','24 Monate','36 Monate','48 Monate']
+ selectValueAttribute:"label",
+ selectManualOptions: [
+ {label:'12 Monate'},
+ {label:'24 Monate'},
+ {label:'36 Monate'},
+ {label:'48 Monate'},
+ ],
+ inputColumn: "Allgemeines"
},{
key: 'invoiceDispatch',
label: "Rechnungsversand",
inputType: "select",
- selectManualOptions: ['E-Mail','Post']
+ selectValueAttribute: "label",
+ selectManualOptions: [
+ {label:'E-Mail'},
+ {label:'Post'}
+ ],
+ inputColumn: "Abrechnung"
},{
key: 'paymentType',
label: "Zahlungsart",
inputType: "select",
- selectManualOptions: ['Einzug','Überweisung']
+ selectValueAttribute: "label",
+ selectManualOptions: [
+ {label:'Einzug'},
+ {label:'Überweisung'}
+ ],
+ inputColumn: "Abrechnung"
},{
key: 'startDate',
label: "Vertragsstart",
inputType: "date",
+ inputColumn: "Allgemeines"
},{
key: 'endDate',
label: "Vertragsende",
inputType: "date",
+ inputColumn: "Allgemeines"
},{
key: 'signDate',
label: "Unterschrieben am",
inputType: "date",
+ inputColumn: "Allgemeines"
},{
key: 'sepaDate',
label: "SEPA Datum",
inputType: "date",
+ inputColumn: "Abrechnung"
},{
key: 'sepaRef',
label: "Mandatsreferenz",
inputType: "text",
+ inputColumn: "Abrechnung"
},{
key: 'bankingIban',
label: "IBAN",
inputType: "text",
+ inputColumn: "Abrechnung"
},{
key: 'bankingOwner',
label: "Inhaber",
inputType: "text",
+ inputColumn: "Abrechnung"
},{
key: 'bankingName',
label: "Bank",
inputType: "text",
+ inputColumn: "Abrechnung"
},{
key: 'bankinBIC',
label: "BIC",
inputType: "text",
+ inputColumn: "Abrechnung"
},{
key: "notes",
label: "Notizen",
- inputType: "textarea"
+ inputType: "textarea",
}
],
- showTabs: [{label: 'Informationen'},{label: 'Dokumente'}]
+ showTabs: [{label: 'Informationen'},{label: 'Dateien'}]
},
absencerequests: {
label: "Abwesenheitsanträge",
@@ -527,7 +562,7 @@ export const useDataStore = defineStore('data', () => {
},{
label: "Aufgaben"
},{
- label: "Dokumente"
+ label: "Dateien"
}]
},
products: {
@@ -536,6 +571,7 @@ export const useDataStore = defineStore('data', () => {
isStandardEntity: true,
redirect:true,
supabaseSelectWithInformation: "*, unit(name)",
+ historyItemHolder: "product",
filters: [],
templateColumns: [
{
@@ -568,6 +604,16 @@ export const useDataStore = defineStore('data', () => {
label: "Verkaufpreispreis",
component: sellingPrice,
inputType: "number"
+ },{
+ key: "taxPercentage",
+ label: "Umsatzsteuer",
+ inputType: "select",
+ selectOptionAttribute: "label",
+ selectValueAttribute: 'key',
+ selectManualOptions: [
+ {label: "19 %", key: 19},
+ {label: "7 %", key: 7},
+ {label: "0 %", key: 0}]
},
/*{
key: "tags",
@@ -601,7 +647,7 @@ export const useDataStore = defineStore('data', () => {
redirect:true,
historyItemHolder: "project",
numberRangeHolder: "projectNumber",
- supabaseSelectWithInformation: "*, customer(id,name), plant(id,name), projecttype(name, id), tasks(*), documents(*), createddocuments(*)",
+ supabaseSelectWithInformation: "*, customer(id,name), plant(id,name), projecttype(name, id), tasks(*), files(*), createddocuments(*)",
supabaseSortColumn: "projectNumber",
filters: [
{
@@ -685,8 +731,8 @@ export const useDataStore = defineStore('data', () => {
key: "tasks",
label: "Aufgaben"
},{
- key: "documents",
- label: "Dokumente"
+ key: "files",
+ label: "Dateien"
},{
label: "Ausgangsbelege"
}/*,{
@@ -706,7 +752,7 @@ export const useDataStore = defineStore('data', () => {
isStandardEntity: true,
redirect:true,
historyItemHolder: "vehicle",
- supabaseSelectWithInformation: "*, checks(*), documents(*)",
+ supabaseSelectWithInformation: "*, checks(*), files(*)",
filters:[],
templateColumns:[
{
@@ -779,7 +825,7 @@ export const useDataStore = defineStore('data', () => {
{
label: 'Informationen',
}, {
- label: 'Dokumente',
+ label: 'Dateien',
}, {
label: 'Überprüfungen',
}
@@ -902,7 +948,7 @@ export const useDataStore = defineStore('data', () => {
{
label: 'Informationen',
}, {
- label: 'Dokumente',
+ label: 'Dateien',
}
]
},
@@ -914,7 +960,7 @@ export const useDataStore = defineStore('data', () => {
label: "Lagerplätze",
labelSingle: "Lagerplatz",
isStandardEntity: true,
- supabaseSelectWithInformation: "*, documents(*)",
+ supabaseSelectWithInformation: "*, files(*)",
supabaseSortColumn: "spaceNumber",
redirect: true,
numberRangeHolder: "spaceNumber",
@@ -943,7 +989,14 @@ export const useDataStore = defineStore('data', () => {
key: "type",
label: "Typ",
inputType: "select",
- selectManualOptions: ["Standort","Regalplatz", "Kiste", "Palettenplatz", "Sonstiges"],
+ selectValueAttribute: "label",
+ selectManualOptions: [
+ {label:"Standort"},
+ {label:"Regalplatz"},
+ {label:"Kiste"},
+ {label:"Palettenplatz"},
+ {label:"Sonstiges"}
+ ],
inputColumn: "Allgemeines"
},
{
@@ -1013,7 +1066,7 @@ export const useDataStore = defineStore('data', () => {
{
label: 'Informationen',
}, {
- label: 'Dokumente',
+ label: 'Dateien',
},{label: 'Inventarartikel'}
]
},
@@ -1034,7 +1087,7 @@ export const useDataStore = defineStore('data', () => {
label: "Inventarartikel",
labelSingle: "Inventarartikel",
isStandardEntity: true,
- supabaseSelectWithInformation: "*, documents(*), vendor(id,name), currentSpace(id,name)",
+ supabaseSelectWithInformation: "*, files(*), vendor(id,name), currentSpace(id,name)",
redirect: true,
numberRangeHolder: "articleNumber",
inputColumns: [
@@ -1151,7 +1204,7 @@ export const useDataStore = defineStore('data', () => {
{
label: 'Informationen',
}, {
- label: 'Dokumente',
+ label: 'Dateien',
}
]
},
@@ -1405,7 +1458,7 @@ export const useDataStore = defineStore('data', () => {
label: "Überprüfungen",
labelSingle: "Überprüfung",
isStandardEntity: true,
- supabaseSelectWithInformation: "*, vehicle(id,licensePlate), profile(id, fullName), inventoryitem(name), documents(*)",
+ supabaseSelectWithInformation: "*, vehicle(id,licensePlate), profile(id, fullName), inventoryitem(name), files(*)",
redirect: true,
historyItemHolder: "check",
filters: [],
@@ -1451,7 +1504,7 @@ export const useDataStore = defineStore('data', () => {
showTabs: [
{
label: 'Informationen',
- }, {label: 'Dokumente'}, {label: 'Ausführungen'}]
+ }, {label: 'Dateien'}, {label: 'Ausführungen'}]
},
roles: {
label: "Rollen",
@@ -2060,44 +2113,60 @@ export const useDataStore = defineStore('data', () => {
}
const uploadFiles = async (formData, files, upsert) => {
- //console.log(files)
- //console.log(formData)
- let documentsToInsert = []
-
const uploadSingleFile = async (file) => {
- const {data, error} = await supabase
- .storage
+ const {data:createdFileData,error:createdFileError} = await supabase
.from("files")
- .upload(`${profileStore.currentTenant}/${file.name}`, file, {upsert: upsert})
+ .insert({
+ tenant: profileStore.currentTenant,
+ })
+ .select()
+ .single()
- if (error) {
- console.log(error)
- console.log(error.statusCode)
+ if(createdFileError){
+ console.log(createdFileError)
+ toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+ } else if(createdFileData) {
+ console.log(createdFileData)
+ const {data:uploadData, error: uploadError} = await supabase
+ .storage
+ .from("filesdev")
+ .upload(`${profileStore.currentTenant}/filesbyid/${createdFileData.id}/${file.name}`, file, {upsert: upsert})
- if(error.statusCode === '400') {
- console.log("is 400")
- toast.add({title: "Hochladen fehlgeschlagen", description: "Die Datei enthält ungültige Zeichen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
- } else if(error.statusCode === '409') {
- console.log("is 409")
- toast.add({title: "Hochladen fehlgeschlagen", description: "Es existiert bereits eine Datei mit diesem Namen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
- } else {
- toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+ if(uploadError) {
+ console.log(uploadError)
+ console.log(uploadError.statusCode)
+ if(uploadError.statusCode === '400') {
+ console.log("is 400")
+ toast.add({title: "Hochladen fehlgeschlagen", description: "Die Datei enthält ungültige Zeichen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+ } else if(uploadError.statusCode === '409') {
+ console.log("is 409")
+ toast.add({title: "Hochladen fehlgeschlagen", description: "Es existiert bereits eine Datei mit diesem Namen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+ } else {
+ toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+
+ }
+ } else if(uploadData) {
+ const {data:updateFileData, error:updateFileError} = await supabase
+ .from("files")
+ .update({
+ ...formData,
+ path: uploadData.path,
+ })
+ .eq("id", createdFileData.id)
+
+ if(updateFileError) {
+ console.log(updateFileError)
+ toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+ } else {
+ toast.add({title: "Hochladen erfolgreich"})
+
+ }
}
-
- } else if (data) {
- const returnPath = data.path
-
- documentsToInsert.push({...formData, path: returnPath, tenant: profileStore.currentTenant})
}
-
- //console.log(data)
}
- //uploadInProgress.value = true
-
-
if(files.length === 1) {
await uploadSingleFile(files[0])
} else if( files.length > 1) {
@@ -2107,25 +2176,6 @@ export const useDataStore = defineStore('data', () => {
}
}
-
- //console.log(documentsToInsert)
-
- const {data, error} = await supabase
- .from("documents")
- .insert(documentsToInsert)
- .select()
- if(error) console.log(error)
- else {
- //console.log(data)
-
- await fetchDocuments()
-
- //documents.value.push(...data)
- }
- //uploadModalOpen.value = false;
- //uploadInProgress.value = false;
-
-
}
async function fetchBankAccounts () {
@@ -2177,7 +2227,7 @@ export const useDataStore = defineStore('data', () => {
vehicles.value = (await supabase.from("vehicles").select().eq('tenant', profileStore.currentTenant)).data
}
async function fetchTimes () {
- times.value = (await supabase.from("times").select().eq('tenant', profileStore.currentTenant).order("start", {ascending:false})).data
+ times.value = (await supabase.from("times").select().eq('tenant', profileStore.currentTenant).order("startDate", {ascending:false})).data
}
async function fetchHistoryItems () {
+
+
+
+
+ | Name | +Erstellt am | + +
+ |
+ {{dayjs(documents.find(i => i.id === entry.id).created_at).format("DD.MM.YY HH:mm")}}
+ {{dayjs(currentFolders.find(i => i.id === entry.id).created_at).format("DD.MM.YY HH:mm")}}
+ |
+ |
+
+
+ {{currentFolder.name}}
+ Ablage
+
+ {{currentFolder.name}}
- Ablage
-
-
-
+
-
-
-
+