From 7e40b51784080a55fbc46d889a96ee792e13eae2 Mon Sep 17 00:00:00 2001
From: Dedan Irungu <dedanirungu@gmail.com>
Date: Thu, 23 Feb 2023 16:04:54 +0300
Subject: [PATCH] Improvement to table listing

---
 views/admin/autoresponder/create.vue | 11 -----
 views/admin/autoresponder/edit.vue   | 11 -----
 views/admin/autoresponder/list.vue   | 62 +++++++++++++---------------
 views/admin/campaign/create.vue      | 11 -----
 views/admin/campaign/edit.vue        | 11 -----
 views/admin/campaign/list.vue        | 49 +++++++++++-----------
 views/admin/group/create.vue         | 11 -----
 views/admin/group/edit.vue           | 11 -----
 views/admin/group/list.vue           | 44 +++++++++-----------
 9 files changed, 71 insertions(+), 150 deletions(-)
 delete mode 100755 views/admin/autoresponder/create.vue
 delete mode 100755 views/admin/autoresponder/edit.vue
 delete mode 100755 views/admin/campaign/create.vue
 delete mode 100755 views/admin/campaign/edit.vue
 delete mode 100755 views/admin/group/create.vue
 delete mode 100755 views/admin/group/edit.vue

diff --git a/views/admin/autoresponder/create.vue b/views/admin/autoresponder/create.vue
deleted file mode 100755
index c233947..0000000
--- a/views/admin/autoresponder/create.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-    <customform></customform>
-</template>
-
-<script>
-export default {
-    components: {
-        customform: window.$func.fetchComponent(["mailmass", "autoresponder", "form.vue"])
-    },
-};
-</script>
diff --git a/views/admin/autoresponder/edit.vue b/views/admin/autoresponder/edit.vue
deleted file mode 100755
index c233947..0000000
--- a/views/admin/autoresponder/edit.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-    <customform></customform>
-</template>
-
-<script>
-export default {
-    components: {
-        customform: window.$func.fetchComponent(["mailmass", "autoresponder", "form.vue"])
-    },
-};
-</script>
diff --git a/views/admin/autoresponder/list.vue b/views/admin/autoresponder/list.vue
index aae64e0..deb4dfb 100755
--- a/views/admin/autoresponder/list.vue
+++ b/views/admin/autoresponder/list.vue
@@ -1,7 +1,32 @@
 
 <template>
-    <table-render title="Autoresponder Mail Masses" :path_param="path_param" :search_fields="search_fields" :model="model"
-        :table_fields="table_fields"></table-render>
+    <table-render :path_param="['mailmass', 'autoresponder']" title="Autoresponder Mail Masses"
+        :table_fields="table_fields">
+
+        <template #header>
+            <th-render>Subject</th-render>
+            <th-render>Wait Period</th-render>
+            <th-render>Table Name</th-render>
+            <th-render>Email Field</th-render>
+            <th-render>Date Field</th-render>
+            <th-render>Start Date</th-render>
+            <th-render>End Date</th-render>
+            <th-render>Published</th-render>
+        </template>
+
+        <template #body="{ item }">
+            <td>{{ item.subject }}</td>
+            <td>{{ item.wait_period }}</td>
+            <td>{{ item.table_name }}</td>
+            <td>{{ item.email_field }}</td>
+            <td>{{ item.date_field }}</td>
+            <td>{{ item.start_date }}</td>
+            <td>{{ item.end_date }}</td>
+            <td>{{ item.published }}</td>
+        </template>
+
+
+    </table-render>
 </template>
 
 <script>
@@ -9,38 +34,7 @@
 export default {
     data() {
         return {
-            path_param: ["mailmass", "autoresponder"],
-            model: {
-                id: "",
-                subject: "",
-                body: "",
-                wait_period: "",
-                table_name: "",
-                email_field: "",
-                start_date: "",
-                end_date: "",
-                published: "",
-            },
-            search_fields: [
-                { type: "text", name: "subject", label: "Subject", ope: "", },
-                { type: "text", name: "wait_period", label: "Wait Period", ope: "", },
-                { type: "text", name: "table_name", label: "Table Name", ope: "", },
-                { type: "text", name: "email_field", label: "Email Field", ope: "", },
-                { type: "text", name: "date_field", label: "Date Field", ope: "", },
-                { type: "text", name: "start_date", label: "Start Date", ope: "", },
-                { type: "text", name: "end_date", label: "End Date", ope: "", },
-                { type: "text", name: "published", label: "Published", ope: "", },
-            ],
-            table_fields: [
-                { text: "Subject", prop: "subject", name: "subject", },
-                { text: "Wait Period", prop: "wait_period", name: "wait_period", },
-                { text: "Table Name", prop: "table_name", name: "table_name", },
-                { text: "Email Field", prop: "email_field", name: "email_field", },
-                { text: "Date Field", prop: "date_field", name: "date_field", },
-                { text: "Start Date", prop: "start_date", name: "start_date", },
-                { text: "End Date", prop: "end_date", name: "end_date", },
-                { text: "Published", prop: "published", name: "published", },
-            ],
+            table_fields: ['subject', 'wait_period', 'table_name', 'email_field', 'date_field', 'start_date', 'end_date', 'published'],
         };
     }
 };
diff --git a/views/admin/campaign/create.vue b/views/admin/campaign/create.vue
deleted file mode 100755
index ef1b206..0000000
--- a/views/admin/campaign/create.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-    <customform></customform>
-</template>
-
-<script>
-export default {
-    components: {
-        customform: window.$func.fetchComponent(["mailmass", "campaign", "form.vue"])
-    },
-};
-</script>
diff --git a/views/admin/campaign/edit.vue b/views/admin/campaign/edit.vue
deleted file mode 100755
index ef1b206..0000000
--- a/views/admin/campaign/edit.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-    <customform></customform>
-</template>
-
-<script>
-export default {
-    components: {
-        customform: window.$func.fetchComponent(["mailmass", "campaign", "form.vue"])
-    },
-};
-</script>
diff --git a/views/admin/campaign/list.vue b/views/admin/campaign/list.vue
index 32ea988..bc8df69 100755
--- a/views/admin/campaign/list.vue
+++ b/views/admin/campaign/list.vue
@@ -1,37 +1,34 @@
 
 <template>
-    <table-render title="Mail Masses Campaign" :path_param="path_param" :search_fields="search_fields" :model="model"
-        :table_fields="table_fields"></table-render>
+    <table-render :path_param="['mailmass', 'campaign']" title="Mail Masses Campaign" :table_fields="table_fields">
+
+        <template #header>
+            <th-render>Subject</th-render>
+            <th-render>Body</th-render>
+            <th-render>Send Date</th-render>
+            <th-render>Is Sent</th-render>
+            <th-render>Published</th-render>
+        </template>
+
+        <template #body="{ item }">
+            <td>{{ item.subject }}</td>
+            <td>{{ item.body }}</td>
+            <td>{{ item.send_date }}</td>
+            <td>{{ item.is_sent }}</td>
+            <td>{{ item.published }}</td>
+        </template>
+
+
+    </table-render>
 </template>
 
 <script>
 
 export default {
-    data () {
+    data() {
         return {
-            path_param: ["mailmass", "campaign"],
-            model: {
-                id: "",
-                subject: "",
-                body: "",
-                send_date: "",
-                is_sent: "",
-                published: "",
-            },
-            search_fields: [
-                { type: "text", name: "subject", label: "Subject", ope: "", },
-                { type: "text", name: "body", label: "Body", ope: "", },
-                { type: "text", name: "send_date", label: "Send Date", ope: "", },
-                { type: "text", name: "is_sent", label: "Is Sent", ope: "", },
-                { type: "text", name: "published", label: "Published", ope: "", },
-            ],
-            table_fields: [
-                { text: "Subject", prop: "subject", name: "subject", },
-                { text: "Body", prop: "body", name: "body", },
-                { text: "Send Date", prop: "send_date", name: "send_date", },
-                { text: "Is Sent", prop: "is_sent", name: "is_sent", },
-                { text: "Published", prop: "published", name: "published", },
-            ],
+            table_fields: ['subject', 'body', 'send_date', 'is_sent', 'published'],
+
         };
     }
 };
diff --git a/views/admin/group/create.vue b/views/admin/group/create.vue
deleted file mode 100755
index 7533223..0000000
--- a/views/admin/group/create.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-    <customform></customform>
-</template>
-
-<script>
-export default {
-    components: {
-        customform: window.$func.fetchComponent(["mailmass", "group", "form.vue"])
-    },
-};
-</script>
diff --git a/views/admin/group/edit.vue b/views/admin/group/edit.vue
deleted file mode 100755
index 7533223..0000000
--- a/views/admin/group/edit.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-    <customform></customform>
-</template>
-
-<script>
-export default {
-    components: {
-        customform: window.$func.fetchComponent(["mailmass", "group", "form.vue"])
-    },
-};
-</script>
diff --git a/views/admin/group/list.vue b/views/admin/group/list.vue
index 8b9c3ea..84c121c 100755
--- a/views/admin/group/list.vue
+++ b/views/admin/group/list.vue
@@ -1,35 +1,31 @@
 
 <template>
-    <table-render title="Mail Mass Group" :path_param="path_param" :search_fields="search_fields" :model="model"
-        :table_fields="table_fields"></table-render>
+    <table-render :path_param="['mailmass', 'group']" title="Mail Mass Group" :table_fields="table_fields">
+
+        <template #header>
+            <th-render>Name</th-render>
+            <th-render>Description</th-render>
+            <th-render>Ordering</th-render>
+            <th-render>Published</th-render>
+        </template>
+
+        <template #body="{ item }">
+            <td>{{ item.name }}</td>
+            <td>{{ item.description }}</td>
+            <td>{{ item.ordering }}</td>
+            <td>{{ item.published }}</td>
+        </template>
+
+
+    </table-render>
 </template>
 
 <script>
 
 export default {
-    data () {
+    data() {
         return {
-            path_param: ["mailmass", "group"],
-            model: {
-                id: "",
-                name: "",
-                description: "",
-                ordering: "",
-                published: "",
-            },
-
-            search_fields: [
-                { type: "text", name: "name", label: "Name", ope: "", },
-                { type: "text", name: "description", label: "Description", ope: "", },
-                { type: "text", name: "ordering", label: "Ordering", ope: "", },
-                { type: "text", name: "published", label: "Published", ope: "", },
-            ],
-            table_fields: [
-                { text: "Name", prop: "name", name: "name", },
-                { text: "Description", prop: "description", name: "description", },
-                { text: "Ordering", prop: "ordering", name: "ordering", },
-                { text: "Published", prop: "published", name: "published", },
-            ],
+            table_fields: ['name', 'description', 'ordering', 'published'],
         };
     }
 };