From ba0ff0337079bc0c1b510d498b3f91124c4ba551 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Wed, 11 Jan 2017 12:07:32 +0530 Subject: [PATCH 01/36] download --- .idea/misc.xml | 2 +- .idea/modules.xml | 2 ++ .../main/java/cpm/com/gskmtorange/constant/CommonString.java | 4 +--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index b8dc4d6..b15ecee 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -41,7 +41,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index ad566b9..a329b11 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,8 @@ + + diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java index 5150b47..8f02679 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -299,9 +299,7 @@ public class CommonString { + TABLE_INSERT_STOCK_ADDITIONAL_DATA + " (" + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + KEY_STORE_ID + " VARCHAR," + KEY_BRAND_ID + " VARCHAR," + KEY_BRAND + " VARCHAR," - - + KEY_SKU_ID + " VARCHAR," + KEY_IMAGE + " VARCHAR," - + + KEY_SKU_ID + " VARCHAR," + KEY_SKUNAME + " VARCHAR," + KEY_IMAGE + " VARCHAR)"; From fc5e21f9d02173953dddae0f330d57787b604311 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Wed, 11 Jan 2017 16:30:33 +0530 Subject: [PATCH 02/36] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- GSKMTOrange/src/main/res/drawable/hfd.png | Bin 4661 -> 3982 bytes .../src/main/res/drawable/hfd_done.png | Bin 8721 -> 8136 bytes GSKMTOrange/src/main/res/drawable/ohc.png | Bin 4543 -> 3702 bytes .../src/main/res/drawable/ohc_done.png | Bin 8595 -> 7757 bytes GSKMTOrange/src/main/res/drawable/pdr.png | Bin 4770 -> 3958 bytes .../src/main/res/drawable/pdr_done.png | Bin 8596 -> 7907 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/GSKMTOrange/src/main/res/drawable/hfd.png b/GSKMTOrange/src/main/res/drawable/hfd.png index 82782775b090ca081ca226627f0a99fa43b98f72..f8b22111381bc0d4bf7eb01e009c66d683474b4d 100644 GIT binary patch literal 3982 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 JDpYJD{sR-zcqjk> literal 4661 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 Gp-b)Cg_ma_tAEQPu5pDDm5hYQhMhQX~Eg||K zF%i8-olm~!UGIADpLeZ&_dfgFd(K(+i$a>p`%Y4P`iB{xNQHqSrNTox3~3;ryp4(! zTwm`eZh6d_fem*yp;E8Z9`qB3yTqj=WMwoMCF{P|-(PyHR?-VuEQ&gTD`t#R$xaJXX`6VXgdq&iW}PACMD+uGZheU{izlKXCO zf)V{~mt5TgsFCvqMGR3&Q%KZJe20QE+-^aE6%mfK!&!7zikY&>^~EiTxcum7rJPtC zt}nog5e3L`EEVC%$Z}p}u#Nl}t2@FS?pi0Rk!s*}{#G&HkNq8Q*qM+Tcv zE41hwN6`1_p$YGLNsB_47>)6J4(6kj6#$AWi)EHV42eQ6oi1?&`wCpu4>%`^03i7? zgN+p`c&<-&emav146ogyV?M$y1IAqfl)I@;dR?}HeK?$PRQxPQ?u-={4u3E9es)hc zsL|1z;lA%JDbUTr;kIVvHTx79i1%#GtlqIrl)uqA&@#=Dw2zgxh*fWWnX^(gL8TPgAte`COe zDzgVQBc(1R;VjiBAlP!e=!t8A9Lya0Xw9^FSlXPjn$vrW~~XM zjD*_Ah6#RR%Oy&Wdipg~jyU|59Z7?Ybj5&MZq;fM zh@WOL>e<69B|(;`C|AUr(Rl@hlPN_XmbzK1i|gg^}!?wx5Snbm6%itYx6A?E8FU%nFZlV=|u+O z-C+w?yUQ$#;Gwd8r2GdR&M>9y%*e#|!9n&z9i`@7MrV!a%m*}G^WQVe3zK(_&&>G8 zanY@nzVcrWE-FS(uQavvurH~}-bxHo!E(3;u_)4ANt=nx~flSxKDtV)b6tGfq+h zvKQ<+CGT17KT7PN9l_ok=?o-_c#7XeJ-wt%y1u|y?0;kKlQloNo{7||b8!sH?d_19 zvCihHkzWVEcDFO=@R^ftduHEeIo0)9O&WO}KxZE|2lREA*SAvi)<5f|O$=i&`(D4_ z5mdVW<2dvvh9D%p(yA@I(9M2{`6SnPvdg87LS3~oi~P62>JNlxrd{B z1Gm>lbPwaSAVnSg48-A0{Mqc?b!({$qEq%8_?Ft*tZQ?grh={*d_$XS2XZ!#1s;u< zkylh7pd8JA^82z{N8Dfax(RH&G#HX_+x>00llI|+LIJg{E<2iXtaGa4<3y?zAs{++ zObY`3J)ZdYAow+0Y6!hG60&=`sYI(uR>3^J#e3Mk-5V)g zcy+bDy*oHEPR74h(!+0f=?(|{2c$!wSIUbPne(nCtP22>FqonQ(2wc#y#t6{^TI@f3+NE{n@YY`^LsSm(Pe zhAg_Mf)XK(Hg~!ObiwM-v%>AZ->)+VbLIkS3YYD@BhvdS+U^#P=M%>UZ1Vq}*UwtqTg zW*Ogr{$bf<(4c*hkW+e2Q@=sH%L`fT$Vg`cA|PXtsgX5c2Wex?bgt)I83%vtw!uVI z{FbnIl0IoRXOa_~D@~%j!G5YXlJLa&t;!#ZI5_{^N}(D(6{V`sA9*l5v6tHG=mpu+ zCB#@AWd@M>e#gDz@oydfu~4QM8SmZL9l{5;0~4) zMSHw11bXOD^n*Siv%d%16heXj;+2w3uflFh`|{EW46G>5o|Sk7E`lo3vbF>50fKmn z_=AE(7v*9$iOsXFCDy{ci_0DsEO?64epOn!GeEYIY6Ob$kw7XftC?2YU^5Q|b+NMV zn@0!B6d(t(L}5|;NENE*C0q%QPxmTTRq~@#;>5mUTHnc`2{}dcY<(gmT*?Mqn(%LfhTjf0KUC~&3+kkFEoG2t=k;sRQS07V~zmY z)h_p4siC&OR<>&*THfg0c&i#6rMFn}#Moquf#E{uIXeMu#MJIzFNrnTnMlN>N0&a{ z;u<6(*C17c!yz(a8h&eA3}H8Vf9#VT7tI|0X&nQV{S&RW{SE({Y8mDR$CMsn_ zD-=aoOQczBD-Xvs&vaOHK5ZA;*nF^;I6>-FhaO6{1PxO^_tL)0&yxn=#cAV>E(E-C z4gAi;O~U;^{S`%;vo;}fqF|6DUg`H^Ljx=^@y1vxCPs_-rHR&`f%eU85Sm|sAV z8^r1C$gRdD5Z@=0$3+VOuDq@yEChci(sSO9SWwIewfU7SMcEYL8?nYU@`7JM=|D7& z-0o->srC^fm&u`*C>|gOvYkE}V@1`*Jen#(FvRpolamfw_W4V9qkh`fQ18aQ%h%a} ze!ck?;mS8Pw|B z2Y+2b3#HKdT^2^}U!;#-ZxXI-y&l}~yBv($cW>=xEPS-|Bn>f+698Z9(O{Li%+7|V zQ&5pLvGDPPUw{cEY}t&$YxV$^HFro!8khBTW&CX5V0e1)<=mkH=(8YCUj8A{d*&bH z@RXFpssXlHaqrTLdM|m~WK$I#QFpFvZ0cz=Y^%AF$cwxsFB)QfayavZ;SOJ33Q?HA|HKQ@}KT4w1|2)aik*gr7~osDHHD~P;0 zPoj@nUYv&Mw;xy0qq@9~B|7~#O{aP`xJqZP3o9b`R<@A{Hq0l>uITm~7ej;APL_p% zH~efLX|Nhv%rb7Ae6AODAxeRD{pOJfm$%1?M*>zJUA_-KlxDIH3;n0a>ZT_D6ZN0M z`CsSkAy_6mQ{(>q<+%$~2$rIA%7B2*;(?*zuLQB*#Iz+40m}KZ8hux8XngV8R2||- zTgBqr>8}0I4Xp$@Boe@jocLCz2Z#2@5fPAbQnMF-$=@iVh zXRnZ<7;R&6iaAT=Q%DG5v3~E9FpX3&BnB+^yqG@d9$ujy%hR3j-DDD~qhH9y0~lbj z$I+fH-u^NwCSK2ibW1AD^Ol~jQ zR?NqoZX|Tk#ORuzo)_Twyj9Aa>4ZIlIS;f}7Z&I^Zuc<9G1Vb9RYm?PLt z@@0&kg3@Yo60^0l!9+C2E6$SrL%PcC!t25s$pzt51*E4xx8`Z0>+Z>@-%U0GJ3$?b z;;U?xNUDBT*^>u~L+K%$+1}?RCOU%wr@q^u3hh17M;Cs$YCE4oT9V{Aj4B*e_o@SD zDDW74FGP1J$e_#&TWRYGCU=Gq-sj*mE%ziJ>``MSrY$gQ^x7+VO^7{vXL(*cx#dB` zr<=M4Y~BB1xm_dV(!2&iB9H;e-!6iFaW5{sE^Fi=;lb{6!X&iFrxYO(a^Qp1jA+FQ zjf(yc6g`P7OGakpy`49SoVJiM^0+v-&~+^|2_tNn;=N}?A}cv2{M!sShZqH`t9Wyk zEg5P|?lzTg9A`GFSmYWU6o8dR^o*4u_CbJ-RbxEwSHzzu;Td_;ksn;IyK3A9Bs~Sg z8`_=Fj_-rCD_?>8+GK;>0+LVTW7R`!_;K?+an!$u=rGjP4G3c)1rlC%6g6zv$e4iJcj|c z91|V9j{|#Vzl9B$>wN5ci4x+3O!D_Ky2j*&ejnLsF8%JHvWGU*NEh%ZKibVS2wHzk z?rgB@qpB7N%DyrmfSbIiiA8Dk?LKdczI8%D#yax}4#t8b?JU1fn6_^&KFjfIjkJ&# z@6-Gs{P^>V<;3`th=s<$w>00nY8@4T#z(ou?UCbJUYb+aC(nb1E2qlPT;Wye4l);q z4=y&3@lkSbYR?*4|ETu3e;F~muO>3hP!+r`N9eC3F<_A9U^vqiJjUUcEr2iB|8YQR zh=2{=pLTzm*NUZfg8V6=xWu2Tq+@kx7H?v#OAD42T zZbX#n$7%Mb(H-AGA>vNWxX963j52g=4HhHrnK!rSjPV!uMqOFCLAg=M7HtQ@My({gpofter5-^@OG%#nT(zmrA7`d;8aO|qN&7Qd#om?E zpqqOqc^guLJ267Pm!aU=7O{fqc3UG)ff(lr)8Csfi%N!rbTJN z^v6szK5>va@7!RBYHrQ>#ln%C!k(>{I3g{u(~D#T z{rj6!9Eh^~j;6zW?)jmBiP$QpH}s}7Y2+m03e-J@A5)pNXZl5>M9(A2Zf3LA*@|$X zZ$9|6J&c8G)qU_)!o$n(Qo98hbh$>FN_sCP zXoY3jvR+~m6^v>Iwk)(OSGUBP5@e^pvjKG&7Lsv}T;dVD9eL^iVWdR!TDACJ9f^_> znuoGY0h<{ap*j`-A&Qx-Yd)$t206Rx5_+Yp>dmWO*+$V|kth0%;{Ltr+WB)|u#>pG z@nZhsYMIw6{op}!6?)ff1{VuKbB~Y5%V_5RkkTQW z7*ihWYFnSqEpx&$dVF37JcSmJEBYa0gEOemZ)=y&Q~nVr7nm2q;cSk`6C+mAY(~3!ZC7(GFE^FA)l_+8H+SKrz5K_rC)S5gjYBT5?Arlk zeq&agI_Rz6+t%{uONXYdN0H?cQqTMio4hbN5FN0SB?h#xg=%jGLQdG|8*$C8pjAi YzO+5?HxVQI_p$p}RY#>(*#`Ol01Rww-~a#s diff --git a/GSKMTOrange/src/main/res/drawable/ohc.png b/GSKMTOrange/src/main/res/drawable/ohc.png index 9ccf323b7748d55f13575bbeecf67d752a4fb871..ba146f863731dc7e679e610037e5738c114ab242 100644 GIT binary patch literal 3702 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 PHejGkaK literal 4543 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 Gi1{C#`hK+l diff --git a/GSKMTOrange/src/main/res/drawable/ohc_done.png b/GSKMTOrange/src/main/res/drawable/ohc_done.png index 96545681c87f1e90d2d972278b2715df2242924e..7c96401d2c1f1de37a7a122bc2f86137ae1822ac 100644 GIT binary patch delta 4984 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 delta 5829 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 diff --git a/GSKMTOrange/src/main/res/drawable/pdr.png b/GSKMTOrange/src/main/res/drawable/pdr.png index 9190d2dcdcd0ea7b500f7a6a840d1574d3abfb77..8d4b78785ec8daaf5cc1a0c3c0a152bc893e6613 100644 GIT binary patch literal 3958 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 UQ^xrHIcbakFSyVl5mK}mis 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 YUFcK9fASlAP4oa=P0-V7b-Sql0$$2CcK`qY diff --git a/GSKMTOrange/src/main/res/drawable/pdr_done.png b/GSKMTOrange/src/main/res/drawable/pdr_done.png index 4b99cf57c86591e599e3953d08da798d3c19a97b..ed70cc61bc3c24c8f42314cf8a9bd2881090d30c 100644 GIT binary patch delta 5117 zcmYLMbyU<1vz8E$UP3@pKuVF;rKLkyI;2}97nZIcB~mV30s=1}v4nu6#4epncXvv6 zUcdX^^WA^uk7wpNXXcqXGiMTIR>gld;bT&eCbZyl198kD6p!WZAMS2HFCS$ws{jl7<_oB^AZ+*zkZ2LOL>rK#Y!!obxgreO+)?bL4cQomzTHE@^TP*a+}doT0%!h zcxz-tcp=$nd3tqC4VVFFEhJY3fM%562MBiq`1u-d+K{m;7k{2eg-HD69_B`!Kzxvj znx|B&uET{=ia6`Nass^k+&NQB-#*TOY)KRH350;VTjdAIhx-oOyzJ8lbX5T%G2{LU z&vQw(Cr@}?PptX)ZzmrHyOF4FRPnc~~Bk6j8tRC&oFtox(x?1#$mX z8^>YR(SvX2L-fxb+h1n19yni<6~^A;J$m%$;bCvGLb*+yqVwoM$#phXH-~d9N92+a z0(S>oj)nY~-sY$+n<%F^H3#G6E5FYff0v%u)AX8KnhBgL-;r_Udf*J+6rF2*%~ecH z+{*@I%h#Bp#wcqmy5;DGjUj8tliCe+m1KE*I4RvQ#4z=f8P!OE zJ5~*UvnG4r;Op5EsEkE)6R}4-#ow=$lW>=vgx^bW(c0OJc_*h%SZInhlk+|Bga_WC z;5m3^SFf85kX-*?)h$k=>J(i^i}jNp(I@5kKbSycyiC-oqL0W8Bik|60;z#ne%?b& zLPA1CFU&Ixed^f4u_t_o3epxbyu9y}$9P%MjC~$ti@vF`r2iDc4J@=5*)O+t=;m(* zD7K*H_vh|+SG|%jJ3pZe=G_Z&7U~fT2phIhgh5rCB6DJzKI;>l_@DeQqgjKz5lA_k z_F+8ZoZ-~RVd2m*&SRHZ6e|E9B9OT>Fn@9FDZqlk@rYyke0p?$gIzWkx2TR{<=n3g>Y<`rOl{)Y!nB?%LHfF3( zxb4=);HjUGRK8hTJeep8YMB?G-ZCl6r2;r^hcV4eiKa`o_>`cvKU?+jVn`h(@JZ)y zseMYo7cfFBVl6{v(EKzUL0&5F@Yojet2E7VcF%6G=f1ODV`Hg+d)^V;1SuJkq$#JB z9;mKflb7-b^^6Uyr2_MilGS6ra(b)Wj_L;e^BU8Sn7P%>MrYr6_=C&``X~=}f2)|0 zbzWV4F_oZ$JMNTBqCfCT?3|b-6zy4QtX$Op)&l>|0HA5&2~>&eS7@ z2ZMc~7-v!dEeX~W>BIQR)tWy3&c6Rf}=CW2GE^j2Eg zzrH1!0qJHWwJL5n9y`$R&#|gx-Y=K)IL~)qEH?Z`P3~*HdRJR=b8qsZ`Q)b~fvDb033i3NtUE7>fFZK_Q9h5N zp8(u8G}|nCsPd^?VaP}7+fHytfR9z<11!eA-}xX? znOtQ#iwsT49NLC1VsBHI?`tz#N>GL}6$mB52n(VB3TC=yj3K#cEYV%4VNMA=w`z`E z*eadB_OT=RK8s+Nl)bbft7oib@jrwz04G;gojqV0_EkD-o^M)f?v4IO3X%Z9f1xwQHP>4if;52N#mS2JK*U zf(t+7-z2OuXrf!De`iq%!(RrjF6xa7jEalqCh4-qCnf2Ul5ehj#+LRAe-hM9Rqoa; z*I65z?)f4Fct;!-8^ZI(qrbc2wFVO@xv^{I`!Vp5rZ+kCU{v4=Vy;v}pVJt8xrR z&ar|Ka|-CCgU2BLmav@qa%RHz;f+=dOQ24ZZPF;_7$#)xw&#dwTgTPuK+F=+0bO5+rMJ!!h-3T;lR%I z%u2pc_PcR!*q{nM`b~6&5=DJk#V;L{cLr>2f$u4Y+BUzD9PWfhQg^E5uCljzc>^T@%@vD#U~^m+Yr8G{-p1gnGd@+Q?y=2 zPNld-)u);Kp0o?OppZl9e&^%D=hriqq^ur3kmT+-(B_aFC`1a`N_ zBACwyPiqFnf6dnQ@+o&Y>S!{AEe(q%liJu1EkaGjqdd7FYI3AwyV`g>@P^Hv8`0^H_8{gk&=L;Tj9N(?x%yD$E$pmkMu+27fR6+~2%n+iL#F4nc=9@okex==V~ zeX9toD4%wvMBjwCj9p&^<=wcIldt*@*u+((ZLXDFJ0u<$hX{zkP7O`0hw&5|NoiH| z%;n9pr1cVMC=EDpPy~tZ%4|6mif<+uLPu==S~TE`062_}no*agZP^dF2R zwTb}Xyi7!BR1lI(^@ZnQA;6ZxUOoDfxYXV`k8IuE}I5fZ2X=T;F&KE864 z*?uTzl%JDJsyZxWDu0t0FvnPO#`bhm@?}?mMf8=W*7i+E^a zq`oL`eV^UcWlYDhjm)<5U%6o9QB@VLx409BDPbd2cPIm~`lPDLLvg-ih}YnBk!x}c zw}JirGpI-7bH*kT`$Yn1{~TB)lUF9@wv}Yhs47T|+?ZY+ zBoI4Wryz8`-I?5F2bP-LY-yBk*h7$7ZRIjdeKY+5J4uS z3oIMLn3$R>7^luFR?K}FNkYgMscSc5C#}N7S89fbZQAooP_g728}%hKK1E^}1*OIf z2KiTc%NL{DvP|vDhG{hydrirV=qCSIn@|g1;mkWV$VQ)v&HA3{{l`-G^ADnn86|`e zT^xY@Wk`Zhy2&nf_hfN`f7{j4Qui6MHpqOb5%KXyR^O5p6oQX#3t>qynyfZ zp*x_$GXPIO3D+E+HuKhs()%S{+rw0lg$hBbhsffz?HDWQ1{f^P;N2zX5o3Qcz5W z`nf2vXGq+g+`gt~spdZlX@;|1*#lv%Mq7kvx1^vyy8QgUYSs$Z5g668f}*9N*eGF?sKWA{b*Z|T1Svj_bhaAIZ1ifl0KdWWTHM**a}SiC1>6iiV&bcpbWgv7l}D_{@EN(c2qC0|3JKuhudtnPb!h{qKN1B9&Mu08 zGGK|%hwwYfXRWWAQI$F}t6~uBe!DLbagdTNH!k8XMRqw6PK`7O@M83$-0RZ;;yRK$ zWK_YC(dgKT-NA*qPZnFMK@}`BpkBrEZCc!;vN;-W!Mm4qgDA1Xbk^Gbh_+#fVqx`> zmMDJza`B3y&cj}wV*YkdVU26Yd#xL_o^5{c$7jiLyL5BgadIX*jjZ8q^*-6vn8UxC zwUzAN7EgQb)tPVY1Jr^9xRDlvW(cA3O~KD6c-h6;I&089Xx(TLDk2WvX{>P;X;rh> zuP@Y>JwpfqV5#1iwC$IbAtPFY**xu_hWZGqFS`&Ky`bJ`xZT?aMb_%_qG`u4_Z$}r ziC0ck9gDNp2yy-7U((soGq;=65segKBljHzt?1vmI~_g1sc^L=wMiz*+jx_26%)5=q-&1>a0^-(`gR=`R`W z*n@b70*6Sx9SvWlvw4awFiev|Yq8lw_bs~_2RuW=K}9z&hq#+|1Bj&Pn1eksexY;??@Asl+@=n-sB;X4$l_xl?Rl;QkjZpzAuqUkhcagyC+VNMh$ zb~*c$jYPE0sG%i$tOrKs@zN;oFiXq0gAl?pN_V$}F1_wnqT1NP9Dnqrk!F=M)CD2h zFZpJ9v|xpwCZjV1wgR%Q!f?xYjkSR90Nep3a~ZF?NJ?l8Sz43jZ90Ems*)!>IP5ez z`(Yg}HB^){`PC}%Wkn>+@`J0k7I!-rXhLxV37(yW20Naxvq>hPwkLD#{)|+wSZR@4 zGA@X%Ymf7T{fF+Wb4{V>`BCK1>QK8?9DRZF)xef}`0NC7h=fE{rA7dJhbWc+Ubo(< zS_RlzxCY=9sQI|ekJvYMtEE$4Z%dd9h6tpumYDkFGf6sINO?7=nGP)VC)1TP8t+3z z)4Okn+Si~s1vOUB_Nf>*;!FTNKPZ`w+73A{ z{orS=K>;{f?AaZOx26BcLN5WQEE;v@dyblwzauKx*H<2=vuE`$owm8?#=t4CoSa$c zahu${EOsIYA&jScL@b;AFWU&dy3tj=f9f!Eg7^MCnPtRvTc8aMWWBO2 zSew4coiKCQ;!yi{HKD8KtjE4^1Ttpf_1u z&S=?x0HdeA0lIKu;X0dBOw5DF^`z8q<3K?##ztR3R+Cj{am7N8qET7A)7ApG9z+jj zi%}nE#nC4&mHe9E4>bQ?LiU$`FJTg@r+3N98d}K@{_y{ffARl1{v}K}Tpv8j?v5X; UTBADp`};pql7q;WNt*@#4@n~y^8f$< delta 5811 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 From ef976db07c73b365887f0138ce1df4b119a11553 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Wed, 11 Jan 2017 16:49:36 +0530 Subject: [PATCH 03/36] T2P insert update complete --- GSKMTOrange/src/main/AndroidManifest.xml | 1 + .../main/assets/fonts/fontawesome-webfont.ttf | Bin 0 -> 165548 bytes .../com/gskmtorange/Database/GSKOrangeDB.java | 188 +++++++++++++++++- .../gskmtorange/constant/CommonString.java | 74 +++++-- .../dailyentry/T2PComplianceActivity.java | 172 ++++++++++++---- .../com/gskmtorange/fonts/FontManager.java | 18 ++ .../com/gskmtorange/fonts/TextDrawable.java | 52 +++++ .../xmlGetterSetter/T2PGetterSetter.java | 10 +- .../main/res/layout/gap_checklist_item.xml | 1 + .../src/main/res/layout/t2p_item_layout.xml | 1 + .../main/res/layout/t2p_sku_dialog_layout.xml | 6 +- .../main/res/menu/activity_main_drawer.xml | 2 +- GSKMTOrange/src/main/res/values/colors.xml | 1 + GSKMTOrange/src/main/res/values/icons.xml | 6 + GSKMTOrange/src/main/res/values/strings.xml | 15 +- 15 files changed, 478 insertions(+), 69 deletions(-) create mode 100644 GSKMTOrange/src/main/assets/fonts/fontawesome-webfont.ttf create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/FontManager.java create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/TextDrawable.java create mode 100644 GSKMTOrange/src/main/res/values/icons.xml diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index a1ad5b4..9ce8360 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -80,6 +80,7 @@ android:name=".dailyentry.T2PComplianceActivity" android:label="@string/title_activity_t2_pcompliance" android:screenOrientation="portrait" + android:configChanges="screenSize|orientation|keyboardHidden" android:theme="@style/AppTheme.NoActionBar" /> diff --git a/GSKMTOrange/src/main/assets/fonts/fontawesome-webfont.ttf b/GSKMTOrange/src/main/assets/fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..35acda2fa1196aad98c2adf4378a7611dd713aa3 GIT binary patch literal 165548 zcmd4434D~*)jxjkv&@#+*JQHIB(r2Agk&ZO5W=u;0Z~v85Ce*$fTDsRbs2>!AXP+E zv})s8XszXKwXa&S)7IKescosX*7l99R$G?_w7v?NC%^Bx&rC7|(E7f=|L^lpa-Zk9 z`?>d?d+s^so_oVMW6Z|VOlEVZPMtq{)pOIHX3~v25n48F@|3AkA5-983xDXec_W** zHg8HX#uvihecqa7Yb`$*a~)&Wy^KjmE?joS+JOO-B;B|Y@umw`Uvs>da>d0W;5qQ!4Qz zJxL+bkEIe8*8}j>Q>BETG1+ht-^o+}utRA<*p2#Ix&jHe=hB??wf3sZuV5(_`d1DH zgI+ncCI1s*Tuw6@6DFOB@-mE3%l-{_4z<*f9!g8!dcoz@f1eyoO9;V5yN|*Pk0}XYPFk z!g(%@Qka**;2iW8;b{R|Dg0FbU_E9^hd3H%a#EV5;HVvgVS_k;c*=`1YN*`2lhZm3 zqOTF2Pfz8N%lA<(eJUSDWevumUJ;MocT>zZ5W08%2JkP2szU{CP(((>LmzOmB>ZOpelu zIw>A5mu@gGU}>QA1RKFi-$*aQL_KL1GNuOxs0@)VEz%g?77_AY_{e55-&2X`IC z!*9krPH>;hA+4QUe(ZB_4Z@L!DgUN;`X-m}3;G6(Mf9flyest6ciunvokm)?oZmzF z@?{e2C{v;^ys6AQy_IN=B99>#C*fPn3ra`%a_!FN6aIXi^rn1ymrrZ@gw3bA$$zqb zqOxiHDSsYDDkGmZpD$nT@HfSi%fmt6l*S0Iupll)-&7{*yFioy4w3x%GVEpx@jWf@QO?itTs?#7)d3a-Ug&FLt_)FMnmOp5gGJy@z7B*(^RVW^e1dkQ zkMHw*dK%Ayu_({yrG6RifN!GjP=|nt${60CMrjDAK)0HZCYpnJB&8QF&0_TaoF9-S zu?&_mPAU0&@X=Qpc>I^~UdvKIk0usk``F{`3HAbeHC$CyQPtgN@2lwR?3>fKwC|F> zYx{2LyT9-8zVGxM?E7=y2YuRM`{9bijfXoA&pEvG@Fj<@J$%dI`wu^U__@Oe5C8e_ z2ZyyI_9GQXI*-gbvh>I$N3K0`%aQw!JbvW4BL|QC`N#+Vf_#9QLu~J`8d;ySFWi^v zo7>mjx3(|cx3jOOZ+~B=@8!PUzP`iku=8-}aMR(`;kk#q53fC(KD_gA&*A-tGlyS3 z+m)8@1~El#u3as^j;LR~)}{9CG~D_9MNw(aQga zKO~TeK}MY%7{tgG{veXj;r|am2GwFztR{2O|5v~?px`g+cB0=PQ}aFOx^-}vA95F5 zA7=4<%*Y5_FJ|j%P>qdnh_@iTs0Qv3Shg)-OV0=S+zU1vekc4cfZ>81?nWLD;PJf5 zm^TgA&zNr~$ZdkLfD=nH@)f_xSjk$*;M3uDgT;zqnj*X$`6@snD%LSpiMm2N;QAN~ z_kcBPVyrp@Qi?Q@UdCdRu{^&CvWYrt=QCD^e09&FD^N$nM_`>%e`5*`?~&bbh->n~ zJ(9*nTC4`EGNEOm%t%U8(?hP3%1b;hjQAV0Nc?8hxeG3 zaPKiTHp5uQTE@n~b#}l3uJMQ)kGfOHpF%kkn&43O#D#F5Fg6KwPr4VR9c4{M`YDK; z3jZ{uoAx?m(^2k>9gNLvXKdDEjCCQ+Y~-2K00%hd9AfOW{fx~8OmhL>=?SSyfsZaC!Gt-z(=`WU+-&Dfn0#_n3e*q()q-CYLpelpxsjC~b#-P^<1eJJmK#NGc1 zV_&XPb2-)pD^|e^5@<6_cHeE7RC;w7<*1(><1_>^E_ievcm0P?8kubdDQj%vyA=3 z3HKCZFYIRQXH9UujQt#S{T$`}0_FTN4TrE7KVs}9q&bK>55B|Lul6(cGRpdO1Kd`| zeq(~e`?pp&g#Y$EXw}*o`yJwccQ0eFbi*Ov?^iSS>U6j#82bal{s6dMn-2#V{#Xo$ zI$lq~{fx0cA?=^g&OdKq?7tBAUym`?3z*+P_+QpC_SX>Hn~c4gX6!Ab|67K!w~_Ac z_ZWKz;eUUXv46n53-{h3#@>IKu@7En?4O7`qA>R1M~r=hy#Got_OTNVaQ-*)f3gq` zWqlf9>?rCwhC2Ie;GSYEYlZ8Edx9~|1c$Hz6P6|~v_elnBK`=R&nMuzUuN8VKI0ZA z+#be@iW#>ma1S$XYhc_CQta5uxC`H|9>(1-GVW=IdlO`OC*!^vIHdJ2gzINKkYT)d z3*#jl84q5~c0(mMGIK+jJFO2k6NLvlqs#h}}L0klN#8)z2^A6*6 zU5q!Nj7Gdit%LiB@#bE}TbkhZGoIMXcoN~QNYfU9dezGK=;@4)al-X6K6WSL9b4dD zWqdqfOo0cRfI27sjPXfulka7G3er!7o3@tm>3GioJTpUZZ!$jX5aV4vjL$A+d`^n- zxp1e$e?~9k^CmMsKg9T%fbFbqIHX;GIu<72kYZMzEPZ`#55myqXbyss&PdzkU-kng%ZaGx-qUd{ORDE9`W-<*I${1)W@@_xo| z#P?RjZA0Ge?Tp_{4)ER51-F;+Tjw*r6ZPHZW&C#J-;MVj3S2+qccSdOkoNAY8NUbR z-HUYhnc!Y!{C@9;sxqIIma{CrC z{*4;OzZrsik@3eKWBglt8Gju9$G0;6ZPfp5`1hya;Q!vUjQ{6qsNQ=S2c6;1ApV)% zjDJ4@_b}tnn&43HfiA|MBZsgbpsdVv#(xMHfA~D(KUU!0Wc>La#(y%O@fT{~-ede{ zR>pr0_Y2hXOT@kS3F8L=^RH0;%c~jx_4$nd=5@w@I~NXdzuUt2E2!)DYvKACfAu5A zUwe%4KcdXn;r@iOKr8s4QQm)bG5$uH@xLJ7o5hU3g}A?UF#a~+dV4S9??m7ZG5+_} zjQ<05{sZ6d0><|ea8JQ~#Q6It>z^jLhZ*lv;9g|>Fxqwm@O+4TAHKu*zfkVS4R9I8 z{~NIVcQ50g0KQKVb`<_&>lp7xn*Q?{2i@S=9gJ(JgXqP;%S_@4CSmVFk{g($tYngU z2omdDCYcd#!MC-SNwz*FIf|L&M40PMCV4uTQXRtTUT0GMZYDM0-H5Up z-(yk}+^8)~YEHrRGpXe%CMDJ}DT(-2W~^` zjDf-D4fq2U%2=tnQ*LW*>*Q@NeQ=U48Xk01IuzADy1ym0rit^WHK~^SwU449k4??k zJX|$cO-EBU&+R{a*)XQ6t~;?kuP)y%}DA(=%g4sNM$ z8a1k^e#^m%NS4_=9;HTdn_VW0>ap!zx91UcR50pxM}wo(NA}d;)_n~5mQGZt41J8L zZE5Hkn1U{CRFZ(Oxk3tb${0}UQ~92RJG;|T-PJKt>+QV$(z%hy+)Jz~xmNJS#48TFsM{-?LHd-bxvg|X{pRq&u74~nC4i>i16LEAiprfpGA zYjeP(qECX_9cOW$*W=U1YvVDXKItrNcS$?{_zh2o=MDaGyL^>DsNJtwjW%Do^}YA3 z3HS=f@249Yh{jnme5ZRV>tcdeh+=o(;eXg_-64c@tJ&As=oIrFZ& z*Gx&Lr>wdAF8POg_#5blBAP!&nm-O!$wspA>@;>RyOdqWZe?F%--gC9nTXZ%DnmK< z`p0sh@aOosD-jbIoje0ec`&&fWsK?xPdf*L)Qp(MwKKIOtB+EDn(3w-9Ns9O~i z7MwnG8-?RZlv&XIJZUK*;)r!1@Bh4bnRO*JmgwqANa8v4EvHWvBQYYGT?tN4>BRz1 zf1&5N7@@!g89ym5LO{@=9>;Y8=^ExA9{+#aKfFGPwby8wn)db@o}%Z_x0EjQWsmb6 zA9uX(vr-n8$U~x9dhk~VKeI!h^3Z2NXu;>n6BHB%6e2u2VJ!ZykHWv-t19}tU-Yz$ zHXl2#_m7V&O!q(RtK+(Yads868*Wm*!~EzJtW!oq)kw}`iSZl@lNpanZn&u|+px84 zZrN7t&ayK4;4x_@`Q;;XMO4{VelhvW%CtX7w;>J6y=346)vfGe)zJBQ9o$eAhcOPy zjwRa6$CvN-8qHjFi;}h1wAb{Kcnn{;+ITEi`fCUk^_(hJ&q1Z=yo*jRs<94E#yX67 zRj)s)V&gd0VVZGcLALQ|_Lp<4{XEBIF-*yma#;%V*m^xSuqeG?H-7=M0Cq%%W9`2Oe>Ov)OMv8yKrI^mZ$ql{A!!3mw_27Y zE=V#cA@HopguAWPAMhKDb__-Z_(TN7;*A`XxrMefxoz4{Seu)$%$=sPf{vT@Pf_T`RlrC#CPDl$#FnvU|VBC$0(E>+3EG z&3xsml}L_UE3bNGX6T~2dV6S%_M9{`E9kgHPa+9mas{tj$S<&{z?nRzH2b4~4m^Wc zVF+o4`w9BO_!IohZO_=<;=$8j?7KUk(S5llK6wfy9m$GsiN5*e{q(ZS6vU4l6&{s5 zXrJJ@giK>(m%yKhRT;egW||O~pGJ&`7b8-QIchNCms)}88aL8Jh{cIp1uu`FMo!ZP z1fne;+5#%k3SM7Kqe|`%w1JI=6hJJrog4j?5Iq!j=b=0AJS5%ev_9?eR!_H>OLzLM z_U#QLoi=0npY1+gHmde37Kgp)+PKl=nC>pM|EJCAEPBRXQZvb74&LUs*^WCT5Q%L-{O+y zQKgd4Cek)Gjy~OLwb&xJT2>V%wrprI+4aOtWs*;<9pGE>o8u|RvPtYh;P$XlhlqF_ z77X`$AlrH?NJj1CJdEBA8;q*JG-T8nm>hL#38U9ZYO3UTNWdO3rg-pEe5d= zw3Xi@nV)1`P%F?Y4s9yVPgPYT9d#3SLD{*L0U{ z;TtVh?Wb0Lp4MH{o@L6GvhJE=Y2u>{DI_hMtZgl~^3m3#ZUrkn?-5E3A!m!Z>183- zpkovvg1$mQawcNKoQ*tW=gtZqYGqCd)D#K;$p113iB1uE#USvWT}QQ7kM7!al-C^P zmmk!=rY+UJcJLry#vkO%BuM>pb)46x!{DkRYY7wGNK$v=np_sv7nfHZO_=eyqLSK zA6ebf$Bo&P&CR_C*7^|cA>zl^hJ7z0?xu#wFzN=D8 zxm(>@s?z1E;|!Py8HuyHM}_W5*Ff>m5U0Jhy?txDx{jjLGNXs}(CVxgu9Q4tPgE+Hm z*9ll7bz80456xzta(cX+@W!t7xTWR-OgnG_>YM~t&_#5vzC`Mp5aKlXsbO7O0HKAC z2iQF2_|0d6y4$Pu5P-bfZMRzac(Yl{IQgfa0V>u;BJRL(o0$1wD7WOWjKwP)2-6y$ zlPcRhIyDY>{PFLvIr0!VoCe;c_}dp>U-X z`pii$Ju=g+Wy~f|R7yuZZjYAv4AYJT}Ct-OfF$ZUBa> zOiKl0HSvn=+j1=4%5yD}dAq5^vgI~n>UcXZJGkl671v`D74kC?HVsgEVUZNBihyAm zQUE~mz%na<71JU=u_51}DT92@IPPX)0eiDweVeDWmD&fpw12L;-h=5Gq?za0HtmUJ zH@-8qs1E38^OR8g5Q^sI0)J}rOyKu$&o1s=bpx{TURBaQ(!P7i1=oA@B4P>8wu#ek zxZHJqz$1GoJ3_W^(*tZqZsoJlG*66B5j&D6kx@x^m6KxfD?_tCIgCRc?kD~(zmgCm zLGhpE_YBio<-2T9r;^qM0TO{u_N5@cU&P7is8f9-5vh4~t?zMqUEV!d@P{Y)%APE6 zC@k9|i%k6)6t2uJRQQTHt`P5Lgg%h*Fr*Hst8>_$J{ZI{mNBjN$^2t?KP8*6_xXu5xx8ufMp5R?P(R-t`{n6c{!t+*z zh;|Ek#vYp1VLf;GZf>~uUhU}a<>y*ErioacK@F{%7aq0y(Ytu@OPe;mq`jlJD+HtQ zUhr^&Zeh93@tZASEHr)@YqdxFu69(=VFRCysjBoGqZ!U;W1gn5D$myEAmK|$NsF>Z zoV+w>31}eE0iAN9QAY2O+;g%zc>2t#7Dq5vTvb&}E*5lHrkrj!I1b0=@+&c(qJcmok6 zSZAuQ496j<&@a6?K6ox1vRks+RqYD< zT9On_zdVf}IStW^#13*WV8wHQWz$L;0cm)|JDbh|f~*LV8N$;2oL|R99**#AT1smo zob=4dB_WB-D3}~I!ATFHzdW%WacH{qwv5Go2WzQzwRrv)ZajWMp{13T_u;Rz^V-VF z@#62k@#FD#t@v9ye*A%@ODWm-@oM_$_3Cy1BS+(+ujzNF@8a7?`$B^{iX2A-2_nA? zfi2=05XV^;D_2G}Up$eFW|Ofb^zuE)bWHkXR4Jm!Sz0O?)x6QD^kOufR`*v0=|sS?#*ZCvvr^VkV!zhLF3}FHf%+=#@ae1Qq<4~Y1EGYK$Ib1 zg!s~&&u27X&4Ks^(L3%}Npx!_-A)We=0v#yzv03fzxKZ8iV6KIX5U&?>^E?%iIUZ4 z2sD^vRg%kOU!B5@iV{&gBNc9vB)i{Wa@joIa2#4=oAl|-xqj_~$h33%zgk*UWGUV# zf3>{T#2buK?AZH?)h>10N)#VHvOV}%c|wR%HF|pgm8k`*=1l5P8ttZ1Ly@=C5?d9s z)R>B@43V`}=0??4tp?Y}Ox0$SH)yg(!|@V7H^}C-GyAXHFva04omv@`|LCuFRM2`U zxCM>41^p9U3cR>W>`h`{m^VWSL0SNz27{ske7TN1dTpM|P6Hn!^*}+fr>rJ*+GQN{ ziKp9Zda}CgnbNv#9^^&{MChK=E|Wr}tk?tP#Q?iZ%$2k;Eo9~}^tmv?g~PW^C$`N)|awe=5m{Xqd!M=ST?2~(mWjdOsXK#yVMN(qP6`q#tg+rQexf|*BeIU)a z^WuJyPR4WVsATp2E{*y77*kZ9 zEB{*SRHSVGm8ThtES`9!v{E``H)^3d+TG_?{b|eytE1cy^QbPxY3KFTWh&NZi`C?O z;777FMti@+U+IRl7B{=SCc93nKp`>jeW38muw(9T3AqySM#x@9G|p?N;IiNy(KN7? zMz3hIS5SaXrGqD(NIR0ZMnJT%%^~}|cG(Ez!3#)*o{{QjPUIVFOQ%dccgC0*WnAJW zL*1k^HZ5-%bN;%C&2vpW`=;dB5iu4SR48yF$;K8{SY`7mu6c z@q{10W=zwHuav3wid&;5tHCUlUgeVf&>wKuUfEVuUsS%XZ2RPvr>;HI=<(RACmN-M zR8(DJD^lePC9|rUrFgR?>hO#VkFo8}zA@jt{ERalZl$!LP4-GTT`1w}QNUcvuEFRv z`)NyzRG!e-04~~Y1DK>70lGq9rD4J}>V(1*UxcCtBUmyi-Y8Q$NOTQ&VfJIlBRI;7 z5Dr6QNIl|8NTfO>Jf|kZVh7n>hL^)`@3r1BaPIKjxrLrjf8A>RDaI{wYlKG)6-7R~ zsZQ}Kk{T~BDVLo#Zm@cc<&x{X<~boVS5(zfvp1s3RbASf6EKpp>+IFV9s`#Yx#+I& zMz5zL9IUgaqrnG*_=_qm|JBcwfl`bw=c=uU^R>Nm%k4_TeDjy|&K2eKwx!u8 z9&lbdJ?yJ@)>!NgE_vN8+*}$8+Uxk4EBNje>!s2_nOCtE+ie>zl!9&!!I)?QPMD&P zm$5sb#Le|%L<#tZbz%~WWv&yUZH6NLl>OK#CBOp{e~$&fuqQd03DJfLrcWa}IvMu* zy;z7L)WxyINd`m}Fh=l&6EWmHUGLkeP{6Vc;Xq->+AS`1T*b9>SJ#<2Cf!N<)o7Ms z!Gj)CiteiY$f@_OT4C*IODVyil4|R)+8nCf&tw%_BEv!z3RSN|pG(k%hYGrU_Ec^& zNRpzS-nJ*v_QHeHPu}Iub>F_}G1*vdGR~ZSdaG(JEwXM{Df;~AK)j(<_O<)u)`qw* zQduoY)s+$7NdtxaGEAo-cGn7Z5yN#ApXWD1&-5uowpb7bR54QcA7kWG@gybdQQa&cxCKxup2Av3_#{04Z^J#@M&a}P$M<((Zx{A8 z!Ue=%xTpWEzWzKIhsO_xc?e$$ai{S63-$76>gtB?9usV&`qp=Kn*GE5C&Tx`^uyza zw{^ImGi-hkYkP`^0r5vgoSL$EjuxaoKBh2L;dk#~x%`TgefEDi7^(~cmE)UEw*l#i+5f-;!v^P%ZowUbhH*3Av)CifOJX7KS6#d|_83fqJ#8VL=h2KMI zGYTbGm=Q=0lfc{$IDTn;IxIgLZ(Z?)#!mln$0r3A(um zzBIGw6?zmj=H#CkvRoT+C{T=_kfQQ!%8T;loQ5;tH?lZ%M{aG+z75&bhJE`sNSO`$ z`0eget1V7SqB@uA;kQ4UkJ-235xxryG*uzwDPikrWOi1;8WASslh$U4RY{JHgggsL zMaZ|PI2Ise8dMEpuPnW`XYJY^W$n>4PxVOPCO#DnHKfqe+Y7BA6(=QJn}un5MkM7S zkL?&Gvnj|DI!4xt6BV*t)Zv0YV-+(%$}7QcBMZ01jlLEiPk>A3;M^g%K=cNDF6d!7 z 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 d0m promoSkuListData, String category_id) { ContentValues values = new ContentValues(); try { db.beginTransaction(); - for (int i = 0; i < promoSkuListData.size(); i++) { Promo_Compliance_DataGetterSetter data = promoSkuListData.get(i); @@ -1571,7 +1585,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { //Gagan End Method - //Non Working data +//Non Working data public void insertNonWorkingData(NonWorkingReasonGetterSetter data) { db.delete("NON_WORKING_REASON", null, null); @@ -1654,8 +1668,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { + dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " + - "where VISIT_DATE ='" + date + "' AND STORE_ID='" + store_id + "'", null); + "where VISIT_DATE ='" + date + "' AND STORE_ID'="+ store_id +"'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -1983,7 +1998,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } //Gagan end new code 1 - + public void InsertStockDialog(AdditionalDialogGetterSetter data) { ContentValues values = new ContentValues(); @@ -2266,4 +2281,161 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } + public void InsertT2PData(ArrayList data, String store_id, String category_id) { + db.delete(CommonString.TABLE_INSERT_T2P_COMPLIANCE, CommonString.KEY_STORE_ID + "='" + store_id + "' AND " + CommonString.KEY_CATEGORY_ID + "='" + category_id + "'", null); + + long l = 0; + + ContentValues values = new ContentValues(); + ContentValues values1 = new ContentValues(); + ContentValues values2 = new ContentValues(); + try { + for (int i = 0; i < data.size(); i++) { + + values.put(CommonString.KEY_STORE_ID, store_id); + values.put(CommonString.KEY_CATEGORY_ID, category_id); + values.put(CommonString.KEY_DISPLAY_ID, data.get(i).getDisplay_id()); + values.put(CommonString.KEY_BRAND_ID, data.get(i).getBrand_id()); + values.put(CommonString.KEY_BRAND, data.get(i).getBrand()); + values.put(CommonString.KEY_DISPLAY, data.get(i).getDisplay()); + values.put(CommonString.KEY_IMAGE, data.get(i).getImage()); + values.put(CommonString.KEY_REMARK, data.get(i).getRemark()); + values.put(CommonString.KEY_PRESENT, data.get(i).isPresent()); + + l = db.insert(CommonString.TABLE_INSERT_T2P_COMPLIANCE, null, values); + + ArrayList gaps = data.get(i).getGapsChecklist(); + + for (int j = 0; j < gaps.size(); j++) { + + values1.put(CommonString.KEY_COMMON_ID, l); + values1.put(CommonString.KEY_CHECKLIST_ID, gaps.get(j).getChecklist_id()); + values1.put(CommonString.KEY_DISPLAY_ID, gaps.get(j).getDisplay_id()); + values1.put(CommonString.KEY_CHECKLIST, gaps.get(j).getChecklist()); + values1.put(CommonString.KEY_PRESENT, gaps.get(j).isPresent()); + + db.insert(CommonString.TABLE_INSERT_T2P_GAPS, null, values1); + + } + + ArrayList sku = data.get(i).getSkulist(); + + for (int k = 0; k < sku.size(); k++) { + + values2.put(CommonString.KEY_COMMON_ID, l); + values2.put(CommonString.KEY_SKU_ID, sku.get(k).getSKU_ID()); + values2.put(CommonString.KEY_BRAND_ID, sku.get(k).getBRAND_ID()); + values2.put(CommonString.KEY_STOCK, sku.get(k).getSTOCK()); + values2.put(CommonString.KEY_BRAND, sku.get(k).getBRAND()); + values2.put(CommonString.KEY_SKU, sku.get(k).getSKU()); + + db.insert(CommonString.TABLE_INSERT_T2P_SKU, null, values2); + + } + + } + } catch (Exception ex) { + Log.d("Exception ", " in T2P_COMPLIANCE " + ex.toString()); + } + } + + // get T2P Compliance data + public ArrayList getT2pComplianceData(String store_id, String common_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + try { + dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + + CommonString.KEY_STORE_ID + "='" + store_id + "' AND " + + CommonString.KEY_CATEGORY_ID + "='" + common_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + T2PGetterSetter tp = new T2PGetterSetter(); + + tp.setKey_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_ID))); + tp.setDisplay_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY_ID))); + tp.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID))); + tp.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND))); + tp.setDisplay(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY))); + tp.setImage(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE))); + tp.setRemark(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_REMARK))); + tp.setPresent((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)).equalsIgnoreCase("1"))); + + list.add(tp); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + return list; + } + return list; + } + + // get Gaps T2P data + public ArrayList getGapsData(String common_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + try { + dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_GAPS + " where " + + CommonString.KEY_COMMON_ID + "='" + common_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + GapsChecklistGetterSetter gp = new GapsChecklistGetterSetter(); + + gp.setDisplay_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY_ID))); + gp.setChecklist_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CHECKLIST_ID))); + gp.setChecklist(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CHECKLIST))); + gp.setPresent((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)).equalsIgnoreCase("1"))); + + list.add(gp); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + return list; + } + return list; + } + + // get T2P SKU data + public ArrayList getT2PSKUData(String common_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + try { + dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_SKU + " where " + + CommonString.KEY_COMMON_ID + "='" + common_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + SkuGetterSetter gp = new SkuGetterSetter(); + + gp.setSKU_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SKU_ID))); + gp.setBRAND_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID))); + gp.setSTOCK(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STOCK))); + gp.setBRAND(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND))); + gp.setSKU(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SKU))); + + list.add(gp); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + return list; + } + return list; + } + } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java index 3f4d81c..46e60e4 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -53,6 +53,16 @@ public class CommonString { public static final String KEY_ID = "Id"; public static final String KEY_MERCHANDISER_ID = "MERCHANDISER_ID"; + //KEYS RELATED TO T2P COMPLIANCE + + public static final String KEY_DISPLAY = "DISPLAY"; + public static final String KEY_REMARK = "REMARK"; + public static final String KEY_PRESENT = "PRESENT"; + public static final String KEY_COMMON_ID = "COMMON_ID"; + public static final String KEY_CHECKLIST_ID = "CHECKLIST_ID"; + public static final String KEY_CHECKLIST = "CHECKLIST"; + public static final String KEY_SKU = "SKU"; + public static final String KEY_STOCK = "STOCK"; public static final String KEY_BRAND = "BRAND"; public static final String KEY_BRAND_ID = "BRAND_ID"; public static final String KEY_DISPLAY_ID = "DISPLAY_ID"; @@ -298,14 +308,6 @@ public class CommonString { + KEY_PROCESS_ID + " VARCHAR)"; - public static final String CREATE_TABLE_STOCK_ADDITIONAL_STOCK_DATA = "CREATE TABLE " - + TABLE_INSERT_STOCK_ADDITIONAL_DATA + " (" + KEY_ID - + " INTEGER PRIMARY KEY AUTOINCREMENT," + KEY_STORE_ID + " VARCHAR," - + KEY_BRAND_ID + " VARCHAR," + KEY_BRAND + " VARCHAR," - + KEY_SKU_ID + " VARCHAR," - + KEY_SKUNAME + " VARCHAR," - + KEY_IMAGE + " VARCHAR)"; - public static final String TABLE_INSERT_STOCK_ADDITIONAL = "Stock_Additional_visibility"; public static final String CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY = "CREATE TABLE IF NOT EXISTS " @@ -352,14 +354,11 @@ public class CommonString { + "STORE_ID" + " INTEGER," - + "CATEGORY_ID" - + " INTEGER," - - + "SKU_ID" + /*+ "SKU_ID" + " INTEGER," + "SKU" - + " VARCHAR," + + " VARCHAR,"*/ + "PROMO_ID" + " INTEGER," @@ -427,4 +426,53 @@ public class CommonString { + KEY_IMAGE + " VARCHAR)"; + + //Tables related to T2p Compliance + + public static final String TABLE_INSERT_T2P_COMPLIANCE = "T2P_COMPLIANCE"; + + public static final String CREATE_TABLE_INSERT_T2P_COMPLIANCE = "CREATE TABLE IF NOT EXISTS " + + TABLE_INSERT_T2P_COMPLIANCE + + "(" + + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ," + + KEY_STORE_ID + " INTEGER," + + KEY_CATEGORY_ID + " INTEGER," + + KEY_BRAND_ID + " INTEGER," + + KEY_DISPLAY_ID + " INTEGER," + + KEY_BRAND + " VARCHAR," + + KEY_DISPLAY + " VARCHAR," + + KEY_IMAGE + " VARCHAR," + + KEY_REMARK + " VARCHAR," + + KEY_PRESENT + " VARCHAR" + + + ")"; + + + public static final String TABLE_INSERT_T2P_GAPS = "T2P_GAPS"; + + public static final String CREATE_TABLE_INSERT_T2P_GAPS = "CREATE TABLE IF NOT EXISTS " + + TABLE_INSERT_T2P_GAPS + + "(" + + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ," + + KEY_COMMON_ID + " INTEGER," + + KEY_CHECKLIST_ID + " INTEGER," + + KEY_DISPLAY_ID + " INTEGER," + + KEY_CHECKLIST + " VARCHAR," + + KEY_PRESENT + " VARCHAR" + + ")"; + + + public static final String TABLE_INSERT_T2P_SKU = "T2P_SKU"; + + public static final String CREATE_TABLE_INSERT_T2P_SKU = "CREATE TABLE IF NOT EXISTS " + + TABLE_INSERT_T2P_SKU + + "(" + + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ," + + KEY_COMMON_ID + " INTEGER," + + KEY_SKU_ID + " INTEGER," + + KEY_BRAND_ID + " INTEGER," + + KEY_STOCK + " INTEGER," + + KEY_BRAND+ " VARCHAR," + + KEY_SKU + " VARCHAR" + + ")"; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 5652d8c..1ae2a9e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -4,12 +4,15 @@ import android.app.Activity; import android.app.Dialog; import android.content.ActivityNotFoundException; import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.Color; +import android.graphics.Typeface; import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -17,6 +20,7 @@ import android.preference.PreferenceManager; import android.provider.MediaStore; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; +import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -47,8 +51,11 @@ import java.util.Calendar; import java.util.List; import cpm.com.gskmtorange.Database.GSKOrangeDB; +import cpm.com.gskmtorange.LoginActivity; import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; +import cpm.com.gskmtorange.fonts.FontManager; +import cpm.com.gskmtorange.fonts.TextDrawable; import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; @@ -64,29 +71,31 @@ public class T2PComplianceActivity extends AppCompatActivity { T2PAdapter t2PAdapter; RecyclerView rec_t2p; - String categoryName, categoryId, storeId; + String categoryName, categoryId; private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; String path = "", str = CommonString.FILE_PATH, _pathforcheck = "", img = ""; int child_position = -1; - /** - * ATTENTION: This was auto-generated to implement the App Indexing API. - * See https://g.co/AppIndexing/AndroidStudio for more information. - */ - private GoogleApiClient client; + + String error_msg; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_t2_pcompliance); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + + //Intent data + categoryName = getIntent().getStringExtra("categoryName"); + categoryId = getIntent().getStringExtra("categoryId"); + // toolbar.setTitle(R.string.title_activity_t2_pcompliance + " - " + categoryName); + setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - db = new GSKOrangeDB(T2PComplianceActivity.this); db.open(); @@ -108,24 +117,47 @@ public class T2PComplianceActivity extends AppCompatActivity { fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Snackbar.make(view, "Data Saved", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); - finish(); + + if (isValid()) { + + db.InsertT2PData(t2PGetterSetters, store_id, categoryId); + + Snackbar.make(view, "Data Saved", Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); + + finish(); + } else { + Snackbar.make(view, error_msg, Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); + } + } }); - t2PGetterSetters = db.getT2PDefaultData(store_id); + t2PGetterSetters = db.getT2pComplianceData(store_id, categoryId); + + if (t2PGetterSetters.size() == 0) { + t2PGetterSetters = db.getT2PDefaultData(store_id); + } else { + for (int i = 0; i < t2PGetterSetters.size(); i++) { + ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i).getKey_id()); + ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i).getKey_id()); + + t2PGetterSetters.get(i).setGapsChecklist(gapsList); + t2PGetterSetters.get(i).setSkulist(skuList); + } + + } if (t2PGetterSetters.size() > 0) { - for (int i = 0; i < t2PGetterSetters.size(); i++) { + /* for (int i = 0; i < t2PGetterSetters.size(); i++) { ArrayList gapsChecklist = db.getGapsDefaultData(t2PGetterSetters.get(i).getDisplay_id()); t2PGetterSetters.get(i).setGapsChecklist(gapsChecklist); - } - + }*/ rec_t2p.setLayoutManager(new LinearLayoutManager(getApplicationContext())); t2PAdapter = new T2PAdapter(t2PGetterSetters); @@ -133,9 +165,6 @@ public class T2PComplianceActivity extends AppCompatActivity { } - // ATTENTION: This was auto-generated to implement the App Indexing API. - // See https://g.co/AppIndexing/AndroidStudio for more information. - client = new GoogleApiClient.Builder(this).addApi(AppIndex.API).build(); } @Override @@ -168,11 +197,16 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.tv_brand.setText(mItem.getBrand()); holder.tv_display.setText(mItem.getDisplay().trim()); + //holder.tv_display.setTypeface(FontManager.getTypeface(getApplicationContext(),FontManager.FONTAWESOME)); + + /* Typeface iconFont = FontManager.getTypeface(getApplicationContext(), FontManager.FONTAWESOME); + FontManager.markAsIconContainer(findViewById(R.id.icons_container), iconFont); +*/ holder.btn_gaps.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - showGapsDialog(mItem.getGapsChecklist()); + showGapsDialog(mItem); } }); @@ -181,11 +215,7 @@ public class T2PComplianceActivity extends AppCompatActivity { @Override public void onClick(View v) { - if (((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")) { - mItem.setPresent(true); - } else { - mItem.setPresent(false); - } + mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")); t2PAdapter.notifyDataSetChanged(); } @@ -217,13 +247,24 @@ public class T2PComplianceActivity extends AppCompatActivity { } if (mItem.getImage().equals("")) { - holder.img_cam.setBackgroundResource(R.drawable.cam_deactive); + holder.img_cam.setBackgroundResource(R.mipmap.camera); } else { - holder.img_cam.setBackgroundResource(R.drawable.cam_active); + holder.img_cam.setBackgroundResource(R.mipmap.camera_done); } holder.toggle_btn.setChecked(mItem.isPresent()); + if (mItem.getGapsChecklist().size() > 0) { + holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.green)); + } else { + holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + } + + if (mItem.getSkulist().size() > 0) { + holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green)); + } else { + holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + } } @@ -261,8 +302,16 @@ public class T2PComplianceActivity extends AppCompatActivity { } } - public void showGapsDialog(ArrayList gapsChecklist) { - //ArrayList gapsChecklist = db.getGapsDefaultData(display_id); + public void showGapsDialog(final T2PGetterSetter t2p) { + + final ArrayList gapsChecklist; + + if (t2p.getGapsChecklist().size() > 0) { + + gapsChecklist = t2p.getGapsChecklist(); + } else { + gapsChecklist = db.getGapsDefaultData(t2p.getDisplay_id()); + } final Dialog dialog = new Dialog(T2PComplianceActivity.this); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); @@ -279,8 +328,9 @@ public class T2PComplianceActivity extends AppCompatActivity { @Override public void onClick(View v) { + t2p.setGapsChecklist(gapsChecklist); dialog.cancel(); - + t2PAdapter.notifyDataSetChanged(); } }); @@ -315,7 +365,7 @@ public class T2PComplianceActivity extends AppCompatActivity { final ArrayList sku_list = new ArrayList<>(); - if(skuAddedList.size()>0){ + if (skuAddedList.size() > 0) { rec_sku.setLayoutManager(new LinearLayoutManager(getApplicationContext())); SkuAddedAdapter skuAdapter = new SkuAddedAdapter(skuAddedList); @@ -327,11 +377,10 @@ public class T2PComplianceActivity extends AppCompatActivity { @Override public void onClick(View v) { - if(brand_selected[0] ==null || sku_selected[0]==null || et_stock.getText().toString().equals("")){ + if (brand_selected[0] == null || sku_selected[0] == null || et_stock.getText().toString().equals("")) { - Snackbar.make(v, getResources().getString(R.string.enter_the_values),Snackbar.LENGTH_SHORT).show(); - } - else{ + Snackbar.make(v, getResources().getString(R.string.enter_the_values), Snackbar.LENGTH_SHORT).show(); + } else { SkuGetterSetter sku = new SkuGetterSetter(); sku.setBRAND_ID(brand_selected[0].getBRAND_ID().get(0)); sku.setBRAND(brand_selected[0].getBRAND().get(0)); @@ -360,7 +409,6 @@ public class T2PComplianceActivity extends AppCompatActivity { brand_selected[0] = null; sku_selected[0] = null; - } } @@ -369,7 +417,9 @@ public class T2PComplianceActivity extends AppCompatActivity { btn_cancel.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + dialog.cancel(); + t2PAdapter.notifyDataSetChanged(); } }); @@ -394,13 +444,13 @@ public class T2PComplianceActivity extends AppCompatActivity { sku_list.clear(); - brand_selected[0] = brandList.get(position); + brand_selected[0] = brandList.get(position); String brand_id = brandList.get(position).getBRAND_ID().get(0); ArrayList temp_list = db.getSkuT2PData(storeType_id, class_id, keyAccount_id, brand_id); - for (int k=0;k parent, View view, int position, long id) { - if(position!=0){ + if (position != 0) { sku_selected[0] = sku_list.get(position); } @@ -470,9 +520,9 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.tb_present.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")) { - mItem.setPresent(true); - } + + mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")); + } }); @@ -786,4 +836,46 @@ public class T2PComplianceActivity extends AppCompatActivity { } } + public boolean isValid() { + boolean flag = true; + + for (int i = 0; i < t2PGetterSetters.size(); i++) { + + if (t2PGetterSetters.get(i).getImage().equals("")) { + flag = false; + error_msg = getResources().getString(R.string.click_image); + break; + } else if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) { + flag = false; + error_msg = getResources().getString(R.string.fill_gaps_data); + break; + } else if (t2PGetterSetters.get(i).getSkulist().size() == 0) { + flag = false; + error_msg = getResources().getString(R.string.fill_sku_data); + break; + } + } + + return flag; + } + + @Override + public void onBackPressed() { + //super.onBackPressed(); + + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(T2PComplianceActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + /* Intent i = new Intent(activity, StorelistActivity.class); + activity.startActivity(i); + activity.finish();*/ + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/FontManager.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/FontManager.java new file mode 100644 index 0000000..b53fdce --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/FontManager.java @@ -0,0 +1,18 @@ +package cpm.com.gskmtorange.fonts; + +import android.content.Context; +import android.graphics.Typeface; + +/** + * Created by yadavendras on 11-01-2017. + */ + +public class FontManager { + + public static final String ROOT = "fonts/", + FONTAWESOME = ROOT + "fontawesome-webfont.ttf"; + + public static Typeface getTypeface(Context context, String font) { + return Typeface.createFromAsset(context.getAssets(), font); + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/TextDrawable.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/TextDrawable.java new file mode 100644 index 0000000..b7024a0 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/TextDrawable.java @@ -0,0 +1,52 @@ +package cpm.com.gskmtorange.fonts; + +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.ColorFilter; +import android.graphics.Paint; +import android.graphics.PixelFormat; +import android.graphics.drawable.Drawable; + +/** + * Created by yadavendras on 11-01-2017. + */ + +public class TextDrawable extends Drawable { + + private final String text; + private final Paint paint; + + public TextDrawable(String text) { + + this.text = text; + + this.paint = new Paint(); + paint.setColor(Color.WHITE); + paint.setTextSize(22f); + paint.setAntiAlias(true); + paint.setFakeBoldText(true); + paint.setShadowLayer(6f, 0, 0, Color.BLACK); + paint.setStyle(Paint.Style.FILL); + paint.setTextAlign(Paint.Align.LEFT); + } + + @Override + public void draw(Canvas canvas) { + canvas.drawText(text, 0, 0, paint); + } + + @Override + public void setAlpha(int alpha) { + paint.setAlpha(alpha); + } + + @Override + public void setColorFilter(ColorFilter cf) { + paint.setColorFilter(cf); + } + + @Override + public int getOpacity() { + return PixelFormat.TRANSLUCENT; + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java index f79aec6..430728a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java @@ -8,7 +8,7 @@ import java.util.ArrayList; public class T2PGetterSetter { - String brand_id, display_id, brand, display, image, remark; + String brand_id, display_id, brand, display, image, remark, key_id; boolean isPresent; ArrayList gapsChecklist = new ArrayList<>(); @@ -85,4 +85,12 @@ public class T2PGetterSetter { public void setSkulist(ArrayList skulist) { this.skulist = skulist; } + + public String getKey_id() { + return key_id; + } + + public void setKey_id(String key_id) { + this.key_id = key_id; + } } diff --git a/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml b/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml index ee096fd..d10aa62 100644 --- a/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml +++ b/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml @@ -48,6 +48,7 @@ android:layout_height="wrap_content" android:textOn="Yes" android:textOff="No" + android:background="@drawable/toggle_selector_background" android:layout_centerInParent="true"/> diff --git a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml index 0f9883d..d847b68 100644 --- a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml +++ b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml @@ -93,6 +93,7 @@ android:layout_height="wrap_content" android:textOn="Yes" android:textOff="No" + android:background="@drawable/toggle_selector_background" android:layout_centerInParent="true"/> diff --git a/GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml b/GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml index 4da1e59..9c9fe9a 100644 --- a/GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml +++ b/GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml @@ -130,7 +130,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="@string/cancel"/> + android:text="@string/closed"/> @@ -147,7 +147,7 @@ - - + --> diff --git a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml index 976c9cf..93d14c2 100644 --- a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml +++ b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml @@ -12,7 +12,7 @@ android:title="@string/menu_daily_download" /> #FFE0B2 + diff --git a/GSKMTOrange/src/main/res/values/icons.xml b/GSKMTOrange/src/main/res/values/icons.xml new file mode 100644 index 0000000..f3632f9 --- /dev/null +++ b/GSKMTOrange/src/main/res/values/icons.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 4c6b7b6..b138052 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -34,9 +34,6 @@ Select Add Cancel - Yes - No - Please select language SelectLanguageActivity @@ -99,9 +96,14 @@ Please checkout from current store Data already filled + Please Download Data First + Enter the values + Yes + No + Upload Data No Data For Upload First checkout of store @@ -126,5 +128,12 @@ Photo Additional Visibility Non-Work Reason + Close + + Please click image + Please fill SKU data + Please fill GAP data + Want to proceed usaved data will be deleted + From 5b080446e6d89965e246555d570ef6ae16815468 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Wed, 11 Jan 2017 18:04:08 +0530 Subject: [PATCH 04/36] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- GSKMTOrange/src/main/AndroidManifest.xml | 11 +- .../com/gskmtorange/Database/GSKOrangeDB.java | 108 +++++++++++ .../dailyentry/StoreimageActivity.java | 10 +- .../download/DownloadActivity.java | 41 +++++ .../CategoryWisePerformanceActivity.java | 158 +++++++--------- .../StoreWisePerformanceActivity.java | 173 ++++++++++++++++++ .../CategoryWisePerformaceGetterSetter.java | 42 ++++- .../STORE_PERFORMANCE_MasterGetterSetter.java | 101 ++++++++++ .../StoreWisePerformaceGetterSetter.java | 81 ++++++++ .../xmlGetterSetter/TableBean.java | 10 + .../gskmtorange/xmlHandlers/XMLHandlers.java | 49 +++++ .../activity_store_wise_performance.xml | 33 ++++ .../content_category_wise_performance.xml | 119 +++++++++++- .../layout/content_store_wise_performance.xml | 146 +++++++++++++++ .../layout/item_category_wise_performance.xml | 131 ++++++------- .../layout/item_store_wise_performance.xml | 120 ++++++++++++ GSKMTOrange/src/main/res/values-tr/string.xml | 50 +++++ GSKMTOrange/src/main/res/values/strings.xml | 12 ++ 18 files changed, 1208 insertions(+), 187 deletions(-) create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java create mode 100644 GSKMTOrange/src/main/res/layout/activity_store_wise_performance.xml create mode 100644 GSKMTOrange/src/main/res/layout/content_store_wise_performance.xml create mode 100644 GSKMTOrange/src/main/res/layout/item_store_wise_performance.xml diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 0799069..78966ce 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -59,9 +59,9 @@ android:theme="@style/AppTheme.NoActionBar" /> + + android:label="@string/title_activity_upload" /> \ No newline at end of file diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index 440f3b6..ba4bf3a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -15,6 +15,7 @@ import cpm.com.gskmtorange.GetterSetter.CoverageBean; import cpm.com.gskmtorange.GetterSetter.GeotaggingBeans; import cpm.com.gskmtorange.GetterSetter.StoreBean; +import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter; @@ -31,9 +32,11 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.StoreWisePerformaceGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.TableBean; @@ -83,6 +86,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(CommonString.CREATE_TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE); db.execSQL(CommonString.CREATE_TABLE_INSERT_PROMO_SKU); + db.execSQL(TableBean.getStorePerformance()); + //Gagan End db.execSQL(CommonString.CREATE_TABLE_STORE_GEOTAGGING); @@ -1987,6 +1992,109 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } return list; } + + //Store wise Performance + public void InsertSTORE_PERFORMANCE(STORE_PERFORMANCE_MasterGetterSetter data) { + db.delete("STORE_PERFORMANCE", null, null); + + ContentValues values = new ContentValues(); + try { + for (int i = 0; i < data.getSTORE_ID().size(); i++) { + + values.put("STORE_ID", data.getSTORE_ID().get(i)); + values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i)); + values.put("PERIOD", data.getPERIOD().get(i)); + values.put("MSL_AVAILABILITY", data.getMSL_AVAILABILITY().get(i)); + values.put("SOS", data.getSOS().get(i)); + values.put("T2P", data.getT2P().get(i)); + values.put("PROMO", data.getPROMO().get(i)); + values.put("OSS", data.getOSS().get(i)); + values.put("ORDERID", data.getORDERID().get(i)); + + db.insert("STORE_PERFORMANCE", null, values); + } + } catch (Exception ex) { + Log.d("Exception ", " STORE_PERFORMANCE " + ex.toString()); + } + } + + //Category wise Performance + public ArrayList getCategoryWisePerformance(String store_id, String category_id) { + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select * from STORE_PERFORMANCE " + + "where STORE_ID='" + store_id + "' and CATEGORY_ID='" + category_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + CategoryWisePerformaceGetterSetter cd = new CategoryWisePerformaceGetterSetter(); + + cd.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID"))); + cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID"))); + cd.setPeriod(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PERIOD"))); + cd.setMsl_availability(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MSL_AVAILABILITY"))); + cd.setSos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS"))); + cd.setT2p(dbcursor.getString(dbcursor.getColumnIndexOrThrow("T2P"))); + cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO"))); + cd.setOss(dbcursor.getString(dbcursor.getColumnIndexOrThrow("OSS"))); + cd.setOrder_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ORDERID"))); + + list.add(cd); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + Log.d("Exception ", "getPromoComplianceSkuData!" + e.toString()); + return list; + } + return list; + } + + public ArrayList getStoreWisePerformance(String store_id) { + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select PERIOD, ROUND(avg(MSL_AVAILABILITY),1) as MSL_AVAILABILITY,ROUND(avg(sos),1) as SOS ," + + " ROUND(avg(t2p),1) as T2P,ROUND(avg(pROMO),1) as PROMO,ROUND(SUM(oss),1) AS OSS " + + "from STORE_PERFORMANCE " + + "where STORE_ID='" + store_id + "' " + + "GROUP BY PERIOD " + + "ORDER BY ORDERID ", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + StoreWisePerformaceGetterSetter cd = new StoreWisePerformaceGetterSetter(); + +/* cd.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID"))); + cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));*/ + cd.setPeriod(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PERIOD"))); + cd.setMsl_availability(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MSL_AVAILABILITY"))); + cd.setSos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS"))); + cd.setT2p(dbcursor.getString(dbcursor.getColumnIndexOrThrow("T2P"))); + cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO"))); + cd.setOss(dbcursor.getString(dbcursor.getColumnIndexOrThrow("OSS"))); + // cd.setOrder_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ORDERID"))); + + list.add(cd); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + Log.d("Exception ", "getPromoComplianceSkuData!" + e.toString()); + return list; + } + return list; + } + //Gagan end new code 1 } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index 147164f..8b4cea6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -40,6 +40,7 @@ import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.GetterSetter.CoverageBean; import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity; +import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity; /** * Created by ashishc on 31-05-2016. @@ -198,7 +199,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic editor.commit();*/ - Intent in = new Intent(StoreimageActivity.this, CategoryListActivity.class); + //Intent in = new Intent(StoreimageActivity.this, CategoryListActivity.class); + Intent in = new Intent(StoreimageActivity.this, StoreWisePerformanceActivity.class); startActivity(in); finish(); } @@ -268,8 +270,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); intent.setPackage(defaultCameraPackage); startActivityForResult(intent, 0); - } - catch (ActivityNotFoundException e) { + } catch (ActivityNotFoundException e) { e.printStackTrace(); Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); @@ -277,8 +278,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic intent.setPackage(gallery_package); startActivityForResult(intent, 0); - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index c6a0484..2614509 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -39,6 +39,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.TableBean; @@ -68,6 +69,7 @@ public class DownloadActivity extends AppCompatActivity { NonWorkingReasonGetterSetter nonWorkingReasonGetterSetter; MappingPromotionGetterSetter mappingPromotionGetterSetter; MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter mapping_additional_promotion_masterGetterSetter; + STORE_PERFORMANCE_MasterGetterSetter store_performance_masterGetterSetter; @Override protected void onCreate(Bundle savedInstanceState) { @@ -584,6 +586,43 @@ public class DownloadActivity extends AppCompatActivity { } publishProgress(data); + + //STORE_PERFORMANCE + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); + request.addProperty("UserName", userId); + request.addProperty("Type", "STORE_PERFORMANCE"); + request.addProperty("cultureid", culture_id); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); + + result = (Object) envelope.getResponse(); + + if (result.toString() != null) { + xpp.setInput(new StringReader(result.toString())); + xpp.next(); + eventType = xpp.getEventType(); + store_performance_masterGetterSetter = XMLHandlers.STORE_PERFORMANCEXMLHandler(xpp, eventType); + + if (store_performance_masterGetterSetter.getSTORE_ID().size() > 0) { + String table_store_performace = store_performance_masterGetterSetter.getTable_STORE_PERFORMANCE(); + if (table_store_performace != null) { + resultHttp = CommonString.KEY_SUCCESS; + TableBean.setStorePerformance(table_store_performace); + } + } else { + //return "STORE_PERFORMANCE"; + } + data.value = 100; + data.name = "STORE_PERFORMANCE Data Download"; + } + publishProgress(data); + + //Gagan end code @@ -605,6 +644,8 @@ public class DownloadActivity extends AppCompatActivity { db.insertNonWorkingData(nonWorkingReasonGetterSetter); + db.InsertSTORE_PERFORMANCE(store_performance_masterGetterSetter); + } catch (MalformedURLException e) { /*final AlertMessage message = new AlertMessage( CompleteDownloadActivity.this, diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java index 3553a8a..9dc09bb 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java @@ -2,7 +2,10 @@ package cpm.com.gskmtorange.gsk_dailyentry; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; +import android.content.res.Resources; import android.os.Bundle; +import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; @@ -19,121 +22,84 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter; public class CategoryWisePerformanceActivity extends AppCompatActivity { - TextView txt_categoryName; RecyclerView recyclerView; + Toolbar toolbar; String categoryName = "", categoryId; ArrayList categoryWisePerformanceList; CategoryWisePerformaceAdapter adapter; + GSKOrangeDB db; + private SharedPreferences preferences; + String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_category_wise_performance); + try { + setContentView(R.layout.activity_category_wise_performance); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar = (Toolbar) findViewById(R.id.toolbar); + recyclerView = (RecyclerView) findViewById(R.id.recyclerView); - recyclerView = (RecyclerView) findViewById(R.id.recyclerView); - //txt_categoryName = (TextView) findViewById(R.id.txt_categoryName); + db = new GSKOrangeDB(this); + db.open(); - categoryName = getIntent().getStringExtra("categoryName"); - categoryId = getIntent().getStringExtra("categoryId"); + //preference data + preferences = PreferenceManager.getDefaultSharedPreferences(this); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); + visit_date = preferences.getString(CommonString.KEY_DATE, null); + date = preferences.getString(CommonString.KEY_DATE, null); + username = preferences.getString(CommonString.KEY_USERNAME, null); + intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, ""); + keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, ""); + class_id = preferences.getString(CommonString.KEY_CLASS_ID, ""); + storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, ""); - //txt_categoryName.setText(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName); - toolbar.setTitle(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName); - setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); + //Intent data + categoryName = getIntent().getStringExtra("categoryName"); + categoryId = getIntent().getStringExtra("categoryId"); - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Intent intent = new Intent(CategoryWisePerformanceActivity.this, DailyDataMenuActivity.class); - intent.putExtra("categoryName", categoryName); - intent.putExtra("categoryId", categoryId); - startActivity(intent); - } - }); + //txt_categoryName.setText(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName); + toolbar.setTitle(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName); + setSupportActionBar(toolbar); + getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(CategoryWisePerformanceActivity.this, DailyDataMenuActivity.class); + intent.putExtra("categoryName", categoryName); + intent.putExtra("categoryId", categoryId); + startActivity(intent); + } + }); + } catch (Resources.NotFoundException e) { + e.printStackTrace(); + } } @Override protected void onResume() { super.onResume(); + try { + categoryWisePerformanceList = db.getCategoryWisePerformance(store_id, categoryId); - categoryWisePerformanceList = new ArrayList<>(); - CategoryWisePerformaceGetterSetter data = new CategoryWisePerformaceGetterSetter(); - - data.setPeriod("Period"); - data.setSos("SOS"); - data.setT2p("T2P"); - data.setPromo("Promo"); - data.setMsl_availability("MSL Availability"); - data.setOss("OSS"); - categoryWisePerformanceList.add(data); - - data = new CategoryWisePerformaceGetterSetter(); - data.setPeriod("LTM"); - data.setSos("75"); - data.setT2p("0"); - data.setPromo("0"); - data.setMsl_availability("25"); - data.setOss("55"); - categoryWisePerformanceList.add(data); - - data = new CategoryWisePerformaceGetterSetter(); - data.setPeriod("MTM"); - data.setSos("75"); - data.setT2p("0"); - data.setPromo("0"); - data.setMsl_availability("25"); - data.setOss("55"); - categoryWisePerformanceList.add(data); - - data = new CategoryWisePerformaceGetterSetter(); - data.setPeriod("RTM"); - data.setSos("75"); - data.setT2p("0"); - data.setPromo("0"); - data.setMsl_availability("25"); - data.setOss("55"); - categoryWisePerformanceList.add(data); - - data = new CategoryWisePerformaceGetterSetter(); - data.setPeriod("LTM"); - data.setSos("75"); - data.setT2p("0"); - data.setPromo("0"); - data.setMsl_availability("25"); - data.setOss("55"); - categoryWisePerformanceList.add(data); - - data = new CategoryWisePerformaceGetterSetter(); - data.setPeriod("MTM"); - data.setSos("75"); - data.setT2p("0"); - data.setPromo("0"); - data.setMsl_availability("25"); - data.setOss("55"); - categoryWisePerformanceList.add(data); - - data = new CategoryWisePerformaceGetterSetter(); - data.setPeriod("RTM"); - data.setSos("75"); - data.setT2p("0"); - data.setPromo("0"); - data.setMsl_availability("25"); - data.setOss("55"); - categoryWisePerformanceList.add(data); - - adapter = new CategoryWisePerformaceAdapter(CategoryWisePerformanceActivity.this, categoryWisePerformanceList); - recyclerView.setAdapter(adapter); - recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + adapter = new CategoryWisePerformaceAdapter(CategoryWisePerformanceActivity.this, categoryWisePerformanceList); + recyclerView.setAdapter(adapter); + recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + } catch (Exception e) { + e.printStackTrace(); + } } public class CategoryWisePerformaceAdapter extends RecyclerView.Adapter { @@ -158,11 +124,18 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { public void onBindViewHolder(CategoryWisePerformaceAdapter.MyViewHolder holder, int position) { final CategoryWisePerformaceGetterSetter categoryData = list.get(position); - holder.txt_period.setText(categoryData.getPeriod()); + if (categoryData.getPeriod().equalsIgnoreCase("LTM")) { + holder.txt_period.setText(getResources().getString(R.string.category_performance_ltm)); + } else if (categoryData.getPeriod().equalsIgnoreCase("MTD")) { + holder.txt_period.setText(getResources().getString(R.string.category_performance_mtd)); + } else if (categoryData.getPeriod().equalsIgnoreCase("LSV")) { + holder.txt_period.setText(getResources().getString(R.string.category_performance_lsv)); + } + //holder.txt_period.setText(categoryData.getPeriod()); + holder.txt_msl_availability.setText(categoryData.getMsl_availability()); holder.txt_sos.setText(categoryData.getSos()); holder.txt_t2p.setText(categoryData.getT2p()); holder.txt_promo.setText(categoryData.getPromo()); - holder.txt_msl_availability.setText(categoryData.getMsl_availability()); holder.txt_oss.setText(categoryData.getOss()); } @@ -186,7 +159,6 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { txt_oss = (TextView) itemView.findViewById(R.id.txt_oss); } } - } @Override diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java new file mode 100644 index 0000000..38ca963 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java @@ -0,0 +1,173 @@ +package cpm.com.gskmtorange.gsk_dailyentry; + +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.content.res.Resources; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.support.design.widget.FloatingActionButton; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.Toolbar; +import android.view.LayoutInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.LinearLayout; +import android.widget.TextView; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import cpm.com.gskmtorange.Database.GSKOrangeDB; +import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonString; +import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.StoreWisePerformaceGetterSetter; + +public class StoreWisePerformanceActivity extends AppCompatActivity { + RecyclerView recyclerView; + Toolbar toolbar; + + ArrayList storeWisePerformanceList; + StoreWisePerformaceAdapter adapter; + + GSKOrangeDB db; + private SharedPreferences preferences; + String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + try { + setContentView(R.layout.activity_store_wise_performance); + + toolbar = (Toolbar) findViewById(R.id.toolbar); + recyclerView = (RecyclerView) findViewById(R.id.recyclerView); + + db = new GSKOrangeDB(this); + db.open(); + + //preference data + preferences = PreferenceManager.getDefaultSharedPreferences(this); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); + visit_date = preferences.getString(CommonString.KEY_DATE, null); + date = preferences.getString(CommonString.KEY_DATE, null); + username = preferences.getString(CommonString.KEY_USERNAME, null); + intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, ""); + keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, ""); + class_id = preferences.getString(CommonString.KEY_CLASS_ID, ""); + storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, ""); + + toolbar.setTitle(getResources().getString(R.string.title_activity_store_wise_performance)); + setSupportActionBar(toolbar); + getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(StoreWisePerformanceActivity.this, CategoryListActivity.class); + startActivity(intent); + } + }); + } catch (Resources.NotFoundException e) { + e.printStackTrace(); + } + } + + @Override + protected void onResume() { + super.onResume(); + try { + storeWisePerformanceList = db.getStoreWisePerformance(store_id); + + adapter = new StoreWisePerformaceAdapter(StoreWisePerformanceActivity.this, storeWisePerformanceList); + recyclerView.setAdapter(adapter); + recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public class StoreWisePerformaceAdapter extends RecyclerView.Adapter { + Context context; + private LayoutInflater inflator; + List list = Collections.emptyList(); + + public StoreWisePerformaceAdapter(Context context, List list) { + inflator = LayoutInflater.from(context); + this.list = list; + this.context = context; + } + + @Override + public StoreWisePerformaceAdapter.MyViewHolder onCreateViewHolder(ViewGroup parent, int i) { + View view = inflator.inflate(R.layout.item_store_wise_performance, parent, false); + StoreWisePerformaceAdapter.MyViewHolder holder = new StoreWisePerformaceAdapter.MyViewHolder(view); + return holder; + } + + @Override + public void onBindViewHolder(StoreWisePerformaceAdapter.MyViewHolder holder, int position) { + final StoreWisePerformaceGetterSetter categoryData = list.get(position); + + if (categoryData.getPeriod().equalsIgnoreCase("LTM")) { + holder.txt_period.setText(getResources().getString(R.string.category_performance_ltm)); + } else if (categoryData.getPeriod().equalsIgnoreCase("MTD")) { + holder.txt_period.setText(getResources().getString(R.string.category_performance_mtd)); + } else if (categoryData.getPeriod().equalsIgnoreCase("LSV")) { + holder.txt_period.setText(getResources().getString(R.string.category_performance_lsv)); + } + holder.txt_msl_availability.setText(categoryData.getMsl_availability()); + holder.txt_sos.setText(categoryData.getSos()); + holder.txt_t2p.setText(categoryData.getT2p()); + holder.txt_promo.setText(categoryData.getPromo()); + holder.txt_oss.setText(categoryData.getOss()); + } + + @Override + public int getItemCount() { + return list.size(); + } + + class MyViewHolder extends RecyclerView.ViewHolder { + TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability, txt_oss; + LinearLayout lay_menu; + + public MyViewHolder(View itemView) { + super(itemView); + lay_menu = (LinearLayout) itemView.findViewById(R.id.lay_menu); + txt_period = (TextView) itemView.findViewById(R.id.txt_period); + txt_sos = (TextView) itemView.findViewById(R.id.txt_sos); + txt_t2p = (TextView) itemView.findViewById(R.id.txt_t2p); + txt_promo = (TextView) itemView.findViewById(R.id.txt_promo); + txt_msl_availability = (TextView) itemView.findViewById(R.id.txt_msl_availability); + txt_oss = (TextView) itemView.findViewById(R.id.txt_oss); + } + } + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + if (id == android.R.id.home) { + finish(); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryWisePerformaceGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryWisePerformaceGetterSetter.java index ad875c1..2982517 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryWisePerformaceGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryWisePerformaceGetterSetter.java @@ -5,7 +5,23 @@ package cpm.com.gskmtorange.xmlGetterSetter; */ public class CategoryWisePerformaceGetterSetter { - String period, sos, t2p, promo, msl_availability, oss; + String store_id, category_id, period, msl_availability, sos, t2p, promo, oss, order_id; + + public String getStore_id() { + return store_id; + } + + public void setStore_id(String store_id) { + this.store_id = store_id; + } + + public String getCategory_id() { + return category_id; + } + + public void setCategory_id(String category_id) { + this.category_id = category_id; + } public String getPeriod() { return period; @@ -15,6 +31,14 @@ public class CategoryWisePerformaceGetterSetter { this.period = period; } + public String getMsl_availability() { + return msl_availability; + } + + public void setMsl_availability(String msl_availability) { + this.msl_availability = msl_availability; + } + public String getSos() { return sos; } @@ -39,14 +63,6 @@ public class CategoryWisePerformaceGetterSetter { this.promo = promo; } - public String getMsl_availability() { - return msl_availability; - } - - public void setMsl_availability(String msl_availability) { - this.msl_availability = msl_availability; - } - public String getOss() { return oss; } @@ -54,4 +70,12 @@ public class CategoryWisePerformaceGetterSetter { public void setOss(String oss) { this.oss = oss; } + + public String getOrder_id() { + return order_id; + } + + public void setOrder_id(String order_id) { + this.order_id = order_id; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java new file mode 100644 index 0000000..9b546b7 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java @@ -0,0 +1,101 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +import java.util.ArrayList; + +/** + * Created by gagang on 11-01-2017. + */ + +public class STORE_PERFORMANCE_MasterGetterSetter { + String table_STORE_PERFORMANCE; + + ArrayList STORE_ID = new ArrayList<>(); + ArrayList CATEGORY_ID = new ArrayList<>(); + ArrayList PERIOD = new ArrayList<>(); + ArrayList SOS = new ArrayList<>(); + ArrayList T2P = new ArrayList<>(); + ArrayList PROMO = new ArrayList<>(); + ArrayList MSL_AVAILABILITY = new ArrayList<>(); + ArrayList OSS = new ArrayList<>(); + ArrayList ORDERID = new ArrayList<>(); + + public String getTable_STORE_PERFORMANCE() { + return table_STORE_PERFORMANCE; + } + + public void setTable_STORE_PERFORMANCE(String table_STORE_PERFORMANCE) { + this.table_STORE_PERFORMANCE = table_STORE_PERFORMANCE; + } + + public ArrayList getSTORE_ID() { + return STORE_ID; + } + + public void setSTORE_ID(String STORE_ID) { + this.STORE_ID.add(STORE_ID); + } + + public ArrayList getCATEGORY_ID() { + return CATEGORY_ID; + } + + public void setCATEGORY_ID(String CATEGORY_ID) { + this.CATEGORY_ID.add(CATEGORY_ID); + } + + public ArrayList getPERIOD() { + return PERIOD; + } + + public void setPERIOD(String PERIOD) { + this.PERIOD.add(PERIOD); + } + + public ArrayList getSOS() { + return SOS; + } + + public void setSOS(String SOS) { + this.SOS.add(SOS); + } + + public ArrayList getT2P() { + return T2P; + } + + public void setT2P(String t2P) { + this.T2P.add(t2P); + } + + public ArrayList getPROMO() { + return PROMO; + } + + public void setPROMO(String PROMO) { + this.PROMO.add(PROMO); + } + + public ArrayList getMSL_AVAILABILITY() { + return MSL_AVAILABILITY; + } + + public void setMSL_AVAILABILITY(String MSL_AVAILABILITY) { + this.MSL_AVAILABILITY.add(MSL_AVAILABILITY); + } + + public ArrayList getOSS() { + return OSS; + } + + public void setOSS(String OSS) { + this.OSS.add(OSS); + } + + public ArrayList getORDERID() { + return ORDERID; + } + + public void setORDERID(String ORDERID) { + this.ORDERID.add(ORDERID); + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java new file mode 100644 index 0000000..9f290d7 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java @@ -0,0 +1,81 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +/** + * Created by gagang on 23-12-2016. + */ + +public class StoreWisePerformaceGetterSetter { + String store_id, category_id, period, msl_availability, sos, t2p, promo, oss, order_id; + + public String getStore_id() { + return store_id; + } + + public void setStore_id(String store_id) { + this.store_id = store_id; + } + + public String getCategory_id() { + return category_id; + } + + public void setCategory_id(String category_id) { + this.category_id = category_id; + } + + public String getPeriod() { + return period; + } + + public void setPeriod(String period) { + this.period = period; + } + + public String getMsl_availability() { + return msl_availability; + } + + public void setMsl_availability(String msl_availability) { + this.msl_availability = msl_availability; + } + + public String getSos() { + return sos; + } + + public void setSos(String sos) { + this.sos = sos; + } + + public String getT2p() { + return t2p; + } + + public void setT2p(String t2p) { + this.t2p = t2p; + } + + public String getPromo() { + return promo; + } + + public void setPromo(String promo) { + this.promo = promo; + } + + public String getOss() { + return oss; + } + + public void setOss(String oss) { + this.oss = oss; + } + + public String getOrder_id() { + return order_id; + } + + public void setOrder_id(String order_id) { + this.order_id = order_id; + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java index 28b4f06..dedce85 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java @@ -21,6 +21,8 @@ public class TableBean { //Gagan start code public static String MAPPING_ADDITIONAL_PROMOTION; + public static String STORE_PERFORMANCE; + //Gagan end code public static String getJourneyPlan() { @@ -129,5 +131,13 @@ public class TableBean { MAPPING_ADDITIONAL_PROMOTION = mappingAdditionalPromotion; } + public static String getStorePerformance() { + return STORE_PERFORMANCE; + } + + public static void setStorePerformance(String storePerformance) { + STORE_PERFORMANCE = storePerformance; + } + //Gagan end code } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java index 6e320e9..cae3a52 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -18,6 +18,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter; @@ -616,5 +617,53 @@ public class XMLHandlers { return map; } + + public static STORE_PERFORMANCE_MasterGetterSetter STORE_PERFORMANCEXMLHandler(XmlPullParser xpp, int eventType) { + STORE_PERFORMANCE_MasterGetterSetter st = new STORE_PERFORMANCE_MasterGetterSetter(); + + try { + while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) { + if (xpp.getEventType() == XmlPullParser.START_TAG) { + + if (xpp.getName().equals("META_DATA")) { + st.setTable_STORE_PERFORMANCE(xpp.nextText()); + } + if (xpp.getName().equals("STORE_ID")) { + st.setSTORE_ID(xpp.nextText()); + } + if (xpp.getName().equals("CATEGORY_ID")) { + st.setCATEGORY_ID(xpp.nextText()); + } + if (xpp.getName().equals("PERIOD")) { + st.setPERIOD(xpp.nextText()); + } + if (xpp.getName().equals("SOS")) { + st.setSOS(xpp.nextText()); + } + if (xpp.getName().equals("T2P")) { + st.setT2P(xpp.nextText()); + } + if (xpp.getName().equals("PROMO")) { + st.setPROMO(xpp.nextText()); + } + if (xpp.getName().equals("MSL_AVAILABILITY")) { + st.setMSL_AVAILABILITY(xpp.nextText()); + } + if (xpp.getName().equals("OSS")) { + st.setOSS(xpp.nextText()); + } + if (xpp.getName().equals("ORDERID")) { + st.setORDERID(xpp.nextText()); + } + } + xpp.next(); + } + } catch (XmlPullParserException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return st; + } //Gagan End Code } diff --git a/GSKMTOrange/src/main/res/layout/activity_store_wise_performance.xml b/GSKMTOrange/src/main/res/layout/activity_store_wise_performance.xml new file mode 100644 index 0000000..c41a876 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/activity_store_wise_performance.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + diff --git a/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml b/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml index 0dbc80b..7f24658 100644 --- a/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml +++ b/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml @@ -24,14 +24,123 @@ android:text="Category Performance" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" - android:visibility="gone"/> + android:visibility="gone" /> - + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GSKMTOrange/src/main/res/layout/content_store_wise_performance.xml b/GSKMTOrange/src/main/res/layout/content_store_wise_performance.xml new file mode 100644 index 0000000..7f24658 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/content_store_wise_performance.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GSKMTOrange/src/main/res/layout/item_category_wise_performance.xml b/GSKMTOrange/src/main/res/layout/item_category_wise_performance.xml index 2a448be..195204d 100644 --- a/GSKMTOrange/src/main/res/layout/item_category_wise_performance.xml +++ b/GSKMTOrange/src/main/res/layout/item_category_wise_performance.xml @@ -15,7 +15,6 @@ android:layout_height="match_parent" android:orientation="horizontal" android:weightSum="30"> - + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="#000" /> - - - - - - - - - - - - + android:background="@color/colorPrimary" /> + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="#000" /> + android:background="@color/colorPrimary" /> + + + + + + + + + + + + + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="#000" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 11235dc..24b71fe 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -47,4 +47,54 @@ Veri Paylaş + + Kategoriler + Kategori Performansı + Günlük Veri Menüsü + Bulunurluk + Raf Payı + + Bulunurluk + Raf Payı + Kalıcı Teşhir + Ek Teşhir + Promosyon + Rakip Bilgisi + Promosyon + + Ürün Adı + X + Bulunurluk + + Örnek Fotoğraf + Ürün Adı + X + Önyüz + Raf Payı Hedefi + + Promosyon + + Additional Promos + Promos + Promosyon Ürünü + Promosyon Ürünü + Ürün Bulunuyor + Duyuru Var + Kasa Okuyor + Add + + Zaman + Bulunurluk + Raf Payi + Kalici Teshir + Promosyon + TMP + + Son 3 Ay + Bu Ay + Son Ziyaret + + Mağaza Performansı + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index c5096a6..e0e3b1a 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -117,6 +117,18 @@ Running on POS Add + Period + MSL Availability + SOS + T2P + Promo + OSS + + LTM + MTD + LSV + + Store wise Performance From 4a73e327ed5ee227cbe45508df241db75948c064 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 12 Jan 2017 10:19:00 +0530 Subject: [PATCH 05/36] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 900a856..2be7763 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -265,7 +265,7 @@ public class MainActivity extends AppCompatActivity } else if (id == R.id.nav_setting) { - startActivity(new Intent(MainActivity.this, CategoryListActivity.class)); + //startActivity(new Intent(MainActivity.this, CategoryListActivity.class)); } else if (id == R.id.nav_export) { From 6c33cfd2e8d88f27102451981da99f348c2721b2 Mon Sep 17 00:00:00 2001 From: YadavendraSinghYaduvanshi Date: Thu, 12 Jan 2017 10:21:59 +0530 Subject: [PATCH 06/36] Delete HFD.png --- GSKMTOrange/src/main/res/drawable/HFD.png | Bin 4661 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 GSKMTOrange/src/main/res/drawable/HFD.png diff --git a/GSKMTOrange/src/main/res/drawable/HFD.png b/GSKMTOrange/src/main/res/drawable/HFD.png deleted file mode 100644 index 82782775b090ca081ca226627f0a99fa43b98f72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4661 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 Date: Thu, 12 Jan 2017 10:22:11 +0530 Subject: [PATCH 07/36] Delete HFD_done.png --- GSKMTOrange/src/main/res/drawable/HFD_done.png | Bin 8721 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 GSKMTOrange/src/main/res/drawable/HFD_done.png diff --git a/GSKMTOrange/src/main/res/drawable/HFD_done.png b/GSKMTOrange/src/main/res/drawable/HFD_done.png deleted file mode 100644 index 073f978450ee6625358697816fcadea94865c3e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8721 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 S`}unT0LaTIOIJ%82mOCKXSQ7c From 98afe0e18b85fc709998ad9ccd8126264fe0316d Mon Sep 17 00:00:00 2001 From: YadavendraSinghYaduvanshi Date: Thu, 12 Jan 2017 10:22:22 +0530 Subject: [PATCH 08/36] Delete OHC.png --- GSKMTOrange/src/main/res/drawable/OHC.png | Bin 4543 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 GSKMTOrange/src/main/res/drawable/OHC.png diff --git a/GSKMTOrange/src/main/res/drawable/OHC.png b/GSKMTOrange/src/main/res/drawable/OHC.png deleted file mode 100644 index 9ccf323b7748d55f13575bbeecf67d752a4fb871..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4543 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 Gi1{C#`hK+l From 9b06016641710637c907ef513315d2805db92d8c Mon Sep 17 00:00:00 2001 From: YadavendraSinghYaduvanshi Date: Thu, 12 Jan 2017 10:22:36 +0530 Subject: [PATCH 09/36] Delete OHC_done.png --- GSKMTOrange/src/main/res/drawable/OHC_done.png | Bin 8595 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 GSKMTOrange/src/main/res/drawable/OHC_done.png diff --git a/GSKMTOrange/src/main/res/drawable/OHC_done.png b/GSKMTOrange/src/main/res/drawable/OHC_done.png deleted file mode 100644 index 96545681c87f1e90d2d972278b2715df2242924e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8595 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 From fb8dce4660483e8d134ef254dc14c5fa7b1b8888 Mon Sep 17 00:00:00 2001 From: YadavendraSinghYaduvanshi Date: Thu, 12 Jan 2017 10:22:48 +0530 Subject: [PATCH 10/36] Delete PDR.png --- GSKMTOrange/src/main/res/drawable/PDR.png | Bin 4770 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 GSKMTOrange/src/main/res/drawable/PDR.png diff --git a/GSKMTOrange/src/main/res/drawable/PDR.png b/GSKMTOrange/src/main/res/drawable/PDR.png deleted file mode 100644 index 9190d2dcdcd0ea7b500f7a6a840d1574d3abfb77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4770 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 YUFcK9fASlAP4oa=P0-V7b-Sql0$$2CcK`qY From 740d384df755928a47335f418a13b46d3732ad76 Mon Sep 17 00:00:00 2001 From: YadavendraSinghYaduvanshi Date: Thu, 12 Jan 2017 10:23:01 +0530 Subject: [PATCH 11/36] Delete PDR_done.png --- GSKMTOrange/src/main/res/drawable/PDR_done.png | Bin 8596 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 GSKMTOrange/src/main/res/drawable/PDR_done.png diff --git a/GSKMTOrange/src/main/res/drawable/PDR_done.png b/GSKMTOrange/src/main/res/drawable/PDR_done.png deleted file mode 100644 index 4b99cf57c86591e599e3953d08da798d3c19a97b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8596 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 From 9384adeec3c3ff52674c343539c9a504d9dbbfad Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 12 Jan 2017 12:04:18 +0530 Subject: [PATCH 12/36] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../com/gskmtorange/Database/GSKOrangeDB.java | 70 +++----- .../gskmtorange/constant/CommonString.java | 3 + .../gsk_dailyentry/Stock_FacingActivity.java | 161 +++++++++++------- .../res/layout/item_stock_facing_header.xml | 8 +- 4 files changed, 133 insertions(+), 109 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index aaca1e8..8bff672 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -119,7 +119,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void deleteTableWithStoreID(String storeid) { - db.delete( CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); } @@ -920,7 +920,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { cd.setMrp(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MRP"))); cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE"))); cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ"))); - cd.setToggleValue("0"); + cd.setToggleValue("1"); list.add(cd); dbcursor.moveToNext(); @@ -1017,11 +1017,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } dbcursor.close(); - if (list.size() > 0) { - return true; - } else { - return false; - } + return list.size() > 0; } } catch (Exception e) { Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString()); @@ -1063,7 +1059,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND " + + dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID " + "from MAPPING_STOCK M " + "inner join SKU_MASTER SK " + "on M.SKU_ID=SK.SKU_ID " + @@ -1074,13 +1070,14 @@ public class GSKOrangeDB extends SQLiteOpenHelper { "inner join CATEGORY_MASTER CA " + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + "where CA.CATEGORY_ID='" + category_id + "' " + - "order by SB.SUB_CATEGORY,BR.BRAND", null); + "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null); if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { Stock_FacingGetterSetter cd = new Stock_FacingGetterSetter(); + cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID"))); cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID"))); cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY"))); cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID"))); @@ -1158,6 +1155,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values1.put("Store_Id", storeId); values1.put("Category_Id", categoryId); + values1.put("COMPANY_ID", data1.getCompany_id()); values1.put("SUB_CATEGORY_ID", data1.getSub_category_id()); values1.put("SUB_CATEGORY", data1.getSub_category()); values1.put("BRAND_ID", data1.getBrand_id()); @@ -1204,6 +1202,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { while (!dbcursor.isAfterLast()) { Stock_FacingGetterSetter cd = new Stock_FacingGetterSetter(); + cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID"))); cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID"))); cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY"))); cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID"))); @@ -1312,11 +1311,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } dbcursor.close(); - if (list.size() > 0) { - return true; - } else { - return false; - } + return list.size() > 0; } } catch (Exception e) { Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString()); @@ -1530,7 +1525,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } - public void InsertPromoSkuData(ArrayList promoSkuListData, String category_id) { ContentValues values = new ContentValues(); try { @@ -1577,11 +1571,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } dbcursor.close(); - if (list.size() > 0) { - return true; - } else { - return false; - } + return list.size() > 0; } } catch (Exception e) { Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString()); @@ -1679,7 +1669,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " + - "where VISIT_DATE ='" + date + "' AND STORE_ID'="+ store_id +"'", null); + "where VISIT_DATE ='" + date + "' AND STORE_ID'=" + store_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -2111,7 +2101,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { //Gagan end new code 1 - public void InsertStockDialog(AdditionalDialogGetterSetter data) { + public void InsertStockDialog(AdditionalDialogGetterSetter data) { ContentValues values = new ContentValues(); try { @@ -2121,16 +2111,16 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put(CommonString.KEY_BRAND, data.getBrand()); values.put(CommonString.KEY_BRAND_ID, data.getBrand_id()); - // values.put(CommonString.KEY_DISPLAY_ID, data.getDisplay_id()); + // values.put(CommonString.KEY_DISPLAY_ID, data.getDisplay_id()); values.put(CommonString.KEY_QUANTITY, data.getQuantity()); values.put(CommonString.KEY_SKU_ID, data.getSku_id()); values.put(CommonString.KEY_SKUNAME, data.getSku_name()); - // values.put(CommonString.UNIQUE_KEY_ID, data.getUnique_id()); + // values.put(CommonString.UNIQUE_KEY_ID, data.getUnique_id()); - // values.put(CommonString.KEY_CATEGORY_ID, data.getCategory_id()); + // values.put(CommonString.KEY_CATEGORY_ID, data.getCategory_id()); - // values.put(CommonString.KEY_PROCESS_ID, data.getProcess_id()); + // values.put(CommonString.KEY_PROCESS_ID, data.getProcess_id()); db.insert(CommonString.TABLE_INSERT_STOCK_DIALOG, null, values); @@ -2148,7 +2138,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE COMMON_ID = '"+keyid + "'", null); + cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE COMMON_ID = '" + keyid + "'", null); if (cursordata != null) { cursordata.moveToFirst(); @@ -2171,7 +2161,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setSku_id(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_SKU_ID))); - sb.setSku_name(cursordata.getString(cursordata + sb.setSku_name(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_SKUNAME))); @@ -2209,8 +2199,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - - public ArrayList getBrandMasterData(String store_id) { Cursor cursordata = null; ArrayList Data = new ArrayList(); @@ -2231,7 +2219,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setSUB_CATEGORY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("SUB_CATEGORY_ID"))); - sb.setCOMPANY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("COMPANY_ID"))); sb.setBRAND_SEQUENCE(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_SEQUENCE"))); @@ -2252,7 +2239,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public ArrayList getSKUMasterData(String store_id) { Cursor cursordata = null; ArrayList Data = new ArrayList(); @@ -2273,7 +2259,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setBRAND_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_ID"))); - sb.setMRP(cursordata.getString(cursordata.getColumnIndexOrThrow("MRP"))); sb.setSKU_SEQUENCE(cursordata.getString(cursordata.getColumnIndexOrThrow("SKU_SEQUENCE"))); @@ -2293,7 +2278,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public void InsertAdditionalData(AddittionalGetterSetter data,ArrayList dialog) { + public void InsertAdditionalData(AddittionalGetterSetter data, ArrayList dialog) { ContentValues values = new ContentValues(); ContentValues values1 = new ContentValues(); try { @@ -2307,10 +2292,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("sku_name", data.getSku()); values.put("toggle_value", data.getBtn_toogle()); - long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, null, values); + long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, null, values); - for(int i=0;i + android:layout_marginRight="10dp" /> + + android:layout_marginRight="10dp" /> + Date: Thu, 12 Jan 2017 12:28:09 +0530 Subject: [PATCH 13/36] T2P upload data --- .idea/modules.xml | 2 - GSKMTOrange/src/main/AndroidManifest.xml | 14 +- .../com/gskmtorange/Database/GSKOrangeDB.java | 19 ++- .../dailyentry/T2PComplianceActivity.java | 51 ++++--- .../gskmtorange/upload/UploadActivity.java | 134 ++++++++++++++++++ .../xmlGetterSetter/T2PGetterSetter.java | 10 +- .../main/res/mipmap-hdpi/OralCare_tick.png | Bin 0 -> 13329 bytes .../res/mipmap-hdpi/additional_visibility.png | Bin 7093 -> 7153 bytes .../additional_visibility_done.png | Bin 9999 -> 9512 bytes .../src/main/res/mipmap-hdpi/camera_green.png | Bin 0 -> 9336 bytes .../src/main/res/mipmap-hdpi/camera_grey.png | Bin 0 -> 9336 bytes .../main/res/mipmap-hdpi/camera_orange.png | Bin 0 -> 9322 bytes .../src/main/res/mipmap-hdpi/exclamation.png | Bin 0 -> 3121 bytes .../res/mipmap-hdpi/msl_availability_done.png | Bin 9874 -> 9643 bytes .../src/main/res/mipmap-hdpi/nutritionals.png | Bin 0 -> 8058 bytes .../res/mipmap-hdpi/nutritionals_tick.png | Bin 0 -> 10644 bytes .../src/main/res/mipmap-hdpi/oral_care.png | Bin 0 -> 10844 bytes .../res/mipmap-hdpi/promo_compliance_done.png | Bin 9869 -> 9647 bytes .../src/main/res/mipmap-hdpi/stock_facing.png | Bin 0 -> 9984 bytes .../res/mipmap-hdpi/stock_facing_done.png | Bin 0 -> 12370 bytes .../res/mipmap-hdpi/t2p_compliance_done.png | Bin 9441 -> 9231 bytes GSKMTOrange/src/main/res/mipmap-hdpi/tick.png | Bin 0 -> 4111 bytes .../src/main/res/mipmap-hdpi/wellness.png | Bin 0 -> 10423 bytes .../main/res/mipmap-hdpi/wellness_tick.png | Bin 0 -> 12922 bytes 24 files changed, 196 insertions(+), 34 deletions(-) create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/OralCare_tick.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/camera_green.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/camera_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/camera_orange.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/exclamation.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals_tick.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/oral_care.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing_done.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/tick.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/wellness.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/wellness_tick.png diff --git a/.idea/modules.xml b/.idea/modules.xml index a329b11..ad566b9 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,8 +3,6 @@ - - diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 9ce8360..ac805bc 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -59,9 +59,9 @@ android:theme="@style/AppTheme.NoActionBar" /> @@ -125,22 +125,24 @@ - - + android:screenOrientation="portrait" /> diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index e54f96b..ee185f9 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -267,7 +267,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "') As Brand", null); + dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID ='1') As Brand", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -2340,14 +2340,22 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } // get T2P Compliance data - public ArrayList getT2pComplianceData(String store_id, String common_id) { + public ArrayList getT2pComplianceData(String store_id, String category_id) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + - CommonString.KEY_STORE_ID + "='" + store_id + "' AND " + - CommonString.KEY_CATEGORY_ID + "='" + common_id + "'", null); + + if(category_id == null){ + dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + + CommonString.KEY_STORE_ID + "='" + store_id + "'", null); + } + else{ + dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + + CommonString.KEY_STORE_ID + "='" + store_id + "' AND " + + CommonString.KEY_CATEGORY_ID + "='" + category_id + "'", null); + } + if (dbcursor != null) { dbcursor.moveToFirst(); @@ -2361,6 +2369,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { tp.setDisplay(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY))); tp.setImage(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE))); tp.setRemark(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_REMARK))); + tp.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID))); tp.setPresent((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)).equalsIgnoreCase("1"))); list.add(tp); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 1ae2a9e..9f1ab57 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -74,7 +74,7 @@ public class T2PComplianceActivity extends AppCompatActivity { String categoryName, categoryId; private SharedPreferences preferences; - String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow; String path = "", str = CommonString.FILE_PATH, _pathforcheck = "", img = ""; int child_position = -1; @@ -109,7 +109,7 @@ public class T2PComplianceActivity extends AppCompatActivity { keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, ""); class_id = preferences.getString(CommonString.KEY_CLASS_ID, ""); storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, ""); - + camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, ""); rec_t2p = (RecyclerView) findViewById(R.id.rec_t2p); @@ -221,16 +221,6 @@ public class T2PComplianceActivity extends AppCompatActivity { } }); - holder.img_cam.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; - child_position = position; - path = str + _pathforcheck; - - startCameraActivity(); - } - }); holder.btn_sku.setOnClickListener(new View.OnClickListener() { @Override @@ -246,11 +236,29 @@ public class T2PComplianceActivity extends AppCompatActivity { } } - if (mItem.getImage().equals("")) { - holder.img_cam.setBackgroundResource(R.mipmap.camera); - } else { - holder.img_cam.setBackgroundResource(R.mipmap.camera_done); + if(camera_allow.equals("1")){ + + holder.img_cam.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + child_position = position; + path = str + _pathforcheck; + + startCameraActivity(); + } + }); + + if (mItem.getImage().equals("")) { + holder.img_cam.setBackgroundResource(R.mipmap.camera_orange); + } else { + holder.img_cam.setBackgroundResource(R.mipmap.camera_green); + } } + else { + holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); + } + holder.toggle_btn.setChecked(mItem.isPresent()); @@ -841,7 +849,7 @@ public class T2PComplianceActivity extends AppCompatActivity { for (int i = 0; i < t2PGetterSetters.size(); i++) { - if (t2PGetterSetters.get(i).getImage().equals("")) { + if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) { flag = false; error_msg = getResources().getString(R.string.click_image); break; @@ -869,9 +877,12 @@ public class T2PComplianceActivity extends AppCompatActivity { .setPositiveButton("OK", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - /* Intent i = new Intent(activity, StorelistActivity.class); - activity.startActivity(i); - activity.finish();*/ + finish(); + } + }) + .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { } }); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index 8030b22..1ebb27d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -36,9 +36,12 @@ import cpm.com.gskmtorange.GetterSetter.StoreBean; import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter; import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler; public class UploadActivity extends AppCompatActivity { @@ -66,6 +69,7 @@ public class UploadActivity extends AppCompatActivity { ArrayList msl_availabilityList; ArrayList stock_facingHeaderList, stock_facingChildList; ArrayList promotionSkuList, additionalPromotionList; + ArrayList t2PGetterSetters; @Override protected void onCreate(Bundle savedInstanceState) { @@ -436,6 +440,136 @@ public class UploadActivity extends AppCompatActivity { data.name = "Additional Promotion Data Uploading"; publishProgress(data); + //T2p Upload Data + + String t2p_data_xml = ""; + onXML = ""; + t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null); + + if (t2PGetterSetters.size() > 0) { + for (int i1 = 0; i1 < t2PGetterSetters.size(); i1++) { + + ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i).getKey_id()); + ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i).getKey_id()); + + String gaps_xml = ""; + String gaps_child; + + for (int l = 0; l < gapsList.size(); l++) { + + String present = ""; + if (gapsList.get(l).isPresent()) { + present = "1"; + } else { + present = "0"; + } + + gaps_child = "[GAPS]" + + "[CHECK_LIST_ID]" + + gapsList.get(l).getChecklist_id() + + "[/CHECK_LIST_ID]" + + "[DISPLAY_ID]" + + gapsList.get(l).getDisplay_id() + + "[/DISPLAY_ID]" + + "[PRESENT]" + + present + + "[/PRESENT]" + + "[/GAPS]"; + gaps_xml = gaps_xml + gaps_child; + } + + String sku_xml = ""; + String sku_child; + + for (int k = 0; k < skuList.size(); k++) { + + sku_child = "[SKU]" + + "[SKU_ID]" + + skuList.get(k).getSKU_ID() + + "[/SKU_ID]" + + "[BRAND_ID]" + + skuList.get(k).getBRAND_ID() + + "[/BRAND_ID]" + + "[STOCK]" + + skuList.get(k).getSTOCK() + + "[/STOCK]" + + "[/SKU]"; + sku_xml = sku_xml + sku_child; + } + + String present = ""; + if (t2PGetterSetters.get(i1).isPresent()) { + present = "1"; + } else { + present = "0"; + } + + onXML = "[T2P_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[CATEGORY_ID]" + + Integer.parseInt(t2PGetterSetters.get(i1).getCategory_id()) + + "[/CATEGORY_ID]" + + "[BRAND_ID]" + + Integer.parseInt(t2PGetterSetters.get(i1).getBrand_id()) + + "[/BRAND_ID]" + + "[DISPLAY_ID]" + + Integer.parseInt(t2PGetterSetters.get(i1).getDisplay_id()) + + "[/DISPLAY_ID]" + + "[COMMON_ID]" + + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + + "[/COMMON_ID]" + + "[IMAGE]" + + t2PGetterSetters.get(i1).getImage() + + "[/IMAGE]" + + "[PRESENT]" + + present + + "[/PRESENT]" + + "[GAPS_DATA]" + + gaps_xml + + "[/GAPS_DATA]" + + "[SKU_DATA]" + + sku_xml + + "[/SKU_DATA]" + + "[/T2P_DATA]"; + + t2p_data_xml = t2p_data_xml + onXML; + + } + + final String t2p_final_xml = "[DATA]" + t2p_data_xml + "[/DATA]"; + + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", t2p_final_xml); + request.addProperty("KEYS", "T2P_DATA"); + request.addProperty("USERNAME", userId); + request.addProperty("MID", mid); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); + + result = (Object) envelope.getResponse(); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + + if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + + if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + } + data.value = 40; + data.name = "T2P Data Uploading"; + publishProgress(data); + //Image Upload diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java index 430728a..b040e6b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java @@ -8,7 +8,7 @@ import java.util.ArrayList; public class T2PGetterSetter { - String brand_id, display_id, brand, display, image, remark, key_id; + String brand_id, display_id, brand, display, image, remark, key_id, category_id; boolean isPresent; ArrayList gapsChecklist = new ArrayList<>(); @@ -93,4 +93,12 @@ public class T2PGetterSetter { public void setKey_id(String key_id) { this.key_id = key_id; } + + public String getCategory_id() { + return category_id; + } + + public void setCategory_id(String category_id) { + this.category_id = category_id; + } } diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/OralCare_tick.png b/GSKMTOrange/src/main/res/mipmap-hdpi/OralCare_tick.png new file mode 100644 index 0000000000000000000000000000000000000000..4f3e7814226afc9b680838a2e65dead23d7da527 GIT binary patch literal 13329 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 a7YM){1ue4q7{vdnoQ(Ca=siF05dJ@cW863Z diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/additional_visibility_done.png b/GSKMTOrange/src/main/res/mipmap-hdpi/additional_visibility_done.png index 95e50f13078f5e2d80a2eb7e08cc3267c1e85473..c578330c71a04ab320126b8c873c035b5169cc77 100644 GIT binary patch delta 6822 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 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/camera_green.png b/GSKMTOrange/src/main/res/mipmap-hdpi/camera_green.png new file mode 100644 index 0000000000000000000000000000000000000000..4c58759470da6cf8f3f967651f11db08644b82f2 GIT binary patch literal 9336 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 LNkvXXu0mjfnq|Jl literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/msl_availability_done.png b/GSKMTOrange/src/main/res/mipmap-hdpi/msl_availability_done.png index 24a4d07181f75d19dc2680cdfded2528e02d3527..c7fe3de208444d598f6407434f56925c93a7bb05 100644 GIT binary patch delta 6954 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 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals.png b/GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals.png new file mode 100644 index 0000000000000000000000000000000000000000..a17a0370daaa68e4fff3dbf92ea75014a12efe8b GIT binary patch literal 8058 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%0Dt&_yBqptbPgWRyIf;kW2ylDGVR5t zyU3y?SUX4IsH@X7fh!>tSz9z};?#h%R23;UTsT^sU5UO_6(vSnI7;DkLEX5B?pgyy zS{Lc;uR5|LInOxnqux(Y#dYx1bwuzmjwJp#I93B=?D>_uqFuWl*mhCeYrBvd5X{MsN&(~ z60q%Ii)*Psd*Gc%LCN&!(Mf)ewD8s1#UneXj^9qfV$jat^^3f$TN(FXYac#QI8W27 zJ7H5OqB&)~tz79q_F3uvtYP&$)L7YMbCZr;*7%93vEs}&<~Q-YDcCo;g|qr`S!0D$ zedQ_17m1__8AVp8Fr7yc-`1)-p66!7w6D?2Z8aRpg931uvXQ=ZA3eT`bT?|FD6^APtS@Bp!E#`4~9BD@iz5lUpYqeUDzv&3JBO(JVW z9KA4_M{O0~WP`6|f0)g*+{?CyzE5s3W^*gDZl4vqFihuP0Ql|m9c0=C&cLv8zbc{wnfnQ(sYuNZVwgy+Dkow)}mnBC3iYA{A>>_RS>qO;N!Bd$6)=Dw#n{ z0MlW7drIifF;1Cy&Lt#XOllJFevWccEGxAILmB|0HJmdpdDy-zdcP0*8Ux36xJ9rcj@3QeLQ!@*lpF7+6 zt?kC3qgmw|*XNb~*gnL}7k@N2DpBHyQB*jpuqiEXuq(ew$Lf}LjE!SW!+)evAPrt^ z|7AeyV;2`~?7u^t#{z044+*`SO_w}o(0z|}4-ZS{uCi$51Zo`zO-bs#1ABIU`XM4a zAt)|pl@_Ob-=R*uua&`-gI2FQ!rKpe=hlzs9(is%uF}8P#32|#1CnXY4- zxEe8Y62P5s?=1tkOQ)=8;;80klf!SefHr0sH*!VI-eKetikwHz?vG@ zp)CBEA}}c2>LTJ&XyxN0Img*7$IbE)M_rD7)t26$#Squ)zpj7QoWEx$)Y60URFkfn zhTL9;`{gIIoalxvVSebVqyi2%{BEAJ}qJotRBFSKzhxZ;_p+x4y@_RkgzvfBGBw5i_R^5?Xef zR7J_^1s`|Hq#bf-xdN@TR1v4uh zfiudD2yKbz1Vi~ezZIT$%!m(m)~hk(qiH<6h@gmSm&v>|)Tv!mm%(8TpjdJGb#P4h z9L=Ud6XpX(cyw*Ij4Y(f`UZ$ywP$iA0uM2XYU9o7$>O`Zx2C_1f$~Rz(WLr!9!xs0 zw_re)c`iP@EFC6-w(yQbP85$|nVX{wE8+aZ+!N4|$}MP`n(gw~g=EgY?K}Z^fg;X1 z=k?L$VF76u6TDY_&T$0tL6_Y!gn|GWcB2Az#3cV^r~VG#C*b*)6e!BqaNSKv!8IZS z28@$V!TQG7IwdE|6Y5$eXSF~xIOWo|j*Jx;mShK=WIzNyMo7}i-gt5VJ5iz_IG5#5 zgn9ms)|4D{5CbBee-b@H{)Oj{KppTc_SWe)+cA9zgq#?)|2^8nek{=v7{E5xwzrHP_qj`b6CYTvaJf!4I@(KM?5Eoz+Ux*;ld;QE7cQI0%k$~G6hK8 z`F@lJo>4!;f_avwjY|e-eOBnoiW=oWyzHF{1wUS9aC>3h)bZm3vC|V4|1+c zkiib7VJ^Vx^PA4Mr8?BXz6?tOWAUxD5M94pjocmIn7BB;v^ctNKe`zj1tsRbs??=l zP(5gGI{k%q_NVHXOCtUv{S{$5x%yuqFik8oh4Nb_+y0r>!ds7rMfX>sEVmL+>jqG{>-E*rT*EkA4Lq9L}#Z z51b@Q))BiaP(utLkfGiq8Ug!M7Nb!{GFUQbD>y5_TR25@7jP|c_S%A-TG4#Ziv)Vm z(D>qGuynbe`aS!{VCHgb=)tVu!&z|vqgZJ{)sZ^-~6(VH__YIioWo_F_eaiu5yhcJnVlX CXur+? literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals_tick.png b/GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals_tick.png new file mode 100644 index 0000000000000000000000000000000000000000..57e71b7f4fbe7ffe20fbc5830aab82763719fc5b GIT binary patch literal 10644 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 literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/oral_care.png b/GSKMTOrange/src/main/res/mipmap-hdpi/oral_care.png new file mode 100644 index 0000000000000000000000000000000000000000..fd0e1b0d552598b4bf61cc04af241ecfd6532165 GIT binary patch literal 10844 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 literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/promo_compliance_done.png b/GSKMTOrange/src/main/res/mipmap-hdpi/promo_compliance_done.png index 0f0f6c651ef3e1f79e6fdd6786db1a84b88ba1b1..7cc5ea531626c59f9c0567fb7e955e46ab110d70 100644 GIT binary patch delta 6958 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 delta 7182 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 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing.png b/GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing.png new file mode 100644 index 0000000000000000000000000000000000000000..d883850d69598b4d662f4e7b507e0ce19627db89 GIT binary patch literal 9984 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 literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing_done.png b/GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing_done.png new file mode 100644 index 0000000000000000000000000000000000000000..fc99b1e0697aeb26e825357338d6fdd9bc8226aa GIT binary patch literal 12370 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 literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/t2p_compliance_done.png b/GSKMTOrange/src/main/res/mipmap-hdpi/t2p_compliance_done.png index bf2006c22cddf8056eada6f43d18c63d2390e596..c85db658d5f33d450f6dc9c536b53359ba073439 100644 GIT binary patch delta 6539 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 U!n(}{fWHF{Q&*^j$eD-y4=xKs=l}o! delta 6750 zcma);bx_n__s2iW5-TiSOUY772rQvUhop2#hag>xbbglZ5=0RxK}rN9q-6;KX%OiW zq$MPz;m7xR{(7GI&HR3M=FYt{_s+TJ^*-mGIZ4VtRVrHvL3+4~ysVz@wAID+wKS9$ zLJ3W1E5^fx5NTvQR#d^qkF=A|9J|U%F_uET_aeJw&`If!#%q;Z{vhj6b?+nz@0yAA z8x^_yBp^N}a*aSBT!m1mN&yt=;@uN6mHEr=J}b_}(oQUPFDfKNmipCCc7hbDYDgGW zb(@gMlNEjt4u?;;mpILcmSj&N=9bA;4`hy6*q7ZL8yc3+SiJCWyf|2CLVT+N zm=J{ZtPjaL=!RbHzPm>)c^=S)$gF=+$r$@CGYgXDRIZ#@FK!?jXbAi##vEm0W$YPdA_v3RXf|qt0zK@~!>2 zZ!6g7F5>borM*I7(|l*wnIS4r3o<(IMsjL-lpWWieN~|J^;4016CIhTY~w`Ek08

doI^Oz%o`Emt}TUZ

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 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/tick.png b/GSKMTOrange/src/main/res/mipmap-hdpi/tick.png new file mode 100644 index 0000000000000000000000000000000000000000..b6e180975547297aac63a0eb0ba8ddd08324892f GIT binary patch literal 4111 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 N002ovPDHLkV1m)ft|R~e literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/wellness.png b/GSKMTOrange/src/main/res/mipmap-hdpi/wellness.png new file mode 100644 index 0000000000000000000000000000000000000000..6e7f59b609ed8ea05be3807f865a3d36cdc02acc GIT binary patch literal 10423 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 Gf&T-$L_yF1 literal 0 HcmV?d00001 From 2b7f9fe88296301944b248e3124315f8155d6221 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 12 Jan 2017 13:04:42 +0530 Subject: [PATCH 14/36] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../com/gskmtorange/Database/GSKOrangeDB.java | 28 +- .../download/DownloadActivity.java | 112 +++++--- .../gskmtorange/upload/UploadActivity.java | 255 +++++++++--------- .../MAPPING_PLANOGRAM_MasterGetterSetter.java | 65 +++++ .../xmlGetterSetter/TableBean.java | 9 + .../gskmtorange/xmlHandlers/XMLHandlers.java | 37 +++ 6 files changed, 337 insertions(+), 169 deletions(-) create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_MasterGetterSetter.java diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index 8bff672..0ec76e4 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -18,6 +18,7 @@ import cpm.com.gskmtorange.GetterSetter.StoreBean; import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter; import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter; @@ -50,8 +51,8 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean; public class GSKOrangeDB extends SQLiteOpenHelper { public static final String DATABASE_NAME = "GSK_ORANGE"; public static final int DATABASE_VERSION = 13; - private SQLiteDatabase db; TableBean tableBean; + private SQLiteDatabase db; public GSKOrangeDB(Context context) { super(context, DATABASE_NAME, null, DATABASE_VERSION); @@ -110,6 +111,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(CommonString.CREATE_TABLE_INSERT_T2P_COMPLIANCE); db.execSQL(CommonString.CREATE_TABLE_INSERT_T2P_GAPS); db.execSQL(CommonString.CREATE_TABLE_INSERT_T2P_SKU); + + db.execSQL(TableBean.getMappingPlanogram()); } @Override @@ -2544,4 +2547,27 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } + //Gagan start new code 2 + + public void InsertMAPPING_PLANOGRAM(MAPPING_PLANOGRAM_MasterGetterSetter data) { + db.delete("MAPPING_PLANOGRAM", null, null); + + ContentValues values = new ContentValues(); + try { + for (int i = 0; i < data.getKEYACCOUNT_ID().size(); i++) { + + values.put("KEYACCOUNT_ID", data.getKEYACCOUNT_ID().get(i)); + values.put("STORETYPE_ID", data.getSTORETYPE_ID().get(i)); + values.put("CLASS_ID", data.getCLASS_ID().get(i)); + values.put("PLANOGRAM_IMAGE", data.getPLANOGRAM_IMAGE().get(i)); + values.put("IMAGE_PATH", data.getIMAGE_PATH().get(i)); + + db.insert("MAPPING_PLANOGRAM", null, values); + } + } catch (Exception ex) { + Log.d("Exception ", " MAPPING_PLANOGRAM " + ex.toString()); + } + } + //Gagan end new code 2 + } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index 2614509..33e3d0d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -35,6 +35,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; @@ -47,15 +48,10 @@ import cpm.com.gskmtorange.xmlHandlers.XMLHandlers; public class DownloadActivity extends AppCompatActivity { - private Dialog dialog; - private ProgressBar pb; - private TextView percentage, message; Data data; int eventType; GSKOrangeDB db; - private SharedPreferences preferences = null; String userId, culture_id; - JourneyPlanGetterSetter jcpgettersetter; SkuMasterGetterSetter skumastergettersetter; BrandMasterGetterSetter brandMasterGetterSetter; @@ -70,6 +66,11 @@ public class DownloadActivity extends AppCompatActivity { MappingPromotionGetterSetter mappingPromotionGetterSetter; MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter mapping_additional_promotion_masterGetterSetter; STORE_PERFORMANCE_MasterGetterSetter store_performance_masterGetterSetter; + MAPPING_PLANOGRAM_MasterGetterSetter mapping_planogram_masterGetterSetter; + private Dialog dialog; + private ProgressBar pb; + private TextView percentage, message; + private SharedPreferences preferences = null; @Override protected void onCreate(Bundle savedInstanceState) { @@ -84,6 +85,24 @@ public class DownloadActivity extends AppCompatActivity { new UploadTask(DownloadActivity.this).execute(); } + public void showAlert(String str) { + + AlertDialog.Builder builder = new AlertDialog.Builder(DownloadActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(str).setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + /* Intent i = new Intent(activity, StorelistActivity.class); + activity.startActivity(i); + activity.finish();*/ + + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } + class Data { int value; String name; @@ -137,7 +156,7 @@ public class DownloadActivity extends AppCompatActivity { HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - Object result = (Object) envelope.getResponse(); + Object result = envelope.getResponse(); if (result.toString() != null) { //InputStream stream = new ByteArrayInputStream(result.toString().getBytes("UTF-8")); @@ -177,7 +196,7 @@ public class DownloadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (result.toString() != null) { xpp.setInput(new StringReader(result.toString())); @@ -213,7 +232,7 @@ public class DownloadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (result.toString() != null) { xpp.setInput(new StringReader(result.toString())); @@ -249,7 +268,7 @@ public class DownloadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (result.toString() != null) { xpp.setInput(new StringReader(result.toString())); @@ -284,7 +303,7 @@ public class DownloadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (result.toString() != null) { xpp.setInput(new StringReader(result.toString())); @@ -319,7 +338,7 @@ public class DownloadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (result.toString() != null) { xpp.setInput(new StringReader(result.toString())); @@ -354,7 +373,7 @@ public class DownloadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (result.toString() != null) { xpp.setInput(new StringReader(result.toString())); @@ -389,7 +408,7 @@ public class DownloadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (result.toString() != null) { xpp.setInput(new StringReader(result.toString())); @@ -423,7 +442,7 @@ public class DownloadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (result.toString() != null) { xpp.setInput(new StringReader(result.toString())); @@ -457,7 +476,7 @@ public class DownloadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (result.toString() != null) { xpp.setInput(new StringReader(result.toString())); @@ -492,7 +511,7 @@ public class DownloadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (result.toString() != null) { xpp.setInput(new StringReader(result.toString())); @@ -527,7 +546,7 @@ public class DownloadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (result.toString() != null) { xpp.setInput(new StringReader(result.toString())); @@ -564,7 +583,7 @@ public class DownloadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (result.toString() != null) { xpp.setInput(new StringReader(result.toString())); @@ -600,7 +619,7 @@ public class DownloadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (result.toString() != null) { xpp.setInput(new StringReader(result.toString())); @@ -623,6 +642,42 @@ public class DownloadActivity extends AppCompatActivity { publishProgress(data); + //MAPPING_PLANOGRAM + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); + request.addProperty("UserName", userId); + request.addProperty("Type", "MAPPING_PLANOGRAM"); + request.addProperty("cultureid", culture_id); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); + + result = envelope.getResponse(); + + if (result.toString() != null) { + xpp.setInput(new StringReader(result.toString())); + xpp.next(); + eventType = xpp.getEventType(); + mapping_planogram_masterGetterSetter = XMLHandlers.MAPPING_PLANOGRAM_XMLHandler(xpp, eventType); + + if (mapping_planogram_masterGetterSetter.getKEYACCOUNT_ID().size() > 0) { + String table_mapping_planogram = mapping_planogram_masterGetterSetter.getTable_MAPPING_PLANOGRAM(); + if (table_mapping_planogram != null) { + resultHttp = CommonString.KEY_SUCCESS; + TableBean.setMappingPlanogram(table_mapping_planogram); + } + } else { + //return "MAPPING_PLANOGRAM"; + } + data.value = 100; + data.name = "MAPPING_PLANOGRAM Data Download"; + } + publishProgress(data); + + //Gagan end code @@ -645,6 +700,7 @@ public class DownloadActivity extends AppCompatActivity { db.insertNonWorkingData(nonWorkingReasonGetterSetter); db.InsertSTORE_PERFORMANCE(store_performance_masterGetterSetter); + db.InsertMAPPING_PLANOGRAM(mapping_planogram_masterGetterSetter); } catch (MalformedURLException e) { /*final AlertMessage message = new AlertMessage( @@ -704,22 +760,4 @@ public class DownloadActivity extends AppCompatActivity { } } - - public void showAlert(String str) { - - AlertDialog.Builder builder = new AlertDialog.Builder(DownloadActivity.this); - builder.setTitle("Parinaam"); - builder.setMessage(str).setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - - /* Intent i = new Intent(activity, StorelistActivity.class); - activity.startActivity(i); - activity.finish();*/ - - } - }); - AlertDialog alert = builder.create(); - alert.show(); - } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index ca542bb..420c756 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -45,31 +45,27 @@ import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler; public class UploadActivity extends AppCompatActivity { - private Dialog dialog; - private ProgressBar pb; - private TextView percentage, message; GSKOrangeDB db; ArrayList coverageList; - - private FailureGetterSetter failureGetterSetter = null; - private SharedPreferences preferences; String date, userId, app_version; - StoreBean storeData; String datacheck = ""; String[] words; String validity; int mid; - private int factor, k = 0; String errormsg = "", Path; - Data data; - ArrayList msl_availabilityList; ArrayList stock_facingHeaderList, stock_facingChildList; ArrayList promotionSkuList, additionalPromotionList; - ArrayList additionalVisibilityList; + ArrayList additionalVisibilityList; ArrayList additionalVisibilitySkuList; + private Dialog dialog; + private ProgressBar pb; + private TextView percentage, message; + private FailureGetterSetter failureGetterSetter = null; + private SharedPreferences preferences; + private int factor, k = 0; @Override protected void onCreate(Bundle savedInstanceState) { @@ -92,6 +88,85 @@ public class UploadActivity extends AppCompatActivity { new UploadTask(this).execute(); } + public String UploadImage(String path, String folder_name) throws Exception { + errormsg = ""; + BitmapFactory.Options o = new BitmapFactory.Options(); + o.inJustDecodeBounds = true; + BitmapFactory.decodeFile(Path + path, o); + + // The new size we want to scale to + final int REQUIRED_SIZE = 1639; + + // Find the correct scale value. It should be the power of 2. + int width_tmp = o.outWidth, height_tmp = o.outHeight; + int scale = 1; + + while (true) { + if (width_tmp < REQUIRED_SIZE && height_tmp < REQUIRED_SIZE) + break; + width_tmp /= 2; + height_tmp /= 2; + scale *= 2; + } + + // Decode with inSampleSize + BitmapFactory.Options o2 = new BitmapFactory.Options(); + o2.inSampleSize = scale; + Bitmap bitmap = BitmapFactory.decodeFile(Path + path, o2); + + ByteArrayOutputStream bao = new ByteArrayOutputStream(); + bitmap.compress(Bitmap.CompressFormat.JPEG, 90, bao); + byte[] ba = bao.toByteArray(); + String ba1 = Base64.encodeBytes(ba); + + SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_IMAGE); + + String[] split = path.split("/"); + String path1 = split[split.length - 1]; + + request.addProperty("img", ba1); + request.addProperty("name", path1); + request.addProperty("FolderName", folder_name); + + SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope); + + Object result = envelope.getResponse(); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) { + return CommonString.KEY_FALSE; + } + + SAXParserFactory saxPF = SAXParserFactory.newInstance(); + SAXParser saxP = saxPF.newSAXParser(); + XMLReader xmlR = saxP.getXMLReader(); + + // for failure + FailureXMLHandler failureXMLHandler = new FailureXMLHandler(); + xmlR.setContentHandler(failureXMLHandler); + + InputSource is = new InputSource(); + is.setCharacterStream(new StringReader(result.toString())); + xmlR.parse(is); + + failureGetterSetter = failureXMLHandler.getFailureGetterSetter(); + + if (failureGetterSetter.getStatus().equalsIgnoreCase(CommonString.KEY_FAILURE)) { + errormsg = failureGetterSetter.getErrorMsg(); + return CommonString.KEY_FAILURE; + } + } else { + new File(Path + path).delete(); + } + + return result.toString(); + } + class Data { int value; String name; @@ -180,7 +255,7 @@ public class UploadActivity extends AppCompatActivity { HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope); - Object result = (Object) envelope.getResponse(); + Object result = envelope.getResponse(); datacheck = result.toString(); words = datacheck.split("\\;"); @@ -212,6 +287,7 @@ public class UploadActivity extends AppCompatActivity { + "[CATEGORY_ID]" + Integer.parseInt(msl_availabilityList.get(j).getCategory_id()) + "[/CATEGORY_ID]" + "[BRAND_ID]" + Integer.parseInt(msl_availabilityList.get(j).getBrand_id()) + "[/BRAND_ID]" + "[SKU_ID]" + Integer.parseInt(msl_availabilityList.get(j).getSku_id()) + "[/SKU_ID]" + + "[MBQ]" + Integer.parseInt(msl_availabilityList.get(j).getMbq()) + "[/MBQ]" //+ "[SKU]" + msl_availabilityList.get(j).getSku() + "[/SKU]" + "[TOGGLE_VALUE]" + Integer.parseInt(msl_availabilityList.get(j).getToggleValue()) + "[/TOGGLE_VALUE]" + "[/MSL_AVAILABILITY_DATA]"; @@ -235,7 +311,7 @@ public class UploadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; @@ -304,7 +380,7 @@ public class UploadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; @@ -363,7 +439,7 @@ public class UploadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; @@ -422,7 +498,7 @@ public class UploadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; @@ -440,7 +516,7 @@ public class UploadActivity extends AppCompatActivity { data.name = "Additional Promotion Data Uploading"; publishProgress(data); - ////ashish open + ////ashish open //Additional Visibility Data String additional_visibility_data_xml = ""; @@ -452,11 +528,11 @@ public class UploadActivity extends AppCompatActivity { if (additionalVisibilityList.size() > 0) { for (int J = 0; J < additionalVisibilityList.size(); J++) { - String KeyID = additionalVisibilityList.get(J).getKey_id(); + String KeyID = additionalVisibilityList.get(J).getKey_id(); - additionalVisibilitySkuList = db.getDialogStock(KeyID); + additionalVisibilitySkuList = db.getDialogStock(KeyID); - for (int k = 0; k < additionalVisibilitySkuList.size(); k++) { + for (int k = 0; k < additionalVisibilitySkuList.size(); k++) { onXMLdIALOG = "[VISIBILITY_DAILOG]" @@ -478,34 +554,34 @@ public class UploadActivity extends AppCompatActivity { + "[/QUANTITY]" + "[/VISIBILITY_DAILOG]"; - additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG; + additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG; - } + } - onXML = "[ADDITIONAL_VISIBILITY_DATA]" - + "[MID]" + mid + "[/MID]" - + "[USER_ID]" - + userId - + "[/USER_ID]" - + "[KEY_ID]" - + additionalVisibilityList.get(J).getKey_id() - + "[/KEY_ID]" - + "[ADDITIONAL_DISPLAY]" - + additionalVisibilityList.get(J).getBtn_toogle() - + "[/ADDITIONAL_DISPLAY]" - + "[BRAND_ID]" - + additionalVisibilityList.get(J).getBrand_id() - + "[/BRAND_ID]" - + "[IMAGE_URL]" - + additionalVisibilityList.get(J).getImage() - + "[/IMAGE_URL]" - + "[DISPLAY_ID]" - + additionalVisibilityList.get(J).getSku_id() - + "[/DISPLAY_ID]" - + "[SKU_LIST]" - + additional_visibility_dialog_xml - + "[/SKU_LIST]" - + "[/ADDITIONAL_VISIBILITY_DATA]"; + onXML = "[ADDITIONAL_VISIBILITY_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + + userId + + "[/USER_ID]" + + "[KEY_ID]" + + additionalVisibilityList.get(J).getKey_id() + + "[/KEY_ID]" + + "[ADDITIONAL_DISPLAY]" + + additionalVisibilityList.get(J).getBtn_toogle() + + "[/ADDITIONAL_DISPLAY]" + + "[BRAND_ID]" + + additionalVisibilityList.get(J).getBrand_id() + + "[/BRAND_ID]" + + "[IMAGE_URL]" + + additionalVisibilityList.get(J).getImage() + + "[/IMAGE_URL]" + + "[DISPLAY_ID]" + + additionalVisibilityList.get(J).getSku_id() + + "[/DISPLAY_ID]" + + "[SKU_LIST]" + + additional_visibility_dialog_xml + + "[/SKU_LIST]" + + "[/ADDITIONAL_VISIBILITY_DATA]"; additional_visibility_data_xml = additional_visibility_data_xml + onXML; @@ -526,7 +602,7 @@ public class UploadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; @@ -545,13 +621,9 @@ public class UploadActivity extends AppCompatActivity { publishProgress(data); - /////ashish close - - - //Image Upload //Stock Facing Images Upload @@ -626,7 +698,7 @@ public class UploadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_COVERAGE_STATUS, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_COVERAGE_STATUS; @@ -669,83 +741,4 @@ public class UploadActivity extends AppCompatActivity { } } } - - public String UploadImage(String path, String folder_name) throws Exception { - errormsg = ""; - BitmapFactory.Options o = new BitmapFactory.Options(); - o.inJustDecodeBounds = true; - BitmapFactory.decodeFile(Path + path, o); - - // The new size we want to scale to - final int REQUIRED_SIZE = 1639; - - // Find the correct scale value. It should be the power of 2. - int width_tmp = o.outWidth, height_tmp = o.outHeight; - int scale = 1; - - while (true) { - if (width_tmp < REQUIRED_SIZE && height_tmp < REQUIRED_SIZE) - break; - width_tmp /= 2; - height_tmp /= 2; - scale *= 2; - } - - // Decode with inSampleSize - BitmapFactory.Options o2 = new BitmapFactory.Options(); - o2.inSampleSize = scale; - Bitmap bitmap = BitmapFactory.decodeFile(Path + path, o2); - - ByteArrayOutputStream bao = new ByteArrayOutputStream(); - bitmap.compress(Bitmap.CompressFormat.JPEG, 90, bao); - byte[] ba = bao.toByteArray(); - String ba1 = Base64.encodeBytes(ba); - - SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_IMAGE); - - String[] split = path.split("/"); - String path1 = split[split.length - 1]; - - request.addProperty("img", ba1); - request.addProperty("name", path1); - request.addProperty("FolderName", folder_name); - - SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); - envelope.dotNet = true; - envelope.setOutputSoapObject(request); - - HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); - androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope); - - Object result = (Object) envelope.getResponse(); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) { - return CommonString.KEY_FALSE; - } - - SAXParserFactory saxPF = SAXParserFactory.newInstance(); - SAXParser saxP = saxPF.newSAXParser(); - XMLReader xmlR = saxP.getXMLReader(); - - // for failure - FailureXMLHandler failureXMLHandler = new FailureXMLHandler(); - xmlR.setContentHandler(failureXMLHandler); - - InputSource is = new InputSource(); - is.setCharacterStream(new StringReader(result.toString())); - xmlR.parse(is); - - failureGetterSetter = failureXMLHandler.getFailureGetterSetter(); - - if (failureGetterSetter.getStatus().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - errormsg = failureGetterSetter.getErrorMsg(); - return CommonString.KEY_FAILURE; - } - } else { - new File(Path + path).delete(); - } - - return result.toString(); - } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_MasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_MasterGetterSetter.java new file mode 100644 index 0000000..a68788d --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_MasterGetterSetter.java @@ -0,0 +1,65 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +import java.util.ArrayList; + +/** + * Created by gagang on 12-01-2017. + */ + +public class MAPPING_PLANOGRAM_MasterGetterSetter { + String table_MAPPING_PLANOGRAM; + + ArrayList KEYACCOUNT_ID = new ArrayList<>(); + ArrayList STORETYPE_ID = new ArrayList<>(); + ArrayList CLASS_ID = new ArrayList<>(); + ArrayList PLANOGRAM_IMAGE = new ArrayList<>(); + ArrayList IMAGE_PATH = new ArrayList<>(); + + public String getTable_MAPPING_PLANOGRAM() { + return table_MAPPING_PLANOGRAM; + } + + public void setTable_MAPPING_PLANOGRAM(String table_MAPPING_PLANOGRAM) { + this.table_MAPPING_PLANOGRAM = table_MAPPING_PLANOGRAM; + } + + public ArrayList getKEYACCOUNT_ID() { + return KEYACCOUNT_ID; + } + + public void setKEYACCOUNT_ID(String KEYACCOUNT_ID) { + this.KEYACCOUNT_ID.add(KEYACCOUNT_ID); + } + + public ArrayList getSTORETYPE_ID() { + return STORETYPE_ID; + } + + public void setSTORETYPE_ID(String STORETYPE_ID) { + this.STORETYPE_ID.add(STORETYPE_ID); + } + + public ArrayList getCLASS_ID() { + return CLASS_ID; + } + + public void setCLASS_ID(String CLASS_ID) { + this.CLASS_ID.add(CLASS_ID); + } + + public ArrayList getPLANOGRAM_IMAGE() { + return PLANOGRAM_IMAGE; + } + + public void setPLANOGRAM_IMAGE(String PLANOGRAM_IMAGE) { + this.PLANOGRAM_IMAGE.add(PLANOGRAM_IMAGE); + } + + public ArrayList getIMAGE_PATH() { + return IMAGE_PATH; + } + + public void setIMAGE_PATH(String IMAGE_PATH) { + this.IMAGE_PATH.add(IMAGE_PATH); + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java index dedce85..5fb75a8 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java @@ -22,6 +22,7 @@ public class TableBean { //Gagan start code public static String MAPPING_ADDITIONAL_PROMOTION; public static String STORE_PERFORMANCE; + public static String MAPPING_PLANOGRAM; //Gagan end code @@ -139,5 +140,13 @@ public class TableBean { STORE_PERFORMANCE = storePerformance; } + public static String getMappingPlanogram() { + return MAPPING_PLANOGRAM; + } + + public static void setMappingPlanogram(String mappingPlanogram) { + MAPPING_PLANOGRAM = mappingPlanogram; + } + //Gagan end code } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java index 96db1b3..cffad97 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -14,6 +14,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; @@ -670,5 +671,41 @@ public class XMLHandlers { } return st; } + + public static MAPPING_PLANOGRAM_MasterGetterSetter MAPPING_PLANOGRAM_XMLHandler(XmlPullParser xpp, int eventType) { + MAPPING_PLANOGRAM_MasterGetterSetter st = new MAPPING_PLANOGRAM_MasterGetterSetter(); + + try { + while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) { + if (xpp.getEventType() == XmlPullParser.START_TAG) { + + if (xpp.getName().equals("META_DATA")) { + st.setTable_MAPPING_PLANOGRAM(xpp.nextText()); + } + if (xpp.getName().equals("KEYACCOUNT_ID")) { + st.setKEYACCOUNT_ID(xpp.nextText()); + } + if (xpp.getName().equals("STORETYPE_ID")) { + st.setSTORETYPE_ID(xpp.nextText()); + } + if (xpp.getName().equals("CLASS_ID")) { + st.setCLASS_ID(xpp.nextText()); + } + if (xpp.getName().equals("PLANOGRAM_IMAGE")) { + st.setPLANOGRAM_IMAGE(xpp.nextText()); + } + if (xpp.getName().equals("IMAGE_PATH")) { + st.setIMAGE_PATH(xpp.nextText()); + } + } + xpp.next(); + } + } catch (XmlPullParserException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return st; + } //Gagan End Code } From 046b361e8014e7a06e4dfd8096695eff5c6572d1 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 12 Jan 2017 13:21:37 +0530 Subject: [PATCH 15/36] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../dailyentry/T2PComplianceActivity.java | 737 +++++++++--------- .../gskmtorange/upload/UploadActivity.java | 195 +++-- 2 files changed, 461 insertions(+), 471 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 9f1ab57..ab96d1e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -72,14 +72,11 @@ public class T2PComplianceActivity extends AppCompatActivity { RecyclerView rec_t2p; String categoryName, categoryId; - - private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow; - String path = "", str = CommonString.FILE_PATH, _pathforcheck = "", img = ""; int child_position = -1; - String error_msg; + private SharedPreferences preferences; @Override protected void onCreate(Bundle savedInstanceState) { @@ -174,142 +171,6 @@ public class T2PComplianceActivity extends AppCompatActivity { } - - public class T2PAdapter extends RecyclerView.Adapter { - - private ArrayList list; - - public T2PAdapter(ArrayList t2PList) { - list = t2PList; - } - - @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.t2p_item_layout, parent, false); - return new ViewHolder(view); - } - - @Override - public void onBindViewHolder(final ViewHolder holder, final int position) { - - final T2PGetterSetter mItem = list.get(position); - holder.tv_brand.setText(mItem.getBrand()); - holder.tv_display.setText(mItem.getDisplay().trim()); - - //holder.tv_display.setTypeface(FontManager.getTypeface(getApplicationContext(),FontManager.FONTAWESOME)); - - /* Typeface iconFont = FontManager.getTypeface(getApplicationContext(), FontManager.FONTAWESOME); - FontManager.markAsIconContainer(findViewById(R.id.icons_container), iconFont); -*/ - holder.btn_gaps.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - - showGapsDialog(mItem); - - } - }); - - holder.toggle_btn.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - - mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")); - - t2PAdapter.notifyDataSetChanged(); - } - }); - - - holder.btn_sku.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - showSkuDialog(mItem.getSkulist()); - } - }); - - if (!img.equalsIgnoreCase("")) { - if (position == child_position) { - mItem.setImage(img); - img = ""; - } - } - - if(camera_allow.equals("1")){ - - holder.img_cam.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; - child_position = position; - path = str + _pathforcheck; - - startCameraActivity(); - } - }); - - if (mItem.getImage().equals("")) { - holder.img_cam.setBackgroundResource(R.mipmap.camera_orange); - } else { - holder.img_cam.setBackgroundResource(R.mipmap.camera_green); - } - } - else { - holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); - } - - - holder.toggle_btn.setChecked(mItem.isPresent()); - - if (mItem.getGapsChecklist().size() > 0) { - holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.green)); - } else { - holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); - } - - if (mItem.getSkulist().size() > 0) { - holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green)); - } else { - holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); - } - - } - - @Override - public int getItemCount() { - return list.size(); - } - - public class ViewHolder extends RecyclerView.ViewHolder { - public final View mView; - public final LinearLayout parentLayout; - public final TextView tv_brand, tv_display; - public final ImageView img_cam, img_remark; - public final Button btn_gaps, btn_sku, btn_ref_img; - public final ToggleButton toggle_btn; - - - public ViewHolder(View view) { - super(view); - - mView = view; - - tv_brand = (TextView) mView.findViewById(R.id.tv_brand); - tv_display = (TextView) mView.findViewById(R.id.tv_display); - img_cam = (ImageView) mView.findViewById(R.id.img_cam); - img_remark = (ImageView) mView.findViewById(R.id.img_remark); - btn_gaps = (Button) mView.findViewById(R.id.btn_gaps); - btn_sku = (Button) mView.findViewById(R.id.btn_sku); - btn_ref_img = (Button) mView.findViewById(R.id.btn_ref_image); - parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout); - toggle_btn = (ToggleButton) mView.findViewById(R.id.toggle_btn); - - } - - } - } - public void showGapsDialog(final T2PGetterSetter t2p) { final ArrayList gapsChecklist; @@ -504,191 +365,6 @@ public class T2PComplianceActivity extends AppCompatActivity { } - public class GapsAdapter extends RecyclerView.Adapter { - - private ArrayList list; - - public GapsAdapter(ArrayList gapsPList) { - list = gapsPList; - } - - @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.gap_checklist_item, parent, false); - return new ViewHolder(view); - } - - @Override - public void onBindViewHolder(final ViewHolder holder, int position) { - - final GapsChecklistGetterSetter mItem = list.get(position); - holder.tv_checklist.setText(mItem.getChecklist()); - - holder.tb_present.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - - mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")); - - } - }); - - holder.tb_present.setChecked(mItem.isPresent()); - - } - - @Override - public int getItemCount() { - return list.size(); - } - - public class ViewHolder extends RecyclerView.ViewHolder { - public final View mView; - public final LinearLayout parentLayout; - public final TextView tv_checklist; - public final ToggleButton tb_present; - - - public ViewHolder(View view) { - super(view); - - mView = view; - - tv_checklist = (TextView) mView.findViewById(R.id.tv_checklist); - tb_present = (ToggleButton) mView.findViewById(R.id.btn_is_present); - parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout); - - } - - } - } - - - public class CustomAdapter extends ArrayAdapter { - - private Activity activity; - private ArrayList data; - BrandMasterGetterSetter tempValues = null; - LayoutInflater inflater; - - /************* - * CustomAdapter Constructor - *****************/ - public CustomAdapter( - T2PComplianceActivity activitySpinner, - int textViewResourceId, - ArrayList objects - - ) { - super(activitySpinner, textViewResourceId, objects); - - /********** Take passed values **********/ - activity = activitySpinner; - data = objects; - /*********** Layout inflator to call external xml layout () **********************/ - inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - - } - - @Override - public View getDropDownView(int position, View convertView, ViewGroup parent) { - return getCustomView(position, convertView, parent); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - return getCustomView(position, convertView, parent); - } - - // This funtion called for each row ( Called data.size() times ) - public View getCustomView(int position, View convertView, ViewGroup parent) { - - /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/ - View row = inflater.inflate(R.layout.custom_spinner_item, parent, false); - - /***** Get each Model object from Arraylist ********/ - tempValues = null; - tempValues = (BrandMasterGetterSetter) data.get(position); - - TextView label = (TextView) row.findViewById(R.id.tv_text); - - if (position == 0) { - - // Default selected Spinner item - label.setText("Select"); - //sub.setText(""); - } else { - // Set values for spinner each row - label.setText(tempValues.getBRAND().get(0)); - } - - return row; - } - } - - public class CustomSkuAdapter extends ArrayAdapter { - - private Activity activity; - private ArrayList data; - SkuGetterSetter tempValues = null; - LayoutInflater inflater; - - /************* - * CustomAdapter Constructor - *****************/ - public CustomSkuAdapter( - T2PComplianceActivity activitySpinner, - int textViewResourceId, - ArrayList objects - - ) { - super(activitySpinner, textViewResourceId, objects); - - /********** Take passed values **********/ - activity = activitySpinner; - data = objects; - /*********** Layout inflator to call external xml layout () **********************/ - inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - - } - - @Override - public View getDropDownView(int position, View convertView, ViewGroup parent) { - return getCustomView(position, convertView, parent); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - return getCustomView(position, convertView, parent); - } - - // This funtion called for each row ( Called data.size() times ) - public View getCustomView(int position, View convertView, ViewGroup parent) { - - /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/ - View row = inflater.inflate(R.layout.custom_spinner_item, parent, false); - - /***** Get each Model object from Arraylist ********/ - tempValues = null; - tempValues = (SkuGetterSetter) data.get(position); - - TextView label = (TextView) row.findViewById(R.id.tv_text); - - if (position == 0) { - - // Default selected Spinner item - label.setText("Select"); - //sub.setText(""); - } else { - // Set values for spinner each row - label.setText(tempValues.getSKU()); - } - - return row; - } - } - @Override public boolean onOptionsItemSelected(MenuItem item) { // Handle action bar item clicks here. The action bar will @@ -794,6 +470,371 @@ public class T2PComplianceActivity extends AppCompatActivity { super.onActivityResult(requestCode, resultCode, data); } + public boolean isValid() { + boolean flag = true; + + for (int i = 0; i < t2PGetterSetters.size(); i++) { + + if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) { + flag = false; + error_msg = getResources().getString(R.string.click_image); + break; + } else if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) { + flag = false; + error_msg = getResources().getString(R.string.fill_gaps_data); + break; + } else if (t2PGetterSetters.get(i).getSkulist().size() == 0) { + flag = false; + error_msg = getResources().getString(R.string.fill_sku_data); + break; + } + } + + return flag; + } + + @Override + public void onBackPressed() { + //super.onBackPressed(); + + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(T2PComplianceActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + finish(); + } + }) + .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } + + public class T2PAdapter extends RecyclerView.Adapter { + + private ArrayList list; + + public T2PAdapter(ArrayList t2PList) { + list = t2PList; + } + + @Override + public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.t2p_item_layout, parent, false); + return new ViewHolder(view); + } + + @Override + public void onBindViewHolder(final ViewHolder holder, final int position) { + + final T2PGetterSetter mItem = list.get(position); + holder.tv_brand.setText(mItem.getBrand()); + holder.tv_display.setText(mItem.getDisplay().trim()); + + //holder.tv_display.setTypeface(FontManager.getTypeface(getApplicationContext(),FontManager.FONTAWESOME)); + + /* Typeface iconFont = FontManager.getTypeface(getApplicationContext(), FontManager.FONTAWESOME); + FontManager.markAsIconContainer(findViewById(R.id.icons_container), iconFont); +*/ + holder.btn_gaps.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + showGapsDialog(mItem); + + } + }); + + holder.toggle_btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")); + + t2PAdapter.notifyDataSetChanged(); + } + }); + + + holder.btn_sku.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + showSkuDialog(mItem.getSkulist()); + } + }); + + if (!img.equalsIgnoreCase("")) { + if (position == child_position) { + mItem.setImage(img); + img = ""; + } + } + + if(camera_allow.equals("1")){ + + holder.img_cam.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + child_position = position; + path = str + _pathforcheck; + + startCameraActivity(); + } + }); + + if (mItem.getImage().equals("")) { + holder.img_cam.setBackgroundResource(R.mipmap.camera_orange); + } else { + holder.img_cam.setBackgroundResource(R.mipmap.camera_green); + } + } + else { + holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); + } + + + holder.toggle_btn.setChecked(mItem.isPresent()); + + if (mItem.getGapsChecklist().size() > 0) { + holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.green)); + } else { + holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + } + + if (mItem.getSkulist().size() > 0) { + holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green)); + } else { + holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + } + + } + + @Override + public int getItemCount() { + return list.size(); + } + + public class ViewHolder extends RecyclerView.ViewHolder { + public final View mView; + public final LinearLayout parentLayout; + public final TextView tv_brand, tv_display; + public final ImageView img_cam, img_remark; + public final Button btn_gaps, btn_sku, btn_ref_img; + public final ToggleButton toggle_btn; + + + public ViewHolder(View view) { + super(view); + + mView = view; + + tv_brand = (TextView) mView.findViewById(R.id.tv_brand); + tv_display = (TextView) mView.findViewById(R.id.tv_display); + img_cam = (ImageView) mView.findViewById(R.id.img_cam); + img_remark = (ImageView) mView.findViewById(R.id.img_remark); + btn_gaps = (Button) mView.findViewById(R.id.btn_gaps); + btn_sku = (Button) mView.findViewById(R.id.btn_sku); + btn_ref_img = (Button) mView.findViewById(R.id.btn_ref_image); + parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout); + toggle_btn = (ToggleButton) mView.findViewById(R.id.toggle_btn); + + } + + } + } + + public class GapsAdapter extends RecyclerView.Adapter { + + private ArrayList list; + + public GapsAdapter(ArrayList gapsPList) { + list = gapsPList; + } + + @Override + public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.gap_checklist_item, parent, false); + return new ViewHolder(view); + } + + @Override + public void onBindViewHolder(final ViewHolder holder, int position) { + + final GapsChecklistGetterSetter mItem = list.get(position); + holder.tv_checklist.setText(mItem.getChecklist()); + + holder.tb_present.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")); + + } + }); + + holder.tb_present.setChecked(mItem.isPresent()); + + } + + @Override + public int getItemCount() { + return list.size(); + } + + public class ViewHolder extends RecyclerView.ViewHolder { + public final View mView; + public final LinearLayout parentLayout; + public final TextView tv_checklist; + public final ToggleButton tb_present; + + + public ViewHolder(View view) { + super(view); + + mView = view; + + tv_checklist = (TextView) mView.findViewById(R.id.tv_checklist); + tb_present = (ToggleButton) mView.findViewById(R.id.btn_is_present); + parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout); + + } + + } + } + + public class CustomAdapter extends ArrayAdapter { + + BrandMasterGetterSetter tempValues = null; + LayoutInflater inflater; + private Activity activity; + private ArrayList data; + + /************* + * CustomAdapter Constructor + *****************/ + public CustomAdapter( + T2PComplianceActivity activitySpinner, + int textViewResourceId, + ArrayList objects + + ) { + super(activitySpinner, textViewResourceId, objects); + + /********** Take passed values **********/ + activity = activitySpinner; + data = objects; + /*********** Layout inflator to call external xml layout () **********************/ + inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + + } + + @Override + public View getDropDownView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + // This funtion called for each row ( Called data.size() times ) + public View getCustomView(int position, View convertView, ViewGroup parent) { + + /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/ + View row = inflater.inflate(R.layout.custom_spinner_item, parent, false); + + /***** Get each Model object from Arraylist ********/ + tempValues = null; + tempValues = (BrandMasterGetterSetter) data.get(position); + + TextView label = (TextView) row.findViewById(R.id.tv_text); + + if (position == 0) { + + // Default selected Spinner item + label.setText("Select"); + //sub.setText(""); + } else { + // Set values for spinner each row + label.setText(tempValues.getBRAND().get(0)); + } + + return row; + } + } + + public class CustomSkuAdapter extends ArrayAdapter { + + SkuGetterSetter tempValues = null; + LayoutInflater inflater; + private Activity activity; + private ArrayList data; + + /************* + * CustomAdapter Constructor + *****************/ + public CustomSkuAdapter( + T2PComplianceActivity activitySpinner, + int textViewResourceId, + ArrayList objects + + ) { + super(activitySpinner, textViewResourceId, objects); + + /********** Take passed values **********/ + activity = activitySpinner; + data = objects; + /*********** Layout inflator to call external xml layout () **********************/ + inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + + } + + @Override + public View getDropDownView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + // This funtion called for each row ( Called data.size() times ) + public View getCustomView(int position, View convertView, ViewGroup parent) { + + /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/ + View row = inflater.inflate(R.layout.custom_spinner_item, parent, false); + + /***** Get each Model object from Arraylist ********/ + tempValues = null; + tempValues = (SkuGetterSetter) data.get(position); + + TextView label = (TextView) row.findViewById(R.id.tv_text); + + if (position == 0) { + + // Default selected Spinner item + label.setText("Select"); + //sub.setText(""); + } else { + // Set values for spinner each row + label.setText(tempValues.getSKU()); + } + + return row; + } + } + public class SkuAddedAdapter extends RecyclerView.Adapter { private ArrayList list; @@ -843,50 +884,4 @@ public class T2PComplianceActivity extends AppCompatActivity { } } - - public boolean isValid() { - boolean flag = true; - - for (int i = 0; i < t2PGetterSetters.size(); i++) { - - if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) { - flag = false; - error_msg = getResources().getString(R.string.click_image); - break; - } else if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) { - flag = false; - error_msg = getResources().getString(R.string.fill_gaps_data); - break; - } else if (t2PGetterSetters.get(i).getSkulist().size() == 0) { - flag = false; - error_msg = getResources().getString(R.string.fill_sku_data); - break; - } - } - - return flag; - } - - @Override - public void onBackPressed() { - //super.onBackPressed(); - - android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(T2PComplianceActivity.this); - builder.setTitle("Parinaam"); - builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - - finish(); - } - }) - .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - - } - }); - android.app.AlertDialog alert = builder.create(); - alert.show(); - } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index b1a29e7..1cc5548 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -48,33 +48,28 @@ import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler; public class UploadActivity extends AppCompatActivity { - private Dialog dialog; - private ProgressBar pb; - private TextView percentage, message; GSKOrangeDB db; ArrayList coverageList; - - private FailureGetterSetter failureGetterSetter = null; - private SharedPreferences preferences; String date, userId, app_version; - StoreBean storeData; String datacheck = ""; String[] words; String validity; int mid; - private int factor, k = 0; String errormsg = "", Path; - Data data; - ArrayList msl_availabilityList; ArrayList stock_facingHeaderList, stock_facingChildList; ArrayList promotionSkuList, additionalPromotionList; ArrayList t2PGetterSetters; ArrayList additionalVisibilityList; ArrayList additionalVisibilitySkuList; - + private Dialog dialog; + private ProgressBar pb; + private TextView percentage, message; + private FailureGetterSetter failureGetterSetter = null; + private SharedPreferences preferences; + private int factor, k = 0; @Override protected void onCreate(Bundle savedInstanceState) { @@ -97,6 +92,85 @@ public class UploadActivity extends AppCompatActivity { new UploadTask(this).execute(); } + public String UploadImage(String path, String folder_name) throws Exception { + errormsg = ""; + BitmapFactory.Options o = new BitmapFactory.Options(); + o.inJustDecodeBounds = true; + BitmapFactory.decodeFile(Path + path, o); + + // The new size we want to scale to + final int REQUIRED_SIZE = 1639; + + // Find the correct scale value. It should be the power of 2. + int width_tmp = o.outWidth, height_tmp = o.outHeight; + int scale = 1; + + while (true) { + if (width_tmp < REQUIRED_SIZE && height_tmp < REQUIRED_SIZE) + break; + width_tmp /= 2; + height_tmp /= 2; + scale *= 2; + } + + // Decode with inSampleSize + BitmapFactory.Options o2 = new BitmapFactory.Options(); + o2.inSampleSize = scale; + Bitmap bitmap = BitmapFactory.decodeFile(Path + path, o2); + + ByteArrayOutputStream bao = new ByteArrayOutputStream(); + bitmap.compress(Bitmap.CompressFormat.JPEG, 90, bao); + byte[] ba = bao.toByteArray(); + String ba1 = Base64.encodeBytes(ba); + + SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_IMAGE); + + String[] split = path.split("/"); + String path1 = split[split.length - 1]; + + request.addProperty("img", ba1); + request.addProperty("name", path1); + request.addProperty("FolderName", folder_name); + + SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope); + + Object result = envelope.getResponse(); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) { + return CommonString.KEY_FALSE; + } + + SAXParserFactory saxPF = SAXParserFactory.newInstance(); + SAXParser saxP = saxPF.newSAXParser(); + XMLReader xmlR = saxP.getXMLReader(); + + // for failure + FailureXMLHandler failureXMLHandler = new FailureXMLHandler(); + xmlR.setContentHandler(failureXMLHandler); + + InputSource is = new InputSource(); + is.setCharacterStream(new StringReader(result.toString())); + xmlR.parse(is); + + failureGetterSetter = failureXMLHandler.getFailureGetterSetter(); + + if (failureGetterSetter.getStatus().equalsIgnoreCase(CommonString.KEY_FAILURE)) { + errormsg = failureGetterSetter.getErrorMsg(); + return CommonString.KEY_FAILURE; + } + } else { + new File(Path + path).delete(); + } + + return result.toString(); + } + class Data { int value; String name; @@ -185,7 +259,7 @@ public class UploadActivity extends AppCompatActivity { HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope); - Object result = (Object) envelope.getResponse(); + Object result = envelope.getResponse(); datacheck = result.toString(); words = datacheck.split("\\;"); @@ -240,7 +314,7 @@ public class UploadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; @@ -309,7 +383,7 @@ public class UploadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; @@ -368,7 +442,7 @@ public class UploadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; @@ -427,7 +501,7 @@ public class UploadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; @@ -532,7 +606,7 @@ public class UploadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; @@ -547,7 +621,7 @@ public class UploadActivity extends AppCompatActivity { } } - + data.value = 35; data.name = "Additional Visibility Data"; publishProgress(data); @@ -666,7 +740,7 @@ public class UploadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; @@ -680,7 +754,7 @@ public class UploadActivity extends AppCompatActivity { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; } } - + data.value = 40; data.name = "T2P Data Uploading"; publishProgress(data); @@ -759,7 +833,7 @@ public class UploadActivity extends AppCompatActivity { androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_COVERAGE_STATUS, envelope); - result = (Object) envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_COVERAGE_STATUS; @@ -802,83 +876,4 @@ public class UploadActivity extends AppCompatActivity { } } } - - public String UploadImage(String path, String folder_name) throws Exception { - errormsg = ""; - BitmapFactory.Options o = new BitmapFactory.Options(); - o.inJustDecodeBounds = true; - BitmapFactory.decodeFile(Path + path, o); - - // The new size we want to scale to - final int REQUIRED_SIZE = 1639; - - // Find the correct scale value. It should be the power of 2. - int width_tmp = o.outWidth, height_tmp = o.outHeight; - int scale = 1; - - while (true) { - if (width_tmp < REQUIRED_SIZE && height_tmp < REQUIRED_SIZE) - break; - width_tmp /= 2; - height_tmp /= 2; - scale *= 2; - } - - // Decode with inSampleSize - BitmapFactory.Options o2 = new BitmapFactory.Options(); - o2.inSampleSize = scale; - Bitmap bitmap = BitmapFactory.decodeFile(Path + path, o2); - - ByteArrayOutputStream bao = new ByteArrayOutputStream(); - bitmap.compress(Bitmap.CompressFormat.JPEG, 90, bao); - byte[] ba = bao.toByteArray(); - String ba1 = Base64.encodeBytes(ba); - - SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_IMAGE); - - String[] split = path.split("/"); - String path1 = split[split.length - 1]; - - request.addProperty("img", ba1); - request.addProperty("name", path1); - request.addProperty("FolderName", folder_name); - - SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); - envelope.dotNet = true; - envelope.setOutputSoapObject(request); - - HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); - androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope); - - Object result = (Object) envelope.getResponse(); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) { - return CommonString.KEY_FALSE; - } - - SAXParserFactory saxPF = SAXParserFactory.newInstance(); - SAXParser saxP = saxPF.newSAXParser(); - XMLReader xmlR = saxP.getXMLReader(); - - // for failure - FailureXMLHandler failureXMLHandler = new FailureXMLHandler(); - xmlR.setContentHandler(failureXMLHandler); - - InputSource is = new InputSource(); - is.setCharacterStream(new StringReader(result.toString())); - xmlR.parse(is); - - failureGetterSetter = failureXMLHandler.getFailureGetterSetter(); - - if (failureGetterSetter.getStatus().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - errormsg = failureGetterSetter.getErrorMsg(); - return CommonString.KEY_FAILURE; - } - } else { - new File(Path + path).delete(); - } - - return result.toString(); - } } From 11455f77024df7242f6568441fd32e6d12c692f5 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 12 Jan 2017 13:22:38 +0530 Subject: [PATCH 16/36] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index 1cc5548..41b1005 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -291,6 +291,7 @@ public class UploadActivity extends AppCompatActivity { + "[CATEGORY_ID]" + Integer.parseInt(msl_availabilityList.get(j).getCategory_id()) + "[/CATEGORY_ID]" + "[BRAND_ID]" + Integer.parseInt(msl_availabilityList.get(j).getBrand_id()) + "[/BRAND_ID]" + "[SKU_ID]" + Integer.parseInt(msl_availabilityList.get(j).getSku_id()) + "[/SKU_ID]" + + "[MBQ]" + Integer.parseInt(msl_availabilityList.get(j).getMbq()) + "[/MBQ]" //+ "[SKU]" + msl_availabilityList.get(j).getSku() + "[/SKU]" + "[TOGGLE_VALUE]" + Integer.parseInt(msl_availabilityList.get(j).getToggleValue()) + "[/TOGGLE_VALUE]" + "[/MSL_AVAILABILITY_DATA]"; From 1c48f2f8ad11402ec7d29c863ab89d5ba15850f2 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 12 Jan 2017 17:04:24 +0530 Subject: [PATCH 17/36] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../com/gskmtorange/Database/GSKOrangeDB.java | 2 +- .../gsk_dailyentry/CategoryListActivity.java | 69 +- .../gsk_dailyentry/DailyDataMenuActivity.java | 61 +- .../MSL_AvailabilityActivity.java | 45 +- .../gsk_dailyentry/Stock_FacingActivity.java | 668 ++++++++++-------- .../layout/item_msl_availability_child.xml | 4 +- .../res/layout/item_stock_facing_header.xml | 40 +- .../res/layout/planogram_dialog_layout.xml | 66 ++ GSKMTOrange/src/main/res/menu/planogram.xml | 10 + .../src/main/res/mipmap-hdpi/cancel.png | Bin 0 -> 995 bytes GSKMTOrange/src/main/res/values-tr/string.xml | 6 +- GSKMTOrange/src/main/res/values/strings.xml | 4 + 12 files changed, 559 insertions(+), 416 deletions(-) create mode 100644 GSKMTOrange/src/main/res/layout/planogram_dialog_layout.xml create mode 100644 GSKMTOrange/src/main/res/menu/planogram.xml create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/cancel.png diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index d91acb0..b38031b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -1672,7 +1672,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " + - "where VISIT_DATE ='" + date + "' AND STORE_ID'=" + store_id + "'", null); + "where VISIT_DATE ='" + date + "' AND STORE_ID='" + store_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index 0b6a11d..a4a887f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -37,9 +37,8 @@ public class CategoryListActivity extends AppCompatActivity { CategoryListAdapter adapter; GSKOrangeDB db; - - private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + private SharedPreferences preferences; @Override protected void onCreate(Bundle savedInstanceState) { @@ -93,10 +92,36 @@ public class CategoryListActivity extends AppCompatActivity { recyclerView.setLayoutManager(new GridLayoutManager(getApplicationContext(), 2)); } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + if (id == android.R.id.home) { + finish(); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + public class CategoryListAdapter extends RecyclerView.Adapter { - private LayoutInflater inflator; List list = Collections.emptyList(); Context context; + private LayoutInflater inflator; public CategoryListAdapter(CategoryListActivity context, List list) { inflator = LayoutInflater.from(context); @@ -123,19 +148,19 @@ public class CategoryListActivity extends AppCompatActivity { && db.checkStockAndFacingData(store_id, categoryData.getCategory_id()) && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) { - holder.categoryIcon.setImageResource(R.drawable.ohc_done); + holder.categoryIcon.setImageResource(R.mipmap.oralcare_tick); } else { - holder.categoryIcon.setImageResource(R.drawable.ohc); + holder.categoryIcon.setImageResource(R.mipmap.oral_care); } } else if (categoryData.getCategory().equalsIgnoreCase("Wellness")) { if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id()) && db.checkStockAndFacingData(store_id, categoryData.getCategory_id()) && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) { - holder.categoryIcon.setImageResource(R.drawable.pdr_done); + holder.categoryIcon.setImageResource(R.mipmap.wellness_tick); } else { - holder.categoryIcon.setImageResource(R.drawable.pdr); + holder.categoryIcon.setImageResource(R.mipmap.wellness); } } else if (categoryData.getCategory().equalsIgnoreCase("Nutritionals")) { @@ -143,9 +168,9 @@ public class CategoryListActivity extends AppCompatActivity { && db.checkStockAndFacingData(store_id, categoryData.getCategory_id()) && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) { - holder.categoryIcon.setImageResource(R.drawable.hfd_done); + holder.categoryIcon.setImageResource(R.mipmap.nutritionals_tick); } else { - holder.categoryIcon.setImageResource(R.drawable.hfd); + holder.categoryIcon.setImageResource(R.mipmap.nutritionals); } } @@ -179,30 +204,4 @@ public class CategoryListActivity extends AppCompatActivity { } } } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - if (id == android.R.id.home) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java index 6593bf8..b055e81 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java @@ -37,9 +37,8 @@ public class DailyDataMenuActivity extends AppCompatActivity { GSKOrangeDB db; String categoryName = "", categoryId; - - private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + private SharedPreferences preferences; @Override protected void onCreate(Bundle savedInstanceState) { @@ -110,9 +109,9 @@ public class DailyDataMenuActivity extends AppCompatActivity { //data.setCategory_name("Stock & Facing"); data.setCategory_name(getResources().getString(R.string.daily_data_menu_stock_facing)); if (db.checkStockAndFacingData(store_id, categoryId)) { - data.setCategory_img(R.mipmap.stock_and_facing_done); + data.setCategory_img(R.mipmap.stock_facing_done); } else { - data.setCategory_img(R.mipmap.stock_and_facing); + data.setCategory_img(R.mipmap.stock_facing); } categoryList.add(data); @@ -159,10 +158,36 @@ public class DailyDataMenuActivity extends AppCompatActivity { } } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + if (id == android.R.id.home) { + finish(); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + public class DailyDataMenuAdapter extends RecyclerView.Adapter { - private LayoutInflater inflator; List list = Collections.emptyList(); Context context; + private LayoutInflater inflator; public DailyDataMenuAdapter(Context context, List list) { inflator = LayoutInflater.from(context); @@ -232,31 +257,5 @@ public class DailyDataMenuActivity extends AppCompatActivity { } } } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - if (id == android.R.id.home) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index 7513fe0..02c615f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -54,9 +54,8 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { GSKOrangeDB db; String categoryName, categoryId, storeId; - - private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + private SharedPreferences preferences; @Override protected void onCreate(Bundle savedInstanceState) { @@ -248,6 +247,25 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { } } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + if (id == android.R.id.home) { + finish(); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + public class ExpandableListAdapter extends BaseExpandableListAdapter { private Context _context; private List _listDataHeader; @@ -362,8 +380,8 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { holder.txt_mbq = (TextView) convertView.findViewById(R.id.txt_mbq); holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available); - holder.toggle_available.setTextOff("No"); - holder.toggle_available.setTextOn("Yes"); + /*holder.toggle_available.setTextOff("No"); + holder.toggle_available.setTextOn("Yes");*/ convertView.setTag(holder); } else { @@ -418,23 +436,4 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { ToggleButton toggle_available; LinearLayout lin_category; } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - if (id == android.R.id.home) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index d83dde1..c1f991e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -1,6 +1,7 @@ package cpm.com.gskmtorange.gsk_dailyentry; import android.app.AlertDialog; +import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -8,7 +9,11 @@ import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Color; import android.graphics.Typeface; +import android.graphics.drawable.ColorDrawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -22,12 +27,16 @@ import android.support.v7.widget.CardView; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; +import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import android.widget.AbsListView; import android.widget.BaseExpandableListAdapter; +import android.widget.Button; import android.widget.EditText; import android.widget.ExpandableListView; import android.widget.ImageView; @@ -48,31 +57,27 @@ import java.util.List; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; +import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; public class Stock_FacingActivity extends AppCompatActivity { + static int child_position = -1; ExpandableListView expandableListView; TextView txt_stockFacingName; - ArrayList headerDataList; ArrayList childDataList; List hashMapListHeaderData; HashMap> hashMapListChildData; List checkHeaderArray = new ArrayList<>(); - ExpandableListAdapter adapter; GSKOrangeDB db; - String categoryName, categoryId, Error_Message = ""; - String path = "", str = "", _pathforcheck = "", img1 = "", img2 = ""; - static int child_position = -1; boolean isDialogOpen = true; boolean checkflag = true; - - private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow; + private SharedPreferences preferences; @Override protected void onCreate(Bundle savedInstanceState) { @@ -270,308 +275,6 @@ public class Stock_FacingActivity extends AppCompatActivity { } } - public class ExpandableListAdapter extends BaseExpandableListAdapter { - private Context _context; - private List _listDataHeader; - private HashMap> _listDataChild; - - public ExpandableListAdapter(Context context, List listDataHeader, - HashMap> listChildData) { - this._context = context; - this._listDataHeader = listDataHeader; - this._listDataChild = listChildData; - } - - @Override - public Object getGroup(int groupPosition) { - return this._listDataHeader.get(groupPosition); - } - - @Override - public int getGroupCount() { - return this._listDataHeader.size(); - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - final Stock_FacingGetterSetter headerTitle = (Stock_FacingGetterSetter) getGroup(groupPosition); - - if (convertView == null) { - LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - convertView = infalInflater.inflate(R.layout.item_stock_facing_header, null, false); - } - - TextView txt_stockFaceupHeader = (TextView) convertView.findViewById(R.id.txt_stockFaceupHeader); - LinearLayout lin_stockFaceupHeader = (LinearLayout) convertView.findViewById(R.id.lin_stockFaceupHeader); - ImageView img_reference = (ImageView) convertView.findViewById(R.id.img_reference); - ImageView img_camera1 = (ImageView) convertView.findViewById(R.id.img_camera1); - ImageView img_camera2 = (ImageView) convertView.findViewById(R.id.img_camera2); - ImageView img_edit = (ImageView) convertView.findViewById(R.id.img_edit); - - txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD); - txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand()); - - if (headerTitle.getCompany_id().equals("1")) { - txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); - } else { - txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black)); - } - - //Camera allow enable - if (camera_allow.equalsIgnoreCase("1")) { - - img_camera1.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //String date = new Date().toLocaleString().toString(); - //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); - - _pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; - child_position = groupPosition; - path = str + _pathforcheck; - - startCameraActivity1(groupPosition); - } - }); - - if (!img1.equalsIgnoreCase("")) { - if (groupPosition == child_position) { - headerTitle.setImage1(img1); - img1 = ""; - } - } - - if (headerTitle.getImage1().equals("")) { - img_camera1.setBackgroundResource(R.mipmap.camera); - } else { - img_camera1.setBackgroundResource(R.mipmap.camera_done); - } - - - img_camera2.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //String date = new Date().toLocaleString().toString(); - //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); - - _pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; - child_position = groupPosition; - path = str + _pathforcheck; - - startCameraActivity2(groupPosition); - } - }); - - if (!img2.equalsIgnoreCase("")) { - if (groupPosition == child_position) { - headerTitle.setImage2(img2); - img2 = ""; - } - } - - if (headerTitle.getImage2().equals("")) { - img_camera2.setBackgroundResource(R.mipmap.camera); - } else { - img_camera2.setBackgroundResource(R.mipmap.camera_done); - } - } else { - //Camera allow disable - img_camera1.setBackgroundResource(R.mipmap.camera); - img_camera2.setBackgroundResource(R.mipmap.camera); - } - - if (!checkflag) { - if (checkHeaderArray.contains(groupPosition)) { - txt_stockFaceupHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark)); - } else { - txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black)); - } - } - - return convertView; - } - - @Override - public Object getChild(int groupPosition, int childPosititon) { - return this._listDataChild.get(this._listDataHeader.get(groupPosition)).get(childPosititon); - } - - @Override - public int getChildrenCount(int groupPosition) { - return this._listDataChild.get(this._listDataHeader.get(groupPosition)).size(); - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild, - View convertView, ViewGroup parent) { - final Stock_FacingGetterSetter childData = (Stock_FacingGetterSetter) getChild(groupPosition, childPosition); - ViewHolder holder = null; - - if (convertView == null) { - LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - convertView = infalInflater.inflate(R.layout.item_stock_facing_child, null, false); - - holder = new ViewHolder(); - holder.cardView = (CardView) convertView.findViewById(R.id.card_view); - holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category); - - holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName); - holder.ed_stock = (EditText) convertView.findViewById(R.id.ed_stock); - holder.ed_facing = (EditText) convertView.findViewById(R.id.ed_facing); - convertView.setTag(holder); - } else { - holder = (ViewHolder) convertView.getTag(); - } - - holder.txt_skuName.setText(childData.getSku()); - - if (childData.getCompany_id().equals("1")) { - holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); - } else { - holder.txt_skuName.setTextColor(getResources().getColor(R.color.black)); - } - - - if (childData.getStock().equals("0")) { - holder.ed_facing.setEnabled(false); - } else { - holder.ed_facing.setEnabled(true); - } - - final ViewHolder finalHolder = holder; - holder.ed_stock.setOnFocusChangeListener(new View.OnFocusChangeListener() { - @Override - public void onFocusChange(View v, boolean hasFocus) { - - final EditText caption = (EditText) v; - String edStock = caption.getText().toString(); - - if (!edStock.equals("")) { - String stock = edStock.replaceFirst("^0+(?!$)", ""); - childData.setStock(stock); - - if (edStock.equals("0")) { - childData.setFacing("0"); - - finalHolder.ed_facing.setEnabled(false); - } else { - childData.setFacing(childData.getFacing()); - finalHolder.ed_facing.setEnabled(true); - } - } else { - childData.setStock(""); - finalHolder.ed_facing.setEnabled(true); - } - } - }); - - holder.ed_stock.setText(childData.getStock()); - - holder.ed_facing.setOnFocusChangeListener(new View.OnFocusChangeListener() { - @Override - public void onFocusChange(View v, boolean hasFocus) { - final EditText caption = (EditText) v; - final String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", ""); - - if (!childData.getStock().equals("")) { - if (!edFaceup.equals("")) { - if (Integer.parseInt(edFaceup) <= Integer.parseInt(childData.getStock())) { - childData.setFacing(edFaceup); - } else { - if (isDialogOpen) { - isDialogOpen = !isDialogOpen; - AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); - builder.setMessage("Faceup can not be greater than stock value") - .setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.dismiss(); - isDialogOpen = !isDialogOpen; - } - }); - AlertDialog alert = builder.create(); - alert.show(); - } - } - } else { - childData.setFacing(""); - } - } else { - if (isDialogOpen) { - isDialogOpen = !isDialogOpen; - AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); - builder.setMessage("First fill the stock value") - .setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.dismiss(); - isDialogOpen = !isDialogOpen; - } - }); - AlertDialog alert = builder.create(); - alert.show(); - } - } - } - }); - - holder.ed_facing.setText(childData.getFacing()); - - if (!checkflag) { - boolean tempflag = false; - - if (holder.ed_stock.getText().toString().equals("")) { - holder.ed_stock.setBackgroundColor(getResources().getColor(R.color.white)); - holder.ed_stock.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark)); - holder.ed_stock.setHint("Empty"); - tempflag = true; - } - - if (holder.ed_facing.getText().toString().equals("")) { - holder.ed_facing.setBackgroundColor(getResources().getColor(R.color.white)); - holder.ed_facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark)); - holder.ed_facing.setHint("Empty"); - tempflag = true; - } - - if (tempflag) { - holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark)); - } else { - holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white)); - } - } - - return convertView; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - } - - public class ViewHolder { - EditText ed_stock, ed_facing; - CardView cardView; - TextView txt_skuName; - LinearLayout lin_category; - } - boolean validateData(List listDataHeader, HashMap> listDataChild) { boolean flag = true; @@ -812,6 +515,12 @@ public class Stock_FacingActivity extends AppCompatActivity { return cdate; } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.planogram, menu); + return true; + } + @Override public boolean onOptionsItemSelected(MenuItem item) { // Handle action bar item clicks here. The action bar will @@ -823,11 +532,348 @@ public class Stock_FacingActivity extends AppCompatActivity { finish(); } - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { + //Planogram Dialog + if (id == R.id.action_planogram) { + //final Dialog dialog = new Dialog(Stock_FacingActivity.this, android.R.style.Theme_Black_NoTitleBar_Fullscreen); + final Dialog dialog = new Dialog(Stock_FacingActivity.this); + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + //dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + dialog.setContentView(R.layout.planogram_dialog_layout); + dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT); + + ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram); + + String planogram_image = ""; + if (new File(str + planogram_image).exists()) { + Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image); + img_planogram.setImageBitmap(bmp); + } else { + img_planogram.setBackgroundResource(R.drawable.sad_cloud); + } + + /*if (new File(str + "Stock_Cam1_3_9_01122017_162052.jpg").exists()) { + Bitmap bmp = BitmapFactory.decodeFile(str + "Stock_Cam1_3_9_01122017_162052.jpg"); + img_planogram.setImageBitmap(bmp); + } else { + img_planogram.setBackgroundResource(R.drawable.sad_cloud); + }*/ + + + ImageView cancel = (ImageView) dialog.findViewById(R.id.img_cancel); + cancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dialog.dismiss(); + } + }); + + dialog.show(); return true; } return super.onOptionsItemSelected(item); } + + public class ExpandableListAdapter extends BaseExpandableListAdapter { + private Context _context; + private List _listDataHeader; + private HashMap> _listDataChild; + + public ExpandableListAdapter(Context context, List listDataHeader, + HashMap> listChildData) { + this._context = context; + this._listDataHeader = listDataHeader; + this._listDataChild = listChildData; + } + + @Override + public Object getGroup(int groupPosition) { + return this._listDataHeader.get(groupPosition); + } + + @Override + public int getGroupCount() { + return this._listDataHeader.size(); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + final Stock_FacingGetterSetter headerTitle = (Stock_FacingGetterSetter) getGroup(groupPosition); + + if (convertView == null) { + LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + convertView = infalInflater.inflate(R.layout.item_stock_facing_header, null, false); + } + + TextView txt_stockFaceupHeader = (TextView) convertView.findViewById(R.id.txt_stockFaceupHeader); + TextView txt_sosHeader = (TextView) convertView.findViewById(R.id.txt_sosHeader); + LinearLayout lin_stockFaceupHeader = (LinearLayout) convertView.findViewById(R.id.lin_stockFaceupHeader); + ImageView img_camera1 = (ImageView) convertView.findViewById(R.id.img_camera1); + ImageView img_camera2 = (ImageView) convertView.findViewById(R.id.img_camera2); + //ImageView img_reference = (ImageView) convertView.findViewById(R.id.img_reference); + //ImageView img_edit = (ImageView) convertView.findViewById(R.id.img_edit); + + txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD); + txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand()); + + if (headerTitle.getCompany_id().equals("1")) { + txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); + } else { + txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black)); + } + + //Camera allow enable + if (camera_allow.equalsIgnoreCase("1")) { + + img_camera1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + //String date = new Date().toLocaleString().toString(); + //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); + + _pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + child_position = groupPosition; + path = str + _pathforcheck; + + startCameraActivity1(groupPosition); + } + }); + + if (!img1.equalsIgnoreCase("")) { + if (groupPosition == child_position) { + headerTitle.setImage1(img1); + img1 = ""; + } + } + + if (headerTitle.getImage1().equals("")) { + img_camera1.setBackgroundResource(R.mipmap.camera_orange); + } else { + img_camera1.setBackgroundResource(R.mipmap.camera_green); + } + + + img_camera2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + //String date = new Date().toLocaleString().toString(); + //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); + + _pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + child_position = groupPosition; + path = str + _pathforcheck; + + startCameraActivity2(groupPosition); + } + }); + + if (!img2.equalsIgnoreCase("")) { + if (groupPosition == child_position) { + headerTitle.setImage2(img2); + img2 = ""; + } + } + + if (headerTitle.getImage2().equals("")) { + img_camera2.setBackgroundResource(R.mipmap.camera_orange); + } else { + img_camera2.setBackgroundResource(R.mipmap.camera_green); + } + } else { + //Camera allow disable + img_camera1.setBackgroundResource(R.mipmap.camera_grey); + img_camera2.setBackgroundResource(R.mipmap.camera_grey); + } + + if (!checkflag) { + if (checkHeaderArray.contains(groupPosition)) { + txt_stockFaceupHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark)); + } else { + txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black)); + } + } + + return convertView; + } + + @Override + public Object getChild(int groupPosition, int childPosititon) { + return this._listDataChild.get(this._listDataHeader.get(groupPosition)).get(childPosititon); + } + + @Override + public int getChildrenCount(int groupPosition) { + return this._listDataChild.get(this._listDataHeader.get(groupPosition)).size(); + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild, + View convertView, ViewGroup parent) { + final Stock_FacingGetterSetter childData = (Stock_FacingGetterSetter) getChild(groupPosition, childPosition); + ViewHolder holder = null; + + if (convertView == null) { + LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + convertView = infalInflater.inflate(R.layout.item_stock_facing_child, null, false); + + holder = new ViewHolder(); + holder.cardView = (CardView) convertView.findViewById(R.id.card_view); + holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category); + + holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName); + holder.ed_stock = (EditText) convertView.findViewById(R.id.ed_stock); + holder.ed_facing = (EditText) convertView.findViewById(R.id.ed_facing); + convertView.setTag(holder); + } else { + holder = (ViewHolder) convertView.getTag(); + } + + holder.txt_skuName.setText(childData.getSku()); + + if (childData.getCompany_id().equals("1")) { + holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); + } else { + holder.txt_skuName.setTextColor(getResources().getColor(R.color.black)); + } + + + if (childData.getStock().equals("0")) { + holder.ed_facing.setEnabled(false); + } else { + holder.ed_facing.setEnabled(true); + } + + final ViewHolder finalHolder = holder; + holder.ed_stock.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + final EditText caption = (EditText) v; + String edStock = caption.getText().toString(); + + if (!edStock.equals("")) { + String stock = edStock.replaceFirst("^0+(?!$)", ""); + childData.setStock(stock); + + if (edStock.equals("0")) { + childData.setFacing("0"); + + finalHolder.ed_facing.setEnabled(false); + } else { + childData.setFacing(childData.getFacing()); + finalHolder.ed_facing.setEnabled(true); + } + } else { + childData.setStock(""); + finalHolder.ed_facing.setEnabled(true); + } + } + }); + + holder.ed_stock.setText(childData.getStock()); + + holder.ed_facing.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + final EditText caption = (EditText) v; + final String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", ""); + + if (!childData.getStock().equals("")) { + if (!edFaceup.equals("")) { + if (Integer.parseInt(edFaceup) <= Integer.parseInt(childData.getStock())) { + childData.setFacing(edFaceup); + } else { + if (isDialogOpen) { + isDialogOpen = !isDialogOpen; + AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); + builder.setMessage("Faceup can not be greater than stock value") + .setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + isDialogOpen = !isDialogOpen; + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } + } + } else { + childData.setFacing(""); + } + } else { + if (isDialogOpen) { + isDialogOpen = !isDialogOpen; + AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); + builder.setMessage("First fill the stock value") + .setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + isDialogOpen = !isDialogOpen; + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } + } + } + }); + + holder.ed_facing.setText(childData.getFacing()); + + if (!checkflag) { + boolean tempflag = false; + + if (holder.ed_stock.getText().toString().equals("")) { + holder.ed_stock.setBackgroundColor(getResources().getColor(R.color.white)); + holder.ed_stock.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark)); + holder.ed_stock.setHint("Empty"); + tempflag = true; + } + + if (holder.ed_facing.getText().toString().equals("")) { + holder.ed_facing.setBackgroundColor(getResources().getColor(R.color.white)); + holder.ed_facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark)); + holder.ed_facing.setHint("Empty"); + tempflag = true; + } + + if (tempflag) { + holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark)); + } else { + holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white)); + } + } + + return convertView; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + } + + public class ViewHolder { + EditText ed_stock, ed_facing; + CardView cardView; + TextView txt_skuName; + LinearLayout lin_category; + } } diff --git a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml index 9979c83..de8f7af 100644 --- a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml +++ b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml @@ -93,7 +93,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@drawable/toggle_selector_background" /> + android:background="@drawable/toggle_selector_background" + android:textOff="@string/no" + android:textOn="@string/yes" /> diff --git a/GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml b/GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml index de13029..d0b2ce6 100644 --- a/GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml +++ b/GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml @@ -23,35 +23,48 @@ + android:layout_weight="1.5" + android:orientation="horizontal" + android:paddingTop="5dp" + android:weightSum="2"> + + + + - + android:src="@mipmap/star" />--> - + android:src="@mipmap/no_camera" />--> + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/planogram_dialog_layout.xml b/GSKMTOrange/src/main/res/layout/planogram_dialog_layout.xml new file mode 100644 index 0000000..7f579a1 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/planogram_dialog_layout.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/menu/planogram.xml b/GSKMTOrange/src/main/res/menu/planogram.xml new file mode 100644 index 0000000..a538a1b --- /dev/null +++ b/GSKMTOrange/src/main/res/menu/planogram.xml @@ -0,0 +1,10 @@ + +

+ + diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/cancel.png b/GSKMTOrange/src/main/res/mipmap-hdpi/cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..d537bc9abbbf2fdf0d821506550da7774cc0f865 GIT binary patch literal 995 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjR6 zFbHyjFyn!zizI-8k|nMYCBgY=CFO}lsSM@i<$9TU*~Q6;1*v-ZMd`EO*+>Buoe%H{ zasB`QKae?Wz^}DD-+-QRDGBlmW?*DyVdLQD5fzt^QPecDv~hBFadmU|4GxWpPfE@# zsA%cz>h77hWW%P-+js2Vcj)kma~E&iymjyK^B1o_ef{?R$DhCdwD#=#$-uy5=IP=X z5^;F#^qXO?90Xjw9UVekX0lAJENJ3Rl$+$X>Hq)PH9H<1nxGKrx>t2>anRk`EFsPf z5eqN9_~N$u>Wb@`AzX%>sh!Ki59=GR_wP);c(JIS`GH=${M)Ftf9+y+G0d)i`a(zEkz*gV^KJ>0cMWzf{Tn=F$D-F;jC?gC+wbgy)cFfp zo1YXqdGamTy1iZ^Mn-#UH)F-Qhh=AVD)(HOYD7nDuZ+80ZFC%K8n^bY5t^d9W$MB&va5rSP5i(z(eUz%X{UtiuTQV* zIGydElPCK=x$?vOZ+Gqfo%{F2AmWRwi;(oHdGR+bzQ_I9+x)h0%_%iSrSlKY+Lxb` zJG{5~ap`Ned9F`-JAeE+ck<1?6Bc%UCtJ)X&RD2fZ}{W!(#}p##!GhY^9l<#-ELoV zePO=0v!m9IeK+kMC+w5lbWC19aC(Yupii>r?yUOOD@7)@)GF?jBwy}!)m2*h^;wXtBZ!>E*t9v`YW|D>mo*k6z5yDV@DM-{kAsb^C6HZU6nN u@iB{Xf8C2q{k7^6HoyqrYX Önyüz Raf Payı Hedefi + Raf Payi Promosyon @@ -95,6 +96,9 @@ Son Ziyaret Mağaza Performansı - + + + Planogram + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 39a13d0..777341f 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -80,6 +80,7 @@ Stock Facing SOS Target + SOS @@ -147,5 +148,8 @@ Please fill GAP data Want to proceed usaved data will be deleted + + Planogram + From 96b2ff2eb674206d9270e8760d3476d306e85634 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Thu, 12 Jan 2017 17:49:12 +0530 Subject: [PATCH 18/36] T2P upload data new --- .idea/misc.xml | 2 +- GSKMTOrange/src/main/AndroidManifest.xml | 6 +- .../com/gskmtorange/Database/GSKOrangeDB.java | 4 +- .../gskmtorange/GeoTag/GeoTagStoreList.java | 4 +- .../cpm/com/gskmtorange/LoginActivity.java | 13 +++ .../cpm/com/gskmtorange/MainActivity.java | 8 +- .../dailyentry/NonWorkingReason.java | 2 +- .../dailyentry/T2PComplianceActivity.java | 8 +- .../download/DownloadActivity.java | 28 +++--- .../gskmtorange/upload/UploadActivity.java | 35 +++++++ .../src/main/res/drawable/toggle_green.png | Bin 0 -> 3959 bytes .../src/main/res/drawable/toggle_grey.png | Bin 0 -> 3928 bytes .../drawable/toggle_selector_background.xml | 4 +- .../src/main/res/layout/activity_login.xml | 87 +----------------- .../res/layout/activity_splash_screen.xml | 6 +- .../main/res/layout/activity_storeimage.xml | 1 - .../res/layout/content_daily_main_menu.xml | 2 +- .../src/main/res/layout/content_main.xml | 7 +- .../res/layout/content_promo_compliance.xml | 5 +- .../src/main/res/layout/contentstoreimage.xml | 4 +- .../res/layout/custom_dialog_progress.xml | 2 +- GSKMTOrange/src/main/res/layout/dialogbox.xml | 6 +- .../layout/item_msl_availability_child.xml | 2 +- .../src/main/res/layout/nav_header_main.xml | 2 +- .../src/main/res/layout/nonworking.xml | 2 +- .../src/main/res/layout/t2p_item_layout.xml | 14 +-- .../main/res/layout/t2p_sku_dialog_layout.xml | 54 +++++------ .../main/res/menu/activity_main_drawer.xml | 18 ++-- .../main/res/mipmap-hdpi/download_grey.png | Bin 0 -> 2451 bytes .../src/main/res/mipmap-hdpi/entry_grey.png | Bin 0 -> 2029 bytes .../src/main/res/mipmap-hdpi/exit_grey.png | Bin 0 -> 1941 bytes .../src/main/res/mipmap-hdpi/geotag_grey.png | Bin 0 -> 2667 bytes .../main/res/mipmap-hdpi/services_grey.png | Bin 0 -> 3351 bytes .../main/res/mipmap-hdpi/settings_grey.png | Bin 0 -> 3364 bytes .../src/main/res/mipmap-hdpi/upload_grey.png | Bin 0 -> 2450 bytes GSKMTOrange/src/main/res/values-tr/string.xml | 26 +++++- GSKMTOrange/src/main/res/values/strings.xml | 20 +++- 37 files changed, 187 insertions(+), 185 deletions(-) create mode 100644 GSKMTOrange/src/main/res/drawable/toggle_green.png create mode 100644 GSKMTOrange/src/main/res/drawable/toggle_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/download_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/entry_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/exit_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/geotag_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/services_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/settings_grey.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/upload_grey.png diff --git a/.idea/misc.xml b/.idea/misc.xml index b15ecee..b8dc4d6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -41,7 +41,7 @@ - + diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index ac805bc..c363469 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -14,7 +14,7 @@ @@ -34,7 +34,7 @@ android:theme="@style/AppTheme.NoActionBar" /> (this, android.R.layout.simple_spinner_item); - reason_adapter.add("Select Reason"); + reason_adapter.add(getResources().getString(R.string.select_reason)); for (int i = 0; i < reasondata.size(); i++) { reason_adapter.add(reasondata.get(i).getREASON().get(0)); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 9f1ab57..e748e66 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -215,7 +215,7 @@ public class T2PComplianceActivity extends AppCompatActivity { @Override public void onClick(View v) { - mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")); + mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes))); t2PAdapter.notifyDataSetChanged(); } @@ -406,7 +406,7 @@ public class T2PComplianceActivity extends AppCompatActivity { spinner_brand.setSelection(0); SkuGetterSetter select = new SkuGetterSetter(); - select.setSKU("Select"); + select.setSKU(getString(R.string.select)); sku_list.clear(); sku_list.add(select); CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, sku_list); @@ -438,7 +438,7 @@ public class T2PComplianceActivity extends AppCompatActivity { SkuGetterSetter select = new SkuGetterSetter(); - select.setSKU("Select"); + select.setSKU(getString(R.string.select)); sku_list.add(select); CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, sku_list); spinner_sku.setAdapter(skuadapter); @@ -463,7 +463,7 @@ public class T2PComplianceActivity extends AppCompatActivity { } SkuGetterSetter select = new SkuGetterSetter(); - select.setSKU("Select"); + select.setSKU(getString(R.string.select)); sku_list.add(0, select); // Create custom adapter object ( see below CustomSkuAdapter.java ) CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, sku_list); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index c6a0484..bceb406 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -116,7 +116,7 @@ public class DownloadActivity extends AppCompatActivity { data = new Data(); data.value = 10; - data.name = "JCP Data Downloading"; + data.name = "JCP "+getResources().getString(R.string.download_data); publishProgress(data); XmlPullParserFactory factory = XmlPullParserFactory.newInstance(); @@ -157,7 +157,7 @@ public class DownloadActivity extends AppCompatActivity { } data.value = 10; - data.name = "JCP Data Downloading"; + data.name = "JCP "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -193,7 +193,7 @@ public class DownloadActivity extends AppCompatActivity { } data.value = 20; - data.name = "SKU_MASTER Data Download"; + data.name = "SKU_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -229,7 +229,7 @@ public class DownloadActivity extends AppCompatActivity { } data.value = 30; - data.name = "BRAND_MASTER Data Download"; + data.name = "BRAND_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -264,7 +264,7 @@ public class DownloadActivity extends AppCompatActivity { return "SUB_CATEGORY_MASTER"; } data.value = 40; - data.name = "SUB_CATEGORY_MASTER Data Download"; + data.name = "SUB_CATEGORY_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -299,7 +299,7 @@ public class DownloadActivity extends AppCompatActivity { return "CATEGORY_MASTER"; } data.value = 50; - data.name = "CATEGORY_MASTER Data Download"; + data.name = "CATEGORY_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -334,7 +334,7 @@ public class DownloadActivity extends AppCompatActivity { return "DISPLAY_MASTER"; } data.value = 60; - data.name = "DISPLAY_MASTER Data Download"; + data.name = "DISPLAY_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -369,7 +369,7 @@ public class DownloadActivity extends AppCompatActivity { return "MAPPING_STOCK"; } data.value = 80; - data.name = "MAPPING_STOCK Data Download"; + data.name = "MAPPING_STOCK "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -404,7 +404,7 @@ public class DownloadActivity extends AppCompatActivity { //return "MAPPING_T2P"; } data.value = 100; - data.name = "MAPPING_T2P Data Download"; + data.name = "MAPPING_T2P "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -438,7 +438,7 @@ public class DownloadActivity extends AppCompatActivity { return "DISPLAY_CHECKLIST_MASTER"; } data.value = 100; - data.name = "DISPLAY_CHECKLIST_MASTER Data Download"; + data.name = "DISPLAY_CHECKLIST_MASTER "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -472,7 +472,7 @@ public class DownloadActivity extends AppCompatActivity { //return "MAPPING_DISPLAY_CHECKLIST"; } data.value = 100; - data.name = "MAPPING_DISPLAY_CHECKLIST Data Download"; + data.name = "MAPPING_DISPLAY_CHECKLIST "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -507,7 +507,7 @@ public class DownloadActivity extends AppCompatActivity { return "NON_WORKING_REASON"; } data.value = 100; - data.name = "NON_WORKING_REASON Data Download"; + data.name = "NON_WORKING_REASON "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -542,7 +542,7 @@ public class DownloadActivity extends AppCompatActivity { //return "MAPPING_PROMOTION"; }*/ data.value = 100; - data.name = "MAPPING_PROMOTION Data Download"; + data.name = "MAPPING_PROMOTION "+getResources().getString(R.string.download_data); } publishProgress(data); @@ -580,7 +580,7 @@ public class DownloadActivity extends AppCompatActivity { //return "MAPPING_ADDITIONAL_PROMOTION"; }*/ data.value = 100; - data.name = "MAPPING_ADDITIONAL_PROMOTION Data Download"; + data.name = "MAPPING_ADDITIONAL_PROMOTION "+getResources().getString(R.string.download_data); } publishProgress(data); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index 1ebb27d..78b9c94 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -465,6 +465,8 @@ public class UploadActivity extends AppCompatActivity { } gaps_child = "[GAPS]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + "[CHECK_LIST_ID]" + gapsList.get(l).getChecklist_id() + "[/CHECK_LIST_ID]" @@ -474,6 +476,9 @@ public class UploadActivity extends AppCompatActivity { + "[PRESENT]" + present + "[/PRESENT]" + + "[COMMON_ID]" + + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + + "[/COMMON_ID]" + "[/GAPS]"; gaps_xml = gaps_xml + gaps_child; } @@ -484,6 +489,8 @@ public class UploadActivity extends AppCompatActivity { for (int k = 0; k < skuList.size(); k++) { sku_child = "[SKU]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + "[SKU_ID]" + skuList.get(k).getSKU_ID() + "[/SKU_ID]" @@ -493,6 +500,9 @@ public class UploadActivity extends AppCompatActivity { + "[STOCK]" + skuList.get(k).getSTOCK() + "[/STOCK]" + + "[COMMON_ID]" + + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + + "[/COMMON_ID]" + "[/SKU]"; sku_xml = sku_xml + sku_child; } @@ -621,6 +631,31 @@ public class UploadActivity extends AppCompatActivity { } + for(int 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 RfOh}@002ovPDHLkV1g}pTO0rY literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/drawable/toggle_grey.png b/GSKMTOrange/src/main/res/drawable/toggle_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..3e650b89ac42c10f3cc1d430a460da6eeb89298f GIT binary patch literal 3928 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 m^pRQ=013(f0000 - - + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_login.xml b/GSKMTOrange/src/main/res/layout/activity_login.xml index 4131c23..454e513 100644 --- a/GSKMTOrange/src/main/res/layout/activity_login.xml +++ b/GSKMTOrange/src/main/res/layout/activity_login.xml @@ -1,80 +1,3 @@ - + android:background="@drawable/gsklogo"> @@ -226,7 +149,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:text="Version" + android:text="Version/Versiyon" android:textSize="@dimen/text_size_normal" /> diff --git a/GSKMTOrange/src/main/res/layout/activity_splash_screen.xml b/GSKMTOrange/src/main/res/layout/activity_splash_screen.xml index 4188c60..bf5cccd 100644 --- a/GSKMTOrange/src/main/res/layout/activity_splash_screen.xml +++ b/GSKMTOrange/src/main/res/layout/activity_splash_screen.xml @@ -34,10 +34,10 @@ + android:background="@drawable/gsklogo" /> diff --git a/GSKMTOrange/src/main/res/layout/activity_storeimage.xml b/GSKMTOrange/src/main/res/layout/activity_storeimage.xml index af63741..cabf5f6 100644 --- a/GSKMTOrange/src/main/res/layout/activity_storeimage.xml +++ b/GSKMTOrange/src/main/res/layout/activity_storeimage.xml @@ -24,5 +24,4 @@ - diff --git a/GSKMTOrange/src/main/res/layout/content_daily_main_menu.xml b/GSKMTOrange/src/main/res/layout/content_daily_main_menu.xml index 43ca858..8ce5f5a 100644 --- a/GSKMTOrange/src/main/res/layout/content_daily_main_menu.xml +++ b/GSKMTOrange/src/main/res/layout/content_daily_main_menu.xml @@ -21,7 +21,7 @@ android:paddingBottom="10dp" android:paddingLeft="20dp" android:paddingTop="10dp" - android:text="Daily Data Menu" + android:text="@string/daily_activity_menu" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" android:visibility="gone"/> diff --git a/GSKMTOrange/src/main/res/layout/content_main.xml b/GSKMTOrange/src/main/res/layout/content_main.xml index 6ebb7b6..ab35d58 100644 --- a/GSKMTOrange/src/main/res/layout/content_main.xml +++ b/GSKMTOrange/src/main/res/layout/content_main.xml @@ -49,11 +49,12 @@ + android:orientation="vertical" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true"> diff --git a/GSKMTOrange/src/main/res/layout/custom_dialog_progress.xml b/GSKMTOrange/src/main/res/layout/custom_dialog_progress.xml index 3828f3a..e49e71f 100644 --- a/GSKMTOrange/src/main/res/layout/custom_dialog_progress.xml +++ b/GSKMTOrange/src/main/res/layout/custom_dialog_progress.xml @@ -28,7 +28,7 @@ android:layout_alignParentLeft="true" android:layout_marginTop="15dp" android:paddingLeft="5dp" - android:text="Downloading Data" + android:text="@string/download_data" android:textSize="@dimen/text_size_normal" android:paddingBottom="20dp" android:textColor="@color/white" diff --git a/GSKMTOrange/src/main/res/layout/dialogbox.xml b/GSKMTOrange/src/main/res/layout/dialogbox.xml index 7274c69..f57a5e7 100644 --- a/GSKMTOrange/src/main/res/layout/dialogbox.xml +++ b/GSKMTOrange/src/main/res/layout/dialogbox.xml @@ -9,7 +9,7 @@ @@ -28,7 +28,7 @@ android:id="@+id/yes" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Yes" + android:text="@string/yes" android:textColor="#000000" android:background="@color/colorPrimary"/> @@ -42,7 +42,7 @@ android:id="@+id/no" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="No" + android:text="@string/no" android:textColor="#000000" android:background="@color/colorPrimary"/> diff --git a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml index 9979c83..6a3f232 100644 --- a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml +++ b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml @@ -91,7 +91,7 @@ diff --git a/GSKMTOrange/src/main/res/layout/nav_header_main.xml b/GSKMTOrange/src/main/res/layout/nav_header_main.xml index 837a560..d07841e 100644 --- a/GSKMTOrange/src/main/res/layout/nav_header_main.xml +++ b/GSKMTOrange/src/main/res/layout/nav_header_main.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="60dp" android:layout_marginTop="5dp" - android:src="@drawable/gsk_logo" /> + android:src="@drawable/gsklogo" /> diff --git a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml index d847b68..1963196 100644 --- a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml +++ b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml @@ -91,8 +91,8 @@ android:id="@+id/toggle_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textOn="Yes" - android:textOff="No" + android:textOn="@string/yes" + android:textOff="@string/no" android:background="@drawable/toggle_selector_background" android:layout_centerInParent="true"/> @@ -127,9 +127,10 @@ android:layout_height="50dp" android:text="@string/image" android:layout_weight="1" - android:layout_centerInParent="true" - android:background="@drawable/cam_active" - android:padding="@dimen/custom_margin"/> + android:background="@mipmap/camera_orange" + android:padding="@dimen/custom_margin" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" /> @@ -137,7 +138,8 @@ + android:layout_weight="1" + android:visibility="gone"> - + android:choiceMode="singleChoice" + android:divider="#ff9933" + android:dividerHeight="2dp" + android:fastScrollEnabled="true" + android:smoothScrollbar="true"> + + --> diff --git a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml index 93d14c2..d696f57 100644 --- a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml +++ b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml @@ -4,28 +4,24 @@ - @@ -33,11 +29,11 @@ diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/download_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/download_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..1478765c66dbac4ea661d21823f3223e4ce7e68e GIT binary patch literal 2451 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 literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/exit_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/exit_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..98cf3684162ba01516304844faca88af4789ccdd GIT binary patch literal 1941 zcmaJ?dsGv58l8xdM*&#^HDC?npe?RT9+(6&5M+`eCemO8TtcxnA(@aM$;4y~fsH zecw4#p-5d5;1})(06>6Dil&iclIQhVKzKId;>44V_fVv`R)n!|;8d^jc+ zd~!i#G>cXTr=gN3vB;GW(i4OkX0Zwi3YZ0}n7AdE#SsVu9*vloXc7@^Ei@5od$h?K zIjewTR*l7ACJeX<^eC!x@U4UpBAxzz1f%(>tjYQ$O=QAYcD0$sVX{3(ngz<`{~u~J zK1ExJH0+t*KNYrS6q+$s8fL|}S~O(gbdjD=W>{>&)C6wH!14UqEGqOkfm`*s85F1U z!Kh4wNsAX)S3Jhc<*>|TCDbMjCPRe~slYTCv@n8jxLj^5ipC*44kww9NDz?(MPm6} zKAX>$2xhq`uGwnDOvEf#`;41BC)d*oMl%^1#ViIJrj=N5Bl!5puwia5qB-@RaJ6%L z5zonGk!Dz)!v3Mqvs+~Mc&1O=mRvk-e9T04yM=7)mg>O?0GRJ9Ly-*o@a^}qrJ)G@ z^bofl%*x7odzp>4KWg%g&{7$iF`UwuJ|77Z?hgs}K}yj&Xs?S~RLN{w{uktcaM`64 zbZ|$oH2CY%bKrBK>weuC3_!zVhW4FCr9-+8e+wBw7*HwrDtt zdaur?;QSbVXveLq|N4GY_G|0c*X;Ir5T44uMQcq7@vEeqe*1N%Cb9zLMD&HXn1RJ<)IOwrincRJojUNGVsWyL)cT&s)?cEKO z@^wE){c>IO-8ZX~Y64?u!wW}BJG^=muL;4xN_K1J-nI1XsPiT7AM?w(_^HpxU~rN@ z=txlt?ojvo_Q+Oma0A8nkC?9}Zq&uE?7V_thX6XdX7HMMs-(BRBBoD`n(ZiX%<0~1?#jhbB2mjCSzO?bOVvF~5`I&DYUa}9tNXXsiVd%=} zhg~UxHsH*I!|vuzszS*kXv5CVvyITB;_=K0;S61L^+<8?)UYEkp0lYCU>7fKeb*g+ zwBO;}Fh07RxyvRxV5`bx0RDHbZxX%K-cKkO6K%^`lQc*MJiC$93y~*Q_(tKu64P7! zFIj8nI}vxu;-<@L@w^Cjciz2*1k;{o#_6rEZ<;q2XfhS#O3%Hro~LrK%Uq0G8~rPm z=C>b{)TJN49qOz#$K@+adeDP`ZvR`QBkoV^gS;m1q0|TI5qBe;|7j)CQ}ZOE9Njz3 zKl_cu=9lzDQM)p>FpKho>HaO}c>nIs8e1>Usig*;{O6@!=|=VTn`})5~kdL@)n1;6liab$KjiOZVm@!f}x&eRM9 u0IUAHK;^1gdUQkg*MXOSqyzQ9Bbo|0|ISJLBU59)=SL|^PDPtVD%Wpni|VWZ literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/geotag_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/geotag_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..27d1f9b021331c8f084b309726bc1a1a9b7f4503 GIT binary patch literal 2667 zcmaJ@dpwi-AAdGh=2Dsn$7Nq=y^W4PnlaEeIpVBhAQFyai6Fq4Er@`yo_tmmn7M@t3iy_+C5)wnFO;(ZfVNR0WP#BTjE#VzxG{9xbWJ@D%VpDXLAFd1 zQ|JnDxSRHhApgDI0pQ+f(4LLk=!m6BsB!^51hcRbJ}*X0mC$jYbgAA1g>3TFCZT?HZtYinsu07+I>SPI3`%Ep#Lv9iFDNmgVcN&Zp@RyI^y3YEM8`}x7i zqlws&R6mCM=UDO;9mj!TA(cpsi;J_2v$hn7qKH=Z_V!B}WHLdHAc&1JiNxO#d!{FZ?PSBmR6$@&hAESVE$eC26UoFF+>q|3mrw zuV^vs2mO=p{}dJnNQDs54-yOZh(LMcB8`_q38}6khy@Eo0RjQ<%PIPD1h7EN5eTua z{uHcf5I2S`h!d~>gl96To-tyW6$3(^3_4D(V9DjOsrGKxZf*=a8-|^;t(BD<#l_X$ z#>K_P-P+xrWMgkf{=#Jlz&(5@2L8fj|HHNYCU?mSe4#ut0}^p#A-20nz{h?nnacfk zF63|Oede;ios0E1xkPy~#HGgmSEIjd$=$Ow{c2nJ;;ZqY7`fX;a$B4J{NoM)SoXw| z;T#|t9NNB;x5Hn1W5Tvb*UPMaPabFtCz)v&yW<8I8%KA{n3y^B`~=^to1$rl`MP7n!#hW+S8HnO|FjE3LTRH;GF4yr3?|1GYnGuVHgDb>A9^SE`9Z)` z-`Q3pAGHOw?7P?=#C<@35bVz|{-}dI{oW?P2ML08g9R33rXJ zD(i{bLjk3HL?+ouRUArB3|oOhgiiY0@#s85SK=jS-OO!eIv-c4xT_bn{<2+}K#2h; zIvDg7%HW;Zf6_HvuGxz!8h<@$GTZAQJFGqJQ=j0DZ2!f}|ATG#Rr8TdZ|N`7ZF-w` zPkrxs1?XtrQ5INvL-&?unW9!kSc=)H&V3p6CM>PwhD%P@vODKf+{|X6RV}$!v&lEE z162CVYaLnKRfC2^4~&v}$g+FW8Ndm4DQVBaM2n|dX2i9`koJ4)S|3Vzk-n5TEui_H z@3pKMf;x74>S-s-bla<(qagMHD@ZHLW2A&ue9NB};?B`p7368F$5}C{dwEDb{P8HV zphizEc~{z!LqKOb$qOYmlchJ4vvxj{a%l>o{r2t z+E?-R8ZS{bROdWR(@vF^mU(@qH()5f=8Puq(9ymX2wJah+vtWgmyunO8|&*q%Y9+z z2v=~8S7-z7ev#2yLd&e??i#h!_WQZswZBPsFLF#p*$u(};&G1+=px1{b4itb>ky~D z8@hM8Z9~`7y1@3bJG|6n|6oIzg#j5Kt`wb&iBjkZzHlLN%R9ku!P7^PL0E%zXecflb=Eihj!`w)|$#f)r59^_?@PjGcR}>2ub-b#Usr6QkX{;?hrTYHEi@v)n3X)3kMp)UnQ;eoUg8cLPjzF2OJ4Bxhqb8u`SK^K(Hjr0}LD0!~Uv3XiTSY4Bzl=r4aG_WeW ztXA?t)ZRPMVs;n}G)6?u@3Lyh#_KwvNhznMQ+Ugn4ob6daMg*zd^q&?d3)#NfxMuo z3F(4=>WujP9~!?c0#e#=S8y=~S(NWIviz>mq1kxElg!Zs4WK#6c?60DF}3Cg46C!a zbI8`&=v!zk`r5?9&6w2uf@lrWJIs;zY2yH=G=lTOq2R2S2u=E7O`rD|MOx>X+0u4x zz4NKuDlap{mOX1#k6Zr=$85gnRdBG5vHnP$K}%p;6=3vCBf#f!!Ty31ufpe`mV!H@ zxi9zKX&|6Cjs~t-(cd>Y+xYz- zq25&&e00p_wdah|z4e7U*c9)yljeiDeW@r3S8P<6x3DGOtE~1Ia!tEKCBWA@@7pzP^qN&*7US`l}koZa?14^RMx9DdAit5dRC Py8d~(c{47$g#Yj#>=IK~ literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/services_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/services_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..3abc6209dc881cd82ac8f988543ee24c9c778e31 GIT binary patch literal 3351 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 literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/upload_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/upload_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..4c34d2ef5b62a82854dd22d32396151ce0e8af53 GIT binary patch literal 2450 zcmaJ@d00~E9!5~i-K=>c$4NwU!DJIi88lH`(A<|uOG7*gB};G=)N-iwj!T7GTDGB; zcFod8%hED5bINSSOw)47xvBnji{!p7n8NHQ6NCz8ly{2C+yhbLfh+K23dCsIgc3Slks(}mJ{ z6D1{6BItgfd}%EY6bA%_6f9OEkzgdQ7=b7Si+6W-U(g^BT(k%maRwh`NnQA2+eHOB zAZClWLXa!qBNr4|iGnoH1Er1huM~K~&$4{+r!r{^hLy5}SUd)|kkTSBIQaiVdA!eP zF&F{-9q<1X7Dr_W0c->y7Nm*T+Quc@F1Qj>d_({X6o{e(g4D$-hH(U-K+F*ckv@@R zq~iuIKS>}FJAK3l2U8e)G05Vx0S4UzrB%Rixk(fgAeev(=O7E_1isBM<5V5oI$5WNguw7 zD)d%6OOtN&@nXaoVt8HRUVQXG z-Q(-t&71?~eF*RBYTBvTyHU8rIA5gW4b(*D{w({Dp|RIPS03;r@gmW;O@i^Pnckgm z#ayLt1@;lga#^H|*~p=Xzia!@JU zg6R7(T&3G*_)3=yi}UJvGgb+43@$tj>(xJ(Ptg0eGq3SBLt)C)K~=VWqZ9U?kVjG? zew@O}e)qC%JT4PWoz5b^UuC=;>MDCFgL;Sqr`Gt7`K%0ul-GOTE(pLII;F+df zF%y9kON3_d*6~vpe;&%j8MvAB`i&g+u!X>$nc+ha4Rbv$twzJT8eJkJ5>TH)OkiL} zFW_iw(7^&vPf{R+;sJYNGqDueQdp-C;ftq~pmA!gjq}SBPUPZtSXfSbw(Apv>Lyg4 zd>7j3+6tx-^=8J+DTCpv7jq>CYRXb*Bcp_rTTkFR@|EWyj-d{KSzqXHbMat1IdJUu zeNeamFi6Ada+AmD1XYHms?H?nt;xh zzs(pObdq&oWe4qtKt44N@uE2|hpfMuBxpytYYoq z`|;)ewRuKqhn#g~jLPXHo7)d|UAhR{l%(#vA7ECmh*8_OtWo|ka=2r<*lxVXX6{|N z73$uN@$Cf{fZFw5`M*p$8E|EPu$o#0qmWZj_NAz9xx9| zV@%dk2aE0%sgJZ<-!$>G7oPD9^(@?M>a5A8L{y$#ro#bOb-ire0cY<1K7=_|?+V0Ps9%lJk#dM#4$6&QCTL7!Yesl=n*DU$m40h_XM2dQV{__2=dV?$OQkVp zPJM4I@?4a;h9kAZ8NOLxUkUHA)_eNaPNkCXICJ!L_@R@7kF%Aq5)$9e(zPrn=B&}% zWywl(jV4G|vJaHb-amdJQ>bGAK8wGrT6R&dcVM3+{IP8Cx7#A;vYM~u6$yb*Out!M zlUGJ;2iA1vN*6=9mK$5;fF7Iz<^n}T1IK|I5^h*Frpte{dV0pftZm$OBOOWs@pdLX zL+D){5h@#ltkwR-kP(vAVLz3NoY7cHopLXzJaYb8MUMc~G~e~HcvUeL2pym4fp(TP zG*KoEGbYq!{&vHym7S~R=LmA!M!X&zqjzzl|4DW7q4L~dLpcheBKY$hm983SLIMjCa@SGR*yT-ytQ#yOSuFl_TUV7rYY<5@EoeslXfq&eE4?+3vtDZSWUZ%B3 zk!mZY+|2X(bsnZ+Dc&HU`VRCe{g`FN%Rgq6n(2T2o5S7yw13v*(TV%tF?`#a9YuS= z7$xyu0e!v4M(FhDy!nQlvE*@i?Z%A#Su~Yxo*be9qtr}Y; E-posta - Şifre (isteğe bağlı) - Giriş yapın veya kayıt olun oturum aç Bu e-posta adresi geçersiz Bu şifre çok kısa @@ -26,6 +24,7 @@ Store Uploaded Store Geo Data Uploaded Store Already Geotagged + GSK Turuncu Mağaza Sakla @@ -38,7 +37,7 @@ Teşhir var mı? Ekle - Seç + Seçiniz Kalıcı Teşhir @@ -46,5 +45,26 @@ Hayır Veri Paylaş + Veri Indir + Mağaza ziyaret edildi mi? + Mağaza girişinin fotoğrafını çekiniz + + Mağaza Girişi Fotoğrafı + Çalışmama Sebebi + Sebep + Bir sebep seçiniz + Günlük Veri Menüsü + + Bulunurluk + Raf Payı + Kalıcı Teşhir + Ek Teşhir + Promosyon + Rakip Bilgisi + Competition Promo + kapalı + + Promosyon + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index b138052..ab02dc9 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -1,5 +1,6 @@ - GSKMTOrange + GSK MT Orange + GSK Orange Stores Open navigation drawer Close navigation drawer @@ -9,9 +10,9 @@ E Mail - User Id - Password - Login + Username/Kullanıcı Adı + Password/Şifre + Login/Giriş Yap Sign in This email address is invalid This password is too short @@ -127,7 +128,7 @@ Display Photo Additional Visibility - Non-Work Reason + Non Working Reason Close Please click image @@ -135,5 +136,14 @@ Please fill GAP data Want to proceed usaved data will be deleted + Downloading Data + Store Visited + Click Store Front Image + + Store Front Image + Reason + Select Reason + Daily Data Menu + From 5db229d980337184ef75fc4288557beb69de128c Mon Sep 17 00:00:00 2001 From: yadavendras Date: Thu, 12 Jan 2017 18:29:02 +0530 Subject: [PATCH 19/36] T2P upload data news --- .../gskmtorange/GeoTag/GeoTagActivity.java | 35 ++++++++++++++++ .../gskmtorange/GeoTag/GeoTagStoreList.java | 30 ++++++++++++++ .../cpm/com/gskmtorange/MainActivity.java | 41 +++++++++++++++++++ .../dailyentry/AdditionalVisibility.java | 37 +++++++++++++++++ .../dailyentry/NonWorkingReason.java | 40 ++++++++++++++++++ .../dailyentry/StoreListActivity.java | 35 +++++++++++++++- .../dailyentry/StoreimageActivity.java | 39 ++++++++++++++++++ .../download/DownloadActivity.java | 40 ++++++++++++++++++ .../gsk_dailyentry/CategoryListActivity.java | 37 +++++++++++++++++ .../CategoryWisePerformanceActivity.java | 41 +++++++++++++++++++ .../gsk_dailyentry/DailyDataMenuActivity.java | 39 +++++++++++++++++- .../MSL_AvailabilityActivity.java | 38 +++++++++++++++++ .../PromoComplianceActivity.java | 40 ++++++++++++++++++ .../gsk_dailyentry/Stock_FacingActivity.java | 38 +++++++++++++++++ .../gskmtorange/upload/UploadActivity.java | 40 ++++++++++++++++++ 15 files changed, 566 insertions(+), 4 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java index 8daca52..57e813b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java @@ -10,6 +10,8 @@ import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.ColorStateList; +import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Color; @@ -67,6 +69,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.List; +import java.util.Locale; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; @@ -130,6 +133,9 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + username = preferences.getString(CommonString.KEY_USERNAME, null); storeid = preferences.getString(CommonString.KEY_STORE_ID, null); storename = preferences.getString(CommonString.KEY_STORE_NAME, null); @@ -384,6 +390,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb protected void onResume() { super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); /* checkPlayServices(); // Resuming the periodic location updates @@ -993,4 +1000,32 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb } + + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java index 11edc6f..f551e30 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java @@ -3,6 +3,8 @@ package cpm.com.gskmtorange.GeoTag; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; @@ -23,6 +25,7 @@ import android.widget.TextView; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.MainActivity; @@ -68,6 +71,9 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi getSupportActionBar().setDisplayHomeAsUpEnabled(true); preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + date = preferences.getString(CommonString.KEY_DATE, null); visit_status = preferences.getString(CommonString.KEY_STOREVISITED_STATUS, ""); @@ -291,13 +297,37 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi } + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + } + private static boolean updateResources(Context context, String language) { + String lang ; + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + Locale locale = new Locale(lang); + Locale.setDefault(locale); + Resources resources = context.getResources(); + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + return true; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index c6f636e..49bca2d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -5,6 +5,8 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.Bitmap; import android.net.ConnectivityManager; import android.net.NetworkInfo; @@ -33,6 +35,7 @@ import java.io.FileOutputStream; import java.nio.channels.FileChannel; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.GeoTag.GeoTagStoreList; @@ -68,7 +71,11 @@ public class MainActivity extends AppCompatActivity setContentView(R.layout.activity_main); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); + preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + date = preferences.getString(CommonString.KEY_DATE, null); imageView = (ImageView) findViewById(R.id.img_main); @@ -122,6 +129,13 @@ public class MainActivity extends AppCompatActivity navigationView.setNavigationItemSelectedListener(this); } + @Override + protected void onResume() { + super.onResume(); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + } + @Override public void onBackPressed() { DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); @@ -408,4 +422,31 @@ public class MainActivity extends AppCompatActivity return flag; } + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } + } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java index 478eac8..80b4ab3 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -9,6 +9,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Color; @@ -46,6 +48,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.HashMap; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter; @@ -113,6 +116,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl preferences = PreferenceManager.getDefaultSharedPreferences(this); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); store_id = "1"; date = preferences.getString(CommonString.KEY_DATE, null); @@ -1149,5 +1153,38 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl return flag; } + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + } + + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } \ No newline at end of file diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java index 5784b81..38bbf25 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -1,11 +1,14 @@ package cpm.com.gskmtorange.dailyentry; import android.app.AlertDialog; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.content.res.Configuration; +import android.content.res.Resources; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -32,6 +35,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.GetterSetter.CoverageBean; @@ -90,6 +94,9 @@ public class NonWorkingReason extends AppCompatActivity implements getSupportActionBar().setDisplayHomeAsUpEnabled(true); preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + _UserId = preferences.getString(CommonString.KEY_USERNAME, ""); visit_date = preferences.getString(CommonString.KEY_DATE, null); store_id = preferences.getString(CommonString.KEY_STORE_ID, ""); @@ -463,4 +470,37 @@ public class NonWorkingReason extends AppCompatActivity implements return super.onOptionsItemSelected(item); } + + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + } + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java index 0b6e749..c4a0f2c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -6,6 +6,8 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; @@ -33,6 +35,7 @@ import android.widget.Toast; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.GeoTag.GeoTagActivity; @@ -71,6 +74,9 @@ public class StoreListActivity extends AppCompatActivity { getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true); preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + date = preferences.getString(CommonString.KEY_DATE, null); visit_status = preferences.getString(CommonString.KEY_STOREVISITED_STATUS, ""); db = new GSKOrangeDB(StoreListActivity.this); @@ -89,8 +95,6 @@ public class StoreListActivity extends AppCompatActivity { startActivity(in); finish(); - - } }); @@ -101,6 +105,8 @@ public class StoreListActivity extends AppCompatActivity { // TODO Auto-generated method stub super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + storelist = db.getStoreData(date); coverage=db.getCoverageData(date); @@ -439,5 +445,30 @@ public class StoreListActivity extends AppCompatActivity { return result_flag; } + private static boolean updateResources(Context context, String language) { + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index 147164f..78c8b8b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -2,11 +2,14 @@ package cpm.com.gskmtorange.dailyentry; import android.app.AlertDialog; import android.content.ActivityNotFoundException; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.location.Location; @@ -34,6 +37,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; @@ -81,6 +85,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic preferences = PreferenceManager.getDefaultSharedPreferences(this); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); @@ -341,6 +347,12 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic } + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + } + protected void onStart() { mGoogleApiClient.connect(); super.onStart(); @@ -351,4 +363,31 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic super.onStop(); } + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } + } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index bceb406..e91297c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -5,6 +5,8 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.drawable.ColorDrawable; import android.os.AsyncTask; import android.os.Bundle; @@ -24,6 +26,7 @@ import org.xmlpull.v1.XmlPullParserFactory; import java.io.IOException; import java.io.StringReader; import java.net.MalformedURLException; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; @@ -77,6 +80,9 @@ public class DownloadActivity extends AppCompatActivity { db = new GSKOrangeDB(this); preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + userId = preferences.getString(CommonString.KEY_USERNAME, null); culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, ""); new UploadTask(DownloadActivity.this).execute(); @@ -681,4 +687,38 @@ public class DownloadActivity extends AppCompatActivity { AlertDialog alert = builder.create(); alert.show(); } + + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + } + + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index 0b6a11d..e5783d5 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -3,6 +3,8 @@ package cpm.com.gskmtorange.gsk_dailyentry; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; @@ -23,6 +25,7 @@ import android.widget.TextView; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; @@ -52,6 +55,9 @@ public class CategoryListActivity extends AppCompatActivity { db.open(); preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); @@ -83,6 +89,8 @@ public class CategoryListActivity extends AppCompatActivity { protected void onResume() { super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + recyclerView = (RecyclerView) findViewById(R.id.recyclerView); categoryList = new ArrayList<>(); @@ -205,4 +213,33 @@ public class CategoryListActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + + + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java index 3553a8a..70f9eff 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java @@ -2,7 +2,11 @@ package cpm.com.gskmtorange.gsk_dailyentry; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.Resources; import android.os.Bundle; +import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; @@ -18,8 +22,10 @@ import android.widget.TextView; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter; public class CategoryWisePerformanceActivity extends AppCompatActivity { @@ -31,6 +37,8 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { ArrayList categoryWisePerformanceList; CategoryWisePerformaceAdapter adapter; + private SharedPreferences preferences; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -44,6 +52,10 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { categoryName = getIntent().getStringExtra("categoryName"); categoryId = getIntent().getStringExtra("categoryId"); + preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + //txt_categoryName.setText(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName); toolbar.setTitle(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName); setSupportActionBar(toolbar); @@ -66,6 +78,8 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { protected void onResume() { super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + categoryWisePerformanceList = new ArrayList<>(); CategoryWisePerformaceGetterSetter data = new CategoryWisePerformaceGetterSetter(); @@ -207,4 +221,31 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java index 6593bf8..953f7c4 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java @@ -3,6 +3,7 @@ package cpm.com.gskmtorange.gsk_dailyentry; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; @@ -22,6 +23,7 @@ import android.widget.TextView; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; @@ -57,6 +59,9 @@ public class DailyDataMenuActivity extends AppCompatActivity { //preference data preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); @@ -93,6 +98,8 @@ public class DailyDataMenuActivity extends AppCompatActivity { protected void onResume() { super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + try { categoryList = new ArrayList<>(); @@ -110,9 +117,9 @@ public class DailyDataMenuActivity extends AppCompatActivity { //data.setCategory_name("Stock & Facing"); data.setCategory_name(getResources().getString(R.string.daily_data_menu_stock_facing)); if (db.checkStockAndFacingData(store_id, categoryId)) { - data.setCategory_img(R.mipmap.stock_and_facing_done); + data.setCategory_img(R.mipmap.stock_facing_done); } else { - data.setCategory_img(R.mipmap.stock_and_facing); + data.setCategory_img(R.mipmap.stock_facing); } categoryList.add(data); @@ -258,5 +265,33 @@ public class DailyDataMenuActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index 7513fe0..a663cff 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -4,6 +4,7 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; +import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Typeface; import android.os.Bundle; @@ -34,6 +35,7 @@ import android.widget.ToggleButton; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; @@ -74,6 +76,9 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { //preference data preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); @@ -437,4 +442,37 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + } + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java index 8824f9d..8614ed1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java @@ -1,8 +1,11 @@ package cpm.com.gskmtorange.gsk_dailyentry; import android.app.AlertDialog; +import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; @@ -22,6 +25,7 @@ import android.widget.TextView; import android.widget.ToggleButton; import java.util.ArrayList; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; @@ -73,6 +77,9 @@ public class PromoComplianceActivity extends AppCompatActivity { //preference data preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); @@ -433,4 +440,37 @@ public class PromoComplianceActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + } + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index 3d28cac..0b6dd9f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -7,6 +7,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Typeface; import android.net.Uri; @@ -44,6 +45,7 @@ import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; @@ -90,6 +92,9 @@ public class Stock_FacingActivity extends AppCompatActivity { //preference data preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); @@ -787,4 +792,37 @@ public class Stock_FacingActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + } + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index 78b9c94..bb1ec02 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -3,6 +3,8 @@ package cpm.com.gskmtorange.upload; import android.app.Dialog; import android.content.Context; import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.AsyncTask; @@ -26,6 +28,7 @@ import java.io.File; import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; +import java.util.Locale; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; @@ -79,6 +82,9 @@ public class UploadActivity extends AppCompatActivity { getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + date = preferences.getString(CommonString.KEY_DATE, null); userId = preferences.getString(CommonString.KEY_USERNAME, null); app_version = preferences.getString(CommonString.KEY_VERSION, null); @@ -802,4 +808,38 @@ public class UploadActivity extends AppCompatActivity { return result.toString(); } + + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + } + + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } From dfbc916266db198fb716b58c765256d52b0e7caf Mon Sep 17 00:00:00 2001 From: YadavendraSinghYaduvanshi Date: Thu, 12 Jan 2017 18:51:29 +0530 Subject: [PATCH 20/36] Update DailyDataMenuActivity.java --- .../gsk_dailyentry/DailyDataMenuActivity.java | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java index fbdb067..56d5f7d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java @@ -282,33 +282,6 @@ public class DailyDataMenuActivity extends AppCompatActivity { } } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - if (id == android.R.id.home) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } - - private static boolean updateResources(Context context, String language) { String lang ; From b8765256a62057088a54bb337cd52ecadf380af8 Mon Sep 17 00:00:00 2001 From: YadavendraSinghYaduvanshi Date: Thu, 12 Jan 2017 18:54:13 +0530 Subject: [PATCH 21/36] Update string.xml --- GSKMTOrange/src/main/res/values-tr/string.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index ca0490a..d8a2a35 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -55,18 +55,8 @@ Bir sebep seçiniz Günlük Veri Menüsü - Bulunurluk - Raf Payı - Kalıcı Teşhir - Ek Teşhir - Promosyon - Rakip Bilgisi - Competition Promo kapalı - Promosyon - - Kategoriler Kategori Performansı @@ -121,4 +111,4 @@ Planogram - \ No newline at end of file + From d3606ada7b1637d94cadabc033c2796f7ba24e22 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Thu, 12 Jan 2017 19:05:45 +0530 Subject: [PATCH 22/36] T2P upload data newss --- .../dailyentry/T2PComplianceActivity.java | 8 +- .../download/DownloadActivity.java | 31 +-- .../gsk_dailyentry/CategoryListActivity.java | 27 --- .../CategoryWisePerformanceActivity.java | 11 +- .../gsk_dailyentry/DailyDataMenuActivity.java | 26 -- .../MSL_AvailabilityActivity.java | 18 -- .../gsk_dailyentry/Stock_FacingActivity.java | 229 ------------------ .../gskmtorange/upload/UploadActivity.java | 78 ------ GSKMTOrange/src/main/res/values-tr/string.xml | 10 - 9 files changed, 7 insertions(+), 431 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 00f3cfb..c2bf438 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -653,7 +653,7 @@ public class T2PComplianceActivity extends AppCompatActivity { alert.show(); } - public class T2PAdapter extends RecyclerView.Adapter { +/* public class T2PAdapter extends RecyclerView.Adapter { private ArrayList list; @@ -677,9 +677,9 @@ public class T2PComplianceActivity extends AppCompatActivity { //holder.tv_display.setTypeface(FontManager.getTypeface(getApplicationContext(),FontManager.FONTAWESOME)); - /* Typeface iconFont = FontManager.getTypeface(getApplicationContext(), FontManager.FONTAWESOME); + *//* Typeface iconFont = FontManager.getTypeface(getApplicationContext(), FontManager.FONTAWESOME); FontManager.markAsIconContainer(findViewById(R.id.icons_container), iconFont); -*/ +*//* holder.btn_gaps.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -786,7 +786,7 @@ public class T2PComplianceActivity extends AppCompatActivity { } } - } + }*/ public class GapsAdapter extends RecyclerView.Adapter { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index 0950f14..95926b7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -21,6 +21,7 @@ import org.ksoap2.serialization.SoapObject; import org.ksoap2.serialization.SoapSerializationEnvelope; import org.ksoap2.transport.HttpTransportSE; import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserFactory; import java.io.IOException; @@ -91,23 +92,7 @@ public class DownloadActivity extends AppCompatActivity { new UploadTask(DownloadActivity.this).execute(); } - public void showAlert(String str) { - AlertDialog.Builder builder = new AlertDialog.Builder(DownloadActivity.this); - builder.setTitle("Parinaam"); - builder.setMessage(str).setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - - /* Intent i = new Intent(activity, StorelistActivity.class); - activity.startActivity(i); - activity.finish();*/ - - } - }); - AlertDialog alert = builder.create(); - alert.show(); - } class Data { int value; @@ -730,20 +715,8 @@ public class DownloadActivity extends AppCompatActivity { showAlert(CommonString.MESSAGE_SOCKETEXCEPTION); } }); - } catch (Exception e) { - /* final AlertMessage message = new AlertMessage( - CompleteDownloadActivity.this, - AlertMessage.MESSAGE_EXCEPTION, "download", e);*/ - - /* e.getMessage(); + } catch (XmlPullParserException e) { e.printStackTrace(); - e.getCause();*/ - runOnUiThread(new Runnable() { - @Override - public void run() { - showAlert(CommonString.MESSAGE_EXCEPTION); - } - }); } return ""; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index bcb19e5..56842f7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -213,33 +213,6 @@ public class CategoryListActivity extends AppCompatActivity { } } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - if (id == android.R.id.home) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } - - private static boolean updateResources(Context context, String language) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java index 18303c1..471461a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java @@ -104,16 +104,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Intent intent = new Intent(CategoryWisePerformanceActivity.this, DailyDataMenuActivity.class); - intent.putExtra("categoryName", categoryName); - intent.putExtra("categoryId", categoryId); - startActivity(intent); - } - }); + } catch (Resources.NotFoundException e) { e.printStackTrace(); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java index fbdb067..0adf4f4 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java @@ -282,32 +282,6 @@ public class DailyDataMenuActivity extends AppCompatActivity { } } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - if (id == android.R.id.home) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } - private static boolean updateResources(Context context, String language) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index b79ea7c..e636c07 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -442,24 +442,6 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { LinearLayout lin_category; } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - if (id == android.R.id.home) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } @Override protected void onResume() { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index 30279a3..1de393f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -882,235 +882,6 @@ public class Stock_FacingActivity extends AppCompatActivity { LinearLayout lin_category; } - boolean validateData(List listDataHeader, - HashMap> listDataChild) { - boolean flag = true; - checkHeaderArray.clear(); - - for (int i = 0; i < listDataHeader.size(); i++) { - String imagePath = listDataHeader.get(i).getImage1(); - String imagePath1 = listDataHeader.get(i).getImage2(); - - for (int j = 0; j < listDataChild.get(listDataHeader.get(i)).size(); j++) { - String stock = listDataChild.get(listDataHeader.get(i)).get(j).getStock(); - String faceup = listDataChild.get(listDataHeader.get(i)).get(j).getFacing(); - - if (!imagePath.equals("") || !imagePath1.equals("")) { - if (!stock.equals("0")) { - if (stock.equals("") || faceup.equals("")) { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); - } - - flag = false; - Error_Message = "Please fill all the data"; - break; - } - } else { - if (stock.equals("")) { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); - } - - flag = false; - Error_Message = "Please fill all the data"; - break; - } - } - } else { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); - } - - flag = false; - Error_Message = "Please click either 1 image"; - break; - } - } - - if (flag == false) { - checkflag = false; - break; - } else { - checkflag = true; - } - } - //expListView.invalidate(); - adapter.notifyDataSetChanged(); - - return checkflag; - } - - private void startCameraActivity1(int position) { - try { - /*Log.e("Stock and Facing ", "startCameraActivity()"); - File file = new File(path); - Uri outputFileUri = Uri.fromFile(file); - - Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); - intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); - startActivityForResult(intent, position);*/ - - Log.i("Stock & Facing ", "startCameraActivity()"); - File file = new File(path); - Uri outputFileUri = Uri.fromFile(file); - - String defaultCameraPackage = ""; - final PackageManager packageManager = getPackageManager(); - List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); - for (int n = 0; n < list.size(); n++) { - if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { - /*Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); - Log.e("TAG", "package name : " + list.get(n).packageName);*/ - - if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { - defaultCameraPackage = list.get(n).packageName; - break; - } - } else { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { - defaultCameraPackage = list.get(n).packageName; - break; - } - } - } - } - - Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); - intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); - intent.setPackage(defaultCameraPackage); - startActivityForResult(intent, 1); - //startActivityForResult(intent, position); - - } catch (Exception e) { - e.printStackTrace(); - } - } - - private void startCameraActivity2(int position) { - try { - /*Log.e("Stock and Facing ", "startCameraActivity()"); - File file = new File(path); - Uri outputFileUri = Uri.fromFile(file); - - Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); - intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); - startActivityForResult(intent, position);*/ - - Log.i("Stock & Facing ", "startCameraActivity()"); - File file = new File(path); - Uri outputFileUri = Uri.fromFile(file); - - String defaultCameraPackage = ""; - final PackageManager packageManager = getPackageManager(); - List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); - for (int n = 0; n < list.size(); n++) { - if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { - /*Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); - Log.e("TAG", "package name : " + list.get(n).packageName);*/ - - if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { - defaultCameraPackage = list.get(n).packageName; - break; - } - } else { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { - defaultCameraPackage = list.get(n).packageName; - break; - } - } - } - } - - Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); - intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); - intent.setPackage(defaultCameraPackage); - startActivityForResult(intent, 2); - //startActivityForResult(intent, position); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - Log.e("Stock & Facing", "resultCode: " + resultCode); - /*switch (resultCode) { - case 0: - Log.e("Stock & Facing", "User cancelled"); - break; - case -1: - if (_pathforcheck != null && !_pathforcheck.equals("")) { - if (new File(str + _pathforcheck).exists()) { - img1 = _pathforcheck; - adapter.notifyDataSetChanged(); - _pathforcheck = ""; - } - } - break; - }*/ - - switch (requestCode) { - case 1: - if (resultCode == -1) { - if (_pathforcheck != null && !_pathforcheck.equals("")) { - if (new File(str + _pathforcheck).exists()) { - img1 = _pathforcheck; - adapter.notifyDataSetChanged(); - _pathforcheck = ""; - } - } - } else { - Log.e("Stock & Facing", "User cancelled"); - } - break; - case 2: - if (resultCode == -1) { - if (_pathforcheck != null && !_pathforcheck.equals("")) { - if (new File(str + _pathforcheck).exists()) { - img2 = _pathforcheck; - adapter.notifyDataSetChanged(); - _pathforcheck = ""; - } - } - } else { - Log.e("Stock & Facing", "User cancelled"); - } - break; - } - super.onActivityResult(requestCode, resultCode, data); - } - - public String getCurrentTime() { - Calendar m_cal = Calendar.getInstance(); - SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss"); - String cdate = formatter.format(m_cal.getTime()); - /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":" - + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/ - - return cdate; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - if (id == android.R.id.home) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } @Override protected void onResume() { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index c17fe9f..f3c6a4b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -954,84 +954,6 @@ public class UploadActivity extends AppCompatActivity { } } - public String UploadImage(String path, String folder_name) throws Exception { - errormsg = ""; - BitmapFactory.Options o = new BitmapFactory.Options(); - o.inJustDecodeBounds = true; - BitmapFactory.decodeFile(Path + path, o); - - // The new size we want to scale to - final int REQUIRED_SIZE = 1639; - - // Find the correct scale value. It should be the power of 2. - int width_tmp = o.outWidth, height_tmp = o.outHeight; - int scale = 1; - - while (true) { - if (width_tmp < REQUIRED_SIZE && height_tmp < REQUIRED_SIZE) - break; - width_tmp /= 2; - height_tmp /= 2; - scale *= 2; - } - - // Decode with inSampleSize - BitmapFactory.Options o2 = new BitmapFactory.Options(); - o2.inSampleSize = scale; - Bitmap bitmap = BitmapFactory.decodeFile(Path + path, o2); - - ByteArrayOutputStream bao = new ByteArrayOutputStream(); - bitmap.compress(Bitmap.CompressFormat.JPEG, 90, bao); - byte[] ba = bao.toByteArray(); - String ba1 = Base64.encodeBytes(ba); - - SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_IMAGE); - - String[] split = path.split("/"); - String path1 = split[split.length - 1]; - - request.addProperty("img", ba1); - request.addProperty("name", path1); - request.addProperty("FolderName", folder_name); - - SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); - envelope.dotNet = true; - envelope.setOutputSoapObject(request); - - HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); - androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope); - - Object result = (Object) envelope.getResponse(); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) { - return CommonString.KEY_FALSE; - } - - SAXParserFactory saxPF = SAXParserFactory.newInstance(); - SAXParser saxP = saxPF.newSAXParser(); - XMLReader xmlR = saxP.getXMLReader(); - - // for failure - FailureXMLHandler failureXMLHandler = new FailureXMLHandler(); - xmlR.setContentHandler(failureXMLHandler); - - InputSource is = new InputSource(); - is.setCharacterStream(new StringReader(result.toString())); - xmlR.parse(is); - - failureGetterSetter = failureXMLHandler.getFailureGetterSetter(); - - if (failureGetterSetter.getStatus().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - errormsg = failureGetterSetter.getErrorMsg(); - return CommonString.KEY_FAILURE; - } - } else { - new File(Path + path).delete(); - } - - return result.toString(); - } @Override protected void onResume() { diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index ca0490a..32156af 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -55,18 +55,8 @@ Bir sebep seçiniz Günlük Veri Menüsü - Bulunurluk - Raf Payı - Kalıcı Teşhir - Ek Teşhir - Promosyon - Rakip Bilgisi - Competition Promo kapalı - Promosyon - - Kategoriler Kategori Performansı From 6d4771973522193acb994621e590e64efff6ae15 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Thu, 12 Jan 2017 19:37:08 +0530 Subject: [PATCH 23/36] T2P upload data newss --- .../cpm/com/gskmtorange/MainActivity.java | 6 +- .../dailyentry/T2PComplianceActivity.java | 173 ++++-------------- .../CategoryWisePerformanceActivity.java | 3 +- .../main/res/layout/gap_checklist_item.xml | 4 +- GSKMTOrange/src/main/res/values-tr/string.xml | 11 +- 5 files changed, 51 insertions(+), 146 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index edfe64b..f16711f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -264,12 +264,12 @@ public class MainActivity extends AppCompatActivity } else if (id == R.id.nav_exit) { - Intent startDownload = new Intent(this,AdditionalVisibility.class); + /* Intent startDownload = new Intent(this,AdditionalVisibility.class); startActivity(startDownload); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); - - +*/ + finish(); } else if (id == R.id.nav_services) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index c2bf438..2c026fe 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -9,6 +9,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.Color; import android.graphics.Typeface; import android.graphics.drawable.ColorDrawable; @@ -49,6 +51,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.LoginActivity; @@ -98,6 +101,9 @@ public class T2PComplianceActivity extends AppCompatActivity { //preference data preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); @@ -168,7 +174,7 @@ public class T2PComplianceActivity extends AppCompatActivity { protected void onResume() { super.onResume(); - + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); } @@ -653,140 +659,6 @@ public class T2PComplianceActivity extends AppCompatActivity { alert.show(); } -/* public class T2PAdapter extends RecyclerView.Adapter { - - private ArrayList list; - - public T2PAdapter(ArrayList t2PList) { - list = t2PList; - } - - @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.t2p_item_layout, parent, false); - return new ViewHolder(view); - } - - @Override - public void onBindViewHolder(final ViewHolder holder, final int position) { - - final T2PGetterSetter mItem = list.get(position); - holder.tv_brand.setText(mItem.getBrand()); - holder.tv_display.setText(mItem.getDisplay().trim()); - - //holder.tv_display.setTypeface(FontManager.getTypeface(getApplicationContext(),FontManager.FONTAWESOME)); - - *//* Typeface iconFont = FontManager.getTypeface(getApplicationContext(), FontManager.FONTAWESOME); - FontManager.markAsIconContainer(findViewById(R.id.icons_container), iconFont); -*//* - holder.btn_gaps.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - - showGapsDialog(mItem); - - } - }); - - holder.toggle_btn.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - - mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")); - - t2PAdapter.notifyDataSetChanged(); - } - }); - - - holder.btn_sku.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - showSkuDialog(mItem.getSkulist()); - } - }); - - if (!img.equalsIgnoreCase("")) { - if (position == child_position) { - mItem.setImage(img); - img = ""; - } - } - - if(camera_allow.equals("1")){ - - holder.img_cam.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; - child_position = position; - path = str + _pathforcheck; - - startCameraActivity(); - } - }); - - if (mItem.getImage().equals("")) { - holder.img_cam.setBackgroundResource(R.mipmap.camera_orange); - } else { - holder.img_cam.setBackgroundResource(R.mipmap.camera_green); - } - } - else { - holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); - } - - - holder.toggle_btn.setChecked(mItem.isPresent()); - - if (mItem.getGapsChecklist().size() > 0) { - holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.green)); - } else { - holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); - } - - if (mItem.getSkulist().size() > 0) { - holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green)); - } else { - holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); - } - - } - - @Override - public int getItemCount() { - return list.size(); - } - - public class ViewHolder extends RecyclerView.ViewHolder { - public final View mView; - public final LinearLayout parentLayout; - public final TextView tv_brand, tv_display; - public final ImageView img_cam, img_remark; - public final Button btn_gaps, btn_sku, btn_ref_img; - public final ToggleButton toggle_btn; - - - public ViewHolder(View view) { - super(view); - - mView = view; - - tv_brand = (TextView) mView.findViewById(R.id.tv_brand); - tv_display = (TextView) mView.findViewById(R.id.tv_display); - img_cam = (ImageView) mView.findViewById(R.id.img_cam); - img_remark = (ImageView) mView.findViewById(R.id.img_remark); - btn_gaps = (Button) mView.findViewById(R.id.btn_gaps); - btn_sku = (Button) mView.findViewById(R.id.btn_sku); - btn_ref_img = (Button) mView.findViewById(R.id.btn_ref_image); - parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout); - toggle_btn = (ToggleButton) mView.findViewById(R.id.toggle_btn); - - } - - } - }*/ public class GapsAdapter extends RecyclerView.Adapter { @@ -899,7 +771,7 @@ public class T2PComplianceActivity extends AppCompatActivity { if (position == 0) { // Default selected Spinner item - label.setText("Select"); + label.setText(getString(R.string.select)); //sub.setText(""); } else { // Set values for spinner each row @@ -961,7 +833,7 @@ public class T2PComplianceActivity extends AppCompatActivity { if (position == 0) { // Default selected Spinner item - label.setText("Select"); + label.setText(getString(R.string.select)); //sub.setText(""); } else { // Set values for spinner each row @@ -1021,4 +893,31 @@ public class T2PComplianceActivity extends AppCompatActivity { } } + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java index 471461a..1cb685a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java @@ -77,7 +77,6 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { }); try { - setContentView(R.layout.activity_category_wise_performance); toolbar = (Toolbar) findViewById(R.id.toolbar); recyclerView = (RecyclerView) findViewById(R.id.recyclerView); @@ -104,7 +103,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - + } catch (Resources.NotFoundException e) { e.printStackTrace(); } diff --git a/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml b/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml index d10aa62..28bbad9 100644 --- a/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml +++ b/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml @@ -46,8 +46,8 @@ android:id="@+id/btn_is_present" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textOn="Yes" - android:textOff="No" + android:textOn="@string/yes" + android:textOff="@string/no" android:background="@drawable/toggle_selector_background" android:layout_centerInParent="true"/> diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 32156af..9c05e53 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -73,12 +73,12 @@ Promosyon Ürün Adı - X + MBQ Bulunurluk Örnek Fotoğraf Ürün Adı - X + Stock Önyüz Raf Payı Hedefi Raf Payi @@ -111,4 +111,11 @@ Planogram + + Stock + Ek Teşhir + Teşhir Türü + Fotoğraf + Ek Teşhir + \ No newline at end of file From af4271360ad4e9ef5a13f3ce2aa0d8a4434c0d96 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 13 Jan 2017 10:07:07 +0530 Subject: [PATCH 24/36] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../com/gskmtorange/Database/GSKOrangeDB.java | 36 +++++++++- .../download/DownloadActivity.java | 63 ++++++++++++++++++ .../gsk_dailyentry/CategoryListActivity.java | 2 +- .../gsk_dailyentry/DailyDataMenuActivity.java | 2 +- .../MSL_AvailabilityActivity.java | 23 +++++++ .../PromoComplianceActivity.java | 28 +++++++- .../gsk_dailyentry/Stock_FacingActivity.java | 28 +++++++- .../MAPPING_PLANOGRAM_DataGetterSetter.java | 51 ++++++++++++++ GSKMTOrange/src/main/res/menu/planogram.xml | 2 +- .../res/mipmap-hdpi/ref_images_orange.png | Bin 0 -> 1325 bytes .../main/res/mipmap-hdpi/ref_images_white.png | Bin 0 -> 1414 bytes 11 files changed, 225 insertions(+), 10 deletions(-) create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/ref_images_orange.png create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/ref_images_white.png diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index b38031b..b09bcc3 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -18,6 +18,7 @@ import cpm.com.gskmtorange.GetterSetter.StoreBean; import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter; import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; import cpm.com.gskmtorange.constant.CommonString; @@ -2455,11 +2456,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - if(category_id == null){ + if (category_id == null) { dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + CommonString.KEY_STORE_ID + "='" + store_id + "'", null); - } - else{ + } else { dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + CommonString.KEY_STORE_ID + "='" + store_id + "' AND " + CommonString.KEY_CATEGORY_ID + "='" + category_id + "'", null); @@ -2577,6 +2577,36 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Log.d("Exception ", " MAPPING_PLANOGRAM " + ex.toString()); } } + + public ArrayList getMappingPlanogramData(String category_id) { + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + try { + dbcursor = db.rawQuery("SELECT * FROM MAPPING_PLANOGRAM", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + MAPPING_PLANOGRAM_DataGetterSetter mp = new MAPPING_PLANOGRAM_DataGetterSetter(); + + mp.setKEYACCOUNT_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("KEYACCOUNT_ID"))); + mp.setSTORETYPE_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORETYPE_ID"))); + mp.setCLASS_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CLASS_ID"))); + mp.setPLANOGRAM_IMAGE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PLANOGRAM_IMAGE"))); + mp.setIMAGE_PATH(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE_PATH"))); + + list.add(mp); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + return list; + } + return list; + } + //Gagan end new code 2 } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index 33e3d0d..9c64cee 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -8,6 +8,7 @@ import android.content.SharedPreferences; import android.graphics.drawable.ColorDrawable; import android.os.AsyncTask; import android.os.Bundle; +import android.os.Environment; import android.preference.PreferenceManager; import android.support.v7.app.AppCompatActivity; import android.view.Window; @@ -21,9 +22,15 @@ import org.ksoap2.transport.HttpTransportSE; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserFactory; +import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.StringReader; +import java.net.HttpURLConnection; import java.net.MalformedURLException; +import java.net.URL; +import java.text.DecimalFormat; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; @@ -678,6 +685,62 @@ public class DownloadActivity extends AppCompatActivity { publishProgress(data); + //MAPPING_PLANOGRAM Image save into folder + if (mapping_planogram_masterGetterSetter != null) { + + for (int i = 0; i < mapping_planogram_masterGetterSetter.getIMAGE_PATH().size(); i++) { + //publishing image download + data.value = data.value + 1; + if (data.value < 100) { + publishProgress(data); + } + + String image_name = mapping_planogram_masterGetterSetter.getPLANOGRAM_IMAGE().get(i); + String path = mapping_planogram_masterGetterSetter.getIMAGE_PATH().get(i); + + if (!image_name.equalsIgnoreCase("NA") && !image_name.equalsIgnoreCase("")) { + URL url = new URL(path + "/" + image_name); + HttpURLConnection c = (HttpURLConnection) url.openConnection(); + c.setRequestMethod("GET"); + c.getResponseCode(); + c.connect(); + + if (c.getResponseCode() == 200) { + int length = c.getContentLength(); + + String size = new DecimalFormat("##.##").format((double) length / 1024) + " KB"; + + //String PATH = Environment.getExternalStorageDirectory() + "/Download/GT_GSK_Images/"; + String PATH = CommonString.FILE_PATH; + File file = new File(PATH); + if (!file.isDirectory()) { + file.mkdir(); + } + + // Environment.getExternalStorageDirectory() + "/GT_GSK_Images/" + _pathforcheck1; + if (!new File(PATH + image_name).exists() && !size.equalsIgnoreCase("0 KB")) { + File outputFile = new File(file, image_name); + FileOutputStream fos = new FileOutputStream(outputFile); + InputStream is1 = c.getInputStream(); + + int bytes = 0; + byte[] buffer = new byte[1024]; + int len1 = 0; + + while ((len1 = is1.read(buffer)) != -1) { + bytes = (bytes + len1); + // data.value = (int) ((double) (((double) + // bytes) / length) * 100); + fos.write(buffer, 0, len1); + } + fos.close(); + is1.close(); + } + } + } + } + } + //Gagan end code diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index a4a887f..4603c3a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -95,7 +95,7 @@ public class CategoryListActivity extends AppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); + //getMenuInflater().inflate(R.menu.main, menu); return true; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java index b055e81..bacd5ce 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java @@ -161,7 +161,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); + //getMenuInflater().inflate(R.menu.main, menu); return true; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index 02c615f..9e78b17 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -266,6 +266,29 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + @Override + public void onBackPressed() { + //super.onBackPressed(); + + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(MSL_AvailabilityActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + finish(); + } + }) + .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } + public class ExpandableListAdapter extends BaseExpandableListAdapter { private Context _context; private List _listDataHeader; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java index 8824f9d..48fb3c2 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java @@ -41,9 +41,8 @@ public class PromoComplianceActivity extends AppCompatActivity { GSKOrangeDB db; String categoryName, categoryId; - - private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + private SharedPreferences preferences; @Override protected void onCreate(Bundle savedInstanceState) { @@ -411,7 +410,7 @@ public class PromoComplianceActivity extends AppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); + //getMenuInflater().inflate(R.menu.main, menu); return true; } @@ -433,4 +432,27 @@ public class PromoComplianceActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + + @Override + public void onBackPressed() { + //super.onBackPressed(); + + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(PromoComplianceActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + finish(); + } + }) + .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index c1f991e..fa5688d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -58,6 +58,7 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity; +import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; @@ -543,7 +544,9 @@ public class Stock_FacingActivity extends AppCompatActivity { ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram); - String planogram_image = ""; + ArrayList mp = db.getMappingPlanogramData(""); + + String planogram_image = mp.get(0).getPLANOGRAM_IMAGE(); if (new File(str + planogram_image).exists()) { Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image); img_planogram.setImageBitmap(bmp); @@ -574,6 +577,29 @@ public class Stock_FacingActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + @Override + public void onBackPressed() { + //super.onBackPressed(); + + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(Stock_FacingActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + finish(); + } + }) + .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } + public class ExpandableListAdapter extends BaseExpandableListAdapter { private Context _context; private List _listDataHeader; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java new file mode 100644 index 0000000..e6c0b90 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java @@ -0,0 +1,51 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +import java.util.ArrayList; + +/** + * Created by gagang on 12-01-2017. + */ + +public class MAPPING_PLANOGRAM_DataGetterSetter { + String KEYACCOUNT_ID, STORETYPE_ID, CLASS_ID, PLANOGRAM_IMAGE, IMAGE_PATH; + + public String getKEYACCOUNT_ID() { + return KEYACCOUNT_ID; + } + + public void setKEYACCOUNT_ID(String KEYACCOUNT_ID) { + this.KEYACCOUNT_ID = KEYACCOUNT_ID; + } + + public String getSTORETYPE_ID() { + return STORETYPE_ID; + } + + public void setSTORETYPE_ID(String STORETYPE_ID) { + this.STORETYPE_ID = STORETYPE_ID; + } + + public String getCLASS_ID() { + return CLASS_ID; + } + + public void setCLASS_ID(String CLASS_ID) { + this.CLASS_ID = CLASS_ID; + } + + public String getPLANOGRAM_IMAGE() { + return PLANOGRAM_IMAGE; + } + + public void setPLANOGRAM_IMAGE(String PLANOGRAM_IMAGE) { + this.PLANOGRAM_IMAGE = PLANOGRAM_IMAGE; + } + + public String getIMAGE_PATH() { + return IMAGE_PATH; + } + + public void setIMAGE_PATH(String IMAGE_PATH) { + this.IMAGE_PATH = IMAGE_PATH; + } +} diff --git a/GSKMTOrange/src/main/res/menu/planogram.xml b/GSKMTOrange/src/main/res/menu/planogram.xml index a538a1b..2aa7f62 100644 --- a/GSKMTOrange/src/main/res/menu/planogram.xml +++ b/GSKMTOrange/src/main/res/menu/planogram.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/ref_images_orange.png b/GSKMTOrange/src/main/res/mipmap-hdpi/ref_images_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..de62d47cb3463918383ca55554d145de030b8300 GIT binary patch literal 1325 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvv ztM~P_^2{qPNz6-5^>ndS0-B(gnVDi`YGPn&X>8%-VrgP(Xy|I@=xSu(WMpD!>g4QV zYH48!)9aF-T$-DjR|3v4~Pj*wm=R%;iu*SQ+p9GS&LhzK4xHGTCgZF_RO}7k2yAMXnM%ASC^&oVvFCmxs8!0JhlnGRdMlDeOxal6V&DKhUJKVV}-oH z|3%ZpH%89jJTkd)hUBUJJV&-U{F%rhZ{S?}SA4pVn#n#B0e^>0JS-)RJNi8MLzp)T z*s;D4o5g4-Emmsg^5Y!yD}%rwotiG^yTMG;8XwhYnxuGa`XD0k-c6WUbq1f!v__{C z)1ZK^NwYHkG+M}a#5VpA6!`8a%%^9-+tEAmhsse!j+*vgCnP(BIU}a=96jM6;?413 z>x75|hO>4&7P@Ovo-j_@du4-wNY3kq8N%%{JR*#RA~yApHca4^YR{?AiQ&@i-N4AX z;{A_>Vofp$o#ziJWjx!@;%o7OVajzIjvsPqeD+h`_MUc{@Q6zzTDGIyaq=FMkTcC4 zLGB_itQA+Z^1KjRbY1N7f>cebA52Gt7Zy3O=&&sPr0EdTrKZP!gnyzg%hFxO8BaBK zGCXmRGuc?8Ft1Z)$>fzOlFVYK9S+D@@-6PrTA;}+ccSozh-TsikpriK92Ne#vH#u? j@#02c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0 zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij}FGg@w6` zrIU$)i-oJ1p`oRji-D7gv8%a}vze=jlPSy$Y>#D)oXxPua$FAYGO%#QAmD%4lD%(WaO9R7iZ)b zC^!e3DQJXe=B4D97i)r|2jW|o)S}F?)D*X({9FZa_*!LRv7fNNA$n8D2{V15WAs6Z z11YhRAyZ`xzE^uTk@po!{5*CT~-$J~Y=ngZ{c zAH|1sJL@FPbg+@^n7Q!JX@?x{Bl4Xe7>%!7ukZ9-ddb0t@uZQ!1=dGaO11&KN1T?V za2qS69bR;^Lsy(0aSfrbw zDrm*9G{;$?j^l{UhDU-k3cfhBn(yL|zM#Y0D4?*9acVTsPZ5h&I&9*Jv0>7k?EGC( zv?#7(#z6=XZom3|i(P1Q+0kR-`*Ls@;6MiN&BS0j7T1iRKS-!1trj+u@M r|J>Mr?}&JDqoL`^;l%r&*f Date: Fri, 13 Jan 2017 10:19:25 +0530 Subject: [PATCH 25/36] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index 9e78b17..fd4338f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -330,6 +330,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { ImageView img_camera = (ImageView) convertView.findViewById(R.id.img_camera); txt_categoryHeader.setTypeface(null, Typeface.BOLD); + txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimary)); txt_categoryHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand()); /*img_camera.setOnClickListener(new View.OnClickListener() { @@ -399,6 +400,8 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { holder.cardView = (CardView) convertView.findViewById(R.id.card_view); holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category); + holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary)); + holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName); holder.txt_mbq = (TextView) convertView.findViewById(R.id.txt_mbq); holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available); From a9f187943c59004d856421659ea90f47c08b720b Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 13 Jan 2017 12:12:46 +0530 Subject: [PATCH 26/36] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../gsk_dailyentry/MSL_AvailabilityActivity.java | 3 +-- .../main/res/layout/content_promo_compliance.xml | 14 +++++++------- .../main/res/layout/item_stock_facing_child.xml | 2 ++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index fd4338f..ae5fa09 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -400,8 +400,6 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { holder.cardView = (CardView) convertView.findViewById(R.id.card_view); holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category); - holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary)); - holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName); holder.txt_mbq = (TextView) convertView.findViewById(R.id.txt_mbq); holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available); @@ -414,6 +412,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { holder = (ViewHolder) convertView.getTag(); } + holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary)); holder.txt_skuName.setText(childData.getSku()); holder.txt_mbq.setText(childData.getMbq()); diff --git a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml index f6d49c0..99f3139 100644 --- a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml +++ b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml @@ -157,9 +157,9 @@ android:id="@+id/toggle_add_InStock" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:background="@drawable/toggle_selector_background" android:textOff="@string/no" - android:textOn="@string/yes" - android:background="@drawable/toggle_selector_background"/> + android:textOn="@string/yes"/> @@ -196,9 +196,9 @@ android:id="@+id/toggle_add_promoAnnouncer" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:background="@drawable/toggle_selector_background" android:textOff="@string/no" - android:textOn="@string/yes" - android:background="@drawable/toggle_selector_background" /> + android:textOn="@string/yes" /> @@ -235,9 +235,9 @@ android:id="@+id/toggle_add_runningPos" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:background="@drawable/toggle_selector_background" android:textOff="@string/no" - android:textOn="@string/yes" - android:background="@drawable/toggle_selector_background" /> + android:textOn="@string/yes" /> @@ -255,7 +255,7 @@ android:id="@+id/btn_add" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" + android:layout_gravity="center" android:background="@color/colorPrimaryDark" android:text="@string/promo_compliance_add" android:textColor="@color/white" /> diff --git a/GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml b/GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml index b728bd5..74c3c02 100644 --- a/GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml +++ b/GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml @@ -77,6 +77,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" + android:hint="@string/stock_facing_stock" android:inputType="number" android:maxLength="7" android:textAppearance="?android:attr/textAppearanceSmall" @@ -105,6 +106,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" + android:hint="@string/stock_facing_faceup" android:inputType="number" android:maxLength="7" android:textAppearance="?android:attr/textAppearanceSmall" From ce531be3df8b20402bc0b16471f05a2a42ce6e60 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 13 Jan 2017 15:10:38 +0530 Subject: [PATCH 27/36] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../MSL_AvailabilityActivity.java | 35 +++++++++++++------ .../PromoComplianceActivity.java | 25 ++++++++++--- GSKMTOrange/src/main/res/values/strings.xml | 10 ++++++ 3 files changed, 55 insertions(+), 15 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index ae5fa09..8abced3 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -101,18 +101,18 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { //if (validateData(listDataHeader, listDataChild)) { AlertDialog.Builder builder = new AlertDialog.Builder(MSL_AvailabilityActivity.this); - builder.setMessage("Are you sure you want to save") + builder.setMessage(getResources().getString(R.string.check_save_message)) .setCancelable(false) - .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { db.open(); if (db.checkMsl_AvailabilityData(store_id, categoryId)) { db.updateMSL_Availability(store_id, categoryId, hashMapListHeaderData, hashMapListChildData); - Snackbar.make(view, "Data has been updated", Snackbar.LENGTH_LONG).setAction("Action", null).show(); + Snackbar.make(view, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show(); } else { db.InsertMSL_Availability(store_id, categoryId, hashMapListHeaderData, hashMapListChildData); - Snackbar.make(view, "Data has been saved", Snackbar.LENGTH_LONG).setAction("Action", null).show(); + Snackbar.make(view, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show(); } //Toast.makeText(getApplicationContext(), "Data has been saved", Toast.LENGTH_LONG).show(); @@ -120,7 +120,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); } }) - .setNegativeButton("No", new DialogInterface.OnClickListener() { + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.cancel(); } @@ -255,7 +255,23 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { int id = item.getItemId(); if (id == android.R.id.home) { - finish(); + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(MSL_AvailabilityActivity.this); + builder.setTitle(getResources().getString(R.string.dialog_title)); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + finish(); + } + }) + .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + //finish(); } //noinspection SimplifiableIfStatement @@ -271,15 +287,14 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { //super.onBackPressed(); android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(MSL_AvailabilityActivity.this); - builder.setTitle("Parinaam"); + builder.setTitle(getResources().getString(R.string.dialog_title)); builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - finish(); } }) - .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { + .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java index 48fb3c2..cefb69a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java @@ -422,7 +422,23 @@ public class PromoComplianceActivity extends AppCompatActivity { int id = item.getItemId(); if (id == android.R.id.home) { - finish(); + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(PromoComplianceActivity.this); + builder.setTitle(getResources().getString(R.string.dialog_title)); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + finish(); + } + }) + .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + //finish(); } //noinspection SimplifiableIfStatement @@ -438,15 +454,14 @@ public class PromoComplianceActivity extends AppCompatActivity { //super.onBackPressed(); android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(PromoComplianceActivity.this); - builder.setTitle("Parinaam"); + builder.setTitle(getResources().getString(R.string.dialog_title)); builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - finish(); } }) - .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { + .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 777341f..c2242aa 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -150,6 +150,16 @@ Planogram + + OK + Are you sure you want to save + Data has been saved + Data has been updated + Fill the value + Please fill all the data + Parinaam + + From c10d4013549a3e89af50e5b7eac6d5e63435e1d6 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 13 Jan 2017 15:49:51 +0530 Subject: [PATCH 28/36] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../gsk_dailyentry/Stock_FacingActivity.java | 439 +++++++++++++----- 1 file changed, 319 insertions(+), 120 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index fa5688d..018f79c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -2,6 +2,7 @@ package cpm.com.gskmtorange.gsk_dailyentry; import android.app.AlertDialog; import android.app.Dialog; +import android.content.ActivityNotFoundException; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -25,6 +26,8 @@ import android.support.design.widget.Snackbar; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.CardView; import android.support.v7.widget.Toolbar; +import android.text.Editable; +import android.text.TextWatcher; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -78,6 +81,8 @@ public class Stock_FacingActivity extends AppCompatActivity { boolean isDialogOpen = true; boolean checkflag = true; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow; + Uri outputFileUri = null; + String gallery_package = ""; private SharedPreferences preferences; @Override @@ -128,18 +133,18 @@ public class Stock_FacingActivity extends AppCompatActivity { if (validateData(hashMapListHeaderData, hashMapListChildData)) { AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); - builder.setMessage("Are you sure you want to save") + builder.setMessage(getResources().getString(R.string.check_save_message)) .setCancelable(false) - .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { db.open(); if (db.checkStockAndFacingData(store_id, categoryId)) { db.updateStockAndFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData); - Snackbar.make(view, "Data has been updated", Snackbar.LENGTH_LONG).setAction("Action", null).show(); + Snackbar.make(view, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show(); } else { db.InsertStock_Facing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData); - Snackbar.make(view, "Data has been saved", Snackbar.LENGTH_LONG).setAction("Action", null).show(); + Snackbar.make(view, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show(); //Toast.makeText(getApplicationContext(), "Data has been saved", Toast.LENGTH_LONG).show(); } @@ -147,7 +152,7 @@ public class Stock_FacingActivity extends AppCompatActivity { overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); } }) - .setNegativeButton("No", new DialogInterface.OnClickListener() { + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.cancel(); } @@ -156,9 +161,10 @@ public class Stock_FacingActivity extends AppCompatActivity { alert.show(); } else { AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); - builder.setMessage("Fill the value or fill 0 ") + //builder.setMessage(getResources().getString(R.string.empty_field)) + builder.setMessage(Error_Message) .setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); } @@ -214,6 +220,8 @@ public class Stock_FacingActivity extends AppCompatActivity { inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0); getCurrentFocus().clearFocus(); } + + fab.setVisibility(View.INVISIBLE); } }); @@ -227,6 +235,8 @@ public class Stock_FacingActivity extends AppCompatActivity { inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0); getCurrentFocus().clearFocus(); } + + fab.setVisibility(View.INVISIBLE); } }); @@ -289,10 +299,45 @@ public class Stock_FacingActivity extends AppCompatActivity { String stock = listDataChild.get(listDataHeader.get(i)).get(j).getStock(); String faceup = listDataChild.get(listDataHeader.get(i)).get(j).getFacing(); - //Camera allow enable - if (camera_allow.equalsIgnoreCase("1")) { + //Company_id + if (listDataChild.get(listDataHeader.get(i)).get(j).getCompany_id().equals("1")) { + //Camera allow enable + if (camera_allow.equalsIgnoreCase("1")) { - if (!imagePath.equals("") || !imagePath1.equals("")) { + if (!imagePath.equals("") || !imagePath1.equals("")) { + if (!stock.equals("0")) { + if (stock.equals("") || faceup.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = getResources().getString(R.string.fill_data); + break; + } + } else { + if (stock.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = getResources().getString(R.string.fill_data); + break; + } + } + } else { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = getResources().getString(R.string.click_image); + break; + } + + } else { + //Camera allow disable if (!stock.equals("0")) { if (stock.equals("") || faceup.equals("")) { if (!checkHeaderArray.contains(i)) { @@ -314,40 +359,17 @@ public class Stock_FacingActivity extends AppCompatActivity { break; } } - } else { + } + } else { + if (faceup.equals("")) { if (!checkHeaderArray.contains(i)) { checkHeaderArray.add(i); } flag = false; - Error_Message = "Please click either 1 image"; + Error_Message = "Please fill all the data"; break; } - - } else { - //Camera allow disable - if (!stock.equals("0")) { - if (stock.equals("") || faceup.equals("")) { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); - } - - flag = false; - Error_Message = "Please fill all the data"; - break; - } - } else { - if (stock.equals("")) { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); - } - - flag = false; - Error_Message = "Please fill all the data"; - break; - } - } - } } @@ -365,16 +387,8 @@ public class Stock_FacingActivity extends AppCompatActivity { } private void startCameraActivity1(int position) { - try { - /*Log.e("Stock and Facing ", "startCameraActivity()"); - File file = new File(path); - Uri outputFileUri = Uri.fromFile(file); - - Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); - intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); - startActivityForResult(intent, position);*/ - - Log.i("Stock & Facing ", "startCameraActivity()"); + /*try { + Log.e("Stock & Facing ", "startCameraActivity()"); File file = new File(path); Uri outputFileUri = Uri.fromFile(file); @@ -383,8 +397,8 @@ public class Stock_FacingActivity extends AppCompatActivity { List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); for (int n = 0; n < list.size(); n++) { if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { - /*Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); - Log.e("TAG", "package name : " + list.get(n).packageName);*/ + *//*Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); + Log.e("TAG", "package name : " + list.get(n).packageName);*//* if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { @@ -406,21 +420,58 @@ public class Stock_FacingActivity extends AppCompatActivity { startActivityForResult(intent, 1); //startActivityForResult(intent, position); + } catch (Exception e) { + e.printStackTrace(); + }*/ + + try { + Log.e("MakeMachine", "startCameraActivity()"); + File file = new File(path); + outputFileUri = Uri.fromFile(file); + + String defaultCameraPackage = ""; + final PackageManager packageManager = getPackageManager(); + List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); + for (int n = 0; n < list.size(); n++) { + if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { + //Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); + //Log.e("TAG", "package name : " + list.get(n).packageName); + + //temp value in case camera is gallery app above jellybean + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + gallery_package = list.get(n).packageName; + } + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + defaultCameraPackage = list.get(n).packageName; + break; + } + } else { + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + defaultCameraPackage = list.get(n).packageName; + break; + } + } + } + } + + Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(defaultCameraPackage); + startActivityForResult(intent, 1); + } catch (ActivityNotFoundException e) { + e.printStackTrace(); + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(gallery_package); + startActivityForResult(intent, 1); } catch (Exception e) { e.printStackTrace(); } } private void startCameraActivity2(int position) { - try { - /*Log.e("Stock and Facing ", "startCameraActivity()"); - File file = new File(path); - Uri outputFileUri = Uri.fromFile(file); - - Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); - intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); - startActivityForResult(intent, position);*/ - + /*try { Log.i("Stock & Facing ", "startCameraActivity()"); File file = new File(path); Uri outputFileUri = Uri.fromFile(file); @@ -430,8 +481,8 @@ public class Stock_FacingActivity extends AppCompatActivity { List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); for (int n = 0; n < list.size(); n++) { if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { - /*Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); - Log.e("TAG", "package name : " + list.get(n).packageName);*/ + *//*Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); + Log.e("TAG", "package name : " + list.get(n).packageName);*//* if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { @@ -451,7 +502,51 @@ public class Stock_FacingActivity extends AppCompatActivity { intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); intent.setPackage(defaultCameraPackage); startActivityForResult(intent, 2); - //startActivityForResult(intent, position); + } catch (Exception e) { + e.printStackTrace(); + }*/ + + try { + Log.e("MakeMachine", "startCameraActivity()"); + File file = new File(path); + outputFileUri = Uri.fromFile(file); + + String defaultCameraPackage = ""; + final PackageManager packageManager = getPackageManager(); + List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); + for (int n = 0; n < list.size(); n++) { + if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { + //Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); + //Log.e("TAG", "package name : " + list.get(n).packageName); + + //temp value in case camera is gallery app above jellybean + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + gallery_package = list.get(n).packageName; + } + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + defaultCameraPackage = list.get(n).packageName; + break; + } + } else { + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + defaultCameraPackage = list.get(n).packageName; + break; + } + } + } + } + + Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(defaultCameraPackage); + startActivityForResult(intent, 2); + } catch (ActivityNotFoundException e) { + e.printStackTrace(); + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(gallery_package); + startActivityForResult(intent, 2); } catch (Exception e) { e.printStackTrace(); } @@ -530,7 +625,24 @@ public class Stock_FacingActivity extends AppCompatActivity { int id = item.getItemId(); if (id == android.R.id.home) { - finish(); + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(Stock_FacingActivity.this); + builder.setTitle(getResources().getString(R.string.dialog_title)); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + finish(); + } + }) + .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + //finish(); } //Planogram Dialog @@ -582,15 +694,15 @@ public class Stock_FacingActivity extends AppCompatActivity { //super.onBackPressed(); android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(Stock_FacingActivity.this); - builder.setTitle("Parinaam"); + builder.setTitle(getResources().getString(R.string.dialog_title)); builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { + .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { finish(); } }) - .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() { + .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -649,8 +761,16 @@ public class Stock_FacingActivity extends AppCompatActivity { if (headerTitle.getCompany_id().equals("1")) { txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); + + txt_sosHeader.setVisibility(View.VISIBLE); + img_camera1.setVisibility(View.VISIBLE); + img_camera2.setVisibility(View.VISIBLE); } else { txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black)); + + txt_sosHeader.setVisibility(View.GONE); + img_camera1.setVisibility(View.GONE); + img_camera2.setVisibility(View.GONE); } //Camera allow enable @@ -662,7 +782,8 @@ public class Stock_FacingActivity extends AppCompatActivity { //String date = new Date().toLocaleString().toString(); //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); - _pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id() + + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; child_position = groupPosition; path = str + _pathforcheck; @@ -690,7 +811,8 @@ public class Stock_FacingActivity extends AppCompatActivity { //String date = new Date().toLocaleString().toString(); //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); - _pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id() + + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; child_position = groupPosition; path = str + _pathforcheck; @@ -716,11 +838,29 @@ public class Stock_FacingActivity extends AppCompatActivity { img_camera2.setBackgroundResource(R.mipmap.camera_grey); } - if (!checkflag) { - if (checkHeaderArray.contains(groupPosition)) { - txt_stockFaceupHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark)); - } else { - txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black)); + if (headerTitle.getCompany_id().equals("1")) { + if (!checkflag) { + if (checkHeaderArray.contains(groupPosition)) { + txt_stockFaceupHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark)); + } else { + txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); + /*if (headerTitle.getCompany_id().equals("1")) { + } else { + txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black)); + }*/ + } + } + } else { + if (!checkflag) { + if (checkHeaderArray.contains(groupPosition)) { + txt_stockFaceupHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark)); + } else { + /*if (headerTitle.getCompany_id().equals("1")) { + txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); + } else {*/ + txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black)); + //} + } } } @@ -768,8 +908,10 @@ public class Stock_FacingActivity extends AppCompatActivity { if (childData.getCompany_id().equals("1")) { holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); + holder.ed_stock.setVisibility(View.VISIBLE); } else { holder.txt_skuName.setTextColor(getResources().getColor(R.color.black)); + holder.ed_stock.setVisibility(View.GONE); } @@ -806,6 +948,43 @@ public class Stock_FacingActivity extends AppCompatActivity { } }); + /*holder.ed_stock.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) { + //final EditText caption = (EditText) v; + String edStock = s.toString(); + + if (!edStock.equals("")) { + String stock = edStock.replaceFirst("^0+(?!$)", ""); + childData.setStock(stock); + + if (edStock.equals("0")) { + childData.setFacing("0"); + + finalHolder.ed_facing.setEnabled(false); + } else { + childData.setFacing(childData.getFacing()); + finalHolder.ed_facing.setEnabled(true); + } + } else { + childData.setStock(""); + finalHolder.ed_facing.setEnabled(true); + } + + expandableListView.invalidateViews(); + } + });*/ + holder.ed_stock.setText(childData.getStock()); holder.ed_facing.setOnFocusChangeListener(new View.OnFocusChangeListener() { @@ -814,44 +993,49 @@ public class Stock_FacingActivity extends AppCompatActivity { final EditText caption = (EditText) v; final String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", ""); - if (!childData.getStock().equals("")) { - if (!edFaceup.equals("")) { - if (Integer.parseInt(edFaceup) <= Integer.parseInt(childData.getStock())) { - childData.setFacing(edFaceup); - } else { - if (isDialogOpen) { - isDialogOpen = !isDialogOpen; - AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); - builder.setMessage("Faceup can not be greater than stock value") - .setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.dismiss(); - isDialogOpen = !isDialogOpen; - } - }); - AlertDialog alert = builder.create(); - alert.show(); + if (childData.getCompany_id().equals("1")) { + if (!childData.getStock().equals("")) { + if (!edFaceup.equals("")) { + if (Integer.parseInt(edFaceup) <= Integer.parseInt(childData.getStock())) { + childData.setFacing(edFaceup); + } else { + if (isDialogOpen) { + isDialogOpen = !isDialogOpen; + AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); + builder.setMessage("Faceup can not be greater than stock value") + .setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + isDialogOpen = !isDialogOpen; + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } } + } else { + childData.setFacing(""); } } else { - childData.setFacing(""); + if (isDialogOpen) { + isDialogOpen = !isDialogOpen; + AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); + builder.setMessage("First fill the stock value") + .setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + isDialogOpen = !isDialogOpen; + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } } } else { - if (isDialogOpen) { - isDialogOpen = !isDialogOpen; - AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); - builder.setMessage("First fill the stock value") - .setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.dismiss(); - isDialogOpen = !isDialogOpen; - } - }); - AlertDialog alert = builder.create(); - alert.show(); - } + childData.setFacing(edFaceup); + childData.setStock("0"); } } }); @@ -861,24 +1045,39 @@ public class Stock_FacingActivity extends AppCompatActivity { if (!checkflag) { boolean tempflag = false; - if (holder.ed_stock.getText().toString().equals("")) { - holder.ed_stock.setBackgroundColor(getResources().getColor(R.color.white)); - holder.ed_stock.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark)); - holder.ed_stock.setHint("Empty"); - tempflag = true; - } + if (childData.getCompany_id().equals("1")) { + if (holder.ed_stock.getText().toString().equals("")) { + holder.ed_stock.setBackgroundColor(getResources().getColor(R.color.white)); + holder.ed_stock.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark)); + holder.ed_stock.setHint("Empty"); + tempflag = true; + } - if (holder.ed_facing.getText().toString().equals("")) { - holder.ed_facing.setBackgroundColor(getResources().getColor(R.color.white)); - holder.ed_facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark)); - holder.ed_facing.setHint("Empty"); - tempflag = true; - } + if (holder.ed_facing.getText().toString().equals("")) { + holder.ed_facing.setBackgroundColor(getResources().getColor(R.color.white)); + holder.ed_facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark)); + holder.ed_facing.setHint("Empty"); + tempflag = true; + } - if (tempflag) { - holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark)); + if (tempflag) { + holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark)); + } else { + holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white)); + } } else { - holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white)); + if (holder.ed_facing.getText().toString().equals("")) { + holder.ed_facing.setBackgroundColor(getResources().getColor(R.color.white)); + holder.ed_facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark)); + holder.ed_facing.setHint("Empty"); + tempflag = true; + } + + if (tempflag) { + holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark)); + } else { + holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white)); + } } } From e4d980a5f20e3bca7ae7bf13a934aba9677d993b Mon Sep 17 00:00:00 2001 From: yadavendras Date: Fri, 13 Jan 2017 15:55:02 +0530 Subject: [PATCH 29/36] T2P upload data newss --- .../gsk_dailyentry/CategoryListActivity.java | 79 +++++++++++-------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index 56842f7..67fc14a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -95,9 +95,49 @@ public class CategoryListActivity extends AppCompatActivity { categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id); - adapter = new CategoryListAdapter(CategoryListActivity.this, categoryList); - recyclerView.setAdapter(adapter); - recyclerView.setLayoutManager(new GridLayoutManager(getApplicationContext(), 2)); + if(categoryList.size()>0){ + + for(int i=0;i Date: Fri, 13 Jan 2017 16:57:58 +0530 Subject: [PATCH 30/36] Update CategoryWisePerformanceActivity.java --- .../CategoryWisePerformanceActivity.java | 166 ++++-------------- 1 file changed, 39 insertions(+), 127 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java index 1cb685a..c92ae49 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java @@ -37,54 +37,28 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { ArrayList categoryWisePerformanceList; CategoryWisePerformaceAdapter adapter; - private SharedPreferences preferences; + GSKOrangeDB db; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + private SharedPreferences preferences; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - setContentView(R.layout.activity_category_wise_performance); - - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - - recyclerView = (RecyclerView) findViewById(R.id.recyclerView); - //txt_categoryName = (TextView) findViewById(R.id.txt_categoryName); - - categoryName = getIntent().getStringExtra("categoryName"); - categoryId = getIntent().getStringExtra("categoryId"); - - preferences = PreferenceManager.getDefaultSharedPreferences(this); - - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); - - //txt_categoryName.setText(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName); - toolbar.setTitle(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName); - setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Intent intent = new Intent(CategoryWisePerformanceActivity.this, DailyDataMenuActivity.class); - intent.putExtra("categoryName", categoryName); - intent.putExtra("categoryId", categoryId); - startActivity(intent); - } - }); - try { + setContentView(R.layout.activity_category_wise_performance); toolbar = (Toolbar) findViewById(R.id.toolbar); recyclerView = (RecyclerView) findViewById(R.id.recyclerView); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + db = new GSKOrangeDB(this); db.open(); - store_id = preferences.getString(CommonString.KEY_STORE_ID, null); + //preference data + preferences = PreferenceManager.getDefaultSharedPreferences(this); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); username = preferences.getString(CommonString.KEY_USERNAME, null); @@ -103,7 +77,16 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(CategoryWisePerformanceActivity.this, DailyDataMenuActivity.class); + intent.putExtra("categoryName", categoryName); + intent.putExtra("categoryId", categoryId); + startActivity(intent); + } + }); } catch (Resources.NotFoundException e) { e.printStackTrace(); } @@ -113,79 +96,8 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { @Override protected void onResume() { super.onResume(); - - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); - - categoryWisePerformanceList = new ArrayList<>(); - CategoryWisePerformaceGetterSetter data = new CategoryWisePerformaceGetterSetter(); - - data.setPeriod("Period"); - data.setSos("SOS"); - data.setT2p("T2P"); - data.setPromo("Promo"); - data.setMsl_availability("MSL Availability"); - data.setOss("OSS"); - categoryWisePerformanceList.add(data); - - data = new CategoryWisePerformaceGetterSetter(); - data.setPeriod("LTM"); - data.setSos("75"); - data.setT2p("0"); - data.setPromo("0"); - data.setMsl_availability("25"); - data.setOss("55"); - categoryWisePerformanceList.add(data); - - data = new CategoryWisePerformaceGetterSetter(); - data.setPeriod("MTM"); - data.setSos("75"); - data.setT2p("0"); - data.setPromo("0"); - data.setMsl_availability("25"); - data.setOss("55"); - categoryWisePerformanceList.add(data); - - data = new CategoryWisePerformaceGetterSetter(); - data.setPeriod("RTM"); - data.setSos("75"); - data.setT2p("0"); - data.setPromo("0"); - data.setMsl_availability("25"); - data.setOss("55"); - categoryWisePerformanceList.add(data); - - data = new CategoryWisePerformaceGetterSetter(); - data.setPeriod("LTM"); - data.setSos("75"); - data.setT2p("0"); - data.setPromo("0"); - data.setMsl_availability("25"); - data.setOss("55"); - categoryWisePerformanceList.add(data); - - data = new CategoryWisePerformaceGetterSetter(); - data.setPeriod("MTM"); - data.setSos("75"); - data.setT2p("0"); - data.setPromo("0"); - data.setMsl_availability("25"); - data.setOss("55"); - categoryWisePerformanceList.add(data); - - data = new CategoryWisePerformaceGetterSetter(); - data.setPeriod("RTM"); - data.setSos("75"); - data.setT2p("0"); - data.setPromo("0"); - data.setMsl_availability("25"); - data.setOss("55"); - categoryWisePerformanceList.add(data); - - adapter = new CategoryWisePerformaceAdapter(CategoryWisePerformanceActivity.this, categoryWisePerformanceList); - recyclerView.setAdapter(adapter); - recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext())); - try { + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); categoryWisePerformanceList = db.getCategoryWisePerformance(store_id, categoryId); adapter = new CategoryWisePerformaceAdapter(CategoryWisePerformanceActivity.this, categoryWisePerformanceList); @@ -194,13 +106,31 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { } catch (Exception e) { e.printStackTrace(); } + } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + if (id == android.R.id.home) { + finish(); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); } public class CategoryWisePerformaceAdapter extends RecyclerView.Adapter { Context context; - private LayoutInflater inflator; List list = Collections.emptyList(); + private LayoutInflater inflator; public CategoryWisePerformaceAdapter(Context context, List list) { inflator = LayoutInflater.from(context); @@ -256,25 +186,6 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { } } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - if (id == android.R.id.home) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } - private static boolean updateResources(Context context, String language) { String lang ; @@ -301,4 +212,5 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { return true; } + } From c209f800d8248a5320f8e70cc09fa715a42beeea Mon Sep 17 00:00:00 2001 From: gagangoel290 Date: Fri, 13 Jan 2017 17:00:30 +0530 Subject: [PATCH 31/36] Update MSL_AvailabilityActivity.java --- .../MSL_AvailabilityActivity.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index 8668a7d..6a1f03b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -73,11 +73,10 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { db = new GSKOrangeDB(this); db.open(); - //preference data - preferences = PreferenceManager.getDefaultSharedPreferences(this); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + //preference data + preferences = PreferenceManager.getDefaultSharedPreferences(this); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); @@ -221,6 +220,13 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { } catch (Resources.NotFoundException e) { e.printStackTrace(); } + + } + + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); } private void prepareList() { @@ -483,12 +489,6 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { } - @Override - protected void onResume() { - super.onResume(); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); - } - private static boolean updateResources(Context context, String language) { String lang ; From d9dda1b0a28070fd19a81cc936c0fe5865ca10b3 Mon Sep 17 00:00:00 2001 From: gagangoel290 Date: Fri, 13 Jan 2017 17:04:22 +0530 Subject: [PATCH 32/36] Update PromoComplianceActivity.java --- .../PromoComplianceActivity.java | 71 ++++++++++--------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java index 016dea0..0e0ae6b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java @@ -48,6 +48,33 @@ public class PromoComplianceActivity extends AppCompatActivity { String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; private SharedPreferences preferences; + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -74,11 +101,10 @@ public class PromoComplianceActivity extends AppCompatActivity { db = new GSKOrangeDB(this); db.open(); - //preference data - preferences = PreferenceManager.getDefaultSharedPreferences(this); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + //preference data + preferences = PreferenceManager.getDefaultSharedPreferences(this); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); @@ -264,6 +290,13 @@ public class PromoComplianceActivity extends AppCompatActivity { } catch (Exception e) { e.printStackTrace(); } + + } + + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); } private void prepareList() { @@ -476,37 +509,5 @@ public class PromoComplianceActivity extends AppCompatActivity { }); android.app.AlertDialog alert = builder.create(); alert.show(); -} - - protected void onResume() { - super.onResume(); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); - } - - private static boolean updateResources(Context context, String language) { - - String lang ; - - if(language.equalsIgnoreCase("English")){ - lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { - lang = "AR"; - } - else { - lang = "TR"; - } - - Locale locale = new Locale(lang); - Locale.setDefault(locale); - - Resources resources = context.getResources(); - - Configuration configuration = resources.getConfiguration(); - configuration.locale = locale; - - resources.updateConfiguration(configuration, resources.getDisplayMetrics()); - - return true; } } From 15f98f76d486ca23281b6e471cc55fcaa8eb637e Mon Sep 17 00:00:00 2001 From: gagangoel290 Date: Fri, 13 Jan 2017 17:05:58 +0530 Subject: [PATCH 33/36] Update Stock_FacingActivity.java --- .../gsk_dailyentry/Stock_FacingActivity.java | 74 +++++++++---------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index 26f2df6..0421cc9 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -87,6 +87,33 @@ public class Stock_FacingActivity extends AppCompatActivity { String gallery_package = ""; private SharedPreferences preferences; + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -101,11 +128,10 @@ public class Stock_FacingActivity extends AppCompatActivity { expandableListView = (ExpandableListView) findViewById(R.id.expandableListView); //txt_stockFacingName = (TextView) findViewById(R.id.txt_stockFacingName); - //preference data - preferences = PreferenceManager.getDefaultSharedPreferences(this); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + //preference data + preferences = PreferenceManager.getDefaultSharedPreferences(this); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); @@ -256,6 +282,7 @@ public class Stock_FacingActivity extends AppCompatActivity { } catch (Resources.NotFoundException e) { e.printStackTrace(); } + } private void prepareList() { @@ -717,6 +744,12 @@ public class Stock_FacingActivity extends AppCompatActivity { alert.show(); } + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + } + public class ExpandableListAdapter extends BaseExpandableListAdapter { private Context _context; private List _listDataHeader; @@ -1106,39 +1139,4 @@ public class Stock_FacingActivity extends AppCompatActivity { TextView txt_skuName; LinearLayout lin_category; } - - - @Override - protected void onResume() { - super.onResume(); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); - } - - private static boolean updateResources(Context context, String language) { - - String lang ; - - if(language.equalsIgnoreCase("English")){ - lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { - lang = "AR"; - } - else { - lang = "TR"; - } - - Locale locale = new Locale(lang); - Locale.setDefault(locale); - - Resources resources = context.getResources(); - - Configuration configuration = resources.getConfiguration(); - configuration.locale = locale; - - resources.updateConfiguration(configuration, resources.getDisplayMetrics()); - - return true; - } - } From adc58aa2d4da7fb36a1bf98babc0b3f5ee35bed2 Mon Sep 17 00:00:00 2001 From: gagangoel290 Date: Fri, 13 Jan 2017 17:06:57 +0530 Subject: [PATCH 34/36] Update StoreWisePerformanceActivity.java --- .../StoreWisePerformanceActivity.java | 76 ++++++++++++++----- 1 file changed, 56 insertions(+), 20 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java index 38ca963..956ad29 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java @@ -3,6 +3,7 @@ package cpm.com.gskmtorange.gsk_dailyentry; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; @@ -21,6 +22,7 @@ import android.widget.TextView; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; @@ -36,8 +38,35 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { StoreWisePerformaceAdapter adapter; GSKOrangeDB db; - private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + private SharedPreferences preferences; + + private static boolean updateResources(Context context, String language) { + + String lang ; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } + else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } @Override protected void onCreate(Bundle savedInstanceState) { @@ -51,6 +80,8 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { db = new GSKOrangeDB(this); db.open(); + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + //preference data preferences = PreferenceManager.getDefaultSharedPreferences(this); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); @@ -78,12 +109,15 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { } catch (Resources.NotFoundException e) { e.printStackTrace(); } + } @Override protected void onResume() { super.onResume(); try { + updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + storeWisePerformanceList = db.getStoreWisePerformance(store_id); adapter = new StoreWisePerformaceAdapter(StoreWisePerformanceActivity.this, storeWisePerformanceList); @@ -94,10 +128,29 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { } } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + if (id == android.R.id.home) { + finish(); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + public class StoreWisePerformaceAdapter extends RecyclerView.Adapter { Context context; - private LayoutInflater inflator; List list = Collections.emptyList(); + private LayoutInflater inflator; public StoreWisePerformaceAdapter(Context context, List list) { inflator = LayoutInflater.from(context); @@ -152,22 +205,5 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { } } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - if (id == android.R.id.home) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } } + From 385bd0a36d6b171c4af84520d65af7c59bfb80c2 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Fri, 13 Jan 2017 17:58:49 +0530 Subject: [PATCH 35/36] T2P upload data newss --- .idea/misc.xml | 2 +- GSKMTOrange/build.gradle | 14 +- GSKMTOrange/src/main/AndroidManifest.xml | 16 +- .../com/gskmtorange/Database/GSKOrangeDB.java | 37 ++- .../cpm/com/gskmtorange/LoginActivity.java | 3 +- .../cpm/com/gskmtorange/MainActivity.java | 6 + .../gskmtorange/SelectLanguageActivity.java | 15 ++ .../gskmtorange/constant/CommonString.java | 4 +- .../dailyentry/SettingsActivity.java | 51 ++++ .../fragment/SelectLanguageFragment.java | 242 ++++++++++++++++++ .../fragment/SettingsActivityFragment.java | 140 ++++++++++ .../gsk_dailyentry/DailyDataMenuActivity.java | 11 +- .../xmlGetterSetter/CategoryGetterSetter.java | 9 +- .../src/main/res/layout/activity_settings.xml | 34 +++ .../src/main/res/layout/content_settings.xml | 9 + .../res/layout/fragment_select_language.xml | 112 ++++++++ .../src/main/res/layout/fragment_settings.xml | 19 ++ .../main/res/layout/settings_item_layout.xml | 63 +++++ .../src/main/res/menu/menu_settings.xml | 10 + .../src/main/res/mipmap-hdpi/checkout_bg.png | Bin 0 -> 4085 bytes .../src/main/res/mipmap-tr/checkout_bg.png | Bin 0 -> 4286 bytes GSKMTOrange/src/main/res/values-tr/string.xml | 2 + GSKMTOrange/src/main/res/values/strings.xml | 8 +- 23 files changed, 783 insertions(+), 24 deletions(-) create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java create mode 100644 GSKMTOrange/src/main/res/layout/activity_settings.xml create mode 100644 GSKMTOrange/src/main/res/layout/content_settings.xml create mode 100644 GSKMTOrange/src/main/res/layout/fragment_select_language.xml create mode 100644 GSKMTOrange/src/main/res/layout/fragment_settings.xml create mode 100644 GSKMTOrange/src/main/res/layout/settings_item_layout.xml create mode 100644 GSKMTOrange/src/main/res/menu/menu_settings.xml create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/checkout_bg.png create mode 100644 GSKMTOrange/src/main/res/mipmap-tr/checkout_bg.png diff --git a/.idea/misc.xml b/.idea/misc.xml index b8dc4d6..b15ecee 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -41,7 +41,7 @@ - + diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index a379ea0..f786b43 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 + compileSdkVersion 24 buildToolsVersion "24.0.1" useLibrary 'org.apache.http.legacy' @@ -32,12 +32,14 @@ dependencies { androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) + compile 'com.android.support:appcompat-v7:24.2.1' compile 'com.android.support:design:24.2.1' - testCompile 'junit:junit:4.12' - - compile 'com.google.android.gms:play-services-location:9.0.2' - compile 'com.google.android.gms:play-services-maps:9.0.2' + compile 'com.google.android.gms:play-services-location:9.4.0' + compile 'com.google.android.gms:play-services-maps:9.4.0' compile 'com.android.support:cardview-v7:24.2.1' - compile 'com.google.android.gms:play-services-appindexing:9.0.2' + compile 'com.google.android.gms:play-services-appindexing:9.4.0' + compile 'com.android.support:support-v4:24.2.1' + testCompile 'junit:junit:4.12' + compile 'com.google.code.gson:gson:2.7' } diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 5c53e95..9cc9aed 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -68,6 +68,7 @@ android:label="@string/title_activity_store_geotag" android:screenOrientation="portrait" android:theme="@style/AppTheme.NoActionBar" /> + @@ -119,7 +120,6 @@ android:screenOrientation="portrait" android:theme="@style/AppTheme.NoActionBar" android:windowSoftInputMode="adjustPan" /> - - - + - + android:theme="@style/AppTheme.NoActionBar" /> - - + \ No newline at end of file diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index 55cd05d..6d3415f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -838,7 +838,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID"))); cd.setCategory(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY"))); - cd.setCategory_img("category"); + cd.setCategory_img(-1); list.add(cd); dbcursor.moveToNext(); @@ -2685,4 +2685,39 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } //Gagan end new code 2 + //T2P is filled + public boolean isFilledT2P(String store_id, String category_id) { + Log.d("T2P ", "T2P data--------------->Start<------------"); + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + + CommonString.KEY_STORE_ID + "='" + store_id + "' AND " + + CommonString.KEY_CATEGORY_ID + "='" + category_id + "'", null); + + if (dbcursor != null) { + if (dbcursor.moveToFirst()) { + do { + T2PGetterSetter tp = new T2PGetterSetter(); + + tp.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID))); + list.add(tp); + } while (dbcursor.moveToNext()); + } + dbcursor.close(); + + if (list.size() > 0) { + return true; + } else { + return false; + } + } + } catch (Exception e) { + Log.d("Exception ", "when fetching Records!!!!" + e.toString()); + return false; + } + + return false; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index 51dde72..c424249 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -39,7 +39,6 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; - import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; import org.ksoap2.serialization.SoapSerializationEnvelope; @@ -695,5 +694,7 @@ public class LoginActivity extends AppCompatActivity { return true; } + + } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index f16711f..5ec029d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -43,6 +43,7 @@ import cpm.com.gskmtorange.GetterSetter.CoverageBean; import cpm.com.gskmtorange.GetterSetter.StoreBean; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.dailyentry.AdditionalVisibility; +import cpm.com.gskmtorange.dailyentry.SettingsActivity; import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity; import cpm.com.gskmtorange.dailyentry.StoreListActivity; import cpm.com.gskmtorange.download.DownloadActivity; @@ -280,6 +281,11 @@ public class MainActivity extends AppCompatActivity } else if (id == R.id.nav_setting) { + Intent startDownload = new Intent(this,SettingsActivity.class); + startActivity(startDownload); + + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); + //startActivity(new Intent(MainActivity.this, CategoryListActivity.class)); } /*else if (id == R.id.nav_export) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java index 3516dcf..93cffca 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java @@ -15,6 +15,8 @@ import android.support.v7.widget.Toolbar; import android.view.View; import android.widget.Button; +import com.google.gson.Gson; + import java.util.ArrayList; import java.util.Locale; @@ -51,6 +53,8 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On language = login_data.getCULTURE_NAME(); culture_id = login_data.getCULTURE_ID(); + setDataFromSharedPreferences(login_data); + if (language.size() > 1) { btn_lang_1.setText(language.get(0)); @@ -144,4 +148,15 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On return true; } + + private void setDataFromSharedPreferences(LoginGetterSetter lgs) { + Gson gson = new Gson(); + String jsonCurProduct = gson.toJson(lgs); + + //SharedPreferences sharedPref = getApplicationContext().getSharedPreferences(CommonString.KEY_LOOGIN_PREF, Context.MODE_PRIVATE); + SharedPreferences.Editor editor = preferences.edit(); + + editor.putString(CommonString.KEY_LOOGIN_PREF, jsonCurProduct); + editor.commit(); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java index 29a13b3..3e52340 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -50,9 +50,11 @@ public class CommonString { public static final String KEY_COVERAGE_REMARK = "REMARK"; public static final String KEY_IMAGE = "IMAGE"; public static final String KEY_IMAGE_URL = "IMAGE_URL"; - public static final String KEY_ID = "Id"; + public static final String KEY_ID = "Id"; public static final String KEY_MERCHANDISER_ID = "MERCHANDISER_ID"; + public static final String KEY_LOOGIN_PREF ="LOGIN_PREF"; + //KEYS RELATED TO T2P COMPLIANCE public static final String KEY_DISPLAY = "DISPLAY"; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java new file mode 100644 index 0000000..f227b48 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java @@ -0,0 +1,51 @@ +package cpm.com.gskmtorange.dailyentry; + +import android.net.Uri; +import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.View; + +import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.fragment.SelectLanguageFragment; +import cpm.com.gskmtorange.fragment.SettingsActivityFragment; + +public class SettingsActivity extends AppCompatActivity implements SelectLanguageFragment.OnFragmentInteractionListener { + + boolean isSelected = false; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_settings); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + SettingsActivityFragment fragment = new SettingsActivityFragment(); + getSupportFragmentManager().beginTransaction().add(R.id.fragment,fragment).commit(); + + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + + if(isSelected){ + finish(); + } + else { + Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); + } + + + } + }); + } + + @Override + public void onFragmentInteraction(boolean isSelected) { + this.isSelected = isSelected; + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java new file mode 100644 index 0000000..8e8b4c8 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java @@ -0,0 +1,242 @@ +package cpm.com.gskmtorange.fragment; + +import android.content.Context; +import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.net.Uri; +import android.os.Bundle; + + +import android.preference.PreferenceManager; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; + +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonString; +import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter; + +/** + * A simple {@link Fragment} subclass. + * Activities that contain this fragment must implement the + * {@link SelectLanguageFragment.OnFragmentInteractionListener} interface + * to handle interaction events. + * Use the {@link SelectLanguageFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class SelectLanguageFragment extends Fragment implements View.OnClickListener{ + // TODO: Rename parameter arguments, choose names that match + // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String ARG_PARAM1 = "param1"; + private static final String ARG_PARAM2 = "param2"; + + // TODO: Rename and change types of parameters + private String mParam1; + private String mParam2; + + private OnFragmentInteractionListener mListener; + + private SharedPreferences preferences = null; + private SharedPreferences.Editor editor = null; + + Button btn_lang_1, btn_lang_2; + + ArrayList language, culture_id; + + LoginGetterSetter login_data; + + public SelectLanguageFragment() { + // Required empty public constructor + } + + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment SelectLanguageFragment. + */ + // TODO: Rename and change types and number of parameters + public static SelectLanguageFragment newInstance(String param1, String param2) { + SelectLanguageFragment fragment = new SelectLanguageFragment(); + Bundle args = new Bundle(); + args.putString(ARG_PARAM1, param1); + args.putString(ARG_PARAM2, param2); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { + mParam1 = getArguments().getString(ARG_PARAM1); + mParam2 = getArguments().getString(ARG_PARAM2); + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + View view = inflater.inflate(R.layout.fragment_select_language, container, false); + + preferences = PreferenceManager.getDefaultSharedPreferences(getActivity()); + editor = preferences.edit(); + + getDataFromSharedPreferences(); + + btn_lang_1 = (Button) view.findViewById(R.id.btn_language_one); + btn_lang_2 = (Button) view.findViewById(R.id.btn_language_two); + + + /* login_data = (LoginGetterSetter) getIntent().getSerializableExtra(CommonString.KEY_LOGIN_DATA); + language = login_data.getCULTURE_NAME(); + culture_id = login_data.getCULTURE_ID(); +*/ + if (language.size() > 1) { + + btn_lang_1.setText(language.get(0)); + btn_lang_2.setText(language.get(1)); + + btn_lang_1.setOnClickListener(this); + btn_lang_2.setOnClickListener(this); + } + return view; + } + + // TODO: Rename method, update argument and hook method into UI event + public void onButtonPressed(boolean selected_flag) { + if (mListener != null) { + + mListener.onFragmentInteraction(selected_flag); + } + } + + @Override + public void onAttach(Context context) { + super.onAttach(context); + if (context instanceof OnFragmentInteractionListener) { + mListener = (OnFragmentInteractionListener) context; + } else { + throw new RuntimeException(context.toString() + + " must implement OnFragmentInteractionListener"); + } + } + + @Override + public void onDetach() { + super.onDetach(); + mListener = null; + } + + @Override + public void onClick(View view) { + int id = view.getId(); + + switch (id) { + case R.id.btn_language_one: + + //selected_flag = true; + onButtonPressed(true); + + updateResources(getActivity(), language.get(0)); + + btn_lang_1.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + btn_lang_2.setBackgroundColor(getResources().getColor(R.color.grey_background)); + + editor.putString(CommonString.KEY_LANGUAGE, language.get(0)); + editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(0)); + editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, login_data.getNOTICE_URL().get(0)); + editor.commit(); + + break; + + case R.id.btn_language_two: + + //selected_flag = true; + + onButtonPressed(true); + + updateResources(getActivity(), language.get(1)); + + btn_lang_1.setBackgroundColor(getResources().getColor(R.color.grey_background)); + btn_lang_2.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + + editor.putString(CommonString.KEY_LANGUAGE, language.get(1)); + editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(1)); + editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, login_data.getNOTICE_URL().get(1)); + editor.commit(); + + break; + } + } + + /** + * This interface must be implemented by activities that contain this + * fragment to allow an interaction in this fragment to be communicated + * to the activity and potentially other fragments contained in that + * activity. + *

+ * See the Android Training lesson Communicating with Other Fragments for more information. + */ + public interface OnFragmentInteractionListener { + // TODO: Update argument type and name + void onFragmentInteraction(boolean flag); + } + + private void getDataFromSharedPreferences(){ + Gson gson = new Gson(); + login_data = new LoginGetterSetter(); + + String jsonPreferences = preferences.getString(CommonString.KEY_LOOGIN_PREF, ""); + + Type type = new TypeToken() {}.getType(); + login_data = gson.fromJson(jsonPreferences, type); + + language = login_data.getCULTURE_NAME(); + culture_id = login_data.getCULTURE_ID(); + + //return ; + } + + private static boolean updateResources(Context context, String language) { + String lang; + + if(language.equalsIgnoreCase("English")){ + lang = "EN"; + } + else if(language.equalsIgnoreCase("UAE")) { + + lang = "AR"; + } else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java new file mode 100644 index 0000000..1d68584 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java @@ -0,0 +1,140 @@ +package cpm.com.gskmtorange.fragment; + +import android.app.Activity; + +import android.content.SharedPreferences; +import android.os.Bundle; + +import android.preference.PreferenceManager; +import android.support.v4.app.Fragment; +import android.support.v7.widget.CardView; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.List; + +import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonString; +import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter; + +/** + * A placeholder fragment containing a simple view. + */ +public class SettingsActivityFragment extends Fragment { + + ArrayList settingsList; + + public SettingsActivityFragment() { + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_settings, container, false); + + RecyclerView rec = (RecyclerView) view.findViewById(R.id.rec_settings); + + SettingsGetterSetter settings = new SettingsGetterSetter(); + settings.setName(getString(R.string.select_language_item)); + settings.setIcon(R.mipmap.entry_grey); + SelectLanguageFragment selectLanguageFragment = new SelectLanguageFragment(); + settings.setFragment(selectLanguageFragment); + + settingsList = new ArrayList<>(); + settingsList.add(settings); + + rec.setLayoutManager(new LinearLayoutManager(getActivity())); + SettingsAdapter settingsAdapter = new SettingsAdapter(); + rec.setAdapter(settingsAdapter); + + return view; + } + + class SettingsAdapter extends RecyclerView.Adapter{ + + + @Override + public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.settings_item_layout, parent, false); + return new ViewHolder(view); + } + + @Override + public void onBindViewHolder(ViewHolder holder, int position) { + final SettingsGetterSetter mItem = settingsList.get(position); + holder.tv_settings.setText(mItem.getName()); + + holder.cardView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Fragment nextFrag= mItem.getFragment(); + getActivity().getSupportFragmentManager().beginTransaction() + .replace(R.id.fragment, nextFrag,"Settings") + .addToBackStack(null) + .commit(); + } + }); + } + + @Override + public int getItemCount() { + return settingsList.size(); + } + + class ViewHolder extends RecyclerView.ViewHolder{ + + public CardView cardView; + public TextView tv_settings; + + public ViewHolder(View itemView) { + super(itemView); + cardView = (CardView) itemView.findViewById(R.id.card_layout); + tv_settings = (TextView) itemView.findViewById(R.id.tv_settings); + } + } + } + + class SettingsGetterSetter{ + + String name; + int icon; + Fragment fragment; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getIcon() { + return icon; + } + + public void setIcon(int icon) { + this.icon = icon; + } + + + public Fragment getFragment() { + return fragment; + } + + public void setFragment(Fragment fragment) { + this.fragment = fragment; + } + } + + +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java index 0adf4f4..644478c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java @@ -123,11 +123,18 @@ public class DailyDataMenuActivity extends AppCompatActivity { } categoryList.add(data); + //T2p data = new DailyDataMenuGetterSetter(); - //data.setCategory_name("T2P Compliance"); data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p)); - data.setCategory_img(R.mipmap.t2p_compliance); + + if (db.isFilledT2P(store_id, categoryId)) { + data.setCategory_img(R.mipmap.t2p_compliance_done); + } else { + data.setCategory_img(R.mipmap.t2p_compliance); + } + categoryList.add(data); + //T2p added data = new DailyDataMenuGetterSetter(); //data.setCategory_name("Additional Visibility"); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryGetterSetter.java index ec785aa..472e412 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryGetterSetter.java @@ -6,7 +6,9 @@ package cpm.com.gskmtorange.xmlGetterSetter; public class CategoryGetterSetter { - String category_id, category, category_img; + String category_id, category; + + int category_img; public String getCategory_id() { return category_id; @@ -24,11 +26,12 @@ public class CategoryGetterSetter { this.category = category; } - public String getCategory_img() { + + public int getCategory_img() { return category_img; } - public void setCategory_img(String category_img) { + public void setCategory_img(int category_img) { this.category_img = category_img; } } diff --git a/GSKMTOrange/src/main/res/layout/activity_settings.xml b/GSKMTOrange/src/main/res/layout/activity_settings.xml new file mode 100644 index 0000000..15fe336 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/activity_settings.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/GSKMTOrange/src/main/res/layout/content_settings.xml b/GSKMTOrange/src/main/res/layout/content_settings.xml new file mode 100644 index 0000000..0a1cb24 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/content_settings.xml @@ -0,0 +1,9 @@ + diff --git a/GSKMTOrange/src/main/res/layout/fragment_select_language.xml b/GSKMTOrange/src/main/res/layout/fragment_select_language.xml new file mode 100644 index 0000000..bf946b4 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/fragment_select_language.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + +