From 923d09d7138dec710b6dfde48dee5d6de8ce4037 Mon Sep 17 00:00:00 2001
From: Patrick Toal <ptoal@takeflight.ca>
Date: Sun, 31 Mar 2024 14:43:45 -0400
Subject: [PATCH] A number of task improvements.  Not optimal tag selection

---
 package.json                               |   1 +
 src/components/task/NewTaskComponent.vue   |   6 -
 src/components/task/TaskTableComponent.vue |   2 +-
 src/pages/task/NewTaskPage.vue             | 181 +++++++++++++++++++++
 src/pages/{ => task}/TaskPage.vue          |   1 -
 src/router/routes.ts                       |  59 ++++---
 src/stores/task.ts                         |  19 ++-
 yarn.lock                                  |   5 +
 8 files changed, 232 insertions(+), 42 deletions(-)
 delete mode 100644 src/components/task/NewTaskComponent.vue
 create mode 100644 src/pages/task/NewTaskPage.vue
 rename src/pages/{ => task}/TaskPage.vue (95%)

diff --git a/package.json b/package.json
index d489648..42ffa91 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "appwrite": "^13.0.0",
     "pinia": "^2.1.7",
     "vue": "3",
+    "vue-multiselect": "^2.1.9",
     "vue-router": "4"
   },
   "devDependencies": {
diff --git a/src/components/task/NewTaskComponent.vue b/src/components/task/NewTaskComponent.vue
deleted file mode 100644
index abcc1b7..0000000
--- a/src/components/task/NewTaskComponent.vue
+++ /dev/null
@@ -1,6 +0,0 @@
-<template>
-  <div>My component</div>
-</template>
-
-<script setup lang="ts">
-</script>
diff --git a/src/components/task/TaskTableComponent.vue b/src/components/task/TaskTableComponent.vue
index dc375b7..2c68245 100644
--- a/src/components/task/TaskTableComponent.vue
+++ b/src/components/task/TaskTableComponent.vue
@@ -12,7 +12,7 @@
           color="primary"
           :disable="loading"
           label="New Task"
-          @click="newTask"
+          to="/task/new"
         />
         <q-btn
           v-if="tasks.length !== 0"
diff --git a/src/pages/task/NewTaskPage.vue b/src/pages/task/NewTaskPage.vue
new file mode 100644
index 0000000..b5d4674
--- /dev/null
+++ b/src/pages/task/NewTaskPage.vue
@@ -0,0 +1,181 @@
+<template>
+  <toolbar-component pageTitle="Tasks" />
+  <q-page padding>
+    <div class="q-pa-md" style="max-width: 400px">
+      <q-form @submit="onSubmit" @reset="onReset" class="q-gutter-md">
+        <q-input
+          filled
+          v-model="newTask.title"
+          label="Task Title"
+          hint="A short description of the task"
+          lazy-rules
+          :rules="[
+            (val) =>
+              (val && val.length > 0) || 'Please enter a title for the task',
+          ]"
+        />
+        <q-editor
+          filled
+          v-model="newTask.description"
+          label="Detailed Description"
+          hint="A detailed description of the task"
+          lazy-rules
+          placeholder="Enter a detailed description..."
+        />
+
+        <q-input
+          filled
+          v-model="newTask.dueDate"
+          mask="date"
+          :rules="[dateRule]"
+          hint="Enter the due date"
+          lazy-rules
+        >
+          <template v-slot:append>
+            <q-icon name="event" class="cursor-pointer">
+              <q-popup-proxy
+                cover
+                transition-show="scale"
+                transition-hide="scale"
+              >
+                <q-date
+                  v-model="newTask.dueDate"
+                  @input="updateDateISO"
+                  today-btn
+                >
+                  <div class="row items-center justify-end">
+                    <q-btn v-close-popup label="Close" color="primary" flat />
+                  </div>
+                </q-date>
+              </q-popup-proxy>
+            </q-icon>
+          </template>
+        </q-input>
+        <q-input
+          outlined
+          filled
+          v-model="tagInput"
+          label="Add required skills"
+          @input="filterMatches"
+        />
+        <q-btn
+          label="Add Tags"
+          @click="addTags"
+          color="primary"
+          class="q-ml-md"
+        />
+        <div class="q-mt-md">
+          <q-badge
+            v-for="(tag, index) in newTask.required_skills"
+            :key="index"
+            class="q-mr-sm"
+            >{{ tag }}</q-badge
+          >
+        </div>
+        <q-list v-if="matches.length > 0 && tagInput"
+          ><q-item
+            v-for="(match, index) in matches"
+            :key="index"
+            clickable
+            @click="selectMatch(match)"
+            >{{ match }}</q-item
+          ></q-list
+        >
+        <div>
+          <q-btn
+            label="Submit"
+            type="submit"
+            color="primary"
+            flat
+            class="q-ml-sm"
+          />
+          <q-btn
+            label="Reset"
+            type="reset"
+            color="primary"
+            flat
+            class="q-ml-sm"
+          />
+          <q-btn
+            label="Cancel"
+            color="secondary"
+            flat
+            class="q-ml-sm"
+            @click="$router.go(-1)"
+          />
+        </div>
+      </q-form>
+    </div>
+  </q-page>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, computed } from 'vue';
+import { useTaskStore } from 'src/stores/task';
+import type { Task } from 'src/stores/task';
+import ToolbarComponent from 'src/components/ToolbarComponent.vue';
+import { useRouter } from 'vue-router';
+import { date } from 'quasar';
+
+const taskStore = useTaskStore();
+
+const tagInput = ref('');
+
+const router = useRouter();
+const newTask = reactive({
+  description: '',
+  dueDate: date.formatDate(Date.now(), 'YYYY-MM-DD'),
+  required_skills: [],
+} as unknown as Task);
+async function onSubmit() {
+  try {
+    await taskStore.addTask(newTask);
+    console.log('Created Task');
+    router.go(-1);
+  } catch (error) {
+    console.error('Failed to create new Task: ', error);
+  }
+}
+taskStore.fetchSkillTags();
+console.log(taskStore.skillTags.map((t) => t.name));
+const matches = computed(() => {
+  if (!tagInput.value) return [];
+  return taskStore.skillTags
+    .map((t) => t.name)
+    .filter((t) => t.toLowerCase().includes(tagInput.value.toLowerCase()));
+});
+
+const addTags = () => {
+  if (tagInput.value.trim() !== '') {
+    const newTags: string[] = tagInput.value
+      .split(',')
+      .map((t) => t.trim())
+      .filter((t) => t !== '' && !newTask.required_skills.includes(t));
+    newTask.required_skills.push(...newTags);
+  }
+};
+
+const filterMatches = () => {
+  return;
+};
+
+// Method to update the model in ISO 8601 format
+const updateDateISO = (value: string) => {
+  newTask.dueDate = date.formatDate(value, 'YYYY-MM-DD');
+};
+const dateRule = (val: string) => {
+  // Check if the date is valid using Quasar's date utils if needed
+  // For simplicity, we are directly checking the date string validity
+  return (val && !isNaN(Date.parse(val))) || 'Please enter a valid date';
+};
+
+const selectMatch = (match: string) => {
+  if (!newTask.required_skills.includes(match)) {
+    newTask.required_skills.push(match);
+    tagInput.value = ''; // Clear input field and close match list
+  }
+};
+function onReset() {
+  return;
+}
+</script>
diff --git a/src/pages/TaskPage.vue b/src/pages/task/TaskPage.vue
similarity index 95%
rename from src/pages/TaskPage.vue
rename to src/pages/task/TaskPage.vue
index 63795e9..941792e 100644
--- a/src/pages/TaskPage.vue
+++ b/src/pages/task/TaskPage.vue
@@ -7,7 +7,6 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
 import { useTaskStore } from 'stores/task';
 import ToolbarComponent from 'src/components/ToolbarComponent.vue';
 import TaskListComponent from 'src/components/task/TaskListComponent.vue';
diff --git a/src/router/routes.ts b/src/router/routes.ts
index ed7a90b..6ec3d31 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -1,24 +1,9 @@
-import ScheduleIndexPage from 'pages/schedule/ScheduleIndexPage.vue';
-import ChecklistPageVue from 'pages/ChecklistPage.vue';
-import LoginPageVue from 'pages/LoginPage.vue';
-import ReferencePageVue from 'src/pages/reference/ReferencePage.vue';
-import ReferenceIndexPageVue from 'src/pages/reference/ReferenceIndexPage.vue';
-import ReferenceItemPageVue from 'src/pages/reference/ReferenceItemPage.vue';
-import MainLayoutVue from 'src/layouts/MainLayout.vue';
-import BoatPageVue from 'src/pages/BoatPage.vue';
-import CertificationPageVue from 'src/pages/CertificationPage.vue';
-import IndexPageVue from 'src/pages/IndexPage.vue';
-import ProfilePageVue from 'src/pages/ProfilePage.vue';
-import TaskPageVue from 'src/pages/TaskPage.vue';
 import { RouteRecordRaw } from 'vue-router';
-import SchedulePageView from 'pages/schedule/SchedulePageView.vue';
-import BoatReservationPageVue from 'src/pages/schedule/BoatReservationPage.vue';
-import BoatScheduleViewVue from 'src/pages/schedule/BoatScheduleView.vue';
 
 const routes: RouteRecordRaw[] = [
   {
     path: '/',
-    component: MainLayoutVue,
+    component: () => import('src/layouts/MainLayout.vue'),
     // If we get so big we need lazy loading, we can use imports again
     // component: () => import('layouts/MainLayout.vue'),
     children: [
@@ -26,69 +11,83 @@ const routes: RouteRecordRaw[] = [
         path: '',
         // If we get so big we need lazy loading, we can use imports again
         // component: () => import('pages/IndexPage.vue'),
-        component: IndexPageVue,
+        component: () => import('src/pages/IndexPage.vue'),
         name: 'index',
       },
       {
         path: '/boat',
-        component: BoatPageVue,
+        component: () => import('src/pages/BoatPage.vue'),
         name: 'boat',
       },
       {
         path: '/schedule',
-        component: SchedulePageView,
+        component: () => import('pages/schedule/SchedulePageView.vue'),
         name: 'schedule',
         children: [
           {
             path: '',
-            component: ScheduleIndexPage,
+            component: () => import('pages/schedule/ScheduleIndexPage.vue'),
             name: 'schedule-index',
           },
           {
             path: 'book',
-            component: BoatReservationPageVue,
+            component: () =>
+              import('src/pages/schedule/BoatReservationPage.vue'),
             name: 'reserve-boat',
           },
           {
             path: 'view',
-            component: BoatScheduleViewVue,
+            component: () => import('src/pages/schedule/BoatScheduleView.vue'),
             name: 'boat-schedule',
           },
         ],
       },
       {
         path: '/certification',
-        component: CertificationPageVue,
+        component: () => import('src/pages/CertificationPage.vue'),
         name: 'certification',
       },
       {
         path: '/task',
-        component: TaskPageVue,
         name: 'task',
+        children: [
+          {
+            path: '',
+            component: () => import('src/pages/task/TaskPage.vue'),
+            name: 'task-index',
+          },
+          {
+            path: 'new',
+            component: () => import('pages/task/NewTaskPage.vue'),
+            name: 'new-task',
+          },
+        ],
       },
       {
         path: '/checklist',
-        component: ChecklistPageVue,
+        component: () => import('pages/ChecklistPage.vue'),
         name: 'checklist',
       },
       {
         path: '/profile',
-        component: ProfilePageVue,
+        component: () => import('src/pages/ProfilePage.vue'),
         name: 'profile',
       },
       {
         path: '/reference',
-        component: ReferencePageVue,
+        component: () => import('src/pages/reference/ReferencePage.vue'),
         name: 'reference',
         children: [
           {
             path: '',
-            component: ReferenceIndexPageVue,
+            component: () =>
+              import('src/pages/reference/ReferenceIndexPage.vue'),
             name: 'reference-index',
           },
           {
             path: '/reference/:id/view',
-            component: ReferenceItemPageVue,
+            component: () =>
+              import('src/pages/reference/ReferenceItemPage.vue'),
           },
         ],
       },
@@ -112,7 +111,7 @@ const routes: RouteRecordRaw[] = [
   },
   {
     path: '/login',
-    component: LoginPageVue,
+    component: () => import('pages/LoginPageVue.vue'),
     name: 'login',
     meta: {
       publicRoute: true,
diff --git a/src/stores/task.ts b/src/stores/task.ts
index 19eaa95..789f1a4 100644
--- a/src/stores/task.ts
+++ b/src/stores/task.ts
@@ -2,14 +2,25 @@ import { defineStore } from 'pinia';
 import { AppwriteIds, databases, ID } from 'src/boot/appwrite';
 import type { Models } from 'appwrite';
 
+export enum TASKSTATUS {
+  READY = 'ready',
+  COMPLETE = 'complete',
+  WAITING = 'waiting',
+}
 export interface Task extends Models.Document {
   title: string;
   description: string;
-  taskLabels: string[];
-  dueDate: Date;
-  parentId: string;
+  required_skills: string[];
+  tags: string[];
+  due_date: string;
+  duration: number;
+  volunteers: string[];
+  volunteers_required: number;
+  status: TASKSTATUS;
+  depends_on: string;
   completed: boolean;
-}
+  boat: string;
+} // TODO: convert some of these strings into objects.
 
 export interface TaskTag extends Models.Document {
   name: string;
diff --git a/yarn.lock b/yarn.lock
index 2df2c5c..c74ce07 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5031,6 +5031,11 @@ vue-eslint-parser@^9.4.2:
     lodash "^4.17.21"
     semver "^7.3.6"
 
+vue-multiselect@^2.1.9:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/vue-multiselect/-/vue-multiselect-2.1.9.tgz#803628d5ff6c5925320930c965bdaae8934b92b1"
+  integrity sha512-nGEppmzhQQT2iDz4cl+ZCX3BpeNhygK50zWFTIRS+r7K7i61uWXJWSioMuf+V/161EPQjexI8NaEBdUlF3dp+g==
+
 vue-router@4:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.3.0.tgz#d5913f27bf68a0a178ee798c3c88be471811a235"