@eohjsc/react-native-smart-city 0.2.45 → 0.2.49

package/src/{screens/Unit/components → commons}/SearchLocation/SearchBarLocationStyles.js

@@ -1,5 +1,5 @@
 import { StyleSheet } from 'react-native';
-import { Colors, Fonts } from '../../../../configs';
+import { Colors, Fonts } from '../../configs';
 
 export default StyleSheet.create({
   container: {

package/src/{screens/Unit/components → commons}/SearchLocation/__test__/RowLocation.test.js

@@ -2,8 +2,8 @@ import React from 'react';
 import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import RowLocation from '../RowLocation';
-import { SCProvider } from '../../../../../context';
-import { mockSCStore } from '../../../../../context/mockStore';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
 
 const mockFunc = jest.fn();
 

package/src/{screens/Unit/components → commons}/SearchLocation/index.js

@@ -1,9 +1,9 @@
 import React, { memo } from 'react';
 import { View, TextInput } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
-import { useTranslations } from '../../../../hooks/Common/useTranslations';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 
-import { Colors } from '../../../../configs';
+import { Colors } from '../../configs';
 import styles from './SearchBarLocationStyles';
 
 const SearchBarLocation = memo(({ input, onTextInput }) => {

package/src/commons/SubUnit/OneTap/ItemOneTap.js

@@ -20,7 +20,7 @@ import { useGetIdUser } from '../../../hooks/Common';
 import { AUTOMATE_TYPE, TESTID } from '../../../configs/Constants';
 
 const ItemOneTap = memo(
-  ({ isOwner, automate, unit, wrapSyles, onPressItem }) => {
+  ({ isOwner, automate = {}, unit, wrapSyles, onPressItem }) => {
     const { navigate } = useNavigation();
     const {
       id,
@@ -54,6 +54,7 @@ const ItemOneTap = memo(
     const goToDetail = useCallback(() => {
       navigate(Routes.ScriptDetail, {
         id,
+        automate,
         name: script?.name,
         type: type,
         havePermission: isOwner || user === idUser,
@@ -61,6 +62,7 @@ const ItemOneTap = memo(
         textCondition,
       });
     }, [
+      automate,
       isOwner,
       user,
       idUser,

package/src/commons/SubUnit/OneTap/__test__/SubUnitAutomate.test.js

@@ -100,6 +100,7 @@ describe('test Item', () => {
       type: 'one_tap',
       unit: undefined,
       textCondition: null,
+      automate: data.automates[0],
     });
 
     const handleScriptAction = instance.findAll(
@@ -196,6 +197,7 @@ describe('test Item', () => {
       type: 'value_change',
       unit: undefined,
       textCondition: 'Temperature higher than 29',
+      automate: data.automates[0],
     });
   });
   test('render SubUnitAutomate script schedule', async () => {

package/src/commons/SubUnit/ShortDetail.js

@@ -80,7 +80,7 @@ const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
       ? 'add_to_favorites'
       : station?.name === SubUnitName.scenario
       ? 'add_script'
-      : 'add_new_device'
+      : 'add_new'
   );
 
   return (

package/src/commons/Unit/SharedUnit.js

@@ -18,8 +18,8 @@ const SharedUnit = ({
   index,
   isOptions = true,
 }) => {
-  const t = useTranslations();
   const { unit } = item;
+  const t = useTranslations();
   const goToDetail = useCallback(() => {
     navigation.navigate(Routes.UnitStack, {
       screen: Routes.UnitDetail,
@@ -76,7 +76,7 @@ const SharedUnit = ({
       <View style={styles.ownerContainer}>
         <Text style={styles.name}>{unit.name}</Text>
         {unit.owner_name ? (
-          <Text style={styles.textBy}>
+          <Text style={styles.textBy} testID={TESTID.SHARED_UNIT_OWN_BY}>
             {t('text_by')}
             <Text style={styles.textOwner}>{unit.owner_name}</Text>
           </Text>

package/src/configs/API.js

@@ -2,6 +2,9 @@ import { SCConfig } from './SCConfig';
 
 const API = {
   UNIT: {
+    MY_UNITS: () => SCConfig.apiRoot + '/property_manager/units/mine/',
+    SHARED_UNITS: () => SCConfig.apiRoot + '/property_manager/shared_units/',
+    CREATE_UNIT: () => SCConfig.apiRoot + '/property_manager/units/',
     UNIT_DETAIL: (id) => SCConfig.apiRoot + `/property_manager/units/${id}/`,
     UNIT_NEAR_ME: (lat, lon, page) =>
       SCConfig.apiRoot +
@@ -172,10 +175,8 @@ const API = {
   },
   NOTIFICATION: {
     LIST_ALL_NOTIFICATIONS: (page, type) =>
-      SCConfig.apiRoot +
-      `/notifications/notifications/?page=${page}&type=${type}`,
-    SET_READ: (id) =>
-      SCConfig.apiRoot + `/notifications/notifications/${id}/set_read/`,
+      SCConfig.apiRoot + `/notifications/root/?page=${page}&type=${type}`,
+    SET_READ: (id) => SCConfig.apiRoot + `/notifications/root/${id}/set_read/`,
   },
   EXTERNAL: {
     GOOGLE_MAP: {
@@ -185,6 +186,12 @@ const API = {
         'https://maps.googleapis.com/maps/api/place/details/json',
     },
   },
+  SMART_ACCOUNT: {
+    LIST_SMART_ACCOUNT: () =>
+      SCConfig.apiRoot + '/smart_account/smart_accounts/',
+    REMOVE_SMART_ACCOUNT: (id) =>
+      SCConfig.apiRoot + `/smart_account/smart_accounts/${id}/`,
+  },
 };
 
 export default API;

package/src/configs/Constants.js

@@ -100,23 +100,29 @@ export const AUTOMATE_SELECT = {
   SELECT_SENSOR: 'select_sensor',
 };
 
+export const CONDITION_TYPES = {
+  IS: 'IS',
+  IS_BELOW: 'IS_BELOW',
+  IS_ABOVE: 'IS_ABOVE',
+};
+
 export const AUTOMATES = {
   one_tap: {
     value: AUTOMATE_TYPE.ONE_TAP,
-    title: 'Launch One-Tap',
-    explanation: 'Do everything with just one button',
+    title: 'launch_one_tap',
+    explanation: 'explanation',
     icon: OneTap,
   },
   value_change: {
     value: AUTOMATE_TYPE.VALUE_CHANGE,
-    title: 'Value change',
-    explanation: 'Short Explanation',
+    title: 'value_change',
+    explanation: 'short_explanation',
     icon: ValueChange,
   },
   schedule: {
     value: AUTOMATE_TYPE.SCHEDULE,
-    title: 'Schedule',
-    explanation: 'Short Explanation',
+    title: 'schedule',
+    explanation: 'short_explanation',
     icon: Schedule,
   },
 };
@@ -580,4 +586,11 @@ export const NOTIFICATION_TYPES = {
   STOP_VIOLATION_FREE_PARKING_ZONE: 'STOP_VIOLATION_FREE_PARKING_ZONE',
   PARKING_COMPLETED_DUE_TO_CAR_LEAVE: 'PARKING_COMPLETED_DUE_TO_CAR_LEAVE',
   NOTIFY_INVITE_MEMBER: 'NOTIFY_INVITE_MEMBER',
+  REMINDER: 'REMINDER',
+};
+
+export const ACTIVITY_LOG_TYPES = {
+  AUTO_ACTIVATED: 'AUTO_ACTIVATED',
+  ACTIVATED_BY: 'ACTIVATED_BY',
+  SCRIPT_UPDATED_BY: 'SCRIPT_UPDATED_BY',
 };

package/src/configs/Images.js

@@ -6,4 +6,5 @@ export default {
   fullscreen: require('../Images/Common/fullscreen.png'),
   file: require('../Images/Common/file.png'),
   activeButton: require('../Images/Common/ActiveButton.png'),
+  logo: require('../Images/Common/logo.png'),
 };

package/src/iot/RemoteControl/Bluetooth.js

@@ -106,7 +106,7 @@ export const getDeviceByName = (name) => {
 };
 
 export const isDeviceConnected = (deviceName) => {
-  return needToScanDevices.some((i) => i === deviceName);
+  return !!bluetoothDevices[deviceName];
 };
 
 export const subcribeCharacteristicNotify = async (device, onListener) => {
@@ -159,3 +159,12 @@ export const sendDataOverBluetooth = async (
 
   await device.cancelConnection();
 };
+
+export const isBluetoothEnabled = async () => {
+  const state = await bleManager.state();
+  return state === 'PoweredOn';
+};
+
+export const enableBluetoothForAndroid = async () => {
+  await bleManager.enable();
+};

package/src/iot/RemoteControl/Internet.js

@@ -18,7 +18,5 @@ export const sendCommandOverInternet = async (sensor, action, data, source) => {
   });
   if (success) {
     ToastBottomHelper.success(t('Command is sent to device via internet'));
-  } else {
-    ToastBottomHelper.error(t('Command is fail to send via internet'));
   }
 };

package/src/navigations/AddDeviceStack.js

@@ -2,6 +2,7 @@ import { createStackNavigator } from '@react-navigation/stack';
 import React, { memo } from 'react';
 
 import AddCommonSelectUnit from '../screens/AddCommon/SelectUnit';
+import AddCommonSelectSubUnit from '../screens/AddCommon/SelectSubUnit';
 import AddNewDevice from '../screens/AddNewDevice';
 import ConnectDevices from '../screens/AddNewDevice/ConnectDevices';
 import ConnectingDevices from '../screens/AddNewDevice/ConnectingDevices';
@@ -21,6 +22,10 @@ export const AddDeviceStack = memo(() => {
         name={Route.AddCommonSelectUnit}
         component={AddCommonSelectUnit}
       />
+      <Stack.Screen
+        name={Route.AddCommonSelectSubUnit}
+        component={AddCommonSelectSubUnit}
+      />
       <Stack.Screen name={Route.AddNewDevice} component={AddNewDevice} />
       <Stack.Screen name={Route.ScanSensorQR} component={ScanSensorQR} />
       <Stack.Screen

package/src/navigations/AddUnitStack.js

@@ -2,6 +2,7 @@ import { createStackNavigator } from '@react-navigation/stack';
 import React, { memo } from 'react';
 
 import AddLocationMaps from '../screens/AddLocationMaps'; //containers/AddLocationMaps
+import AddSubUnit from '../screens/SubUnit/AddSubUnit';
 import Route from '../utils/Route'; // utils/Route
 
 const Stack = createStackNavigator();
@@ -13,6 +14,7 @@ export const AddUnitStack = memo(() => {
         headerShown: false,
       }}
     >
+      <Stack.Screen name={Route.AddSubUnit} component={AddSubUnit} />
       <Stack.Screen
         name={Route.AddLocationMaps}
         component={AddLocationMaps}

package/src/navigations/UnitStack.js

@@ -15,6 +15,7 @@ import SharingMemberList from '../screens/Sharing/MemberList';
 import ManageSubUnit from '../screens/SubUnit/ManageSubUnit';
 import SelectLocation from '../screens/Unit/SelectLocation';
 import ManageUnit from '../screens/Unit/ManageUnit';
+import ListSmartAccount from '../screens/Unit/SmartAccount';
 import MyAllUnit from '../screens/Unit/MyAllUnit';
 import SubUnitDetail from '../screens/SubUnit/Detail';
 import UnitDetail from '../screens/Unit/Detail';
@@ -82,6 +83,13 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.ListSmartAccount}
+        component={ListSmartAccount}
+        options={{
+          headerShown: false,
+        }}
+      />
       <Stack.Screen
         name={Route.EditDevice}
         component={EditDevice}

package/src/screens/ActivityLog/FilterPopup.js

@@ -45,6 +45,7 @@ const FilterPopup = ({
   onShow,
   members,
   filters,
+  userFilterEnabled,
   onApply,
 }) => {
   const t = useTranslations();
@@ -193,7 +194,9 @@ const FilterPopup = ({
         animationOut={'zoomOut'}
         style={styles.wrapPopup}
       >
-        <View style={styles.popup}>
+        <View
+          style={[styles.popup, !userFilterEnabled && styles.heigh50percent]}
+        >
           <>
             <Text type="H4" style={styles.title} bold>
               {t('filters')}
@@ -210,22 +213,26 @@ const FilterPopup = ({
               formatType="date"
               inline={false}
             />
-            <Text type="H4" style={styles.sectionTitle} bold>
-              {t('by_user')}
-            </Text>
-            <ScrollView>
-              {members.map((member, index) => (
-                <RowMember
-                  key={index}
-                  member={member}
-                  isSelected={
-                    selectedUsers.includes(member.id) ||
-                    (member.id === 0 && selectedUsers.length === 0)
-                  }
-                  onSelect={handleOnSelectUser}
-                />
-              ))}
-            </ScrollView>
+            {userFilterEnabled && (
+              <>
+                <Text type="H4" style={styles.sectionTitle} bold>
+                  {t('by_user')}
+                </Text>
+                <ScrollView>
+                  {members.map((member, index) => (
+                    <RowMember
+                      key={index}
+                      member={member}
+                      isSelected={
+                        selectedUsers.includes(member.id) ||
+                        (member.id === 0 && selectedUsers.length === 0)
+                      }
+                      onSelect={handleOnSelectUser}
+                    />
+                  ))}
+                </ScrollView>
+              </>
+            )}
             <View style={styles.separator} />
           </>
           <BottomButtonView

package/src/screens/ActivityLog/ItemLog.js

@@ -1,22 +1,10 @@
 import React from 'react';
-import { View, Text } from 'react-native';
+import { View } from 'react-native';
 import moment from 'moment';
+import Text from '../../commons/Text';
 import t from '../../hooks/Common/useTranslations';
 import styles from './styles/itemLogStyles';
-import { AUTOMATE_TYPE } from '../../configs/Constants';
-
-const DetailManualActivatedLog = ({ item }) => (
-  <Text style={styles.text}>
-    {item.action_name
-      ? `${item.action_name} ${t('by')} `
-      : `${t('activated_by')} `}
-    <Text style={styles.name}>{item.name || item.params?.username}</Text>
-  </Text>
-);
-
-const DetailAutoActivatedLog = () => (
-  <Text style={styles.text}>{t('auto_activated')}</Text>
-);
+import { AUTOMATE_TYPE, ACTIVITY_LOG_TYPES } from '../../configs/Constants';
 
 const DetailEmergencyEventLog = ({ item }) => (
   <Text style={styles.text}>
@@ -31,18 +19,34 @@ const DetailEmergencyEventLog = ({ item }) => (
   </Text>
 );
 
-const DetailAutomateLog = ({ item }) => {
-  if (item.content_code === 'AUTO_ACTIVATED') {
-    return <DetailAutoActivatedLog />;
+const DetailLog = ({ item }) => {
+  switch (item.content_code) {
+    case ACTIVITY_LOG_TYPES.AUTO_ACTIVATED:
+      return <Text style={styles.text}>{t('auto_activated')}</Text>;
+    case ACTIVITY_LOG_TYPES.ACTIVATED_BY:
+      return (
+        <Text style={styles.text}>
+          {item.action_name
+            ? `${item.action_name} ${t('by')} `
+            : `${t('activated_by')} `}
+          <Text style={styles.name}>{item.name || item.params?.username}</Text>
+        </Text>
+      );
+    case ACTIVITY_LOG_TYPES.SCRIPT_UPDATED_BY:
+      return (
+        <Text style={styles.text}>
+          {`${t('script_updated_by')} `}
+          <Text style={styles.name}>{item.name || item.params?.username}</Text>
+        </Text>
+      );
   }
-  return <DetailManualActivatedLog item={item} />;
 };
 
 const itemDetailMaps = {
-  ['action']: DetailManualActivatedLog,
+  ['action']: DetailLog,
   ['emergency_event']: DetailEmergencyEventLog,
-  ['automate']: DetailAutomateLog,
-  [`automate.${AUTOMATE_TYPE.ONE_TAP}`]: DetailAutomateLog,
+  ['automate']: DetailLog,
+  [`automate.${AUTOMATE_TYPE.ONE_TAP}`]: DetailLog,
 };
 
 const ItemLog = ({ item, type, length, index }) => {

package/src/screens/ActivityLog/__test__/FilterPopup.test.js

@@ -39,6 +39,7 @@ test('test FilterPopup', async () => {
     filters: {
       users: [],
     },
+    userFilterEnabled: true,
     onHide: mockOnHide,
     onApply: mockOnApply,
   };

package/src/screens/ActivityLog/__test__/ItemLog.test.js

@@ -19,26 +19,6 @@ jest.mock('react', () => {
   };
 });
 
-test('test ItemLog action', () => {
-  let tree;
-  let props = {
-    item: {
-      action_name: 'action',
-      name: 'name',
-      created_at: '2021-07-02T15:48:24.917932Z',
-    },
-    type: 'action',
-    length: 1,
-    index: 0,
-  };
-  act(() => {
-    tree = create(wrapComponent(props));
-  });
-  const instance = tree.root;
-  const texts = instance.findAllByType(Text);
-  expect(texts[2].props.children).toBe(props.item.name);
-});
-
 test('test ItemLog smart assistant', () => {
   let tree;
   let props = {

package/src/screens/ActivityLog/__test__/index.test.js

@@ -44,6 +44,9 @@ describe('Test Activity log', () => {
     params: {
       id: 1,
       type: `automate.${AUTOMATE_TYPE.ONE_TAP}`,
+      filterEnabled: {
+        user: 'user',
+      },
     },
   };
   Date.now = jest.fn(() => new Date('2021-07-02T15:48:24.917932Z'));

package/src/screens/ActivityLog/hooks/__test__/index.test.js

@@ -65,6 +65,10 @@ describe('Test useActivityLog', () => {
     props = {
       id: 1,
       type: 'action',
+      filterEnabled: {
+        date: false,
+        user: false,
+      },
     };
   });
 
@@ -113,6 +117,7 @@ describe('Test useActivityLog', () => {
 
   it('Test onRefresh activity log of automate one tap', async () => {
     props.type = `automate.${AUTOMATE_TYPE.ONE_TAP}`;
+    props.filterEnabled.date = true;
     const { result } = renderHook(() => useActivityLog(props));
     axios.get.mockImplementation(() => ({
       status: 200,
@@ -178,6 +183,7 @@ describe('Test useActivityLog', () => {
   it('Test fetchMembers', async () => {
     props.type = `automate.${AUTOMATE_TYPE.ONE_TAP}`;
     props.share = { id: 2 };
+    props.filterEnabled.user = true;
     const { result } = renderHook(() => useActivityLog(props));
     axios.get.mockImplementation(() => ({
       status: 200,
@@ -202,6 +208,8 @@ describe('Test useActivityLog', () => {
 
   it('Test filter by users', async () => {
     props.type = `automate.${AUTOMATE_TYPE.ONE_TAP}`;
+    props.filterEnabled.date = true;
+    props.filterEnabled.user = true;
     const { result } = renderHook(() => useActivityLog(props));
 
     const userIds = [1, 2];

package/src/screens/ActivityLog/hooks/index.js

@@ -12,26 +12,22 @@ const apiMaps = {
     url: () => API.SENSOR.ACTIVITY_LOG(),
     params: (id) => ({ id: id }),
     standardizeData: getDataForList,
-    filterEnabled: false,
   },
   ['emergency_event']: {
     url: () => API.EMERGENCY_BUTTON.ACTIVITY_LOG(),
     params: (id) => ({ device_id: id }),
     standardizeData: getEmergencyEventDataForList,
-    filterEnabled: false,
   },
   ['automate']: {
     url: (id) => API.AUTOMATE.ACTIVITY_LOG(id),
     params: () => ({}),
     standardizeData: getDataForList,
-    filterEnabled: false,
   },
   [`automate.${AUTOMATE_TYPE.ONE_TAP}`]: {
     url: (id) => API.AUTOMATE.ACTIVITY_LOG(id),
     params: () => ({}),
     standardizeData: getDataForList,
     memberUrl: (id) => API.SHARE.UNITS_MEMBERS(id),
-    filterEnabled: true,
   },
 };
 
@@ -42,7 +38,7 @@ String.prototype.capitalize = function () {
 
 let dataTemp = [];
 
-export default ({ id, type, share }) => {
+export default ({ id, type, share, filterEnabled }) => {
   const [data, setData] = useState([]);
   const [isLoading, setIsLoading] = useState(false);
   const [page, setPage] = useState(1);
@@ -55,7 +51,6 @@ export default ({ id, type, share }) => {
     date_to: moment().valueOf(),
   });
   const api = apiMaps[type];
-  const { filterEnabled } = api;
 
   const fetchData = async (filters) => {
     const { page } = filters;
@@ -69,10 +64,12 @@ export default ({ id, type, share }) => {
       setIsLoading(true);
     }
     const params = new URLSearchParams();
-    if (filterEnabled) {
+    if (filterEnabled.user) {
       filters.users.map((id) => {
         params.append('users', id);
       });
+    }
+    if (filterEnabled.date) {
       params.append(
         'date_from',
         moment(filters.date_from).format('YYYY-MM-DD')
@@ -102,7 +99,7 @@ export default ({ id, type, share }) => {
 
   const fetchMembers = async () => {
     const api = apiMaps[type];
-    if (!api.memberUrl) {
+    if (!filterEnabled.user) {
       return;
     }
     const { success, data } = await axiosGet(api.memberUrl(share.id));
@@ -124,7 +121,6 @@ export default ({ id, type, share }) => {
     onLoadMore,
     members,
     fetchMembers,
-    filterEnabled,
     filters,
     setFilters,
   };

package/src/screens/ActivityLog/index.js

@@ -23,7 +23,7 @@ const keyExtractor = (item) => item.id;
 
 const ActivityLogScreen = ({ route }) => {
   const t = useTranslations();
-  const { id, type, share } = route.params;
+  const { id, type, share, filterEnabled } = route.params;
   const {
     data,
     isLoading,
@@ -32,10 +32,9 @@ const ActivityLogScreen = ({ route }) => {
     onRefresh,
     members,
     fetchMembers,
-    filterEnabled,
     filters,
     setFilters,
-  } = useActivityLog({ id, type, share });
+  } = useActivityLog({ id, type, share, filterEnabled });
   const [showFilterPopup, setShowFilterPopup, setHideFilterPopup] =
     useBoolean();
 
@@ -117,13 +116,14 @@ const ActivityLogScreen = ({ route }) => {
           contentContainerStyle={styles.contentContainerStyle}
         />
       </View>
-      {filterEnabled && (
+      {(filterEnabled.user || filterEnabled.date) && (
         <FilterPopup
           isVisible={showFilterPopup}
           onHide={setHideFilterPopup}
           onShow={setShowFilterPopup}
           members={members}
           filters={filters}
+          userFilterEnabled={filterEnabled.user}
           onApply={setFilters}
         />
       )}

package/src/screens/ActivityLog/styles/filterPopupStyles.js

@@ -13,6 +13,9 @@ export default StyleSheet.create({
     paddingBottom: 100,
     borderRadius: 10,
   },
+  heigh50percent: {
+    height: (Constants.height * 50) / 100,
+  },
   title: {
     marginBottom: 16,
   },

package/src/screens/AddCommon/SelectSubUnit.js

@@ -1,6 +1,6 @@
+import React, { useCallback, useEffect, useState, useMemo } from 'react';
 import { useIsFocused, useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
-import React, { useCallback, useEffect, useState, useMemo } from 'react';
 import { SafeAreaView, ScrollView, TouchableOpacity, View } from 'react-native';
 
 import { API } from '../../configs';
@@ -28,6 +28,9 @@ const AddCommonSelectSubUnit = ({ route }) => {
         setTitle(t('add_new_gateway'));
         setSubTitle(t('select_a_sub_unit'));
         break;
+      case 'AddHassiDevice':
+        setTitle(t('select_a_sub_unit'));
+        break;
       default:
         setTitle(t('add_new_gateway'));
         setSubTitle(t('select_a_sub_unit'));
@@ -61,6 +64,12 @@ const AddCommonSelectSubUnit = ({ route }) => {
           ...route.params,
         });
         break;
+      case 'AddHassiDevice':
+        navigation.navigate(Routes.SmartAccountConnecting, {
+          listSensorIds: route.params.listSensorIds,
+          station: subUnits[selectedIndex]?.id,
+        });
+        break;
       default:
         break;
     }