From b249335a73764d3b4572fb3595a0ec8a0859d7f8 Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Sat, 12 Feb 2022 18:59:34 +0200
Subject: [PATCH] refactor(Cashflow) refactor(InventoryValuation)

---
 .../CashFlowStatement/CashFlowStatement.js    |  1 -
 .../CashFlowStatementTable.js                 |  3 --
 .../InventoryValuationBody.js                 |  4 +++
 .../InventoryValuationTable.js                | 28 +++++++++++++++++--
 .../ProfitLossSheet/ProfitLossSheetTable.js   |  3 --
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatement.js b/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatement.js
index 7b2cfd299..5e4ed1719 100644
--- a/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatement.js
+++ b/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatement.js
@@ -1,6 +1,5 @@
 import React, { useState, useEffect } from 'react';
 import moment from 'moment';
-import 'style/pages/FinancialStatements/CashFlowStatement.scss';
 
 import { FinancialStatement } from 'components';
 import DashboardPageContent from 'components/Dashboard/DashboardPageContent';
diff --git a/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementTable.js b/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementTable.js
index acdc24fc0..5b359362c 100644
--- a/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementTable.js
+++ b/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementTable.js
@@ -19,7 +19,6 @@ export default function CashFlowStatementTable({
 }) {
   const {
     cashFlowStatement: { tableRows },
-    isCashFlowLoading,
     query,
   } = useCashFlowStatementContext();
 
@@ -31,10 +30,8 @@ export default function CashFlowStatementTable({
   );
   return (
     <FinancialSheet
-      name="cash-flow-statement"
       companyName={companyName}
       sheetType={intl.get('statement_of_cash_flow')}
-      loading={isCashFlowLoading}
       fromDate={query.from_date}
       toDate={query.to_date}
       basis={query.basis}
diff --git a/src/containers/FinancialStatements/InventoryValuation/InventoryValuationBody.js b/src/containers/FinancialStatements/InventoryValuation/InventoryValuationBody.js
index ec0bfc45e..3bdeea91d 100644
--- a/src/containers/FinancialStatements/InventoryValuation/InventoryValuationBody.js
+++ b/src/containers/FinancialStatements/InventoryValuation/InventoryValuationBody.js
@@ -8,6 +8,10 @@ import { FinancialReportBody } from '../FinancialReportPage';
 import { FinancialSheetSkeleton } from '../../../components/FinancialSheet';
 import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
 
+/**
+ * Inventory valuation body.
+ * @returns {JSX.Element}
+ */
 function InventoryValuationBodyJSX({
   // #withCurrentOrganization
   organizationName,
diff --git a/src/containers/FinancialStatements/InventoryValuation/InventoryValuationTable.js b/src/containers/FinancialStatements/InventoryValuation/InventoryValuationTable.js
index f43813906..be5dc2a0c 100644
--- a/src/containers/FinancialStatements/InventoryValuation/InventoryValuationTable.js
+++ b/src/containers/FinancialStatements/InventoryValuation/InventoryValuationTable.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import intl from 'react-intl-universal';
+import styled from 'styled-components';
 
 import { DataTable, FinancialSheet } from 'components';
 
@@ -26,13 +27,13 @@ export default function InventoryValuationTable({
   const columns = useInventoryValuationTableColumns();
 
   return (
-    <FinancialSheet
+    <InventoryValuationSheet
       companyName={companyName}
       sheetType={intl.get('inventory_valuation')}
       asDate={new Date()}
       loading={isLoading}
     >
-      <DataTable
+      <InventoryValuationDataTable
         columns={columns}
         data={tableRows}
         expandable={true}
@@ -45,6 +46,27 @@ export default function InventoryValuationTable({
           'there_were_no_inventory_transactions_during_the_selected_date_range',
         )}
       />
-    </FinancialSheet>
+    </InventoryValuationSheet>
   );
 }
+
+const InventoryValuationSheet = styled(FinancialSheet)`
+  min-width: 850px;
+`;
+
+const InventoryValuationDataTable = styled(DataTable)`
+  .table {
+    .tbody {
+      .tr .td {
+        border-bottom: 0;
+        padding-top: 0.4rem;
+        padding-bottom: 0.4rem;
+      }
+      .tr.row_type--total .td {
+        border-top: 1px solid #bbb;
+        font-weight: 500;
+        border-bottom: 3px double #000;
+      }
+    }
+  }
+`;
diff --git a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js
index 495626c5d..5aaf19a14 100644
--- a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js
+++ b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js
@@ -15,7 +15,6 @@ export default function ProfitLossSheetTable({
   // Profit/Loss sheet context.
   const {
     profitLossSheet: { table, query },
-    isLoading,
   } = useProfitLossSheetContext();
 
   // Retrieves the profit/loss table columns.
@@ -33,8 +32,6 @@ export default function ProfitLossSheetTable({
       sheetType={<T id={'profit_loss_sheet'} />}
       fromDate={query.from_date}
       toDate={query.to_date}
-      name="profit-loss-sheet"
-      loading={isLoading}
       basis={query.basis}
     >
       <ProfitLossDataTable