Merge branch 'main' of https://github.com/komdil/itrun-erp

komdil · Oct 25, 2023 · bc86f0d · bc86f0d
2 parents 8b181aa + ef8a728
commit bc86f0d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 33 deletions.
diff --git a/src/Warehouse.Client/Pages/Index.razor b/src/Warehouse.Client/Pages/Index.razor
@@ -14,8 +14,8 @@
 @if (isError)
 {
     <Alert BackgroundColor="TablerColor.Danger" Title="Error" Dismissible>
-     <div class="text-secondary">@errorMessage</div>
- </Alert>
+        <div class="text-secondary">@errorMessage</div>
+    </Alert>
 }
 
 @if (isLoading)
@@ -140,12 +140,9 @@
                     </EditorTemplate>
                 </Column>
                 <Column Item="SingleProductSellResponse" Property="product=>product.Date" Title="Date">
-                    <EditorTemplate>
-                    </EditorTemplate>
-                </Column>
-                <Column Item="SingleProductSellResponse" Property="product=>product.Comment" Title="Comment">
-                    <EditorTemplate>
-                    </EditorTemplate>
+                    <Template>
+                        @context.Date.ToShortDateString()
+                    </Template>
                 </Column>
             </ChildContent>
         </Table>
@@ -174,12 +171,9 @@
                     </EditorTemplate>
                 </Column>
                 <Column Item="SingleProductPurchaseResponse" Property="product=>product.Date" Title="Date">
-                    <EditorTemplate>
-                    </EditorTemplate>
-                </Column>
-                <Column Item="SingleProductPurchaseResponse" Property="product=>product.Comment" Title="Comment">
-                    <EditorTemplate>
-                    </EditorTemplate>
+                    <Template>
+                        @context.Date.ToShortDateString()
+                    </Template>
                 </Column>
             </ChildContent>
         </Table>
@@ -194,16 +188,16 @@
             </HeaderTemplate>
             <ChildContent>
                 <Column Item="SingleProductResponse" Property="e=>e.Name" Searchable Sortable />
-                 <Column Item="SingleProductResponse" Property="e=>e.ProductUom" Searchable Sortable />
-                 <Column Item="SingleProductResponse" Property="e=>e.Quantity" Searchable Sortable />
-                 <Column Item="SingleProductResponse" Property="e=>e.Manufacturer" Searchable Sortable />
-             </ChildContent>
-         </Table>
+                <Column Item="SingleProductResponse" Property="e=>e.ProductUom" Searchable Sortable />
+                <Column Item="SingleProductResponse" Property="e=>e.Quantity" Searchable Sortable />
+                <Column Item="SingleProductResponse" Property="e=>e.Manufacturer" Searchable Sortable />
+            </ChildContent>
+        </Table>
 
-     </RowCol>
- </Row>
+    </RowCol>
+</Row>
 
- @code {
+@code {
     private GetProductAggregatesQuery query = new();
     private List<SingleProductResponse> products = new();
     private GetProductsQuery getProductQuery = new() { OrderByQuantity = true };

diff --git a/src/Warehouse.Client/Pages/Purchase/Purchases.razor b/src/Warehouse.Client/Pages/Purchase/Purchases.razor
@@ -69,8 +69,9 @@
                     </EditorTemplate>
                 </Column>
                 <Column Item="SingleProductPurchaseResponse" Property="product=>product.Date" Title="Date" Sortable Searchable Groupable>
-                    <EditorTemplate>
-                    </EditorTemplate>
+                    <Template>
+                        @context.Date.ToShortDateString()
+                    </Template>
                 </Column>
                 <Column Item="SingleProductPurchaseResponse" Property="product=>product.Comment" Title="Comment" Sortable Searchable Groupable>
                     <EditorTemplate>
@@ -105,8 +106,9 @@
                     </EditorTemplate>
                 </Column>
                 <Column Item="SingleProductPurchaseResponse" Property="product=>product.Date" Title="Date" Sortable Searchable Groupable>
-                    <EditorTemplate>
-                    </EditorTemplate>
+                    <Template>
+                        @context.Date.ToShortDateString()
+                    </Template>
                 </Column>
                 <Column Item="SingleProductPurchaseResponse" Property="product=>product.Comment" Title="Comment" Sortable Searchable Groupable>
                     <EditorTemplate>

diff --git a/src/Warehouse.Client/Pages/Sales/Sales.razor b/src/Warehouse.Client/Pages/Sales/Sales.razor
@@ -16,8 +16,8 @@
 @if (isError)
 {
     <Alert BackgroundColor="TablerColor.Danger" Title="Error" Dismissible>
-     <div class="text-secondary">@errorMessage</div>
- </Alert>
+        <div class="text-secondary">@errorMessage</div>
+    </Alert>
 }
 
 @if (isLoading)
@@ -68,8 +68,9 @@
                     </EditorTemplate>
                 </Column>
                 <Column Item="SingleProductSellResponse" Property="product=>product.Date" Title="Date" Sortable Searchable Groupable>
-                    <EditorTemplate>
-                    </EditorTemplate>
+                    <Template>
+                        @context.Date.ToShortDateString()
+                    </Template>
                 </Column>
                 <Column Item="SingleProductSellResponse" Property="product=>product.Comment" Title="Comment" Sortable Searchable Groupable>
                     <EditorTemplate>
@@ -80,7 +81,7 @@
         </Table>
     </Authorized>
     <NotAuthorized>
-        <Table Item="SingleProductSellResponse" Items="saleProduct" PageSize="20" 
+        <Table Item="SingleProductSellResponse" Items="saleProduct" PageSize="20"
                Hover Responsive>
             <HeaderTemplate>
                 <strong>Sales</strong>
@@ -104,8 +105,9 @@
                     </EditorTemplate>
                 </Column>
                 <Column Item="SingleProductSellResponse" Property="product=>product.Date" Title="Date" Sortable Searchable Groupable>
-                    <EditorTemplate>
-                    </EditorTemplate>
+                    <Template>
+                        @context.Date.ToShortDateString()
+                    </Template>
                 </Column>
                 <Column Item="SingleProductSellResponse" Property="product=>product.Comment" Title="Comment" Sortable Searchable Groupable>
                     <EditorTemplate>