* Changed css to make grid more responsive

2025-02-19 20:06:26 +01:00
parent 08a6666064
commit c2078d1614
10 changed files with 82 additions and 57 deletions
--- a/FaKrosnoApi/Program.cs
+++ b/FaKrosnoApi/Program.cs
@@ -38,19 +38,19 @@ builder.Services.AddOpenApiDocument(config =>
    config.Version = "v1";
 });

-builder.Services.AddHangfire(config => config
-    .SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
-    .UseSimpleAssemblyNameTypeSerializer()
-    .UseRecommendedSerializerSettings()
-    .UseSqlServerStorage(builder.Configuration.GetConnectionString("OrdersManagementConnection"), new SqlServerStorageOptions
-    {
-        CommandBatchMaxTimeout = TimeSpan.FromMinutes(5),
-        SlidingInvisibilityTimeout = TimeSpan.FromMinutes(5),
-        QueuePollInterval = TimeSpan.Zero,
-        UseRecommendedIsolationLevel = true,
-        DisableGlobalLocks = true
-    }));
-builder.Services.AddHangfireServer();
+// builder.Services.AddHangfire(config => config
+//     .SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
+//     .UseSimpleAssemblyNameTypeSerializer()
+//     .UseRecommendedSerializerSettings()
+//     .UseSqlServerStorage(builder.Configuration.GetConnectionString("OrdersManagementConnection"), new SqlServerStorageOptions
+//     {
+//         CommandBatchMaxTimeout = TimeSpan.FromMinutes(5),
+//         SlidingInvisibilityTimeout = TimeSpan.FromMinutes(5),
+//         QueuePollInterval = TimeSpan.Zero,
+//         UseRecommendedIsolationLevel = true,
+//         DisableGlobalLocks = true
+//     }));
+// builder.Services.AddHangfireServer();

 // Configure AutoMapper
 builder.Services.AddAutoMapper(typeof(FaKrosnoMappingProfile), typeof(SytelineSaAppMappingProfile),
@@ -83,7 +83,7 @@ builder.Services.AddScoped<ICustomerOrderService, CustomerOrderService>();
 builder.Services.AddScoped<IEmailService, EmailService>();
 builder.Services.AddScoped<IScheduleJobService, ScheduleJobService>();
 builder.Services.AddScoped<ITaskSchedulerService, TaskSchedulerService>();
-builder.Services.AddHostedService<TimedHostedService>();
+//builder.Services.AddHostedService<TimedHostedService>();

 var app = builder.Build();

@@ -97,7 +97,7 @@ app.UseAuthorization();

 app.MapControllers();

-app.UseHangfireDashboard();
+//app.UseHangfireDashboard();

 // var scopeFactory = app.Services.GetRequiredService<IServiceScopeFactory>();
 // using (var scope = scopeFactory.CreateScope())
--- a/OrdersManagement/Components/Layout/MainLayout.razor
+++ b/OrdersManagement/Components/Layout/MainLayout.razor
@@ -4,9 +4,8 @@
@inject NavigationManager NavigationManager
@inherits LayoutComponentBase

-<div class="page">
-
-	<main class="container-fluid">
+<div class="page h-100">
+	<main class="container-fluid d-flex flex-column h-100">
 		<div class="bb-top-row px-4 d-flex justify-content-between align-items-center mb-3">
 			<div class="d-flex align-items-center">
 				<img src="logo.svg" class="me-2" width="35" height="35" alt="Icon">
@@ -14,7 +13,7 @@
 			</div>
 			<a href="https://docs.microsoft.com/aspnet/" target="_blank">About</a>
 		</div>
-		<div class="row gx-1">
+		<div class="row gx-1 flex-grow-1">
 			<div class="col-auto custom-menu-width mb-3">
 				<SfMenu HamburgerMode="true" Title="FA Krosno Manager" Items="@MenuItems"
 				        Orientation="Orientation.Vertical" CssClass="custom-menu">
@@ -22,14 +21,14 @@
 					<MenuFieldSettings Text="Text" Children="Children"></MenuFieldSettings>
 				</SfMenu>
 			</div>
-			<article class="content col">
-				<div class="py-2">@Body</div>
+			<article class="content col d-flex flex-column">
+				<div class="py-2 flex-grow-1">@Body</div>
 			</article>
 		</div>
 	</main>
-
 </div>

+
@code {
 	private List<MenuItem> MenuItems { get; set; } = new();

--- a/OrdersManagement/Components/Pages/CustomerOrder.razor
+++ b/OrdersManagement/Components/Pages/CustomerOrder.razor
@@ -8,7 +8,7 @@
@using Syncfusion.Blazor.Cards
@inherits LayoutComponentBase

-<div class="container-fluid h-100">
+<div class="h-100 d-flex flex-column">
    <h5>Zamówienie klienta nr @CustomerOrderDto?.CoNum</h5>
    <SfCard>
        <CardContent>
--- a/OrdersManagement/Components/Pages/CustomerOrders.razor
+++ b/OrdersManagement/Components/Pages/CustomerOrders.razor
@@ -6,7 +6,7 @@
@using Syncfusion.Blazor.Cards
@inherits LayoutComponentBase

-<div class="container-fluid h-100">
+<div class="h-100 d-flex flex-column">
    <h5>Zamówienia Klienta</h5>
    <SfGrid AllowFiltering="true"
            AllowPaging="true"
--- a/OrdersManagement/Components/Pages/EdiCustomerOrder.razor
+++ b/OrdersManagement/Components/Pages/EdiCustomerOrder.razor
@@ -6,7 +6,7 @@
@using Syncfusion.Blazor.Cards
@inherits LayoutComponentBase

-<div class="container-fluid h-100">
+<div class="h-100 d-flex flex-column">
    <h5>Zamówienie klienta nr @EdiCustomerOrderDto?.CustomerOrderNumber</h5>
    <SfCard>
        <CardContent>
--- a/OrdersManagement/Components/Pages/EdiCustomerOrders.razor
+++ b/OrdersManagement/Components/Pages/EdiCustomerOrders.razor
@@ -11,7 +11,7 @@
@using SelectionType = Syncfusion.Blazor.Grids.SelectionType
@inherits LayoutComponentBase

-<div class="container-fluid h-100">
+<div class="h-100 d-flex flex-column">
    <h5>Zamówienia Klienta EDI</h5>
    <div class="row">
        <div class="col-md-12">
--- a/OrdersManagement/Components/Pages/ScheduleOrder.razor
+++ b/OrdersManagement/Components/Pages/ScheduleOrder.razor
@@ -4,7 +4,7 @@
@using Syncfusion.Blazor.Lists
@inject ScheduleOrderDetailsService ScheduleOrderDetailsService

-<div class="container-fluid h-100">
+<div class="h-100 d-flex flex-column">
    <h5>Indeksy</h5>
    <SfGrid AllowFiltering="true"
            AllowPaging="true"
--- a/OrdersManagement/Components/Pages/ScheduleOrders.razor
+++ b/OrdersManagement/Components/Pages/ScheduleOrders.razor
@@ -5,13 +5,9 @@
@inject ScheduleOrderService ScheduleOrderService
@inherits LayoutComponentBase

-<div class="container-fluid h-100">
-    <div>
+<div class="h-100 d-flex flex-column">
    <h5>Zamówienia DELFOR</h5>
-    </div>
-    <div class="container-fluid h-100">
-        <ScheduleOrdersGrid PageSize="20" PassGridRef="SetGridRef" GridData="_scheduleOrders"></ScheduleOrdersGrid>
-    </div>
+    <ScheduleOrdersGrid PageSize="20" PassGridRef="SetGridRef" GridData="_scheduleOrders" />
 </div>

@code {
--- a/OrdersManagement/Components/Pages/Shared/ScheduleOrdersGrid.razor
+++ b/OrdersManagement/Components/Pages/Shared/ScheduleOrdersGrid.razor
@@ -2,7 +2,7 @@
@using Syncfusion.Blazor.Grids
@inherits LayoutComponentBase

-<div class="container-fluid h-100">
+<div class="h-100 d-flex flex-column">
    <SfGrid @ref="_grid"
            TValue="ScheduleOrderDto"
            AllowFiltering="true"
@@ -12,23 +12,17 @@
            DataSource="@_dataSource"
            EnableAdaptiveUI="true"
            EnablePersistence="true"
-
+            AdaptiveUIMode="AdaptiveMode.Both"
            AllowRowClick="true"
            SelectionMode="GridSelectionMode.Single"
            QueryCellInfo="OnQueryCellInfo"
            RowSelected="OnRowSelected">
        <GridColumns>
-            <GridColumn Field=@nameof(ScheduleOrderDto.PONum) HeaderText="Zamówienie Klienta"
-                        Width="150" AllowFiltering="true"></GridColumn>
-            <GridColumn Field=@nameof(ScheduleOrderDto.PurchaserCode) HeaderText="Klient"
-                        Width="100" AllowFiltering="true"></GridColumn>
-            <GridColumn Field=@nameof(ScheduleOrderDto.RecipientName) HeaderText="Odbiorca"
-                        Width="100" AllowFiltering="true"></GridColumn>
-            <GridColumn Field=@nameof(ScheduleOrderDto.LastUpdateDate) HeaderText="Data Utworzenia"
-                        Format="d" Type="ColumnType.Date" Width="130"
-                        AllowFiltering="true"></GridColumn>
-            <GridColumn Field=@nameof(ScheduleOrderDto.DocType) HeaderText="Typ Dokumentu"
-                        Width="100" AllowFiltering="true"></GridColumn>
+            <GridColumn Field=@nameof(ScheduleOrderDto.PONum) HeaderText="Zamówienie Klienta" Width="150" AllowFiltering="true"></GridColumn>
+            <GridColumn Field=@nameof(ScheduleOrderDto.PurchaserCode) HeaderText="Klient" Width="100" AllowFiltering="true"></GridColumn>
+            <GridColumn Field=@nameof(ScheduleOrderDto.RecipientName) HeaderText="Odbiorca" Width="100" AllowFiltering="true"></GridColumn>
+            <GridColumn Field=@nameof(ScheduleOrderDto.LastUpdateDate) HeaderText="Data Utworzenia" Format="d" Type="ColumnType.Date" Width="130" AllowFiltering="true"></GridColumn>
+            <GridColumn Field=@nameof(ScheduleOrderDto.DocType) HeaderText="Typ Dokumentu" Width="100" AllowFiltering="true"></GridColumn>
        </GridColumns>
        <GridTemplates>
            <DetailTemplate>
@@ -41,13 +35,11 @@
                            TValue="ScheduleOrderDetailDto"
                            DataSource="@scheduleOrderDetails"
                            EnablePersistence="true"
-                            EnableAdaptiveUI="true">
+                            EnableAdaptiveUI="true"
+                            AdaptiveUIMode="AdaptiveMode.Both">
                        <GridColumns>
-                            <GridColumn Field=@nameof(ScheduleOrderDetailDto.Sc_productCode) HeaderText="Pozycja"
-                                        Width="100"></GridColumn>
-                            <GridColumn Field=@nameof(ScheduleOrderDetailDto.Sh_productCode)
-                                        HeaderText="Pozycja Klienta"
-                                        Width="100"></GridColumn>
+                            <GridColumn Field=@nameof(ScheduleOrderDetailDto.Sc_productCode) HeaderText="Pozycja" Width="100"></GridColumn>
+                            <GridColumn Field=@nameof(ScheduleOrderDetailDto.Sh_productCode) HeaderText="Pozycja Klienta" Width="100"></GridColumn>
                        </GridColumns>
                        <GridFilterSettings Type="FilterType.Excel"/>
                        <GridPageSettings PageSize="10"/>
--- a/OrdersManagement/wwwroot/material.css
+++ b/OrdersManagement/wwwroot/material.css
@@ -63382,3 +63382,41 @@ span.e-table-box.e-rbox-select {
        --bs-gutter-x: 5px;
    }
 }
+
+html, body {
+    height: 100%;
+    margin: 0;
+    padding: 0;
+}
+
+.page.h-100 {
+    height: 100vh;
+    overflow: hidden;
+}
+
+.custom-menu, .custom-menu-width {
+    width: 300px;
+}
+
+@media (max-width: 767px) {
+    .custom-menu, .custom-menu-width {
+        width: 100%;
+    }
+    .row.gx-1 {
+        flex-direction: column;
+    }
+    .bb-top-row {
+        flex-direction: column;
+        align-items: flex-start;
+    }
+    .bb-top-row > div, .bb-top-row > a {
+        margin-bottom: 10px;
+    }
+    .e-grid {
+        width: 100vw !important;
+        margin: 0 !important;
+    }
+    .e-grid .e-content {
+        height: calc(100vh - 150px) !important;
+    }
+}