Merge branch 'develop'

MyEMS · Feb 18, 2024 · b9eb079 · b9eb079
2 parents 6cbf634 + 6c97249
commit b9eb079
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/myems-web/src/components/MyEMS/common/PeriodTypeOptions.js b/myems-web/src/components/MyEMS/common/PeriodTypeOptions.js
@@ -1,6 +1,7 @@
 export const periodTypeOptions = [
-    { value: 'yearly', label: 'Yearly' },
-    { value: 'monthly', label: 'Monthly' },
-    { value: 'weekly', label: 'Weekly' },
-    { value: 'daily', label: 'Daily' },
-    { value: 'hourly', label: 'Hourly' }];
+  { value: 'yearly', label: 'Yearly' },
+  { value: 'monthly', label: 'Monthly' },
+  { value: 'weekly', label: 'Weekly' },
+  { value: 'daily', label: 'Daily' },
+  { value: 'hourly', label: 'Hourly' }
+];
diff --git a/myems-web/src/components/MyEMS/common/SharePie.js b/myems-web/src/components/MyEMS/common/SharePie.js
@@ -22,7 +22,7 @@ const getOption = (data, isDark) => {
       transitionDuration: 0,
       borderColor: grays['300'],
       borderWidth: 1,
-      formatter: function (params) {
+      formatter: function(params) {
         return `<strong>${params.data.name}:</strong> ${params.value} (${params.percent}%)`;
       }
     },

diff --git a/myems-web/src/components/MyEMS/common/WorkingDaysConsumptionTable.js b/myems-web/src/components/MyEMS/common/WorkingDaysConsumptionTable.js
@@ -4,27 +4,26 @@ import FalconCardHeader from '../../common/FalconCardHeader';
 import { Card, CardBody, Row, Col } from 'reactstrap';
 import { withTranslation } from 'react-i18next';
 
-
-const defaultSorted = [{
-  dataField: 'name',
-  order: 'asc'
-}];
+const defaultSorted = [
+  {
+    dataField: 'name',
+    order: 'asc'
+  }
+];
 
 const WorkingDaysConsumptionTable = ({ data, columns, t }) => {
   return (
     <Fragment>
       <Card>
-        <FalconCardHeader title={ t('Working Days') + ' & ' + t('Non Working Days')} className="bg-light" titleClass="text-lightSlateGray mb-0" />
+        <FalconCardHeader
+          title={t('Working Days') + ' & ' + t('Non Working Days')}
+          className="bg-light"
+          titleClass="text-lightSlateGray mb-0"
+        />
         <CardBody>
           <Row>
             <Col>
-              <BootstrapTable
-                bootstrap4
-                keyField="name"
-                data={data}
-                columns={columns}
-                defaultSorted={defaultSorted}
-              />
+              <BootstrapTable bootstrap4 keyField="name" data={data} columns={columns} defaultSorted={defaultSorted} />
             </Col>
           </Row>
         </CardBody>