diff --git a/Models/Repositories/PhSQuoteRepository.cs b/Models/Repositories/PhSQuoteRepository.cs index 757c3e4..f1af0f6 100644 --- a/Models/Repositories/PhSQuoteRepository.cs +++ b/Models/Repositories/PhSQuoteRepository.cs @@ -112,7 +112,8 @@ namespace Models.Repositories if (!string.IsNullOrWhiteSpace(status)) query = query.Where(q => q.Status == status); - // 3) Execute paged query + // 3) Order by most recent and execute paged query + query = query.OrderByDescending(q => q.Issuedate); var pagedEntities = await query.ToPagedResultAsync(page, pageSize); // 4) Project to DTOs diff --git a/phronCare.UIBlazor/Layout/NavMenu.razor b/phronCare.UIBlazor/Layout/NavMenu.razor index 34b1f31..955e23b 100644 --- a/phronCare.UIBlazor/Layout/NavMenu.razor +++ b/phronCare.UIBlazor/Layout/NavMenu.razor @@ -65,7 +65,7 @@
- + Presupuesto
diff --git a/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteDashboard.razor b/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteDashboard.razor new file mode 100644 index 0000000..a350158 --- /dev/null +++ b/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteDashboard.razor @@ -0,0 +1,198 @@ +@page "/quotes/dashboard" +@using PSC.Blazor.Components.Chartjs +@using PSC.Blazor.Components.Chartjs.Models.Pie +@using PSC.Blazor.Components.Chartjs.Models.Bar +@using PSC.Blazor.Components.Chartjs.Models.Line +@using PSC.Blazor.Components.Chartjs.Models.Common +@inject NavigationManager Navigation +
+ + +
+

Dashboard Operativo de Presupuestos

+
+ + +
+
+
+ +
+
120
+
Total Quotes
+
+
+
+
+
+ +
+
65%
+
Approval Rate
+
+
+
+
+
+ +
+
$150,000
+
Total Quoted
+
+
+
+
+
+ +
+
$2,500
+
Average Quote
+
+
+
+
+ + +
+ + + + + +
+ + +
+
+
+
Quotes by Status
+ +
+
+ +
+
+
Top Productos Presupuestados
+ +
+
+ +
+
+
Quoted Amount Over Time
+ +
+
+
+
+ +@code { + private PieChartConfig _pieChartConfig; + private BarChartConfig _barChartConfig; + private LineChartConfig _lineChartConfig; + + protected override void OnInitialized() + { + InitPieChart(); + InitBarChart(); + InitLineChart(); + } + + private void InitPieChart() + { + _pieChartConfig = new PieChartConfig + { + Options = new PieOptions + { + Plugins = new Plugins + { + Legend = new Legend + { + Display = true, + Position = LegendPosition.Bottom + } + } + }, + Data = new PieData + { + Labels = new List { "Aprobado", "Pendiente", "Rechazado" }, + Datasets = new List + { + new PieDataset + { + Data = new List { 60, 25, 15 }, + BackgroundColor = new List { "#4CAF50", "#FFC107", "#F44336" } + } + } + } + }; + } + + private void InitBarChart() + { + _barChartConfig = new BarChartConfig + { + Options = new Options + { + Plugins = new Plugins { Legend = new Legend { Display = false } }, + Scales = new Dictionary + { + ["x"] = new Axis { Title = new AxesTitle { Display = true, Text = "Producto" } }, + ["y"] = new Axis { Title = new AxesTitle { Display = true, Text = "Cantidad" } } + } + }, + Data = new BarData + { + Labels = new List { "Prod A", "Prod B", "Prod C", "Prod D", "Prod E" }, + Datasets = new List + { + new BarDataset + { + Data = new List { 10, 8, 6, 5, 4 }, + BackgroundColor = Enumerable.Repeat("#2196F3", 5).ToList() + } + } + } + }; + } + + private void InitLineChart() + { + _lineChartConfig = new LineChartConfig + { + Options = new Options + { + Plugins = new Plugins { Legend = new Legend { Display = true } }, + Scales = new Dictionary + { + ["x"] = new Axis { Title = new AxesTitle { Display = true, Text = "Mes" } }, + ["y"] = new Axis { Title = new AxesTitle { Display = true, Text = "Monto ($)" } } + } + }, + Data = new LineData + { + Labels = new List { "Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio" }, + Datasets = new List + { + new LineDataset + { + Label = "Total Presupuestado", + Data = new List { 10000, 12000, 13000, 14000, 16000, 20000 }, + Fill = false, + BorderColor = "#4CAF50", + Tension = 0.3m + } + } + } + }; + } +} diff --git a/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteDashboard.razor.css b/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteDashboard.razor.css new file mode 100644 index 0000000..7beb87a --- /dev/null +++ b/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteDashboard.razor.css @@ -0,0 +1,33 @@ +.quote-action-button { + display: flex; + align-items: center; + gap: 0.5rem; + padding: 0.6rem 1.2rem; + background-color: #fff; + border: 1px solid #ccc; + border-radius: 10px; + box-shadow: 0 2px 6px rgba(0,0,0,0.05); + font-size: 0.95rem; + font-weight: 500; + color: #333; + transition: all 0.2s ease-in-out; +} + + .quote-action-button i { + font-size: 1.2rem; + } + + .quote-action-button:hover { + background-color: #f8f9fa; + transform: translateY(-1px); + box-shadow: 0 4px 10px rgba(0,0,0,0.07); + } + + .quote-action-button.success { + border-color: #198754; + color: #198754; + } + + .quote-action-button.success:hover { + background-color: #e8f5e9; + } diff --git a/phronCare.UIBlazor/Pages/Sales/Quotes/Quotes.razor b/phronCare.UIBlazor/Pages/Sales/Quotes/Quotes.razor index 14b13a4..cc73a84 100644 --- a/phronCare.UIBlazor/Pages/Sales/Quotes/Quotes.razor +++ b/phronCare.UIBlazor/Pages/Sales/Quotes/Quotes.razor @@ -113,10 +113,10 @@ @if (quote.Status?.ToLower() == "emitido") { - } @@ -259,19 +259,19 @@
- - Página @Filters.Page de @TotalPaginas - -
diff --git a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.dgspec.json b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.dgspec.json index bb2f979..526c3ee 100644 --- a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.dgspec.json +++ b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.dgspec.json @@ -160,6 +160,10 @@ "target": "Package", "version": "[9.0.5, )", "autoReferenced": true + }, + "PSC.Blazor.Components.Chartjs": { + "target": "Package", + "version": "[8.0.8, )" } }, "imports": [ diff --git a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.props b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.props index ef64cbe..65a59e4 100644 --- a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.props +++ b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.props @@ -13,7 +13,26 @@ + + + PSC.Blazor.Components.Chartjs + 8.0.8 + Content + false + False + libman.json + + + PSC.Blazor.Components.Chartjs + 8.0.8 + Content + false + False + psc_ico.ico + + + diff --git a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.targets b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.targets index 6143205..0eccd20 100644 --- a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.targets +++ b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.targets @@ -3,9 +3,9 @@ + - \ No newline at end of file diff --git a/phronCare.UIBlazor/obj/project.assets.json b/phronCare.UIBlazor/obj/project.assets.json index fc6282c..7d98c05 100644 --- a/phronCare.UIBlazor/obj/project.assets.json +++ b/phronCare.UIBlazor/obj/project.assets.json @@ -764,6 +764,40 @@ } } }, + "PSC.Blazor.Components.Chartjs/8.0.8": { + "type": "package", + "dependencies": { + "Microsoft.AspNetCore.Components.Web": "8.0.6" + }, + "compile": { + "lib/net8.0/PSC.Blazor.Components.Chartjs.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/PSC.Blazor.Components.Chartjs.dll": { + "related": ".xml" + } + }, + "contentFiles": { + "contentFiles/any/net8.0/libman.json": { + "buildAction": "Content", + "codeLanguage": "any", + "copyToOutput": false + }, + "contentFiles/any/net8.0/psc_ico.ico": { + "buildAction": "Content", + "codeLanguage": "any", + "copyToOutput": false + } + }, + "build": { + "buildTransitive/PSC.Blazor.Components.Chartjs.props": {} + }, + "buildMultiTargeting": { + "buildMultiTargeting/PSC.Blazor.Components.Chartjs.props": {} + } + }, "PuppeteerSharp/6.0.0": { "type": "package", "dependencies": { @@ -3057,6 +3091,40 @@ } } }, + "PSC.Blazor.Components.Chartjs/8.0.8": { + "type": "package", + "dependencies": { + "Microsoft.AspNetCore.Components.Web": "8.0.6" + }, + "compile": { + "lib/net8.0/PSC.Blazor.Components.Chartjs.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/PSC.Blazor.Components.Chartjs.dll": { + "related": ".xml" + } + }, + "contentFiles": { + "contentFiles/any/net8.0/libman.json": { + "buildAction": "Content", + "codeLanguage": "any", + "copyToOutput": false + }, + "contentFiles/any/net8.0/psc_ico.ico": { + "buildAction": "Content", + "codeLanguage": "any", + "copyToOutput": false + } + }, + "build": { + "buildTransitive/PSC.Blazor.Components.Chartjs.props": {} + }, + "buildMultiTargeting": { + "buildMultiTargeting/PSC.Blazor.Components.Chartjs.props": {} + } + }, "PuppeteerSharp/6.0.0": { "type": "package", "dependencies": { @@ -5921,6 +5989,164 @@ "tools/install.ps1" ] }, + "PSC.Blazor.Components.Chartjs/8.0.8": { + "sha512": "N5P5DaddtBmmdpd96t3PQ2td9VUmTZM0VjMWBAuApJGS6QWjwAavRaKZ/jwcuQVk8uajf1/DmR3lWjyAFABtAQ==", + "type": "package", + "path": "psc.blazor.components.chartjs/8.0.8", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "README.md", + "build/Microsoft.AspNetCore.StaticWebAssets.props", + "build/PSC.Blazor.Components.Chartjs.props", + "buildMultiTargeting/PSC.Blazor.Components.Chartjs.props", + "buildTransitive/PSC.Blazor.Components.Chartjs.props", + "content/libman.json", + "content/psc_ico.ico", + "contentFiles/any/net8.0/libman.json", + "contentFiles/any/net8.0/psc_ico.ico", + "lib/net8.0/PSC.Blazor.Components.Chartjs.dll", + "lib/net8.0/PSC.Blazor.Components.Chartjs.xml", + "psc.blazor.components.chartjs.8.0.8.nupkg.sha512", + "psc.blazor.components.chartjs.nuspec", + "psc_logo.png", + "staticwebassets/Chart.js", + "staticwebassets/PSC.Blazor.Components.Chartjs.bundle.scp.css", + "staticwebassets/lib/Chart.js/chart.cjs", + "staticwebassets/lib/Chart.js/chart.cjs.map", + "staticwebassets/lib/Chart.js/chart.esm.js", + "staticwebassets/lib/Chart.js/chart.esm.min.js", + "staticwebassets/lib/Chart.js/chart.js", + "staticwebassets/lib/Chart.js/chart.js.map", + "staticwebassets/lib/Chart.js/chart.min.js", + "staticwebassets/lib/Chart.js/chart.mjs", + "staticwebassets/lib/Chart.js/chart.umd.js", + "staticwebassets/lib/Chart.js/chart.umd.js.map", + "staticwebassets/lib/Chart.js/chunks/helpers.segment.cjs", + "staticwebassets/lib/Chart.js/chunks/helpers.segment.cjs.map", + "staticwebassets/lib/Chart.js/chunks/helpers.segment.js", + "staticwebassets/lib/Chart.js/chunks/helpers.segment.js.map", + "staticwebassets/lib/Chart.js/controllers/controller.bar.d.ts", + "staticwebassets/lib/Chart.js/controllers/controller.bubble.d.ts", + "staticwebassets/lib/Chart.js/controllers/controller.doughnut.d.ts", + "staticwebassets/lib/Chart.js/controllers/controller.line.d.ts", + "staticwebassets/lib/Chart.js/controllers/controller.pie.d.ts", + "staticwebassets/lib/Chart.js/controllers/controller.polarArea.d.ts", + "staticwebassets/lib/Chart.js/controllers/controller.radar.d.ts", + "staticwebassets/lib/Chart.js/controllers/controller.scatter.d.ts", + "staticwebassets/lib/Chart.js/controllers/index.d.ts", + "staticwebassets/lib/Chart.js/core/core.adapters.d.ts", + "staticwebassets/lib/Chart.js/core/core.animation.d.ts", + "staticwebassets/lib/Chart.js/core/core.animations.d.ts", + "staticwebassets/lib/Chart.js/core/core.animations.defaults.d.ts", + "staticwebassets/lib/Chart.js/core/core.animator.d.ts", + "staticwebassets/lib/Chart.js/core/core.config.d.ts", + "staticwebassets/lib/Chart.js/core/core.controller.d.ts", + "staticwebassets/lib/Chart.js/core/core.datasetController.d.ts", + "staticwebassets/lib/Chart.js/core/core.defaults.d.ts", + "staticwebassets/lib/Chart.js/core/core.element.d.ts", + "staticwebassets/lib/Chart.js/core/core.interaction.d.ts", + "staticwebassets/lib/Chart.js/core/core.layouts.d.ts", + "staticwebassets/lib/Chart.js/core/core.layouts.defaults.d.ts", + "staticwebassets/lib/Chart.js/core/core.plugins.d.ts", + "staticwebassets/lib/Chart.js/core/core.registry.d.ts", + "staticwebassets/lib/Chart.js/core/core.scale.autoskip.d.ts", + "staticwebassets/lib/Chart.js/core/core.scale.d.ts", + "staticwebassets/lib/Chart.js/core/core.scale.defaults.d.ts", + "staticwebassets/lib/Chart.js/core/core.ticks.d.ts", + "staticwebassets/lib/Chart.js/core/core.typedRegistry.d.ts", + "staticwebassets/lib/Chart.js/core/index.d.ts", + "staticwebassets/lib/Chart.js/elements/element.arc.d.ts", + "staticwebassets/lib/Chart.js/elements/element.bar.d.ts", + "staticwebassets/lib/Chart.js/elements/element.line.d.ts", + "staticwebassets/lib/Chart.js/elements/element.point.d.ts", + "staticwebassets/lib/Chart.js/elements/index.d.ts", + "staticwebassets/lib/Chart.js/helpers.cjs", + "staticwebassets/lib/Chart.js/helpers.cjs.map", + "staticwebassets/lib/Chart.js/helpers.esm.js", + "staticwebassets/lib/Chart.js/helpers.esm.min.js", + "staticwebassets/lib/Chart.js/helpers.js", + "staticwebassets/lib/Chart.js/helpers.js.map", + "staticwebassets/lib/Chart.js/helpers.mjs", + "staticwebassets/lib/Chart.js/helpers/helpers.canvas.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.collection.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.color.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.config.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.config.types.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.core.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.curve.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.dom.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.easing.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.extras.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.interpolation.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.intl.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.math.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.options.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.rtl.d.ts", + "staticwebassets/lib/Chart.js/helpers/helpers.segment.d.ts", + "staticwebassets/lib/Chart.js/helpers/index.d.ts", + "staticwebassets/lib/Chart.js/index.d.ts", + "staticwebassets/lib/Chart.js/index.umd.d.ts", + "staticwebassets/lib/Chart.js/platform/index.d.ts", + "staticwebassets/lib/Chart.js/platform/platform.base.d.ts", + "staticwebassets/lib/Chart.js/platform/platform.basic.d.ts", + "staticwebassets/lib/Chart.js/platform/platform.dom.d.ts", + "staticwebassets/lib/Chart.js/plugins/index.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.colors.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.decimation.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.filler/filler.drawing.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.filler/filler.helper.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.filler/filler.options.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.filler/filler.segment.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.filler/filler.target.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.filler/filler.target.stack.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.filler/index.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.filler/simpleArc.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.legend.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.subtitle.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.title.d.ts", + "staticwebassets/lib/Chart.js/plugins/plugin.tooltip.d.ts", + "staticwebassets/lib/Chart.js/scales/index.d.ts", + "staticwebassets/lib/Chart.js/scales/scale.category.d.ts", + "staticwebassets/lib/Chart.js/scales/scale.linear.d.ts", + "staticwebassets/lib/Chart.js/scales/scale.linearbase.d.ts", + "staticwebassets/lib/Chart.js/scales/scale.logarithmic.d.ts", + "staticwebassets/lib/Chart.js/scales/scale.radialLinear.d.ts", + "staticwebassets/lib/Chart.js/scales/scale.time.d.ts", + "staticwebassets/lib/Chart.js/scales/scale.timeseries.d.ts", + "staticwebassets/lib/Chart.js/types.d.ts", + "staticwebassets/lib/Chart.js/types/animation.d.ts", + "staticwebassets/lib/Chart.js/types/basic.d.ts", + "staticwebassets/lib/Chart.js/types/color.d.ts", + "staticwebassets/lib/Chart.js/types/geometric.d.ts", + "staticwebassets/lib/Chart.js/types/index.d.ts", + "staticwebassets/lib/Chart.js/types/layout.d.ts", + "staticwebassets/lib/Chart.js/types/utils.d.ts", + "staticwebassets/lib/chartjs-adapter-moment/chartjs-adapter-moment.esm.js", + "staticwebassets/lib/chartjs-adapter-moment/chartjs-adapter-moment.esm.min.js", + "staticwebassets/lib/chartjs-adapter-moment/chartjs-adapter-moment.js", + "staticwebassets/lib/chartjs-adapter-moment/chartjs-adapter-moment.min.js", + "staticwebassets/lib/chartjs-plugin-autocolors/chartjs-plugin-autocolors.cjs", + "staticwebassets/lib/chartjs-plugin-autocolors/chartjs-plugin-autocolors.cjs.map", + "staticwebassets/lib/chartjs-plugin-autocolors/chartjs-plugin-autocolors.esm.js", + "staticwebassets/lib/chartjs-plugin-autocolors/chartjs-plugin-autocolors.esm.js.map", + "staticwebassets/lib/chartjs-plugin-autocolors/chartjs-plugin-autocolors.min.js", + "staticwebassets/lib/chartjs-plugin-autocolors/chartjs-plugin-autocolors.min.js.map", + "staticwebassets/lib/chartjs-plugin-datalabels/chartjs-plugin-datalabels.esm.js", + "staticwebassets/lib/chartjs-plugin-datalabels/chartjs-plugin-datalabels.esm.min.js", + "staticwebassets/lib/chartjs-plugin-datalabels/chartjs-plugin-datalabels.js", + "staticwebassets/lib/chartjs-plugin-datalabels/chartjs-plugin-datalabels.min.js", + "staticwebassets/lib/chartjs-plugin-zoom/chartjs-plugin-zoom.esm.js", + "staticwebassets/lib/chartjs-plugin-zoom/chartjs-plugin-zoom.esm.min.js", + "staticwebassets/lib/chartjs-plugin-zoom/chartjs-plugin-zoom.js", + "staticwebassets/lib/chartjs-plugin-zoom/chartjs-plugin-zoom.min.js", + "staticwebassets/lib/hammer.js/hammer.js", + "staticwebassets/lib/hammer.js/hammer.min.js", + "staticwebassets/lib/hammer.js/hammer.min.js.map", + "staticwebassets/lib/hammer.js/hammer.min.map" + ] + }, "PuppeteerSharp/6.0.0": { "sha512": "wJIQH1qIVqC7iS+RrnfDfK4uQLqrMvWLxbMFXGDrClQGf7LKA4BDpZVPd/0hYtWjYJcsAs9UCn826VUxtD3yxw==", "type": "package", @@ -10333,6 +10559,7 @@ "Microsoft.AspNetCore.Components.WebAssembly.DevServer >= 8.0.6", "Microsoft.NET.ILLink.Tasks >= 8.0.16", "Microsoft.NET.Sdk.WebAssembly.Pack >= 9.0.5", + "PSC.Blazor.Components.Chartjs >= 8.0.8", "Transversal >= 1.0.0" ] }, @@ -10430,6 +10657,10 @@ "target": "Package", "version": "[9.0.5, )", "autoReferenced": true + }, + "PSC.Blazor.Components.Chartjs": { + "target": "Package", + "version": "[8.0.8, )" } }, "imports": [ diff --git a/phronCare.UIBlazor/phronCare.UIBlazor.csproj b/phronCare.UIBlazor/phronCare.UIBlazor.csproj index ae89f9e..9eb57bd 100644 --- a/phronCare.UIBlazor/phronCare.UIBlazor.csproj +++ b/phronCare.UIBlazor/phronCare.UIBlazor.csproj @@ -20,6 +20,7 @@ + diff --git a/phronCare.UIBlazor/wwwroot/index.html b/phronCare.UIBlazor/wwwroot/index.html index a52a021..ff4cbe7 100644 --- a/phronCare.UIBlazor/wwwroot/index.html +++ b/phronCare.UIBlazor/wwwroot/index.html @@ -25,6 +25,10 @@ integrity="sha512-gZwIG9x3wUXg2hdXF6+rVkLF/0Vi9U8D2Ntg4Ga5I5BZpVkVxlJWbSQtXPSiUTtC0TjtGOmxa1AJPuV0CPthew==" crossorigin=""> + + + +