From 63b2a944406f8ee3c1792705ddb522629dcb6345 Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Wed, 10 Feb 2021 01:15:45 +0530
Subject: [PATCH] chore: remove code duplication

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
---
 frontend/package-lock.json      | 18 +++++++++++------
 frontend/src/views/BhavCopy.vue | 35 ++++++++++-----------------------
 2 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 96d600e..b646562 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -16626,7 +16626,8 @@
       "version": "4.5.11",
       "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.11.tgz",
       "integrity": "sha512-JBPeZLubiSHbRkEKDj0tnLiU43AJ3vt6JULn4IKWH1XWZ6MFC8vElaP5/AA4O3Zko5caamDDBq3TRyxdA2ncUQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@vue/cli-service": {
       "version": "4.5.11",
@@ -16786,7 +16787,8 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz",
       "integrity": "sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@vue/web-component-wrapper": {
       "version": "1.2.0",
@@ -17001,7 +17003,8 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
       "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -17041,13 +17044,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
       "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "alphanum-sort": {
       "version": "1.0.2",
@@ -26194,7 +26199,8 @@
     "vuetify": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.4.3.tgz",
-      "integrity": "sha512-i2/Df0U0sedlaCbft4NMbna7WXbTCBhKVYTMjBrLVzrYTTWqzSO7ZCxLuDRY7MjwQhn7AOec7ent9U/NyIICqA=="
+      "integrity": "sha512-i2/Df0U0sedlaCbft4NMbna7WXbTCBhKVYTMjBrLVzrYTTWqzSO7ZCxLuDRY7MjwQhn7AOec7ent9U/NyIICqA==",
+      "requires": {}
     },
     "vuetify-loader": {
       "version": "1.7.2",
diff --git a/frontend/src/views/BhavCopy.vue b/frontend/src/views/BhavCopy.vue
index ffe1be5..aff960b 100644
--- a/frontend/src/views/BhavCopy.vue
+++ b/frontend/src/views/BhavCopy.vue
@@ -5,7 +5,6 @@
       <v-spacer></v-spacer>
         <v-btn
           class="ma-2"
-          color="indigo"
           @click="downloadcsv"
         >
           Download
@@ -51,25 +50,10 @@
       downloadcsv() {
         var table_data = this.$refs["bhavCopyTable"];
         var searchField = this.$refs["searchField"];
-        var rows = []
+        var rows = [[this.headersData.map(header => header.text)]]
         table_data.items.forEach(element => {
           if (element.sc_name.toLowerCase().includes(searchField.value.toLowerCase())){
-            rows.push([
-              element.sc_code,
-              element.sc_name,
-              element.sc_group,
-              element.sc_type,
-              element.open_price,
-              element.high_price,
-              element.low_price,
-              element.close_price,
-              element.last_price,
-              element.prevclose_price,
-              element.no_trades,
-              element.no_of_shrs,
-              element.net_turnov,
-              element.tdcloindi,
-            ])
+            rows.push([this.headersData.map(header => element[header.value])])
           }
         })
         // console.log(rows)
@@ -85,7 +69,14 @@
     },
     computed: {
       headers() {
-        return [
+        return this.headersData
+      }
+    },
+    data() {
+      return {
+        sc_name: '',
+        APIData: [],
+        headersData: [
           {text: 'Stock Code', value: 'sc_code'},
           {
             text: 'Stock Name',
@@ -109,12 +100,6 @@
         ]
       }
     },
-    data() {
-      return {
-        sc_name: '',
-        APIData: []
-      }
-    },
     created() {
       getAPI.get('/bhavcopyequity/',)
         .then(response => {