Merge branch 'develop'

CHANGELOG.md

@@ -11,7 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - added is_cost_data_displayed to microgrid and energy storage power station
 - added energy storage power station relation to space in myems-api
 - added myems energy plan database
-- 
+- added cardsummary to fdd fault in myems-web
 ### Changed
 - changed map marker in myems-web
 - updated popup style of mapbox in myems-web

myems-web/src/components/MyEMS/EnergyStoragePowerStation/Dashboard.js

@@ -1192,7 +1192,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
                 "2024-03",
                 "2024-04"
               ]);
-              setStations([{ value: 'a1', label: '7 Days' }, { value: 'a2', label: 'One Month' }]);
+              setStations([{ value: 'a1', label: '近7日' }, { value: 'a2', label: '本月' }, { value: 'a3', label: '本年' }]);
             }
           });
       }

myems-web/src/components/MyEMS/FDD/Fault.js

@@ -22,6 +22,8 @@ import {
   UncontrolledDropdown,
   Spinner
 } from 'reactstrap';
+import CountUp from 'react-countup';
+import CardSummary from '../common/CardSummary';
 import ButtonIcon from '../../common/ButtonIcon';
 import Badge from 'reactstrap/es/Badge';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -46,6 +48,10 @@ const Fault = ({ setRedirect, setRedirectUrl, t }) => {
   //Results
   const [faults, setFaults] = useState([]);
   const [excelBytesBase64, setExcelBytesBase64] = useState(undefined);
+  const [totalFaultNumber, setTotalFaultNumber] = useState({});
+  const [newFaultNumber, setNewFaultNumber] = useState({});
+  const [inprogressFaultNumber, setInprogressFaultNumber] = useState({});
+  const [doneFaultNumber, setDoneFaultNumber] = useState({});
 
   // buttons
   const [spinnerHidden, setSpinnerHidden] = useState(true);
@@ -262,6 +268,10 @@ const Fault = ({ setRedirect, setRedirectUrl, t }) => {
 
     // Reinitialize tables
     setFaults([]);
+    let totalFaultNumber = 0;
+    let newFaultNumber = 0;
+    let inprogressFaultNumber = 0;
+    let doneFaultNumber = 0;
 
     let isResponseOK = false;
     fetch(
@@ -318,6 +328,10 @@ const Fault = ({ setRedirect, setRedirectUrl, t }) => {
                 'YYYY-MM-DD HH:mm:ss'
               );
               fault['status'] = currentValue['status'];
+              totalFaultNumber += 1;
+              // todo: parse status
+              newFaultNumber += 1;
+
               fault['update_datetime'] = moment(parseInt(currentValue['update_datetime'])).format(
                 'YYYY-MM-DD HH:mm:ss'
               );
@@ -328,6 +342,10 @@ const Fault = ({ setRedirect, setRedirectUrl, t }) => {
           }
 
           setFaults(faultList);
+          setTotalFaultNumber(totalFaultNumber);
+          setNewFaultNumber(newFaultNumber);
+          setInprogressFaultNumber(inprogressFaultNumber);
+          setDoneFaultNumber(doneFaultNumber);
           setExcelBytesBase64(json['excel_bytes_base64']);
           setSpinnerHidden(true);
         } else {
@@ -779,8 +797,22 @@ const Fault = ({ setRedirect, setRedirectUrl, t }) => {
           </Form>
         </CardBody>
       </Card>
-      <Card className="mb-3">
+      <div className="card-deck">
         <Spinner color="primary" hidden={spinnerHidden} />
+        <CardSummary rate={''} title={t('Total Number of Faults')} footunit={''} color="info">
+          {1 && <CountUp end={totalFaultNumber} duration={2} prefix="" separator="," decimal="." decimals={0} />}
+        </CardSummary>
+        <CardSummary rate={''} title={t('Number of New Faults')} footunit={''} color="info">
+          {1 && <CountUp end={newFaultNumber} duration={2} prefix="" separator="," decimal="." decimals={0} />}
+        </CardSummary>
+        <CardSummary rate={''} title={t('Number of Inprogress Faults')} footunit={''} color="info">
+          {1 && <CountUp end={inprogressFaultNumber} duration={2} prefix="" separator="," decimal="." decimals={0} />}
+        </CardSummary>
+        <CardSummary rate={''} title={t('Number of Done Faults')} footunit={''} color="info">
+          {1 && <CountUp end={doneFaultNumber} duration={2} prefix="" separator="," decimal="." decimals={0} />}
+        </CardSummary>
+      </div>
+      <Card className="mb-3">
         <FalconCardHeader title={t('Fault Alarms')} light={false} titleClass="text-lightSlateGray mb-0">
           {isSelected ? (
             <InputGroup size="sm" className="input-group input-group-sm">

myems-web/src/components/MyEMS/Notification/Notification.js

@@ -20,6 +20,7 @@ import {
   UncontrolledDropdown,
   Spinner
 } from 'reactstrap';
+import CardSummary from '../common/CardSummary';
 import ButtonIcon from '../../common/ButtonIcon';
 import { Link } from 'react-router-dom';
 import Badge from 'reactstrap/es/Badge';

myems-web/src/i18n.js

@@ -305,6 +305,10 @@ const resources = {
       'Space Faults': 'Space Faults',
       'Number of All Faults': 'Number of All Faults',
       'Number of Space Faults': 'Number of Space Faults',
+      'Total Number of Faults': 'Total Number of Faults',
+      'Number of New Faults': 'Number of New Faults',
+      'Number of Inprogress Faults': 'Number of Inprogress Faults',
+      'Number of Done Faults': 'Number of Done Faults',
       //Data Panels
       'Ton of Standard Coal': 'Ton of Standard Coal',
       'Ton of Carbon Dioxide Emissions': 'Ton of Carbon Dioxide Emissions',
@@ -1395,6 +1399,10 @@ const resources = {
       'Space Faults': '空间故障',
       'Number of All Faults': '全部故障数',
       'Number of Space Faults': '空间故障数',
+      'Total Number of Faults': '总故障数量',
+      'Number of New Faults': '新发故障数量',
+      'Number of Inprogress Faults': '进行中故障数量',
+      'Number of Done Faults': '已完成故障数量',
       //Data Panels
       'Ton of Standard Coal': '吨标准煤',
       'Ton of Carbon Dioxide Emissions': '吨二氧化碳排放',
@@ -2503,6 +2511,10 @@ const resources = {
       'Space Faults': 'Platz Fehler',
       'Number of All Faults': 'Anzahl aller Fehler',
       'Number of Space Faults': 'Anzahl der Platz Fehler',
+      'Total Number of Faults': 'Total Number of Faults',
+      'Number of New Faults': 'Number of New Faults',
+      'Number of Inprogress Faults': 'Number of Inprogress Faults',
+      'Number of Done Faults': 'Number of Done Faults',
       //Data Panels
       'Ton of Standard Coal': 'Tonne Standardkohle',
       'Ton of Carbon Dioxide Emissions': 'Tonne Kohlendioxidemissionen',
@@ -3634,6 +3646,10 @@ const resources = {
       'Space Faults': 'Espace Fautes',
       'Number of All Faults': 'Nombre de Tout Fautes',
       'Number of Space Faults': 'Nombre de Espace Fautes',
+      'Total Number of Faults': 'Total Number of Faults',
+      'Number of New Faults': 'Number of New Faults',
+      'Number of Inprogress Faults': 'Number of Inprogress Faults',
+      'Number of Done Faults': 'Number of Done Faults',
       //Data Panels
       'Ton of Standard Coal': 'Tonne de Charbon standard',
       'Ton of Carbon Dioxide Emissions': 'Tonne de Émissions de dioxyde de carbone',
@@ -4754,6 +4770,10 @@ const resources = {
       'Space Faults': 'Fallas de espacio',
       'Number of All Faults': 'Número de todas las fallas',
       'Number of Space Faults': 'Número de fallos de espacio',
+      'Total Number of Faults': 'Total Number of Faults',
+      'Number of New Faults': 'Number of New Faults',
+      'Number of Inprogress Faults': 'Number of Inprogress Faults',
+      'Number of Done Faults': 'Number of Done Faults',
       //Data Panels
       'Ton of Standard Coal': 'Tonelada de carbón estándar',
       'Ton of Carbon Dioxide Emissions': 'Toneladas de emisiones de dióxido de carbono',
@@ -5873,6 +5893,10 @@ const resources = {
       'Space Faults': 'Космические разломы',
       'Number of All Faults': 'Количество всех неисправностей',
       'Number of Space Faults': 'Количество пробелов',
+      'Total Number of Faults': 'Total Number of Faults',
+      'Number of New Faults': 'Number of New Faults',
+      'Number of Inprogress Faults': 'Number of Inprogress Faults',
+      'Number of Done Faults': 'Number of Done Faults',
       //Data Panels
       'Ton of Standard Coal': 'Тонна стандартного угля',
       'Ton of Carbon Dioxide Emissions': 'тонн выбросов углекислого газа',
@@ -6985,6 +7009,10 @@ const resources = {
       'Space Faults': 'أخطاء الفضاء',
       'Number of All Faults': 'عدد جميع الأخطاء',
       'Number of Space Faults': 'عدد أخطاء الفضاء',
+      'Total Number of Faults': 'Total Number of Faults',
+      'Number of New Faults': 'Number of New Faults',
+      'Number of Inprogress Faults': 'Number of Inprogress Faults',
+      'Number of Done Faults': 'Number of Done Faults',
       //Data Panels
       'Ton of Standard Coal': 'طن من الفحم القياسي',
       'Ton of Carbon Dioxide Emissions': 'طن من انبعاثات ثاني أكسيد الكربون',
@@ -8088,6 +8116,10 @@ const resources = {
       'Space Faults': 'Lỗi không gian',
       'Number of All Faults': 'Số lượng tất cả các lỗi',
       'Number of Space Faults': 'Số lỗi không gian',
+      'Total Number of Faults': 'Total Number of Faults',
+      'Number of New Faults': 'Number of New Faults',
+      'Number of Inprogress Faults': 'Number of Inprogress Faults',
+      'Number of Done Faults': 'Number of Done Faults',
       //Data Panels
       'Ton of Standard Coal': 'Tấn than tiêu chuẩn',
       'Ton of Carbon Dioxide Emissions': 'Tấn khí thải carbon dioxide',
@@ -9199,6 +9231,10 @@ const resources = {
       'Space Faults': 'ความผิดพลาดของพื้นที่',
       'Number of All Faults': 'จํานวนความผิดพลาดทั้งหมด',
       'Number of Space Faults': 'จํานวนความผิดพลาดของพื้นที่',
+      'Total Number of Faults': 'Total Number of Faults',
+      'Number of New Faults': 'Number of New Faults',
+      'Number of Inprogress Faults': 'Number of Inprogress Faults',
+      'Number of Done Faults': 'Number of Done Faults',
       //Data Panels
       'Ton of Standard Coal': 'ตันของถ่านหินมาตรฐาน',
       'Ton of Carbon Dioxide Emissions': 'ตันของการปล่อยก๊าซคาร์บอนไดออกไซด์',
@@ -10301,6 +10337,10 @@ const resources = {
       'Space Faults': 'Uzay Fayları',
       'Number of All Faults': 'Tüm Arızaların Sayısı',
       'Number of Space Faults': 'Uzay Hatalarının Sayısı',
+      'Total Number of Faults': 'Total Number of Faults',
+      'Number of New Faults': 'Number of New Faults',
+      'Number of Inprogress Faults': 'Number of Inprogress Faults',
+      'Number of Done Faults': 'Number of Done Faults',
       //Data Panels
       'Ton of Standard Coal': 'Ton Standart Kömür',
       'Ton of Carbon Dioxide Emissions': 'Tonlarca karbondioksit emisyonu',
@@ -11413,6 +11453,10 @@ const resources = {
       'Space Faults': 'Kesalahan Angkasa',
       'Number of All Faults': 'Bilangan Semua Kesalahan',
       'Number of Space Faults': 'Bilangan Kesalahan Ruang',
+      'Total Number of Faults': 'Total Number of Faults',
+      'Number of New Faults': 'Number of New Faults',
+      'Number of Inprogress Faults': 'Number of Inprogress Faults',
+      'Number of Done Faults': 'Number of Done Faults',
       //Data Panels
       'Ton of Standard Coal': 'Tan arang batu standard',
       'Ton of Carbon Dioxide Emissions': 'Tan pelepasan karbon dioksida',
@@ -12527,6 +12571,10 @@ const resources = {
       'Space Faults': 'Kesalahan Ruang',
       'Number of All Faults': 'Jumlah Total Kesalahan',
       'Number of Space Faults': 'Jumlah Kesalahan Ruang',
+      'Total Number of Faults': 'Total Number of Faults',
+      'Number of New Faults': 'Number of New Faults',
+      'Number of Inprogress Faults': 'Number of Inprogress Faults',
+      'Number of Done Faults': 'Number of Done Faults',
       //Data Panels
       'Ton of Standard Coal': 'Ton Batubara Standar',
       'Ton of Carbon Dioxide Emissions': 'Ton Emisi Dioksida Karbon',

myems-web/src/layouts/MyEMSRoutes.js

@@ -463,7 +463,7 @@ const MyEMSRoutes = () => (
     <Route path="/energystoragepowerstation/list" exact component={EnergyStoragePowerStationList} />
     <Route path="/energystoragepowerstation/details" exact component={EnergyStoragePowerStationDetails} />
     <Route path="/energystoragepowerstation/reporting" exact component={EnergyStoragePowerStationReporting} />
-    <Route path="/energystoragepowerstation/alarm" exact component={Notification} />
+    <Route path="/energystoragepowerstation/alarm" exact component={FDDFault} />
     <Route path="/energystoragepowerstation/maintenance" exact component={EnergyStoragePowerStationDetails} />
 
     {/*FDD*/}