@eohjsc/react-native-smart-city 0.2.47 → 0.2.51

package/src/screens/SetSchedule/__test__/SelectWeekday.test.js

@@ -28,7 +28,7 @@ test('test select', async () => {
   await act(async () => {
     await items[0].props.onPress();
   });
-  expect(mockSetWeekday).toBeCalledWith(['0']);
+  expect(mockSetWeekday).toBeCalledWith(['1']);
 
   mockSetWeekday.mockClear();
   props = {
@@ -44,5 +44,5 @@ test('test select', async () => {
   await act(async () => {
     await items[0].props.onPress();
   });
-  expect(mockSetWeekday).toBeCalledWith([]);
+  expect(mockSetWeekday).toBeCalledWith(['0', '1']);
 });

package/src/screens/SetSchedule/components/SelectWeekday.js

@@ -5,7 +5,15 @@ import { Colors } from '../../../configs';
 import styles from '../styles/SelectWeekdayStyles';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 
-const WEEKDAY_ITEMS = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'];
+const WEEKDAY_ITEMS = [
+  { day: 'Mon', value: 1 },
+  { day: 'Tue', value: 2 },
+  { day: 'Wed', value: 3 },
+  { day: 'Thu', value: 4 },
+  { day: 'Fri', value: 5 },
+  { day: 'Sat', value: 6 },
+  { day: 'Sun', value: 0 },
+];
 
 const SelectWeekday = ({ weekday, setWeekday }) => {
   const t = useTranslations();
@@ -23,11 +31,10 @@ const SelectWeekday = ({ weekday, setWeekday }) => {
   );
 
   const WeekdayItem = useCallback(
-    ({ item, index, isSelected }) => {
+    ({ item, isSelected }) => {
       return (
         <TouchableOpacity
-          key={index}
-          onPress={() => onSetWeekday(`${index}`)}
+          onPress={() => onSetWeekday(`${item?.value}`)}
           style={[styles.item, isSelected && styles.selected]}
         >
           <Text
@@ -36,7 +43,7 @@ const SelectWeekday = ({ weekday, setWeekday }) => {
             style={styles.text}
             semibold
           >
-            {item}
+            {item?.day}
           </Text>
         </TouchableOpacity>
       );
@@ -54,8 +61,7 @@ const SelectWeekday = ({ weekday, setWeekday }) => {
           <WeekdayItem
             key={index}
             item={item}
-            index={index}
-            isSelected={weekday.includes(`${index}`)}
+            isSelected={weekday.includes(`${item?.value}`)}
           />
         ))}
       </View>

package/src/screens/SubUnit/AddSubUnit.js

@@ -34,9 +34,9 @@ const prepareImageToUpload = async (image) => {
     70
   );
   return {
-    fileName: result.name,
+    fileName: result?.name,
     type: 'image/jpeg',
-    uri: result.uri,
+    uri: result?.uri,
   };
 };
 

package/src/screens/SubUnit/__test__/AddSubUnit.test.js

@@ -24,6 +24,7 @@ const mockedGoBack = jest.fn();
 
 jest.mock('axios');
 jest.mock('react-native-toast-message');
+jest.mock('react-native-image-resizer');
 
 jest.mock('react-redux', () => {
   return {

package/src/screens/Unit/SmartAccount.js

@@ -20,7 +20,7 @@ import { useTranslations } from '../../hooks/Common/useTranslations';
 import { useStateAlertRemove } from '../Unit/hook/useStateAlertRemove';
 
 const ListSmartAccount = ({ route }) => {
-  const { unitId } = route.params;
+  const { unitId } = route?.params || {};
   const t = useTranslations();
   const [data, setData] = useState([]);
   const smartAccountRef = useRef(null);

package/src/screens/UnitSummary/components/3PPowerConsumption/index.js

@@ -141,13 +141,20 @@ const ThreePhasePowerConsumption = memo(({ unit, summary, summaryDetail }) => {
     moment().subtract(7, 'days').valueOf()
   );
   const [endDate, setEndDate] = useState(moment().valueOf());
+  const [groupBy, setGroupBy] = useState('date');
   const [getData, setData] = useState({});
+  const [chartConfig, setChartConfig] = useState({
+    unit: 'kWh',
+    price: '',
+  });
+
   useEffect(() => {
     const fetchData = async () => {
       let params = new URLSearchParams();
       params.append('config', listConfigs.total_power);
-      params.append('date_from', new Date(startDate).setHours(0, 0) / 1000);
-      params.append('date_to', new Date(endDate).setHours(23, 59) / 1000);
+      params.append('group_by', groupBy);
+      params.append('date_from', moment(startDate).format('YYYY-MM-DD'));
+      params.append('date_to', moment(endDate).format('YYYY-MM-DD'));
       const { success, data } = await axiosGet(
         API.POWER_CONSUME.DISPLAY_HISTORY,
         {
@@ -161,7 +168,7 @@ const ThreePhasePowerConsumption = memo(({ unit, summary, summaryDetail }) => {
     if (listConfigs?.total_power) {
       fetchData();
     }
-  }, [startDate, endDate, listConfigs]);
+  }, [startDate, endDate, listConfigs, groupBy]);
   return (
     <>
       <Section type={'border'}>
@@ -239,13 +246,18 @@ const ThreePhasePowerConsumption = memo(({ unit, summary, summaryDetail }) => {
         <PMSensorIndicatior data={dataTotal} style={styles.styleTotalPower} />
         {!!getData?.length && (
           <HistoryChart
-            unit={'kWh'}
             datas={getData}
+            chartConfig={chartConfig}
+            setChartConfig={setChartConfig}
             formatType={'date'}
             startDate={startDate}
             setEndDate={setEndDate}
             setStartDate={setStartDate}
-            configuration={{ type: 'horizontal_bar_chart' }}
+            setGroupBy={setGroupBy}
+            configuration={{
+              type: 'horizontal_bar_chart',
+              config: 'power_consumption',
+            }}
           />
         )}
       </Section>

package/src/screens/UnitSummary/components/PowerConsumption/index.js

@@ -81,13 +81,20 @@ const PowerConsumption = memo(({ summaryDetail }) => {
     moment().subtract(7, 'days').valueOf()
   );
   const [endDate, setEndDate] = useState(moment().valueOf());
-  const [getData, setData] = useState({});
+  const [groupBy, setGroupBy] = useState('date');
+  const [getData, setData] = useState([]);
+  const [chartConfig, setChartConfig] = useState({
+    unit: 'kWh',
+    price: '',
+  });
+
   useEffect(() => {
     const fetchData = async () => {
       let params = new URLSearchParams();
       params.append('config', listConfigs.total_power);
-      params.append('date_from', new Date(startDate).setHours(0, 0) / 1000);
-      params.append('date_to', new Date(endDate).setHours(23, 59) / 1000);
+      params.append('group_by', groupBy);
+      params.append('date_from', moment(startDate).format('YYYY-MM-DD'));
+      params.append('date_to', moment(endDate).format('YYYY-MM-DD'));
       const { success, data } = await axiosGet(
         API.POWER_CONSUME.DISPLAY_HISTORY(),
         {
@@ -101,7 +108,7 @@ const PowerConsumption = memo(({ summaryDetail }) => {
     if (listConfigs?.total_power) {
       fetchData();
     }
-  }, [startDate, endDate, listConfigs]);
+  }, [startDate, endDate, listConfigs, groupBy]);
   return (
     <>
       <Section type={'border'}>
@@ -145,13 +152,19 @@ const PowerConsumption = memo(({ summaryDetail }) => {
         <PMSensorIndicatior data={dataTotal} style={styles.styleTotalPower} />
         {!!getData?.length && (
           <HistoryChart
-            unit={'kWh'}
             datas={getData}
+            chartConfig={chartConfig}
+            setChartConfig={setChartConfig}
             formatType={'date'}
             startDate={startDate}
+            endDate={endDate}
             setEndDate={setEndDate}
             setStartDate={setStartDate}
-            configuration={{ type: 'horizontal_bar_chart' }}
+            setGroupBy={setGroupBy}
+            configuration={{
+              type: 'horizontal_bar_chart',
+              config: 'power_consumption',
+            }}
           />
         )}
       </Section>

package/src/screens/UnitSummary/index.js

@@ -133,14 +133,10 @@ const UnitSummary = memo(({ route }) => {
 export default UnitSummary;
 
 const styles = StyleSheet.create({
-  scrollView: {
-    flex: 1,
-    backgroundColor: Colors.Gray2,
-    paddingTop: 50,
-  },
   container: {
     flex: 1,
     backgroundColor: Colors.Gray2,
+    paddingBottom: 60,
   },
   textHeader: {
     color: Colors.Gray9,

package/src/utils/I18n/translations/en.json

@@ -379,6 +379,9 @@
   "saved_vehicle": "Saved Vehicle",
   "set_a_number": "Set a number",
   "text_total_power_consumption": "Total Power Consumption",
+  "input_price_to_calculate_electricity_cost": "Input price to calculate electricity cost",
+  "calculate_cost": "Calculate cost",
+  "total_power_price": "Total power price:",
   "smart_parking": "Smart Parking",
   "smart_parking_add_destination": "I would like to park near...",
   "see_nearby_parking": "See nearby parking areas",

package/src/utils/I18n/translations/vi.json

@@ -412,6 +412,9 @@
   "save_this_vehicle": "Lưu và đặt phương tiện mặc định",
   "saved_vehicle": "Phương tiện đã lưu",
   "text_total_power_consumption": "Tổng điện năng tiêu thụ",
+  "input_price_to_calculate_electricity_cost": "Nhập số tiền để tính giá tiền điện đã sử dụng",
+  "calculate_cost": "Tính giá điện",
+  "total_power_price": "Tổng giá điện:",
   "smart_parking": "Smart Parking",
   "smart_parking_add_destination": "Tôi muốn đỗ xe gần...",
   "add_card": "Thêm thẻ",