From 6032d2403f1d6d6d8887144ce97d6668040136b2 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Thu, 11 Jul 2019 16:47:49 +0300
Subject: [PATCH] global filters ui

---
 .../Components/Dashboard/Default.cshtml       | 32 +++++++++++--------
 .../DateRangeGlobalFilterViewComponent.cshtml | 12 +++++--
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/Components/Dashboard/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/Components/Dashboard/Default.cshtml
index 22d8ceb7c7..65e694b66d 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/Components/Dashboard/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/Components/Dashboard/Default.cshtml
@@ -12,23 +12,29 @@
 @{
 }
 
-<abp-row class="mb-4">
-    <form id="DashboardGlobalFiltersForm">
-        @foreach (var globalFilterConfiguration in Model.Dashboard.AvailableGlobalFilters)
+    <abp-row class="mb-4 align-items-center justify-content-between">
+        @if (Model.Dashboard.AvailableGlobalFilters.Any())
         {
-            var globalFilter = Model.GetGlobalFilter(globalFilterConfiguration.GlobalFilterName);
+            <abp-column size="_10">
+                <form id="DashboardGlobalFiltersForm">
+                    <abp-row>
+                        @foreach (var globalFilterConfiguration in Model.Dashboard.AvailableGlobalFilters)
+                        {
+                            var globalFilter = Model.GetGlobalFilter(globalFilterConfiguration.GlobalFilterName);
 
-            @await GlobalFilteRenderer.RenderAsync(Component, globalFilter.Name)
+                            @await GlobalFilteRenderer.RenderAsync(Component, globalFilter.Name)
 
+                        }
+                    </abp-row>
+                </form>
+            </abp-column>
+            <abp-column size="_2">
+                <div class="float-right">
+                    <abp-button button-type="Success" text="@L["Refresh"].Value" icon="refresh" id="GlobalRefreshButton" />
+                </div>
+            </abp-column>
         }
-        @if (Model.Dashboard.AvailableGlobalFilters.Any())
-        {
-        <div class="float-right">
-            <abp-button button-type="Success" text="@L["Refresh"].Value" id="GlobalRefreshButton" />
-        </div>
-        }
-    </form>
-</abp-row>
+    </abp-row>
 
 <abp-row>
     @foreach (var widgetConfiguration in Model.Dashboard.AvailableWidgets)
diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/Filters/DateRangeGlobalFilterViewComponent.cshtml b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/Filters/DateRangeGlobalFilterViewComponent.cshtml
index 43787ddf79..3fd2b8fce6 100644
--- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/Filters/DateRangeGlobalFilterViewComponent.cshtml
+++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/Filters/DateRangeGlobalFilterViewComponent.cshtml
@@ -5,7 +5,15 @@
 @{
 }
 <div id="DateRangeGlobalFilterContainer">
-    <input type="date" id="StartDate" name="StartDate"/>
-    <input type="date" id="EndDate" name="EndDate"/>
+    <div class="row">
+        <div class="col-md-6 mb-3">
+            <label for="DateFilterStartDateInput">@L["Start Date"].Value</label>
+            <input class="form-control" type="date" name="StartDate" id="DateFilterStartDateInput">
+        </div>
+        <div class="col-md-6 mb-3">
+            <label for="DateFilterEndDateInput">@L["End Date"].Value</label>
+            <input class="form-control" type="date" name="EndDate" id="EndDateStartDateInput">
+        </div>
+    </div>
 </div>