From 7df66f1d5f7bd677652df17555371ef482a28bef Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Mon, 23 Jan 2017 17:37:48 +0530 Subject: [PATCH 1/4] newcode --- .idea/misc.xml | 2 +- .../main/res/mipmap-xhdpi/checkout_turkish.png | Bin 0 -> 3430 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 GSKMTOrange/src/main/res/mipmap-xhdpi/checkout_turkish.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/res/mipmap-xhdpi/checkout_turkish.png b/GSKMTOrange/src/main/res/mipmap-xhdpi/checkout_turkish.png new file mode 100644 index 0000000000000000000000000000000000000000..2dad632cec5289b6fb925f6275449b785fb93d82 GIT binary patch literal 3430 zcmbVPdpwi-AK#9WOGN2HsWpy7%!W0~uz85g#1tW!ZD!bg%dC_Np>jP$GbgE|sN6+D zNmMGN6bc>5{Zev?#&6C!o!{?|^ZNZ>uix`}p67e}yx*Vu>v=t~`w4qhl(dvUAdrfq z1K=hbZI&MedD%OU&gqs7ntVG?K9Lo`4<&J_AS{LDPlY%#NHnS&l|%{SJfT{GKym?e zcTc{jGagN5F^oyeGR8s%TZRUKEUkrX5;>U4hxk)zbS4HmQB@0t&?y+Ghq<$fGuxIL zNOur%sYDUMoh%9_TTr0ZRuD@eT1LR2@<|XOBZSFA3o+0?c+s-?@-_?#`9p*sjDh}X zl&AB4h%Jjtg_s+g8j(%la0n7<3^y}JBH_Cr2opF0W+JdVnS>E9jL9bnjhH;09}EDM zN9NMmd^(E>S!N{pvjlt$RA%X)E-={6&VLg#d4B~;7BZNS#D>9*O<)YhvR{8l^Z0Jm zf1B}-(meMtHWlVZ<*@`@vMe6~IzPa&*!_1!%Yrg%&@NoMEGeWAfJGKCs7$^ifPu>V>84>{OWDAs;8O|0!VNGzh2s0E4_`&f{SX%&YW+#g|AVb69c1SD$ zN7*BB7Is)WxE;y_`2*|7J$xpf@S@1S~cjGP+m zY*nf&YHm9L+M(5LnQ4@Xq&@q|kE4f3DBKxhM2kY7wkK$Y3*_bfATJY@Lc3P0`u=2{ zTQ9{~MLYJU^w5l`iR*;UtftB%nf#NwE z>$vWOsP<{}nzk{`inSh`iBXH)+d(z?i?M=Xb6)txn$6^CA@5z2Vs+)vumYwl&YXJislsH!pE`{T4bUl^gq9kYirKPtk-ns zgkQC4IM^uGFWu;uSCdh|2w8Qya8Q@fiz#dL>A6WuANW3NsCX;1*5*xV*BZU=+z}eP z>_*>-V^%d+3a(-ARyBjvea&V{r@+#%4W5xxT+)nk$+n(Pl9HdjDp8q~e9I{WsiC*l zHwqiP?30Ft*G%>{Kf)hFigc>qgZnCWpQ*d;QP8`l{T$G9=HktPq%qAX{K3o5vDY^Z z4eH-JGXN{x)(|?a9a*)V@_9XC^}f$gU+JvI6)ki7HB(~?m0KZ($zecs5oaQ(_ZO6j zch8waqIio%qSb6(nZfY2#M()k@NP=zY@*cRZQa?G5&Nq=$LfryYt$FLFb(^iRMq@` zQXxe~aH=rp#!Vi2_7bL5Rg?A-z6>2#tbKe!{Fqdd$gD6WGUO{NP@I<+w<;(?_ z3N^+p-%Q`pt)7Il@IhfWS6;CKQZ~flUQ&{*g3W5Y3b+YG$k+W90TtJ=`PDNg(nxej`>##=alkz<|~cH-gJV=LO=8=Y?ApOu_^ zdvIHzUJ$I1(7{SBxekW()3$llysbG;d^YaFi8hS+<+oLbG^FhY{?io~CT@?HULIN< zVKIY=?A7W^0l;5o^&~F0noVNU&V6$IC`?u#!C#C}eE<@l+VR@m{mN8O!x`zYE%DJ= zQ(ck)7T%uc@i}IC-DqL=Zwve4Th#T+^M~s#f8Nr=Sc(|k6tv=7MC!01zEaY_$Qwjq z;c^^QwSM{A4|>xcDGE_9uLfqPQNp`ADF9($T3@pHAWhr9py9}?rcV)m?!0saGGk?n*8Ct>hnuyCw*SI= z=ZZgnkK}a;=JsnvS0}_R{6rlu<@h81Zjf4DZ21I5a4{em(workBy1JMFP3*xXfF*X zjVseeSwFM8E!kFAwEZRd z{>he-70TLC__&cGarc0Eu+cbmsQXYLUSV6mz35$6V!$j?V^3XXuUdSLk5rS;KT)(~ zE#HQ_#xhAg;FVJl{MPEJ**A=;yDRdWqUP{oaUvtrUp*(@gp@kJ4)OYR`sE!fZ#mY< z+u*T5-(y8e#g;mSc8vO}c7nV_Yu#4wW1#z>yH!m?=?xK`TVAl z>A`YbK5Nh39SN(77r&0@nnKP#1^P3+1z-cg%J63F)coP$o=y3U8TxAnrH5bOBMDN} z!0@+PwfUZ%qzJefF)v(jR;V8`~-I)tWWUh^W%$GJp5z818(Y8{vg0l@fi85poXnu z<52M#$Q}!Cl~Z%9h^^FDGt^PF*%E;QEq^!X_Dya@l=c+ZNx>+RNU7*HrwMo9zyYZR zXiKlYk#dRFM~-W{rYid}ztl6hxy zW4w0oyF${#*6EQq+pauY|4x)Ja%2${0a94%pXI+%*^CTv^YZH4f5HY Date: Wed, 25 Jan 2017 10:57:49 +0530 Subject: [PATCH 2/4] newcode --- .idea/misc.xml | 2 +- .../src/main/java/cpm/com/gskmtorange/MainActivity.java | 3 +-- 2 files changed, 2 insertions(+), 3 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/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 664264c..2397215 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -227,8 +227,7 @@ public class MainActivity extends AppCompatActivity if (coverageList.size() == 0) { Snackbar.make(webView, R.string.no_data_for_upload, Snackbar.LENGTH_SHORT).setAction("Action", null).show(); - Intent i = new Intent(getBaseContext(), UploadActivity.class); - startActivity(i); + } else { if (isStoreCheckedIn() && isValid()) { From 56b5a42ff1fc84224dab27a079b74cd04e0a5b67 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Wed, 25 Jan 2017 11:24:41 +0530 Subject: [PATCH 3/4] newcode --- GSKMTOrange/build.gradle | 4 +- GSKMTOrange/src/main/AndroidManifest.xml | 1 + .../com/gskmtorange/Database/GSKOrangeDB.java | 136 ++++++++++++++++-- .../cpm/com/gskmtorange/MainActivity.java | 3 +- .../dailyentry/CheckoutActivity.java | 2 +- .../dailyentry/NonWorkingReason.java | 6 +- .../dailyentry/StoreListActivity.java | 2 +- .../dailyentry/T2PComplianceActivity.java | 33 ++++- .../fragment/ServiceActivityFragment.java | 6 +- .../gsk_dailyentry/CategoryListActivity.java | 58 +++++--- .../gsk_dailyentry/DailyDataMenuActivity.java | 24 ++-- .../PromoComplianceActivity.java | 4 +- .../upload/PreviousDataUploadActivity.java | 3 +- .../gskmtorange/upload/UploadActivity.java | 25 ++-- GSKMTOrange/src/main/res/values-tr/string.xml | 14 +- GSKMTOrange/src/main/res/values/strings.xml | 13 +- 16 files changed, 257 insertions(+), 77 deletions(-) diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 992c541..213644a 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -14,8 +14,8 @@ android { applicationId "cpm.com.gskmtorange" minSdkVersion 15 targetSdkVersion 22 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index d63a2dd..9a6bced 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -150,6 +150,7 @@ android:name=".upload.UploadActivity" android:configChanges="screenSize|orientation|keyboardHidden" android:label="@string/title_activity_upload" + android:theme="@style/AppTheme.NoActionBar" android:screenOrientation="portrait" /> getPromoComplianceSkuData(String store_id) { + public ArrayList getPromoComplianceSkuData(String store_id, String category_id) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { - dbcursor = db.rawQuery("Select * from MAPPING_PROMOTION " + - "where STORE_ID='" + store_id + "'", null); + dbcursor = db.rawQuery("Select M.* " + + "from MAPPING_PROMOTION M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' " + + "order by SB.SUB_CATEGORY,BR.BRAND", null); + + /*dbcursor = db.rawQuery("Select * from MAPPING_PROMOTION " + + "where STORE_ID='" + store_id + "'", null);*/ if (dbcursor != null) { dbcursor.moveToFirst(); @@ -1530,7 +1543,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } - public ArrayList getPromoSpinnerData(String store_id) { + public ArrayList getPromoSpinnerData(String store_id, String category_id) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; @@ -1541,8 +1554,21 @@ public class GSKOrangeDB extends SQLiteOpenHelper { list.add(promo); - dbcursor = db.rawQuery("Select * from MAPPING_ADDITIONAL_PROMOTION " + - "where STORE_ID='" + store_id + "'", null); + dbcursor = db.rawQuery("Select M.* " + + "from MAPPING_ADDITIONAL_PROMOTION M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' " + + "order by SB.SUB_CATEGORY,BR.BRAND", null); + + /*dbcursor = db.rawQuery("Select * from MAPPING_ADDITIONAL_PROMOTION " + + "where STORE_ID='" + store_id + "'", null);*/ if (dbcursor != null) { dbcursor.moveToFirst(); @@ -1723,6 +1749,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setENTRY_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ENTRY_ALLOW"))); + sb.setIMAGE_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE_ALLOW"))); + + list.add(sb); dbcursor.moveToNext(); } @@ -3271,12 +3300,25 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return filled; } - public boolean isMappingPromotionData() { + public boolean isMappingPromotionData(String store_id, String category_id) { boolean filled = false; Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM MAPPING_PROMOTION ", null); + dbcursor = db.rawQuery("Select M.* " + + "from MAPPING_PROMOTION M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' " + + "order by SB.SUB_CATEGORY,BR.BRAND ", null); + + //dbcursor = db.rawQuery("SELECT * FROM MAPPING_PROMOTION ", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -3295,12 +3337,25 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return filled; } - public boolean isMappingStockData() { + public boolean isMappingStockDataMSL_Availability(String category_id, String keyAccount_id, String storeType_id, String class_id) { boolean filled = false; Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM MAPPING_STOCK ", null); + //dbcursor = db.rawQuery("SELECT * FROM MAPPING_STOCK ", null); + dbcursor = db.rawQuery("Select M.* from MAPPING_STOCK M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where M.MUST_HAVE=1 AND CA.CATEGORY_ID='" + category_id + "' " + + "AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id + "' " + + "AND M.CLASS_ID = '" + class_id + "' " + + "order by SB.SUB_CATEGORY,BR.BRAND", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -3319,12 +3374,24 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return filled; } - public boolean isMappingT2PData() { + public boolean isMappingStockDataStockFacing(String category_id, String keyAccount_id, String storeType_id, String class_id) { boolean filled = false; Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM MAPPING_T2P ", null); + //dbcursor = db.rawQuery("SELECT * FROM MAPPING_STOCK ", null); + dbcursor = db.rawQuery("Select M.* from MAPPING_STOCK M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' " + + "AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "' " + + "order by SB.SUB_CATEGORY,BR.BRAND ", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -3343,12 +3410,53 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return filled; } - public boolean isMappingAdditionalPromotionData() { + + public boolean isMappingT2PData(String store_id, String category_id) { boolean filled = false; Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM MAPPING_ADDITIONAL_PROMOTION ", null); + dbcursor = db.rawQuery("SELECT * FROM MAPPING_T2P M INNER JOIN BRAND_MASTER BR ON M.BRAND_ID = BR.BRAND_ID " + + "INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " + + "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " + + "WHERE M.STORE_ID = '" + store_id + "' AND CA.CATEGORY_ID= '" + category_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + int icount = dbcursor.getInt(0); + dbcursor.close(); + if (icount > 0) { + filled = true; + } else { + filled = false; + } + } + } catch (Exception e) { + Log.d("Exception ", " when fetching Records!!!!!!!!!!!!!!!!!!!!! " + e.toString()); + return filled; + } + return filled; + } + + public boolean isMappingAdditionalPromotionData(String store_id, String category_id) { + boolean filled = false; + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select M.* " + + "from MAPPING_ADDITIONAL_PROMOTION M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' " + + "order by SB.SUB_CATEGORY,BR.BRAND ", null); + + //dbcursor = db.rawQuery("SELECT * FROM MAPPING_ADDITIONAL_PROMOTION ", null); if (dbcursor != null) { dbcursor.moveToFirst(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 2397215..664264c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -227,7 +227,8 @@ public class MainActivity extends AppCompatActivity if (coverageList.size() == 0) { Snackbar.make(webView, R.string.no_data_for_upload, Snackbar.LENGTH_SHORT).setAction("Action", null).show(); - + Intent i = new Intent(getBaseContext(), UploadActivity.class); + startActivity(i); } else { if (isStoreCheckedIn() && isValid()) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java index e8909fc..9ae5d11 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java @@ -105,7 +105,7 @@ public class CheckoutActivity extends AppCompatActivity { dialog = new Dialog(context); dialog.setContentView(R.layout.custom); - dialog.setTitle("Sending Checkout Data"); + dialog.setTitle(getString(R.string.title_activity_checkout)); dialog.setCancelable(false); dialog.show(); pb = (ProgressBar) dialog.findViewById(R.id.progressBar1); 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 a912e47..d6a0227 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -53,7 +53,7 @@ public class NonWorkingReason extends AppCompatActivity implements ArrayList reasondata = new ArrayList(); private Spinner reasonspinner; private GSKOrangeDB database; - String reasonname, reasonid, entry_allow, image, entry, reason_reamrk, intime; + String reasonname, reasonid, entry_allow, image, entry, reason_reamrk, intime,image_allow; Button save; private ArrayAdapter reason_adapter; protected String _path, str; @@ -152,7 +152,9 @@ public class NonWorkingReason extends AppCompatActivity implements reasonid = reasondata.get(position - 1).getREASON_ID().get(0); entry_allow = reasondata.get(position - 1).getENTRY_ALLOW().get(0); - if (reasonname.equalsIgnoreCase("Store closed")) { + image_allow = reasondata.get(position - 1).getIMAGE_ALLOW().get(0); + + if (image_allow.equalsIgnoreCase("1")) { rel_cam.setVisibility(View.VISIBLE); image = "true"; } else { 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 44367ad..72f749f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -110,7 +110,7 @@ public class StoreListActivity extends AppCompatActivity { updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); toolbar.setTitle(getString(R.string.title_activity_store_list)); - + db.open(); storelist = db.getStoreData(date); coverage = db.getCoverageData(date); 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 95136c7..7b9a01a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -1,6 +1,7 @@ package cpm.com.gskmtorange.dailyentry; import android.app.Activity; +import android.app.AlertDialog; import android.app.Dialog; import android.content.ActivityNotFoundException; import android.content.Context; @@ -53,6 +54,7 @@ import java.util.List; import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; +import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter; import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter; @@ -119,12 +121,35 @@ public class T2PComplianceActivity extends AppCompatActivity { if (isValid()) { - db.InsertT2PData(t2PGetterSetters, store_id, categoryId); + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( + T2PComplianceActivity.this); + // set title + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); + // set dialog message + alertDialogBuilder + .setMessage(getResources().getString(R.string.title_activity_Want_save)) + .setCancelable(false) + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + db.InsertT2PData(t2PGetterSetters, store_id, categoryId); + //Snackbar.make(view, "Data Saved", Snackbar.LENGTH_LONG).setAction("Action", null).show(); + finish(); + } + }) + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // if this button is clicked, just close + // the dialog box and do nothing + dialog.cancel(); + } + }); - Snackbar.make(view, "Data Saved", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); + // create alert dialog + AlertDialog alertDialog = alertDialogBuilder.create(); + + // show it + alertDialog.show(); - finish(); } else { Snackbar.make(view, error_msg, Snackbar.LENGTH_LONG) .setAction("Action", null).show(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java index 985c532..5d0240a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java @@ -145,9 +145,9 @@ public class ServiceActivityFragment extends Fragment { public void showExportDialog(){ AlertDialog.Builder builder1 = new AlertDialog.Builder(getActivity()); - builder1.setMessage("Are you sure you want to take the backup of your data") + builder1.setMessage(R.string.Areyou_sure_take_backup) .setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { + .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { @SuppressWarnings("resource") public void onClick(DialogInterface dialog, int id) { try { @@ -192,7 +192,7 @@ public class ServiceActivityFragment extends Fragment { } } }) - .setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.cancel(); } 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 033eca3..7e705bb 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 @@ -102,27 +102,39 @@ public class CategoryListActivity extends AppCompatActivity { boolean flag_filled = false; String category_id = categoryList.get(i).getCategory_id(); + //Additional_Visibility if (db.additionalVisibilitydata(store_id, category_id)) { boolean flag = true; - if (db.isMappingStockData()) { - if (!db.checkMsl_AvailabilityData(store_id, category_id) - && !db.checkStockAndFacingData(store_id, category_id)) { + //MSL_Availability + if (db.isMappingStockDataMSL_Availability(category_id, keyAccount_id, storeType_id, class_id)) { + if (!db.checkMsl_AvailabilityData(store_id, category_id)) { flag = false; } } + //Stock_Facing if (flag) { - if (!db.isMappingPromotionData()) { - if (db.checkPromoComplianceData(store_id, category_id)) { + if (db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id)) { + if (!db.checkStockAndFacingData(store_id, category_id)) { flag = false; } } } + //Promo Compliance if (flag) { - if (!db.isMappingT2PData()) { - if (db.isFilledT2P(store_id, category_id)) { + if (db.isMappingPromotionData(store_id, category_id)) { + if (!db.checkPromoComplianceData(store_id, category_id)) { + flag = false; + } + } + } + + //T2P + if (flag) { + if (db.isMappingT2PData(store_id, category_id)) { + if (!db.isFilledT2P(store_id, category_id)) { flag = false; } } @@ -289,25 +301,31 @@ public class CategoryListActivity extends AppCompatActivity { if (db.additionalVisibilitydata(store_id, category_id)) { //boolean flag = true; - if (db.isMappingStockData()) { - if (!db.checkMsl_AvailabilityData(store_id, category_id) - && !db.checkStockAndFacingData(store_id, category_id)) { + if (db.isMappingStockDataMSL_Availability(category_id, keyAccount_id, storeType_id, class_id)) { + if (!db.checkMsl_AvailabilityData(store_id, category_id)) { + flag_filled = false; + break; + } + } + + //Stock_Facing + if (db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id)) { + if (!db.checkStockAndFacingData(store_id, category_id)) { + flag_filled = false; + break; + } + } + + if (db.isMappingPromotionData(store_id, category_id)) { + if (!db.checkPromoComplianceData(store_id, category_id)) { flag_filled = false; break; } } - if (!db.isMappingPromotionData()) { - if (db.checkPromoComplianceData(store_id, category_id)) { - flag_filled = false; - break; - } - } - - - if (!db.isMappingT2PData()) { - if (db.isFilledT2P(store_id, category_id)) { + if (db.isMappingT2PData(store_id, category_id)) { + if (!db.isFilledT2P(store_id, category_id)) { flag_filled = false; break; } 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 622d558..4b5e4cd 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 @@ -106,7 +106,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { DailyDataMenuGetterSetter data = new DailyDataMenuGetterSetter(); //data.setCategory_name("MSL Availability"); data.setCategory_name(getResources().getString(R.string.daily_data_menu_msl_availability)); - if (db.isMappingStockData()) { + if (db.isMappingStockDataMSL_Availability(categoryId, keyAccount_id, storeType_id, class_id)) { if (db.checkMsl_AvailabilityData(store_id, categoryId)) { data.setCategory_img(R.mipmap.msl_availability_done); } else { @@ -120,7 +120,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { data = new DailyDataMenuGetterSetter(); //data.setCategory_name("Stock & Facing"); data.setCategory_name(getResources().getString(R.string.daily_data_menu_stock_facing)); - if (db.isMappingStockData()) { + if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) { if (db.checkStockAndFacingData(store_id, categoryId)) { data.setCategory_img(R.mipmap.stock_facing_done); } else { @@ -135,7 +135,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { data = new DailyDataMenuGetterSetter(); data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p)); - if (db.isMappingT2PData()) { + if (db.isMappingT2PData(store_id, categoryId)) { if (db.isFilledT2P(store_id, categoryId)) { data.setCategory_img(R.mipmap.t2p_compliance_done); } else { @@ -163,7 +163,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { //data.setCategory_name("Promo Compliance"); data.setCategory_name(getResources().getString(R.string.daily_data_menu_promo_compliance)); - if (db.isMappingPromotionData() || db.isMappingAdditionalPromotionData()) { + if (db.isMappingPromotionData(store_id, categoryId) || db.isMappingAdditionalPromotionData(store_id, categoryId)) { if (db.checkPromoComplianceData(store_id, categoryId) || db.checkAdditionalPromoComplianceData(store_id, categoryId)) { data.setCategory_img(R.mipmap.promo_compliance_done); @@ -248,25 +248,25 @@ public class DailyDataMenuActivity extends AppCompatActivity { holder.categoryIcon.setImageResource(dailyData.getCategory_img()); if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) { - if (db.isMappingStockData()) { + if (db.isMappingStockDataMSL_Availability(categoryId, keyAccount_id, storeType_id, class_id)) { holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); } else { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); } } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_stock_facing))) { - if (db.isMappingStockData()) { + if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) { holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); } else { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); } } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_promo_compliance))) { - if (db.isMappingPromotionData() || db.isMappingAdditionalPromotionData()) { + if (db.isMappingPromotionData(store_id, categoryId) || db.isMappingAdditionalPromotionData(store_id, categoryId)) { holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); } else { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); } } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))) { - if (db.isMappingT2PData()) { + if (db.isMappingT2PData(store_id, categoryId)) { holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); } else { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); @@ -277,14 +277,14 @@ public class DailyDataMenuActivity extends AppCompatActivity { @Override public void onClick(View view) { if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) { - if (db.isMappingStockData()) { + if (db.isMappingStockDataMSL_Availability(categoryId, keyAccount_id, storeType_id, class_id)) { Intent intent = new Intent(DailyDataMenuActivity.this, MSL_AvailabilityActivity.class); intent.putExtra("categoryName", dailyData.getCategory_name()); intent.putExtra("categoryId", categoryId); startActivity(intent); } } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_stock_facing))) { - if (db.isMappingStockData()) { + if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) { Intent intent = new Intent(DailyDataMenuActivity.this, Stock_FacingActivity.class); intent.putExtra("categoryName", dailyData.getCategory_name()); intent.putExtra("categoryId", categoryId); @@ -292,14 +292,14 @@ public class DailyDataMenuActivity extends AppCompatActivity { } } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_promo_compliance))) { - if (db.isMappingPromotionData() || db.isMappingAdditionalPromotionData()) { + if (db.isMappingPromotionData(store_id, categoryId) || db.isMappingAdditionalPromotionData(store_id, categoryId)) { Intent intent = new Intent(DailyDataMenuActivity.this, PromoComplianceActivity.class); intent.putExtra("categoryName", dailyData.getCategory_name()); intent.putExtra("categoryId", categoryId); startActivity(intent); } } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))) { - if (db.isMappingT2PData()) { + if (db.isMappingT2PData(store_id, categoryId)) { Intent intent = new Intent(DailyDataMenuActivity.this, T2PComplianceActivity.class); intent.putExtra("categoryName", dailyData.getCategory_name()); intent.putExtra("categoryId", categoryId); 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 837a3fb..22a928a 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 @@ -317,11 +317,11 @@ public class PromoComplianceActivity extends AppCompatActivity { //Promo SKU List promoSkuListData = db.getPromoComplianceSkuAfterData(store_id, categoryId); if (!(promoSkuListData.size() > 0)) { - promoSkuListData = db.getPromoComplianceSkuData(store_id); + promoSkuListData = db.getPromoComplianceSkuData(store_id, categoryId); } //Promo Spinner List - promoSpinnerListData = db.getPromoSpinnerData(store_id); + promoSpinnerListData = db.getPromoSpinnerData(store_id, categoryId); ArrayAdapter sp_promo_adapter = new ArrayAdapter<>(PromoComplianceActivity.this, android.R.layout.simple_list_item_1); for (int i = 0; i < promoSpinnerListData.size(); i++) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java index 7b5ec8d..d41b982 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -247,8 +247,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { + "[APP_VERSION]" + app_version + "[/APP_VERSION]" + "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]" + "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]" - //+ "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]" - + "[OUT_TIME]" + "00:00" + "[/OUT_TIME]" + + "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]" + "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]" + "[USER_ID]" + userId + "[/USER_ID]" + "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]" 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 10871b5..fdd6098 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -13,6 +13,7 @@ import android.os.AsyncTask; import android.preference.PreferenceManager; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.widget.Toolbar; import android.view.WindowManager; import android.widget.ProgressBar; import android.widget.TextView; @@ -79,10 +80,13 @@ public class UploadActivity extends AppCompatActivity { private int factor, k = 0; Object result = ""; + Toolbar toolbar; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_upload); + setContentView(R.layout.activity_main); + toolbar = (Toolbar) findViewById(R.id.toolbar); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); @@ -199,7 +203,7 @@ public class UploadActivity extends AppCompatActivity { super.onPreExecute(); dialog = new Dialog(context); dialog.setContentView(R.layout.custom); - dialog.setTitle("Uploading Data"); + dialog.setTitle(getString(R.string.uploaddata)); dialog.setCancelable(false); dialog.show(); @@ -250,8 +254,7 @@ public class UploadActivity extends AppCompatActivity { + "[APP_VERSION]" + app_version + "[/APP_VERSION]" + "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]" + "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]" - //+ "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]" - + "[OUT_TIME]" + "00:00" + "[/OUT_TIME]" + + "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]" + "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]" + "[USER_ID]" + userId + "[/USER_ID]" + "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]" @@ -342,7 +345,7 @@ public class UploadActivity extends AppCompatActivity { } } data.value = 10; - data.name = "MSL_Availability Uploading"; + data.name = getString(R.string.availability_data_uploading); publishProgress(data); @@ -467,7 +470,7 @@ public class UploadActivity extends AppCompatActivity { } } data.value = 20; - data.name = "Stock Facing Uploading"; + data.name = getString(R.string.stock_data_uploading); publishProgress(data); @@ -526,7 +529,7 @@ public class UploadActivity extends AppCompatActivity { } } data.value = 30; - data.name = "Promotion Data Uploading"; + data.name = getString(R.string.promo_data_uploading); publishProgress(data); @@ -585,7 +588,7 @@ public class UploadActivity extends AppCompatActivity { } } data.value = 35; - data.name = "Additional Promotion Data Uploading"; + data.name = getString(R.string.additional_data_uploading); publishProgress(data); @@ -700,9 +703,8 @@ public class UploadActivity extends AppCompatActivity { } } - data.value = 35; - data.name = "Additional Visibility Data"; + data.name = getString(R.string.additional_data_uploading); publishProgress(data); /////ashish close @@ -845,7 +847,7 @@ public class UploadActivity extends AppCompatActivity { } data.value = 40; - data.name = "T2P Data Uploading"; + data.name = getString(R.string.t2p_data_uploading); publishProgress(data); //Image Upload @@ -1069,6 +1071,7 @@ public class UploadActivity extends AppCompatActivity { protected void onResume() { super.onResume(); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); + toolbar.setTitle(getString(R.string.title_activity_upload)); } diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 359ccf8..363caae 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -208,7 +208,7 @@ İptal etmek Boş - Raf Payı, stoktan daha az veya eşit olmalıdır + Önyüz sayısı stoktan daha az veya eşit olmalıdır Önce stok değerini doldurun Verileri eklemek istiyor musunuz? Promosyon eklendi @@ -216,6 +216,18 @@ Seçiniz + //text for uploading screen + + Kapsam yükleniyor + Bulunurluk verisi paylaşılıyor + Stok verisi paylaşılıyor + Kalıcı teşhir verisi paylaşılıyor + Ek teşhir verisi paylaşılıyor + Promosyon verisi paylaşılıyor + Yükleme İçin Veri Yok + Çıkış yapmak + Verilerinizin yedeğini almak istediğinizden emin misiniz + Veritabanı Başarıyla Gönderildi diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 20e6089..18f6dd5 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -209,7 +209,7 @@ Hello blank fragment - CheckoutActivity + Checkout Activity Checkout Success Network Error , @@ -251,5 +251,16 @@ Select + + //text for uploading screen + Coverage Uploading + Availability Data Uploading + Stock Data Uploading + T2P Data Uploading + Additional Visibility Data Uploading + Promo Data Uploading + Are you sure you want to take the backup of your data + + From e07c6bc10e7bb514fd59f6c3992d3989b88caff2 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Wed, 25 Jan 2017 18:16:14 +0530 Subject: [PATCH 4/4] newcode --- .../com/gskmtorange/Database/GSKOrangeDB.java | 4 +- .../gskmtorange/GeoTag/GeoTagActivity.java | 29 ++-- .../cpm/com/gskmtorange/MainActivity.java | 12 +- .../dailyentry/AdditionalVisibility.java | 3 +- .../dailyentry/CheckoutActivity.java | 3 +- .../dailyentry/NonWorkingReason.java | 3 +- .../dailyentry/StoreListActivity.java | 136 ++++++++++++++---- .../dailyentry/StoreimageActivity.java | 3 +- .../dailyentry/T2PComplianceActivity.java | 11 +- GSKMTOrange/src/main/res/values-tr/string.xml | 4 + GSKMTOrange/src/main/res/values/strings.xml | 2 +- 11 files changed, 147 insertions(+), 63 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 0da6951..01bd398 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -590,9 +590,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("CHECKOUT_STATUS", status); values1.put(CommonString.KEY_COVERAGE_STATUS, status); - + db.update(CommonString.TABLE_COVERAGE_DATA, values1, CommonString.KEY_STORE_ID + "='" + id + "'", null); db.update(CommonString.KEY_JOURNEY_PLAN, values, CommonString.KEY_STORE_ID + "='" + id + "'", null); - //db.update(CommonString.TABLE_COVERAGE_DATA, values1, CommonString.KEY_STORE_ID + "='" + id + "'", null); + } catch (Exception ex) { 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 61954af..29fb5aa 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java @@ -124,7 +124,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb ArrayList geotaglist = new ArrayList(); ArrayList geotaglistImage = new ArrayList(); - + Boolean markerflag=true; private TextView percentage, message; private FailureGetterSetter failureGetterSetter = null; /** @@ -251,7 +251,8 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb fabcarmabtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); + + /* 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.d("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); @@ -261,9 +262,9 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb break; } } - } + }*/ - _pathforcheck = storeid + getResources().getString(R.string.store) + getResources().getString(R.string.image) + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = storeid +"GeoTag" + visitData.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; @@ -333,8 +334,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb @Override public void onConnected(Bundle bundle) { - mLastLocation = LocationServices.FusedLocationApi - .getLastLocation(mGoogleApiClient); + mLastLocation = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient); if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) { @@ -344,11 +344,17 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb mMap.setMyLocationEnabled(true); - // Add a marker of latest location and move the camera - LatLng latLng = new LatLng(latitude, longitude); - mMap.addMarker(new MarkerOptions().position(latLng)); - mMap.moveCamera(CameraUpdateFactory.newLatLng(latLng)); - mMap.animateCamera(CameraUpdateFactory.zoomTo(15)); + if(markerflag=true) + { + // Add a marker of latest location and move the camera + LatLng latLng = new LatLng(latitude, longitude); + mMap.addMarker(new MarkerOptions().position(latLng)); + mMap.moveCamera(CameraUpdateFactory.newLatLng(latLng)); + mMap.animateCamera(CameraUpdateFactory.zoomTo(15)); + + + } + } } @@ -526,6 +532,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb img_str = _pathforcheck; _pathforcheck = ""; + markerflag=false; } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 664264c..d46426e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -132,6 +132,13 @@ public class MainActivity extends AppCompatActivity updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); toolbar.setTitle(getString(R.string.main_menu_activity_name)); + db.open(); + + coverageList = db.getCoverageData(date); + + storelist = db.getStoreData(date); + + } @Override @@ -227,8 +234,6 @@ public class MainActivity extends AppCompatActivity if (coverageList.size() == 0) { Snackbar.make(webView, R.string.no_data_for_upload, Snackbar.LENGTH_SHORT).setAction("Action", null).show(); - Intent i = new Intent(getBaseContext(), UploadActivity.class); - startActivity(i); } else { if (isStoreCheckedIn() && isValid()) { @@ -253,8 +258,7 @@ public class MainActivity extends AppCompatActivity } } else if (id == R.id.nav_geotag) { - db.open(); - storelist = db.getStoreData(date); + if (storelist.size() > 0) { 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 9a9030c..d1fc2c8 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -676,8 +676,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl btnimage.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - _pathforcheck = store_id + getResources().getString(R.string.store) - + getResources().getString(R.string.image) + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = store_id + "AdditionalVisibility" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; intime = getCurrentTime(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java index 9ae5d11..4b22ba2 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java @@ -293,7 +293,8 @@ public class CheckoutActivity extends AppCompatActivity { finish(); - } else if (!result.equals("")) { + } + else if (!result.equals("")) { /*AlertMessage message = new AlertMessage( CheckOutStoreActivity.this, CommonString1.ERROR + result, "success", null); message.showMessage();*/ 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 d6a0227..d0c0b04 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -310,7 +310,8 @@ public class NonWorkingReason extends AppCompatActivity implements public void onClick(View v) { // TODO Auto-generated method stub if (v.getId() == R.id.imgcam) { - _pathforcheck = store_id + "NonWorking" + _UserId + ".jpg"; + + _pathforcheck = store_id +"NonWorking" + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; 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 72f749f..1150229 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -49,7 +49,7 @@ import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity; */ public class StoreListActivity extends AppCompatActivity { - ArrayList coverage; + ArrayList coverage = new ArrayList(); ArrayList storelist = new ArrayList(); //ListView list; private SharedPreferences preferences; @@ -200,10 +200,11 @@ public class StoreListActivity extends AppCompatActivity { viewHolder.txt.setText(current.getSTORE_NAME()); viewHolder.address.setText(current.getADDRESS()); - if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_VALID)) { + /* if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_VALID)) { viewHolder.chkbtn.setVisibility(View.VISIBLE); viewHolder.imageview.setVisibility(View.INVISIBLE); - } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_U)) { + } else*/ + if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_U)) { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.tick); viewHolder.chkbtn.setVisibility(View.INVISIBLE); @@ -228,20 +229,62 @@ public class StoreListActivity extends AppCompatActivity { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); - } else if (checkleavestatus(storeid)) { + }/* else if (checkleavestatus(storeid)) { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); - } else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_INVALID)) { + }*/ + /*else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_INVALID)) { - if (coverage.size() > 0) { + }*/ + else if (coverage.size() > 0) { + String statusleave=""; - int i; + for (int i = 0; i < coverage.size(); i++) { - for (i = 0; i < coverage.size(); i++) { + if (storeid.equals(coverage.get(i).getStoreId())) { + statusleave=coverage.get(i).getStatus(); - if (coverage.get(i).getInTime() != null) { + if(statusleave.equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)){ + + viewHolder.imageview.setVisibility(View.VISIBLE); + viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); + viewHolder.chkbtn.setVisibility(View.INVISIBLE); + + + } + + else if(coverage.get(i).getStatus().equalsIgnoreCase(CommonString.KEY_VALID)) + { + viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange)); + viewHolder.chkbtn.setVisibility(View.VISIBLE); + viewHolder.imageview.setVisibility(View.INVISIBLE); + + } + else if(coverage.get(i).getStatus().equalsIgnoreCase(CommonString.KEY_INVALID)){ + + viewHolder.imageview.setVisibility(View.INVISIBLE); + viewHolder.chkbtn.setVisibility(View.INVISIBLE); + viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.green)); + } + + + else { + + viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange)); + viewHolder.imageview.setVisibility(View.INVISIBLE); + viewHolder.chkbtn.setVisibility(View.INVISIBLE); + } + + break; + + + + + } + + /* if (coverage.get(i).getInTime() != null) { if (coverage.get(i).getOutTime() == null) { @@ -256,11 +299,11 @@ public class StoreListActivity extends AppCompatActivity { break; } - } + }*/ } - } - } else { + + }else { viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange)); viewHolder.imageview.setVisibility(View.INVISIBLE); @@ -290,7 +333,9 @@ public class StoreListActivity extends AppCompatActivity { Snackbar.make(v, R.string.title_store_list_activity_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show(); } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) { Snackbar.make(v, R.string.title_store_list_activity_already_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show(); - } else if (checkleavestatus(store_id)) { + } + + else if (checkleavestatus(store_id)) { Snackbar.make(v, R.string.title_store_list_activity_already_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show(); @@ -298,20 +343,7 @@ public class StoreListActivity extends AppCompatActivity { } else { // PUT IN PREFERENCES - editor = preferences.edit(); - editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID()); - editor.putString(CommonString.KEY_STORE_NAME, current.getSTORE_NAME()); - editor.putString(CommonString.KEY_VISIT_DATE, current.getVISIT_DATE()); - editor.putString(CommonString.KEY_CAMERA_ALLOW, current.getCAMERA_ALLOW()); - editor.putString(CommonString.KEY_CHECKOUT_STATUS, current.getCHECKOUT_STATUS()); - editor.putString(CommonString.KEY_CLASS_ID, current.getCLASS_ID()); - editor.putString(CommonString.KEY_EMP_ID, current.getEMP_ID()); - editor.putString(CommonString.KEY_GEO_TAG, current.getGEO_TAG()); - editor.putString(CommonString.KEY_KEYACCOUNT_ID, current.getKEYACCOUNT_ID()); - editor.putString(CommonString.KEY_STORETYPE_ID, current.getSTORETYPE_ID()); - editor.putString(CommonString.KEY_UPLOAD_STATUS, current.getUPLOAD_STATUS()); - editor.commit(); // showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS()); @@ -336,7 +368,7 @@ public class StoreListActivity extends AppCompatActivity { } if (enteryflag) { - showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS()); + showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS(),current.getGEO_TAG(),current); } } else { Snackbar.make(v, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show(); @@ -439,7 +471,7 @@ public class StoreListActivity extends AppCompatActivity { } - void showMyDialog(final String storeCd, final String storeName, final String status, final String visitDate, final String checkout_status) { + void showMyDialog(final String storeCd, final String storeName, final String status, final String visitDate, final String checkout_status,final String GeotagStatus,final StoreBean current) { dialog = new Dialog(this); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog.setContentView(R.layout.dialogbox); @@ -452,6 +484,25 @@ public class StoreListActivity extends AppCompatActivity { public void onCheckedChanged(RadioGroup group, int checkedId) { // find which radio button is selected if (checkedId == R.id.yes) { + + if(!GeotagStatus.equalsIgnoreCase("N")){ + + editor = preferences.edit(); + editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID()); + editor.putString(CommonString.KEY_STORE_NAME, current.getSTORE_NAME()); + editor.putString(CommonString.KEY_VISIT_DATE, current.getVISIT_DATE()); + editor.putString(CommonString.KEY_CAMERA_ALLOW, current.getCAMERA_ALLOW()); + editor.putString(CommonString.KEY_CHECKOUT_STATUS, current.getCHECKOUT_STATUS()); + editor.putString(CommonString.KEY_CLASS_ID, current.getCLASS_ID()); + editor.putString(CommonString.KEY_EMP_ID, current.getEMP_ID()); + editor.putString(CommonString.KEY_GEO_TAG, current.getGEO_TAG()); + editor.putString(CommonString.KEY_KEYACCOUNT_ID, current.getKEYACCOUNT_ID()); + editor.putString(CommonString.KEY_STORETYPE_ID, current.getSTORETYPE_ID()); + editor.putString(CommonString.KEY_UPLOAD_STATUS, current.getUPLOAD_STATUS()); + + editor.commit(); + + boolean flag = true; if (coverage.size() > 0) { for (int i = 0; i < coverage.size(); i++) { @@ -462,7 +513,8 @@ public class StoreListActivity extends AppCompatActivity { } } if (flag == true) { - Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class); + + Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class); startActivity(in); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); dialog.cancel(); @@ -473,7 +525,31 @@ public class StoreListActivity extends AppCompatActivity { dialog.cancel(); } - } else if (checkedId == R.id.no) { + } + else{ + dialog.cancel(); + AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this); + builder.setTitle(getResources().getString(R.string.dialog_title)); + builder.setMessage(R.string.first_geotag_the_store).setCancelable(false) + .setPositiveButton(getResources().getString(R.string.ok), + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog1, + int id) { + + dialog1.cancel(); + + } + }); + + + AlertDialog alert = builder.create(); + + alert.show(); + + } + + + }else if (checkedId == R.id.no) { dialog.cancel(); 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 4c341dc..3311208 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -157,8 +157,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic case R.id.img_cam_selfie: - _pathforcheck = store_id + getResources().getString(R.string.store) - + getResources().getString(R.string.image) + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = store_id +"SI" + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; 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 7b9a01a..5fc6a21 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -164,6 +164,7 @@ public class T2PComplianceActivity extends AppCompatActivity { 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()); @@ -175,14 +176,6 @@ public class T2PComplianceActivity extends AppCompatActivity { if (t2PGetterSetters.size() > 0) { - /* 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); rec_t2p.setAdapter(t2PAdapter); @@ -717,7 +710,7 @@ public class T2PComplianceActivity extends AppCompatActivity { break; } else if (t2PGetterSetters.get(i).getSkulist().size() == 0) { flag = false; - error_msg = getResources().getString(R.string.fill_sku_data); + error_msg = getResources().getString(R.string.title_activity_fill_sku); break; } } diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 363caae..a5de0a2 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -228,7 +228,11 @@ Çıkış yapmak Verilerinizin yedeğini almak istediğinizden emin misiniz Veritabanı Başarıyla Gönderildi + İlk depoyu coğrafi etiketle göster + Lütfen GAP verilerini doldurun + + Değerleri girin diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 18f6dd5..4c4bd26 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -261,6 +261,6 @@ Promo Data Uploading Are you sure you want to take the backup of your data - + First geotag the store