diff --git a/Models/Repositories/PhSLookUpRepository.cs b/Models/Repositories/PhSLookUpRepository.cs index d0a2424..6d2faa3 100644 --- a/Models/Repositories/PhSLookUpRepository.cs +++ b/Models/Repositories/PhSLookUpRepository.cs @@ -59,7 +59,7 @@ namespace Models.Repositories } public async Task> PeopleListAsync(string filter, int limit = 10) => await _context.PhSPeople - .Where(c => c.Name.Contains(filter)) + .Where(c => c.Name.Contains(filter) && c.Active) .OrderBy(c => c.Name) .Select(c => new ELookUpItem { Id = c.Id, Nombre = c.Name }) .Take(limit) diff --git a/phronCare.UIBlazor/Shared/MainLayout.razor b/phronCare.UIBlazor/Layout/MainLayout.razor similarity index 100% rename from phronCare.UIBlazor/Shared/MainLayout.razor rename to phronCare.UIBlazor/Layout/MainLayout.razor diff --git a/phronCare.UIBlazor/Shared/MainLayout.razor.css b/phronCare.UIBlazor/Layout/MainLayout.razor.css similarity index 100% rename from phronCare.UIBlazor/Shared/MainLayout.razor.css rename to phronCare.UIBlazor/Layout/MainLayout.razor.css diff --git a/phronCare.UIBlazor/Layout/NavMenu.razor b/phronCare.UIBlazor/Layout/NavMenu.razor new file mode 100644 index 0000000..9419d68 --- /dev/null +++ b/phronCare.UIBlazor/Layout/NavMenu.razor @@ -0,0 +1,136 @@ +@inject NavMenuService navMenuService + +
+
+ + @if (!navMenuService.Minimized) + { + Logo + } + + +
+
+ +
+ +
+ +@code { + private bool collapseNavMenu = true; + private bool minimizeNavMenu = false; + private bool expClientes = false; + + private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; + + [Parameter] + public EventCallback MinStatus { get; set; } + + [CascadingParameter] + public IModalService Modal { get; set; } = default!; + + private void ToggleNavMenu() + { + collapseNavMenu = !collapseNavMenu; + } + + private async void ToggleIconMenu() + { + minimizeNavMenu = !minimizeNavMenu; + await MinStatus.InvokeAsync(minimizeNavMenu); + } +} diff --git a/phronCare.UIBlazor/Shared/NavMenu.razor.css b/phronCare.UIBlazor/Layout/NavMenu.razor.css similarity index 100% rename from phronCare.UIBlazor/Shared/NavMenu.razor.css rename to phronCare.UIBlazor/Layout/NavMenu.razor.css diff --git a/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteCreate.razor b/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteCreate.razor index b01d7f6..61839bd 100644 --- a/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteCreate.razor +++ b/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteCreate.razor @@ -26,8 +26,8 @@
- - Cliente * + +
- - Vendedor * +
- - Profesional * +
- - Paciente * +
- - Institución * + +
- - + + @foreach (var unidad in _businessUnits) { @@ -117,8 +117,8 @@
- - + + @@ -126,8 +126,8 @@
- - + +
@@ -139,12 +139,12 @@
- - + +
- - + +
diff --git a/phronCare.UIBlazor/Shared/NavMenu.razor b/phronCare.UIBlazor/Shared/NavMenu.razor deleted file mode 100644 index 9fc32a9..0000000 --- a/phronCare.UIBlazor/Shared/NavMenu.razor +++ /dev/null @@ -1,137 +0,0 @@ -@inject NavMenuService navMenuService - -
-
- - - @if (!navMenuService.Minimized) - { - Logo - - } - - - @if (navMenuService.Minimized) - { - - } - else - { - - } -
-
- -
- -
- -@code { - private bool collapseNavMenu = true; - private bool minimizeNavMenu = false; - private bool expClientes = false; - private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; - [Parameter] - public EventCallback MinStatus { get; set; } - [CascadingParameter] public IModalService Modal { get; set; } = default!; - private void ToggleNavMenu() - { - collapseNavMenu = !collapseNavMenu; - } - private async void ToggleIconMenu() - { - minimizeNavMenu = !minimizeNavMenu; - await MinStatus.InvokeAsync(minimizeNavMenu); - } -} diff --git a/phronCare.UIBlazor/_Imports.razor b/phronCare.UIBlazor/_Imports.razor index dbf05bc..92552f8 100644 --- a/phronCare.UIBlazor/_Imports.razor +++ b/phronCare.UIBlazor/_Imports.razor @@ -8,7 +8,9 @@ @using Microsoft.AspNetCore.Components.Authorization @using Microsoft.JSInterop @using phronCare.UIBlazor +@using phronCare.UIBlazor.Layout @using phronCare.UIBlazor.Models.Login + @using phronCare.UIBlazor.Shared @using phronCare.UIBlazor.Shared.Components @using phronCare.UIBlazor.Services.Tickets diff --git a/phronCare.UIBlazor/wwwroot/css/app.css b/phronCare.UIBlazor/wwwroot/css/app.css index a58712c..8cffdbc 100644 --- a/phronCare.UIBlazor/wwwroot/css/app.css +++ b/phronCare.UIBlazor/wwwroot/css/app.css @@ -18,9 +18,16 @@ list-style-type: square; padding-left: 20px; /* Alineación adecuada para submenús */ } + .nav-item { - padding: 5px 0; + padding-top: 0.5rem; + padding-bottom: 0.5rem; } + +.nav-link label { + font-size: 0.875rem; +} + html, body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; } @@ -29,6 +36,15 @@ h1:focus { outline: none; } +.nav-link:hover { + background-color: rgba(255, 255, 255, 0.1); + color: #fff; + transition: background-color 0.2s; +} + +.nav-item { + margin-bottom: 0.25rem; +} a, .btn-link { /*color: #0071c1;*/ color: var(--link-color); diff --git a/phronCare.UIBlazor/wwwroot/index.html b/phronCare.UIBlazor/wwwroot/index.html index f952f63..a52a021 100644 --- a/phronCare.UIBlazor/wwwroot/index.html +++ b/phronCare.UIBlazor/wwwroot/index.html @@ -18,6 +18,8 @@ integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ==" crossorigin="" /> + +