From 85bb27408e1330018d216b67c4533a23e3f26e3a Mon Sep 17 00:00:00 2001 From: CPM Date: Wed, 20 Aug 2025 11:21:36 +0530 Subject: [PATCH] Dashboard updated --- .../project.pbxproj | 8 ++--- src/assets/Icons/question-mark.png | Bin 0 -> 6533 bytes src/assets/Icons/wall-clock.png | Bin 0 -> 3763 bytes src/components/Alert.js | 2 +- src/components/CustomModal.js | 33 ++++++++++-------- src/constants/Images.js | 2 ++ src/screens/MainScreen/Dashboard/Details.js | 32 +++++++++++++---- src/screens/MainScreen/Dashboard/index.js | 22 ++++++++---- 8 files changed, 66 insertions(+), 33 deletions(-) create mode 100644 src/assets/Icons/question-mark.png create mode 100644 src/assets/Icons/wall-clock.png 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 0000000000000000000000000000000000000000..1236174e37f6d5f535a07d1e6c995486f17668aa GIT binary patch literal 6533 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 literal 0 HcmV?d00001 diff --git a/src/assets/Icons/wall-clock.png b/src/assets/Icons/wall-clock.png new file mode 100644 index 0000000000000000000000000000000000000000..4a34f514acd4901208e7f95393b5f627fb3f4e73 GIT binary patch literal 3763 zcmV;k4ovZhP)PCY6`Q_%S5vE^wCMw_U?U=;sa9jFl&B3p(y9eDh>8kUQ7M9m#tLdH2&jm9VfDw_ z=X$vJoO@^X*?Z4<>@S(z1KG3pnptblW9^wWqN+3+A~F!zJ4*WidjbQ1K0xp2Z}In5 z-~(WN^tb)*w}BUcmsNFhrUl6Wsdobqk-oqPU?eac7y|T7;Zd!?GRzoW0R9EMsHz)N zcvfcAodJkQcVILy3RC)lK(|2RC}s@z0{5!wYk}m5P2CuPh#U@#1I7Y71s10gOZdVV zUJWgb3pH&3BC-!K9#j0_z~cC_6u29>SylfVT9``IqydP?FyL}v3?PBUsg}*aZNOAj zeKW8u9jGY-5Rs!W#g7UtOA53Cvw`2M>eA4{6sZXV5Rqem$-vOivSfe)4`PO}Ftjj1 z4M0Q&0oMU12NNPJvw;gkju8qW9x5W+iO583Ufrz92RIE_CL$9;36OaU5cTsjF)v+O zDCWUi0W6Qw>zHTn!*;0v^p8@%lHdJ-LBPSlL8RkcD&;ZY$Ex~z8aEe_y#YG-DpWO- z1hfFxV6In9IDHN*1b&A(hk7O~y8wFurvg(kWo=5K9GiekftG~i?gm^2tSfoOy673* zR5cp|0CoqSO1QGt1GfMt0DZDDz1AAnx^iImy4>${WIFd1mvc3x(R)tIx9G)>D%}Noh$xos()&i4&fuWV{Q0`rT zDZobwlzTI9W=uKeIoy9%!?i%c^ZDx??z=vX zg7*R*N#KpYfEsG%tEi6wz;7HC(pmaDu%pLw-R_%$)jwB7A-4jz13QOSTndKJ54g2T zBX|YJZZLBLz~;=$t1R4z(2B~y5RL}ktfHP?0Q%LG0YqAX3?QzPXBMzS)|DK|yxKv&)gfey8;ZeJUlejHh89K%ctZ0*ubY0I&}`zP|mBfH5H}wq6V%l5;rrsoJNG*HGdkaLwnn zAVfr3uvIJrJhCY^(!by5S^E7uD~54;yRK(usw z8PL=5rkjByRrNW?>ocQXTL5U=1^qHM3rmVOTv~wZa92LS4{K5R^^U4;0Dge=-AS>k zQv-;0?D(wPpQ5UFRVPzUB~*1D_7yQHR(0A1h{z(`w`(m04p7zBBqU3NdhP;>h)7T1 zMUvT9adAZhh&FJ{b-a;c{r-Xkgi4J@FaQ7%ITTnxb%8Oq0E1dOx!`h-o83|C%C9v< zqz7;a*22cwb@VzG|0pgGsp^_a&WB;RJ08|jCu{gz%anl}M__YxU$1JCX^g5;sRi(P z`+u#f?|WR|)QHFd*lM2c0mXP8TV>pFb7&Nn1r zz(K0I63Tl5$KxKBi-fDt{M3Wek*JuWeFV%Shi>$@Q7At`_ zRn@C?DK&tRj(P6Mr+(EF)!~9D1)~6M^V0(z^W>|08;If4}q*HAMq( zZT=Ul>W66wlaoC~0~qdj{iA6Kk`soa0Ss}xJ~w~{Lx6#ROR!?aqIGRbSETf)g|C6N zMgjM=WpCHB@^i}LV*o4C6eK4M1>Dz_El*RBoG=uyLls@f4WI!j;J(*Cl{oe}VJToo zsJie$nu6qnp@0P~bRqWuHXuGNKyCmHNYfaAh+G$1hFYYBCg=iUMA&E=f*c!{B{7u$ zPFk|mA_Xjlp9`*CMa>ZN&3`@(S!$I6?oE4L8GwjfkH7M_VxjPwhK4kNNck7U$a=L} zkjAE=g$C;aL}WT}evGWsRQ1ZF<*9XiT7dp(3X%j>DF1p@y(npU>VX2b$`1Y1&abw8sB*nFoTk_hQQ9zajCGkLKmt`A!p>uFIz8P!lJxXD*t^H zPY=fyg}PMQRuVpzJ&^LJhn78qx^W5Xe~PM7%;0*g>B!K9%az|{-E5Do-RP<=9#Yk| zZvn2$y+%7;ml`5+BXDkvtT(7?9OqEIaVU07ZC4D0FFppjdcT4hfEYId=fuc9qe+wx z?mF5GUl_pSj+usvNah~F=p3AClpn`GP_MWefQ71w`i;KWJkg~eJt5;hO|S^rar*oj zq5I^F>#7eHe#Tjkg~$jtV5d^MFvjt^r1&Lpc8q*Cs%jkPP(3pQDn@@TrEQyk>4Ff~ zZs3$C&~fUB$o{|;F|szJ^1+Udb77H2+x$xn;4#O{eSvTLNL2;j$3Ld-%qCSnz#ER& z%`5&WHGoI4fI}{fca^A0T*KBBnW?IAricxJs=fle*2QJ5!0p9AX}bg8=?pLMK= z4D^=JAJ;FHU<1Wwee+8>i_YT^PEpmimZJTlP}lQ*T7aK=3KoZjj@R7;oTt%HxS3Ja zr+|~_xSRVW-~v_MW=vHsT>L8B;svh*_RtjL1xM%OyhP_~5pDv`&6U3`(K*jY0($^Y zs%rV|{blBozr}r?eMts$+k+^7y2fX~uZWB|Pw`S+92gO`1ZQJ@?g5z3;?JtOB+chG z17%MQ6OlPsKjOlLsyaPUsd6%-k^u|@o^`y(IxHe}er`}5Qg&;Y+R?ABj-dg-)Wjsp z$&{u#I5MXrO?7l^PDi@h9qjWV=Ig-ZDrCuVL_|i5$Soo=S48d;ku#!szdsK1@W0{r z4Srncxox8+%me$!3iZAO=wG!Tpp3N*0+s+}AZi$hCC+nX!~zF(cT)N0^-Q zh{&t2Pef!mey57P3k+6|k8@s8 z!XhWnY51+w5#TNn$$B+$Be0+6^%walA7X@wQ`P?f6Fjr^0_No1fj2vPTsu`&XL~=P z3a5n24%BjK7O+ETr%F8}Y)a=+rw;>#IM47J1C$bN*SZtxOu`U82Ob2*)@t{FjelIj?iJI*Q1T`^2&{yN><-Mv?<-7?g!>;6!9V?k>~DtV1Li7Yg9GJ3aU&D0NOq!PsaN6q>pEB#oWt}M(J4%aMHPm zjKG?HUzVuq0ZGf_LS_cg_CVWkG86Yx%j2M!*K7qA1amnS75xM3e1y`}ip^Ylmi%20 zyrbrdbw)(a!-7})a)qk8F8NB9K>g%)z(n9WqD9H22eyqx?>^HM*$Ka3_uBbZ$Xpe~W#WqEb1cqY~ zv->7=`>nv0s(N)o_p3ST-T=xGg|Xc`O8a1eCI?{g^m|8ti@#g2l^?8002ovPDHLkV1j`v_Q3!E literal 0 HcmV?d00001 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 + {/* */} - + }