diff --git a/ios/PerformicsStoreDNA.xcodeproj/project.pbxproj b/ios/PerformicsStoreDNA.xcodeproj/project.pbxproj index d97805d..f85f1c1 100644 --- a/ios/PerformicsStoreDNA.xcodeproj/project.pbxproj +++ b/ios/PerformicsStoreDNA.xcodeproj/project.pbxproj @@ -263,7 +263,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = JGDHGNH9XY; ENABLE_BITCODE = NO; INFOPLIST_FILE = PerformicsStoreDNA/Info.plist; @@ -272,7 +272,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.6; + MARKETING_VERSION = 1.7; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -292,7 +292,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = JGDHGNH9XY; INFOPLIST_FILE = PerformicsStoreDNA/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.1; @@ -300,7 +300,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.6; + MARKETING_VERSION = 1.7; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/src/assets/Icons/question-mark.png b/src/assets/Icons/question-mark.png new file mode 100644 index 0000000..1236174 Binary files /dev/null and b/src/assets/Icons/question-mark.png differ diff --git a/src/assets/Icons/wall-clock.png b/src/assets/Icons/wall-clock.png new file mode 100644 index 0000000..4a34f51 Binary files /dev/null and b/src/assets/Icons/wall-clock.png differ diff --git a/src/components/Alert.js b/src/components/Alert.js index 058bcf0..0096fac 100644 --- a/src/components/Alert.js +++ b/src/components/Alert.js @@ -31,7 +31,7 @@ export function ConfirmSaveAlert({ onYesCallBack = () => { }, msg = 'Do you really want to save data?', yesText = 'Yes', - cancelText = 'NO', + cancelText = 'No', }) { return ( - {onClose && ( + {/* {onClose && ( - + - )} + )} */} - {title && {title}} - {message && {message}} + {/* + + */} + + {title && {title}} + {message && {message}} + {children} - @@ -50,7 +54,8 @@ const styles = StyleSheet.create({ borderRadius: 12, padding: 15, alignItems: 'center', - minHeight:200 + minHeight: 180, + justifyContent: 'center' }, title: { fontSize: 18, @@ -64,17 +69,17 @@ const styles = StyleSheet.create({ textAlign: 'center', }, closeButton: { - alignSelf:'flex-end', - marginBottom:15 + alignSelf: 'center', + marginBottom: 15 }, closeText: { color: '#fff', fontWeight: 'bold', }, - iconStyle:{ - height:35, - width:35, - resizeMode:'contain', + iconStyle: { + height: 50, + width: 50, + resizeMode: 'contain', // tintColor:'red' } }); diff --git a/src/constants/Images.js b/src/constants/Images.js index af29c08..5e7fdac 100644 --- a/src/constants/Images.js +++ b/src/constants/Images.js @@ -26,6 +26,8 @@ const IMAGES = { AuthTopBGNew: require('../assets/Images/appLogoNew.png'), AuthBottomBG: require('../assets/Images/loginbottomBG.png'), dotsIcon: require('../assets/Icons/dots.png'), + pending: require('../assets/Icons/wall-clock.png'), + alert: require('../assets/Icons/question-mark.png'), }; diff --git a/src/screens/MainScreen/Dashboard/Details.js b/src/screens/MainScreen/Dashboard/Details.js index 2d0022d..eee366d 100644 --- a/src/screens/MainScreen/Dashboard/Details.js +++ b/src/screens/MainScreen/Dashboard/Details.js @@ -94,8 +94,8 @@ const Details = () => { Details - - + + @@ -254,7 +254,8 @@ const Details = () => { return ( - + + {detail.GraphTitle} @@ -289,6 +290,7 @@ const Details = () => { borderColor: '#eee', }}> {row[displayKey] || '--'} + { if (row[presentKey] == 100 || row[presentKey] == '100') { @@ -340,8 +342,20 @@ const Details = () => { + + {'Out of Stock SKUs:'} + + {/* SKU List */} - + {/* OOS SKU details */} {selectedCategoryData.map((item, idx) => ( { paddingVertical: 8, borderBottomWidth: idx === selectedCategoryData.length - 1 ? 0 : 1, borderColor: '#eee', + }} > - - {item.Product_MasterProduct_Name} - + + {idx + 1}. + + {item.Product_MasterProduct_Name} + + {/* {item['#_of_OOS_SKU_for_all_visits']} */} diff --git a/src/screens/MainScreen/Dashboard/index.js b/src/screens/MainScreen/Dashboard/index.js index cdad3ed..487875c 100644 --- a/src/screens/MainScreen/Dashboard/index.js +++ b/src/screens/MainScreen/Dashboard/index.js @@ -563,6 +563,10 @@ const Dashboard = (props) => { const barData = values.map((v, idx) => { const value = parseFloat(Object.values(v).find(val => typeof val === 'number').toFixed(1)); + + // console.log('valuevaluevalue--->', value); + + return { value, label: v.CalendarYear_Month, @@ -571,6 +575,7 @@ const Dashboard = (props) => { {value}% ) }; + }); const visibleBars = barData.length; @@ -708,7 +713,7 @@ const Dashboard = (props) => { }); // console.log('mainTabIndex----->',mainTabIndex); - + return ( @@ -769,16 +774,19 @@ const Dashboard = (props) => { disabled={store?.UPLOAD_STATUS == 'U' ? true : false} onPress={() => onSelectStore(store)} key={store.StoreId} style={styles.storeCard}> - - {store.StoreName} + + + {store.StoreName} + {store?.UPLOAD_STATUS === 'U' ? : - - - Pending + + + Feedback Pending + {/* */} - + }