Changes

2023-12-04 20:24:01 +01:00
parent 68a5775717
commit ef9105e286
9 changed files with 443 additions and 134 deletions
--- a/spaces/pages/customers.vue
+++ b/spaces/pages/customers.vue
@@ -3,46 +3,28 @@
 <!-- TODO: Kontakte erstellen und dem Kunden zuweisen    -->
    <div id="left">

-      <UButton @click="showCreateCustomer = true">+ Kunde</UButton>
-      <UModal v-model="showCreateCustomer">
-        <UCard :ui="{ ring: '', divide: 'divide-y divide-gray-100 dark:divide-gray-800' }">
-          <template #header>
-            Kunde erstellen
-          </template>
+      <UButton @click="mode = 'create'">+ Kunde</UButton>

-          <UForm @submit="createCustomer">
-            <UFormGroup label="Name:" required>
-              <UInput v-model="customerInfo.name"/>
-            </UFormGroup>
-            <UFormGroup label="Kundenummer:" required>
-              <UInput type="number" v-model="customerInfo.customerNumber"/>
-            </UFormGroup>
-            <UButton type="submit">
-              Erstellen
-            </UButton>
-          </UForm>
+      <div class="scrollList">
+        <a v-for="item in customers" @click="selectItem(item)">
+          <UCard class="listItem">
+            <UBadge>{{item.customerNumber}}</UBadge> {{item.name}}
+          </UCard>
+        </a>
+      </div>


-        </UCard>
-      </UModal>
-
-
-      <a v-for="item in customers" @click="selectItem(item)">
-        <UCard class="listItem">
-          <UBadge>{{item.customerNumber}}</UBadge> {{item.name}}
-        </UCard>
-      </a>
-


    </div>
    <div id="right">
-
-      <UCard v-if="selectedItem.id">
+            <UCard v-if="selectedItem.id && mode == 'show'" >
        <template #header>
          <UBadge>{{selectedItem.customerNumber}}</UBadge> {{selectedItem.name}}
        </template>

+        {{selectedItem.infoData}}<br>
+
        Kontakte:<br>
 <!--        <ul>
          <li v-for="contact in selectedItem.contacts.data">{{contact.lastName}}, {{contact.firstName}}</li>
@@ -56,9 +38,138 @@

        <br><br>

+        <template #footer>
+          <UButton
+              v-if="mode == 'show' && selectedItem.id"
+              @click="editCustomer"
+          >
+            Bearbeiten
+          </UButton>
+          <UButton
+              @click="cancelEditorCreate"
+              color="red"
+              class="ml-2"
+              disabled
+          >
+            Archivieren
+          </UButton>
+<!-- TODO: Kunde archivieren          -->
+        </template>


-<!-- TODO: Scrollcontainer      -->
+
+      </UCard>
+      <UCard v-else-if="mode == 'edit' || mode == 'create'" >
+        <template #header>
+          <UBadge>{{customerInfo.customerNumber}}</UBadge> {{customerInfo.name}}
+        </template>
+
+        <UFormGroup
+          label="Name:"
+        >
+          <UInput
+            v-model="customerInfo.name"
+          />
+        </UFormGroup>
+
+        <UFormGroup
+          label="Kundennummer:"
+        >
+          <UInput
+            v-model="customerInfo.customerNumber"
+          />
+        </UFormGroup>
+
+        <UTooltip text="Ist ein Kunde nicht aktiv so wird er für neue Aufträge gesperrt">
+          <UFormGroup
+              label="Kunde aktiv:"
+          >
+            <UCheckbox
+                v-model="customerInfo.active"
+            />
+          </UFormGroup>
+        </UTooltip>
+        <UFormGroup
+          label="Notizen:"
+        >
+          <UTextarea
+            v-model="customerInfo.notes"
+          />
+        </UFormGroup>
+
+        <UFormGroup
+          label="Straße + Hausnummer"
+        >
+          <UInput
+            v-model="customerInfo.infoData.street"
+          />
+        </UFormGroup>
+        <UFormGroup
+          label="Postleitzahl"
+        >
+          <UInput
+              v-model="customerInfo.infoData.zip"
+          />
+        </UFormGroup>
+        <UFormGroup
+          label="Ort"
+        >
+          <UInput
+            v-model="customerInfo.infoData.city"
+          />
+        </UFormGroup>
+
+        <UFormGroup
+          label="Telefon:"
+        >
+          <UInput
+              v-model="customerInfo.infoData.tel"
+          />
+        </UFormGroup>
+        <UFormGroup
+          label="E-Mail:"
+        >
+          <UInput
+              v-model="customerInfo.infoData.email"
+          />
+        </UFormGroup>
+        <UFormGroup
+          label="Webseite:"
+        >
+          <UInput
+              v-model="customerInfo.infoData.web"
+          />
+        </UFormGroup>
+        <UFormGroup
+          label="USt-Id:"
+        >
+          <UInput
+              v-model="customerInfo.infoData.ustid"
+          />
+        </UFormGroup>
+
+        <template #footer>
+          <UButton
+              v-if="mode == 'edit'"
+              @click="updateCustomer"
+          >
+            Speichern
+          </UButton>
+          <UButton
+              v-else-if="mode == 'create'"
+              @click="createCustomer"
+          >
+            Erstellen
+          </UButton>
+          <UButton
+              @click="cancelEditorCreate"
+              color="red"
+              class="ml-2"
+          >
+            Abbrechen
+          </UButton>
+        </template>
+
      </UCard>
    </div>
  </div>
@@ -70,7 +181,7 @@ definePageMeta({
 })

 const supabase = useSupabaseClient()
-
+const toast = useToast()
 const {customers } = storeToRefs(useDataStore())
 const {fetchCustomers} = useDataStore()

@@ -78,17 +189,19 @@ const {fetchCustomers} = useDataStore()
 let showCreateCustomer = ref(false)
 let customerInfo = ref({
  name: "",
-  customerNumber: 0
+  customerNumber: 0,
+  infoData: {}
 })

-
+const mode = ref("show")
 let selectedItem = ref({})

 const selectItem = (item) => {
  selectedItem.value = item
+  window.scrollTo(0,0)
 }

-const createCustomer = async () => {
+/*const createCustomer = async () => {
  //await create('customers', customerInfo.value)
  const {data,error} = await supabase
      .from("customers")
@@ -101,8 +214,50 @@ const createCustomer = async () => {
  customerInfo.value = {}
  showCreateCustomer.value = false
  fetchCustomers()
+}*/
+
+
+const createCustomer = async () => {
+  const {error} = await supabase
+      .from("customers")
+      .insert([customerInfo.value])
+      .select()
+
+  if(error) {
+    console.log(error)
+  } else {
+    mode.value = "show"
+    toast.add({title: "Kunde erfolgreich erstellt"})
+    fetchCustomers()
+  }
 }

+const editCustomer = async () => {
+  mode.value = 'edit';
+  customerInfo.value = selectedItem.value
+}
+
+const cancelEditorCreate = () => {
+  mode.value = "show"
+  customerInfo.value = {
+    id: 0,
+    name: "",
+    infoData: {}
+  }
+}
+
+const updateCustomer = async () => {
+  const {error} = await supabase
+      .from("customers")
+      .update(customerInfo.value)
+      .eq('id',customerInfo.value.id)
+  console.log(error)
+  mode.value = "show"
+  toast.add({title: "Kunde erfolgreich gespeichert"})
+  fetchCustomers()
+}
+
+
 </script>

 <style scoped>
@@ -112,8 +267,11 @@ const createCustomer = async () => {
 }
 #left {
  width: 25vw;
+
 }

+
+
 #right {
  width: 60vw;
  padding-left: 3vw;
--- a/spaces/pages/documents.vue
+++ b/spaces/pages/documents.vue
@@ -262,6 +262,8 @@ const openDocument = async (document) => {
  display: flex;
  flex-direction: row;
  flex-wrap: wrap;
+  height: 85vh;
+  overflow-y: scroll;
 }

 .documentListItem {
--- a/spaces/pages/login.vue
+++ b/spaces/pages/login.vue
@@ -1,4 +1,8 @@
 <script setup >
+definePageMeta({
+  layout: "notLoggedIn"
+})
+
 const supabase = useSupabaseClient()
 const user = useSupabaseUser()
 const router = useRouter()
--- a/spaces/pages/projects/[id].vue
+++ b/spaces/pages/projects/[id].vue
@@ -58,6 +58,9 @@ const tabItems = [
  },{
    key: "timetracking",
    label: "Zeiterfassung"
+  },{
+    key: "material",
+    label: "Material"
  }
 ]
 const selectedPhase = ref({})
@@ -142,7 +145,8 @@ const phaseInfo = ref({
    <UTabs :items="tabItems" class="w-full">
      <template #item="{ item }">
        <div v-if="item.key === 'phases'" class="space-y-3">
-          <div id="phaseList">
+          <p>Hier wird aktuell noch gearbeitet</p>
+          <!--          <div id="phaseList">
            <a
                v-for="phase in []"
                @click="selectedPhase = phase"
@@ -158,7 +162,7 @@ const phaseInfo = ref({
                <UDivider icon="i-heroicons-plus-circle"/>
              </a>
            </a>
-          </div>
+          </div>-->

        </div>
        <div v-else-if="item.key === 'forms'" class="space-y-3">
@@ -222,7 +226,12 @@ const phaseInfo = ref({
          </UButton>
          <client-only><editor-js v-model="newProjectDescription" /></client-only>
        </div>
-        {{item}}
+        <div v-else-if="item.key === 'timetracking'" class="space-y-3">
+          <p>Hier wird aktuell noch gearbeitet</p>
+        </div>
+        <div v-else-if="item.key === 'material'" class="space-y-3">
+          <p>Hier wird aktuell noch gearbeitet</p>
+        </div>
      </template>
    </UTabs>
 <!--    <div id="left">
@@ -278,7 +287,7 @@ const phaseInfo = ref({
  </div>
 </template>

-<style >
+<style scoped>

 #main {
  display: flex;
--- a/spaces/pages/tasks.vue
+++ b/spaces/pages/tasks.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-<!-- TODO: Benutzer Aufgaben zuweisen und nach diesen Filtern    -->
+  <UPage>
+    <!-- TODO: Benutzer Aufgaben zuweisen und nach diesen Filtern    -->
    <UModal
        v-model="showCreateTask"
    >
@@ -76,11 +76,16 @@
          {{user}}
        </UBadge>
        <template #footer>
-          <UButton
-            @click="finishTask"
+          <UFormGroup
+            label="Status ändern:"
          >
-            Erledigt
-          </UButton>
+            <USelectMenu
+                :options="taskCategories"
+                @change="updateTask"
+                v-model="taskData.categorie"
+            />
+          </UFormGroup>
+
        </template>
      </UCard>
    </UModal>
@@ -92,30 +97,31 @@
      >
        + Aufgabe
      </UButton>
-      <USelectMenu
-          :options="usersForList"
-          v-model="usersSelected"
-          multiple
-          placeholder="Benutzer"
-          class="w-40"
-          v-on:change="filterTasks"
-      >
-        <template #label>
-          <span v-if="usersSelected.length" class="truncate">{{ usersSelected.join(', ') }}</span>
-          <span v-else>Benutzer auswählen</span>
-        </template>
-      </USelectMenu>
+      <!--      <USelectMenu
+                :options="usersForList"
+                v-model="usersSelected"
+                multiple
+                placeholder="Benutzer"
+                class="w-40"
+                v-on:change="filterTasks"
+            >
+              <template #label>
+                <span v-if="usersSelected.length" class="truncate">{{ usersSelected.join(', ') }}</span>
+                <span v-else>Benutzer auswählen</span>
+              </template>
+            </USelectMenu>-->
    </div>




+
    <div id="taskCatList">
      <div id="catNew">
-        <h3>Neue Aufgaben</h3>
+        <h3>Offene Aufgaben</h3>
        <div class="taskScrollList" v-if="tasks.length > 0">
          <a
-              v-for="taskNew in tasks.filter(task => task.categorie == 'Neu')"
+              v-for="taskNew in tasks.filter(task => task.categorie == 'Offen')"
              @click="inspectTask(taskNew)"
          >
            <UCard class="listItem">
@@ -174,16 +180,16 @@

      </div>
    </div>
-  </div>
+  </UPage>
 </template>

 <script setup>

 definePageMeta({
-  middleware: "auth"
+  middleware: "auth",
 })

-
+const toast = useToast()
 const supabase = useSupabaseClient()
 const {tasks} = storeToRefs(useDataStore())
 const {fetchTasks} = useDataStore()
@@ -199,7 +205,7 @@ usersSelected.value = usersForList


 const showCreateTask = ref(false)
-const taskCategories = ["Neu","In Bearbeitung", "Dringend"]
+const taskCategories = ["Offen","In Bearbeitung", "Dringend"]
 const createTaskData = ref({
  name: "",
  description: "",
@@ -225,15 +231,23 @@ const createTask = async () => {
 }

 const updateTask = async () => {
-  //await update('tasks', taskData.value.id, taskData.value)
+
  console.log(taskData.value)
  const {data,error} = await supabase
      .from("tasks")
-      .update({categorie: taskData.value.categorie})
+      .update(taskData.value)
      .eq('id',taskData.value.id)
      .select()
  console.log(data)
-  console.log(error)
+
+  if(error) {
+    console.log(error)
+  } else {
+    toast.add({title: "Aufgabe aktualisiert"})
+    taskData.value = {}
+    showTaskModal.value = false
+    fetchTasks()
+  }

 }

@@ -257,6 +271,7 @@ const finishTask = async () => {
  //console.log(data)
  console.log(error)
  showTaskModal.value = false
+  fetchTasks()
 }

 //filterTasks()