Merge branch 'develop'

myems-web/src/components/MyEMS/Microgrid/MicrogridTable.js

@@ -6,6 +6,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Button, Col, Row } from 'reactstrap';
 import ButtonIcon from '../../common/ButtonIcon';
 import { Link } from 'react-router-dom';
+import { withTranslation } from 'react-i18next';
 
 const CustomTotal = ({ sizePerPage, totalSize, page, lastIndex }) => (
   <span>
@@ -57,79 +58,6 @@ const capacityFormatter = amount => <Fragment>{amount} kWh</Fragment>;
 const powerFormatter = amount => <Fragment>{amount} kW</Fragment>;
 const currencyFormatter = amount => <Fragment>{amount} </Fragment>;
 
-const columns = [
-  {
-    dataField: 'nameuuid',
-    text: 'Name',
-    formatter: nameFormatter,
-    classes: 'border-0 align-middle',
-    headerClasses: 'border-0',
-    sort: true
-  },
-  {
-    dataField: 'address',
-    text: 'Address',
-    classes: 'border-0 align-middle',
-    headerClasses: 'border-0',
-    sort: true
-  },
-  {
-    dataField: 'total_charge',
-    text: 'Total Charge',
-    formatter: energyFormatter,
-    classes: 'border-0 align-middle',
-    headerClasses: 'border-0',
-    sort: true,
-  },
-  {
-    dataField: 'total_discharge',
-    text: 'Total Discharge',
-    formatter: energyFormatter,
-    classes: 'border-0 align-middle',
-    headerClasses: 'border-0',
-    sort: true,
-  },
-  {
-    dataField: 'total_revenue',
-    text: 'Total Revenue',
-    formatter: currencyFormatter,
-    classes: 'border-0 align-middle',
-    headerClasses: 'border-0',
-    sort: true,
-  },
-  {
-    dataField: 'rated_capacity',
-    text: 'Rated Capacity',
-    formatter: capacityFormatter,
-    classes: 'border-0 align-middle',
-    headerClasses: 'border-0',
-    sort: true,
-  },
-  {
-    dataField: 'rated_power',
-    text: 'Rated Power',
-    formatter: powerFormatter,
-    classes: 'border-0 align-middle',
-    headerClasses: 'border-0',
-    sort: true,
-  },
-  {
-    dataField: 'status',
-    text: 'Status',
-    formatter: badgeFormatter,
-    classes: 'border-0 align-middle fs-0',
-    headerClasses: 'border-0',
-    sort: true,
-    align: 'right',
-    headerAlign: 'right'
-  },
-  {
-    dataField: 'action',
-    classes: 'border-0 align-middle',
-    headerClasses: 'border-0',
-    text: ''
-  }
-];
 
 const SelectRowInput = ({ indeterminate, rowIndex, ...rest }) => (
   <div className="custom-control custom-checkbox">
@@ -157,7 +85,7 @@ const selectRow = onSelect => ({
 });
 
 
-const MicrogridTable = ({ setIsSelected, microgridList }) => {
+const MicrogridTable = ({ setIsSelected, microgridList, t }) => {
   let table = createRef();
   const handleNextPage = ({ page, onPageChange }) => () => {
     onPageChange(page + 1);
@@ -183,6 +111,80 @@ const MicrogridTable = ({ setIsSelected, microgridList }) => {
     totalSize: microgridList.length
   };
 
+  const columns = [
+    {
+      dataField: 'nameuuid',
+      text: t('Name'),
+      formatter: nameFormatter,
+      classes: 'border-0 align-middle',
+      headerClasses: 'border-0',
+      sort: true
+    },
+    {
+      dataField: 'address',
+      text: t('Address'),
+      classes: 'border-0 align-middle',
+      headerClasses: 'border-0',
+      sort: true
+    },
+    {
+      dataField: 'total_charge',
+      text: t('Total Charge'),
+      formatter: energyFormatter,
+      classes: 'border-0 align-middle',
+      headerClasses: 'border-0',
+      sort: true,
+    },
+    {
+      dataField: 'total_discharge',
+      text: t('Total Discharge'),
+      formatter: energyFormatter,
+      classes: 'border-0 align-middle',
+      headerClasses: 'border-0',
+      sort: true,
+    },
+    {
+      dataField: 'total_revenue',
+      text: t('Total Revenue'),
+      formatter: currencyFormatter,
+      classes: 'border-0 align-middle',
+      headerClasses: 'border-0',
+      sort: true,
+    },
+    {
+      dataField: 'rated_capacity',
+      text: t('Rated Capacity'),
+      formatter: capacityFormatter,
+      classes: 'border-0 align-middle',
+      headerClasses: 'border-0',
+      sort: true,
+    },
+    {
+      dataField: 'rated_power',
+      text: t('Rated Power'),
+      formatter: powerFormatter,
+      classes: 'border-0 align-middle',
+      headerClasses: 'border-0',
+      sort: true,
+    },
+    {
+      dataField: 'communication_status',
+      text: t('Communication Status'),
+      formatter: badgeFormatter,
+      classes: 'border-0 align-middle fs-0',
+      headerClasses: 'border-0',
+      sort: true,
+      align: 'right',
+      headerAlign: 'right'
+    },
+    {
+      dataField: 'action',
+      classes: 'border-0 align-middle',
+      headerClasses: 'border-0',
+      text: ''
+    }
+  ];
+
   return (
     <PaginationProvider pagination={paginationFactory(options)}>
       {({ paginationProps, paginationTableProps }) => {
@@ -217,7 +219,7 @@ const MicrogridTable = ({ setIsSelected, microgridList }) => {
                   className="px-0 font-weight-semi-bold"
                   onClick={() => handleViewAll(paginationProps, microgridList.length)}
                 >
-                  view all
+                  {t('View all')}
                 </ButtonIcon>
               </Col>
               <Col xs="auto" className="pr-3">
@@ -248,4 +250,4 @@ const MicrogridTable = ({ setIsSelected, microgridList }) => {
   );
 };
 
-export default MicrogridTable;
+export default withTranslation()(MicrogridTable);

myems-web/src/components/MyEMS/Microgrid/MicrogridTableCard.js

@@ -3,13 +3,14 @@ import MicrogridTable from './MicrogridTable';
 import FalconCardHeader from '../../common/FalconCardHeader';
 import { InputGroup, CustomInput, Button, Card, CardBody } from 'reactstrap';
 import ButtonIcon from '../../common/ButtonIcon';
+import { withTranslation } from 'react-i18next';
 
-const MicrogridTableCard = ({ microgridList }) => {
+const MicrogridTableCard = ({ microgridList, t }) => {
   const [isSelected, setIsSelected] = useState(false);
 
   return (
     <Card className="mb-3">
-      <FalconCardHeader title="Microgrid List" light={false}>
+      <FalconCardHeader title={t("Microgrid List")} light={false}>
         {isSelected ? (
           <InputGroup size="sm" className="input-group input-group-sm">
             <CustomInput
@@ -46,4 +47,4 @@ const MicrogridTableCard = ({ microgridList }) => {
   );
 };
 
-export default MicrogridTableCard;
+export default withTranslation()(MicrogridTableCard);

myems-web/src/i18n.js

@@ -478,6 +478,7 @@ const resources = {
       'Discharge Ranking': 'Discharge Ranking',
       'Number of Microgrids': 'Number of Microgrids',
       'Number of Power Stations': 'Number of Power Stations',
+      'Microgrid List': 'Microgrid List',
 
       // Energy Storage Power Station
       'Battery Operating State': 'Battery Operating State',
@@ -1570,6 +1571,7 @@ const resources = {
       'Discharge Ranking': '放电排名',
       'Number of Microgrids': '微电网数',
       'Number of Power Stations': '电站数',
+      'Microgrid List': '微电网列表',
 
       // Energy Storage Power Station
       'Battery Operating State': '电池运行状态',
@@ -2687,6 +2689,7 @@ const resources = {
       'Discharge Ranking': 'Entlassungsrangliste',
       'Number of Microgrids': 'Anzahl der Mikronetze',
       'Number of Power Stations': 'Anzahl der Kraftwerke',
+      'Microgrid List': 'Microgrid-Liste',
 
       // Energy Storage Power Station
       'Battery Operating State': 'Batteriebetriebszustand',
@@ -3821,6 +3824,7 @@ const resources = {
       'Discharge Ranking': 'Classement de décharge',
       'Number of Microgrids': 'Nombre de micro-réseaux',
       'Number of Power Stations': 'Nombre de centrales électriques',
+      'Microgrid List': 'Liste des microréseaux',
 
       // Energy Storage Power Station
       'Battery Operating State': 'État de fonctionnement de la batterie',
@@ -4945,6 +4949,7 @@ const resources = {
       'Discharge Ranking': 'Clasificación de alta',
       'Number of Microgrids': 'Número de microrredes',
       'Number of Power Stations': 'Número de centrales eléctricas',
+      'Microgrid List': 'Lista de microrredes',
 
       // Energy Storage Power Station
       'Battery Operating State': 'Estado de funcionamiento de la batería',
@@ -6068,6 +6073,7 @@ const resources = {
       'Discharge Ranking': 'Рейтинг разряда',
       'Number of Microgrids': 'Количество микросетей',
       'Number of Power Stations': 'Количество электростанций',
+      'Microgrid List': 'Список микросетей',
 
       // Energy Storage Power Station
       'Battery Operating State': 'режим работы батареи',
@@ -7181,6 +7187,7 @@ const resources = {
       'Discharge Ranking': 'تصنيف التفريغ',
       'Number of Microgrids': 'عدد الشبكات الصغيرة',
       'Number of Power Stations': 'عدد محطات الطاقة',
+      'Microgrid List': 'قائمة ميكروغريد',
 
       // Energy Storage Power Station
       'Battery Operating State': 'حالة البطارية',
@@ -8290,6 +8297,7 @@ const resources = {
       'Discharge Ranking': 'Xếp hạng xả thải',
       'Number of Microgrids': 'Số lượng lưới điện siêu nhỏ',
       'Number of Power Stations': 'Số lượng trạm điện',
+      'Microgrid List': 'Danh sách lưới điện siêu nhỏ',
 
       // Energy Storage Power Station
       'Battery Operating State': 'Trạng thái hoạt động của pin',
@@ -9401,6 +9409,7 @@ const resources = {
       'Discharge Ranking': 'อันดับการปลดปล่อย',
       'Number of Microgrids': 'จำนวนไมโครกริด',
       'Number of Power Stations': 'จำนวนสถานีไฟฟ้า',
+      'Microgrid List': 'รายการไมโครกริด',
 
       // Energy Storage Power Station
       'Battery Operating State': 'สถานะการทำงานของแบตเตอรี่',
@@ -10511,6 +10520,7 @@ const resources = {
       'Discharge Ranking': 'Deşarj sıralaması',
       'Number of Microgrids': 'Mikro şebeke sayısı',
       'Number of Power Stations': 'Elektrik santrallerinin sayısı',
+      'Microgrid List': 'Mikro Şebeke Listesi',
 
       // Energy Storage Power Station
       'Battery Operating State': 'Batarya İşlemi Durumu',
@@ -11627,6 +11637,7 @@ const resources = {
       'Discharge Ranking': 'Kedudukan pelepasan',
       'Number of Microgrids': 'Bilangan mikrogrid',
       'Number of Power Stations': 'Bilangan stesen janakuasa',
+      'Microgrid List': 'Senarai Microgrid',
 
       // Energy Storage Power Station
       'Battery Operating State': 'Keadaan Operasi Bateri',
@@ -12746,6 +12757,7 @@ const resources = {
       'Discharge Ranking': 'Peringkat pelepasan',
       'Number of Microgrids': 'Jumlah microgrid',
       'Number of Power Stations': 'Jumlah pembangkit listrik',
+      'Microgrid List': 'Daftar Mikrogrid',
 
       // Energy Storage Power Station
       'Battery Operating State': 'Status Operasi Bateri',