From fd6eeac8cd55126e5344cb5c35fe15d1188850cc Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Thu, 18 Jul 2019 16:11:15 +0530
Subject: [PATCH] Date Component with default flatpickr config

---
 ui/components/controls/BaseDate.vue      |  9 ++------
 ui/components/controls/Date.vue          | 16 +++++++++++++-
 ui/components/controls/FrappeControl.vue |  1 -
 ui/pages/Report/ReportLinks.vue          |  4 ++--
 ui/pages/Report/index.vue                | 28 +++++++++++++++++-------
 5 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/ui/components/controls/BaseDate.vue b/ui/components/controls/BaseDate.vue
index 2b529fe3..a225bd44 100644
--- a/ui/components/controls/BaseDate.vue
+++ b/ui/components/controls/BaseDate.vue
@@ -1,12 +1,7 @@
 <template>
   <div :class="{'form-group': !onlyInput}">
     <label v-if="!onlyInput">{{ docfield.label }}</label>
-    <flat-pickr
-      class="form-control"
-      :value="value"
-      :config="config"
-      @on-change="emitChange">
-    </flat-pickr>
+    <flat-pickr class="form-control" :value="value" :config="config" @on-change="emitChange"></flat-pickr>
   </div>
 </template>
 <script>
@@ -27,5 +22,5 @@ export default {
 };
 </script>
 <style lang="scss">
-@import "~flatpickr/dist/flatpickr.css";
+@import '~flatpickr/dist/flatpickr.css';
 </style>
diff --git a/ui/components/controls/Date.vue b/ui/components/controls/Date.vue
index 93e48785..7399d51f 100644
--- a/ui/components/controls/Date.vue
+++ b/ui/components/controls/Date.vue
@@ -6,7 +6,21 @@ export default {
   props: {
     config: {
       type: Object,
-      default: () => ({})
+      default: () => {
+        let dateFormat = {
+          'dd/MM/yyyy': 'd/m/Y',
+          'MM/dd/yyyy': 'm/d/Y',
+          'dd-MM-yyyy': 'd-m-Y',
+          'MM-dd-yyyy': 'm-d-Y',
+          'yyyy-MM-dd': 'Y-m-d'
+        };
+        let altFormat = dateFormat[frappe.SystemSettings.dateFormat];
+        return {
+          altInput: true,
+          dateFormat: 'Y-m-d',
+          altFormat: altFormat
+        };
+      }
     }
   }
 };
diff --git a/ui/components/controls/FrappeControl.vue b/ui/components/controls/FrappeControl.vue
index 576a7b4b..cd944f47 100644
--- a/ui/components/controls/FrappeControl.vue
+++ b/ui/components/controls/FrappeControl.vue
@@ -7,7 +7,6 @@
     :disabled="isDisabled"
     :autofocus="autofocus"
     :doc="doc"
-    :config="dateConfig"
     @change="$emit('change', $event)"
   />
 </template>
diff --git a/ui/pages/Report/ReportLinks.vue b/ui/pages/Report/ReportLinks.vue
index 97cc86f2..7c560a3f 100644
--- a/ui/pages/Report/ReportLinks.vue
+++ b/ui/pages/Report/ReportLinks.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="row">
-    <div class="col-12 text-right" v-for="link of links" :key="link.label">
-      <f-button primary @click="link.handler">{{ link.label }}</f-button>
+    <div class="text-right ml-2" v-for="link of links" :key="link.label">
+      <f-button secondary @click="link.handler">{{ link.label }}</f-button>
     </div>
   </div>
 </template>
diff --git a/ui/pages/Report/index.vue b/ui/pages/Report/index.vue
index 9e3b305f..79ba3940 100644
--- a/ui/pages/Report/index.vue
+++ b/ui/pages/Report/index.vue
@@ -1,18 +1,20 @@
 <template>
   <div>
     <div class="p-4">
-      <h4 class="pb-2">{{ reportConfig.title }}</h4>
+      <div class="row pb-4">
+        <h4 class="col-6 d-flex">{{ reportConfig.title }}</h4>
+        <report-links class="col-6 d-flex pr-0 flex-row-reverse" v-if="linksExists" :links="links"></report-links>
+      </div>
       <div class="row pb-4">
         <report-filters
-          :class="linksExists ? 'col-10' : 'col-12'"
+          class="col-12 pr-0"
           v-if="filtersExists"
           :filters="reportConfig.filterFields"
           :filterDefaults="filters"
           @change="getReportData"
         ></report-filters>
-        <report-links class="col-2" v-if="linksExists" :links="links"></report-links>
       </div>
-      <div class="pt-2" ref="datatable" v-once></div>
+      <div class="pt-2 pr-3" ref="datatable" v-once></div>
     </div>
     <not-found v-if="!reportConfig" />
   </div>
@@ -20,8 +22,8 @@
 <script>
 import DataTable from 'frappe-datatable';
 import frappe from 'frappejs';
-import ReportFilters from './ReportFilters';
-import ReportLinks from './ReportLinks';
+import ReportFilters from 'frappejs/ui/pages/Report/ReportFilters';
+import ReportLinks from 'frappejs/ui/pages/Report/ReportLinks';
 import utils from 'frappejs/client/ui/utils';
 
 export default {
@@ -35,6 +37,12 @@ export default {
       return (this.reportConfig.linkFields || []).length;
     }
   },
+  watch: {
+    reportName() {
+      //FIX: Report's data forwards to next consecutively changed report
+      this.getReportData(this.filters);
+    }
+  },
   data() {
     return {
       links: []
@@ -42,7 +50,6 @@ export default {
   },
   async created() {
     this.setLinks();
-    // this.doc.on('change', this.setLinks);
   },
   methods: {
     async getReportData(filters) {
@@ -79,7 +86,9 @@ export default {
       } else {
         this.datatable = new DataTable(this.$refs.datatable, {
           columns: columns,
-          data: rows
+          data: rows,
+          treeView: this.reportConfig.treeView || false,
+          cellHeight: 35
         });
       }
       return [rows, columns];
@@ -110,4 +119,7 @@ export default {
 };
 </script>
 <style>
+.datatable {
+  font-size: 12px;
+}
 </style>