From 96b2ff2eb674206d9270e8760d3476d306e85634 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Thu, 12 Jan 2017 17:49:12 +0530 Subject: [PATCH 1/8] 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 2/8] 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 88eff88838423e7505876f5578e1be59c490feb7 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Thu, 12 Jan 2017 18:40:18 +0530 Subject: [PATCH 3/8] newcode --- .idea/modules.xml | 2 - .../com/gskmtorange/Database/GSKOrangeDB.java | 138 +++++++++++++--- .../AdditionalDialogGetterSetter.java | 20 +++ .../GetterSetter/AddittionalGetterSetter.java | 9 ++ .../cpm/com/gskmtorange/MainActivity.java | 1 + .../gskmtorange/constant/CommonString.java | 4 +- .../dailyentry/AdditionalVisibility.java | 148 +++++++++++++++--- .../dailyentry/StoreListActivity.java | 1 + .../gsk_dailyentry/DailyDataMenuActivity.java | 19 ++- .../gskmtorange/upload/UploadActivity.java | 43 ++++- .../layout/contentadditionalvisibility.xml | 5 +- 11 files changed, 331 insertions(+), 59 deletions(-) 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/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index 870be95..0dc7fb6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -2034,6 +2034,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setKEY_ID(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_ID))); + sb.setCOMMON_ID(cursordata.getString(cursordata + .getColumnIndexOrThrow(CommonString.KEY_Common_ID))); + sb.setBrand_id(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_BRAND_ID))); @@ -2083,7 +2086,17 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } + public void deleteStockEntryall(String storeid,String categoryid) { + try { + db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, "Store_Id" + "='" + storeid +"categoryId" + "='" + categoryid + "'", null); + db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, "Store_Id" + "='" + storeid +"categoryId" + "='" + categoryid + "'", null); + + } catch (Exception e) { + System.out.println("" + e); + } + + } @@ -2093,7 +2106,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - cursordata = db.rawQuery("SELECT * FROM BRAND_MASTER ", null); + cursordata = db.rawQuery("SELECT BR.BRAND_ID, BR.BRAND FROM BRAND_MASTER BR 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 COMPANY_ID =1", null); if (cursordata != null) { cursordata.moveToFirst(); @@ -2104,13 +2117,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setBRAND(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND"))); - sb.setSUB_CATEGORY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("SUB_CATEGORY_ID"))); - - + /*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"))); + sb.setBRAND_SEQUENCE(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_SEQUENCE")));*/ Data.add(sb); cursordata.moveToNext(); @@ -2169,13 +2180,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public void InsertAdditionalData(AddittionalGetterSetter data,ArrayList dialog) { + public void InsertAdditionalData(AddittionalGetterSetter data,ArrayList dialog,String categoryId) { ContentValues values = new ContentValues(); ContentValues values1 = new ContentValues(); try { - - values.put("Store_Id", data.getStore_id()); + values.put("categoryId", categoryId); values.put("brand_name", data.getBrand()); values.put("brand_id", data.getBrand_id()); values.put("image_url", data.getImage()); @@ -2183,12 +2193,14 @@ 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); for(int i=0;i getAdditionalStock(String store_id) { + public ArrayList getAdditionalStock(String store_id,String categoryId) { Cursor cursordata = null; ArrayList productData = new ArrayList(); try { - cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility WHERE Store_Id = '"+store_id + "'", null); - + // cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility WHERE Store_Id = '"+store_id + "'categoryId = '"+categoryId + "'", null); + cursordata = db.rawQuery("Select * from Stock_Additional_visibility " + "where categoryId='" + categoryId + "' and Store_Id='" + store_id + "'", null); if (cursordata != null) { cursordata.moveToFirst(); @@ -2234,10 +2236,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setKey_id(cursordata.getString(cursordata .getColumnIndexOrThrow("KEY_ID"))); - sb.setStore_id(cursordata.getString(cursordata .getColumnIndexOrThrow("Store_Id"))); + sb.setCategoryId(cursordata.getString(cursordata + .getColumnIndexOrThrow("categoryId"))); + sb.setBrand_id(cursordata.getString(cursordata .getColumnIndexOrThrow("brand_id"))); @@ -2256,7 +2260,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setBtn_toogle(cursordata.getString(cursordata .getColumnIndexOrThrow("toggle_value"))); - productData.add(sb); cursordata.moveToNext(); } @@ -2283,4 +2286,93 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } + + public boolean additionalVisibilitydata(String store_id, String category_id) { + Log.d("AdditionalVisibility ", "AdditionalVisibility data--------------->Start<------------"); + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select * from Stock_Additional_visibility " + "where categoryId='" + category_id + "' and Store_Id='" + store_id + "'", null); + + if (dbcursor != null) { + if (dbcursor.moveToFirst()) { + do { + AddittionalGetterSetter sb = new AddittionalGetterSetter(); + + sb.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("brand_id"))); + list.add(sb); + } 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; + } + + public ArrayList getAdditionalStockUpload(String store_id) { + Cursor cursordata = null; + ArrayList productData = new ArrayList(); + + try { + + cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility WHERE Store_Id = '"+store_id +"'", null); + + if (cursordata != null) { + cursordata.moveToFirst(); + while (!cursordata.isAfterLast()) { + AddittionalGetterSetter sb = new AddittionalGetterSetter(); + + + sb.setKey_id(cursordata.getString(cursordata + .getColumnIndexOrThrow("KEY_ID"))); + + sb.setStore_id(cursordata.getString(cursordata + .getColumnIndexOrThrow("Store_Id"))); + + sb.setCategoryId(cursordata.getString(cursordata + .getColumnIndexOrThrow("categoryId"))); + + sb.setBrand_id(cursordata.getString(cursordata + .getColumnIndexOrThrow("brand_id"))); + + sb.setBrand(cursordata.getString(cursordata + .getColumnIndexOrThrow("brand_name"))); + + + sb.setImage(cursordata.getString(cursordata + .getColumnIndexOrThrow("image_url"))); + + sb.setSku_id(cursordata.getString(cursordata + .getColumnIndexOrThrow("sku_id"))); + + sb.setSku(cursordata.getString(cursordata + .getColumnIndexOrThrow("sku_name"))); + sb.setBtn_toogle(cursordata.getString(cursordata + .getColumnIndexOrThrow("toggle_value"))); + + productData.add(sb); + cursordata.moveToNext(); + } + cursordata.close(); + + } + + + } catch (Exception ex) { + + } + return productData; + + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AdditionalDialogGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AdditionalDialogGetterSetter.java index a411572..377d85e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AdditionalDialogGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AdditionalDialogGetterSetter.java @@ -5,6 +5,26 @@ public class AdditionalDialogGetterSetter { image3, BEFORE_QTY, camera1, camera2, camera3, AFTER_QTY, store_id, stock_count, question_id, question, answer, type, KEY_ID, unique_id,image_url, sku_id,quantity, process_id, sku_name, stock_flag; + public String getCOMMON_ID() { + return COMMON_ID; + } + + public void setCOMMON_ID(String COMMON_ID) { + this.COMMON_ID = COMMON_ID; + } + + String COMMON_ID; + + public String getCategoryId() { + return categoryId; + } + + public void setCategoryId(String categoryId) { + this.categoryId = categoryId; + } + + String categoryId; + public String getStock_flag() { return stock_flag; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AddittionalGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AddittionalGetterSetter.java index c9c2dff..15a7ab7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AddittionalGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AddittionalGetterSetter.java @@ -76,5 +76,14 @@ public class AddittionalGetterSetter { String btn_toogle; + public String getCategoryId() { + return categoryId; + } + + public void setCategoryId(String categoryId) { + this.categoryId = categoryId; + } + + String categoryId; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 900a856..5ca8744 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -195,6 +195,7 @@ public class MainActivity extends AppCompatActivity Snackbar.make(webView, R.string.no_data_for_upload, Snackbar.LENGTH_SHORT) .setAction("Action", null).show(); + } else { //if (isStoreCheckedIn()&& isValid()) { 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 cdd79c9..86ec3db 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -293,7 +293,7 @@ public class CommonString { + KEY_BRAND_ID + " VARCHAR," + KEY_BRAND + " VARCHAR," + KEY_DISPLAY_ID +" VARCHAR," + KEY_SKU_ID + " VARCHAR," + KEY_QUANTITY + " VARCHAR," + KEY_Common_ID + " VARCHAR," - + KEY_CATEGORY_ID + " VARCHAR," + + "categoryId" + " VARCHAR," + KEY_SKUNAME + " VARCHAR," + KEY_PROCESS_ID + " VARCHAR)"; @@ -327,7 +327,7 @@ public class CommonString { + "toggle_value" + " VARCHAR," - + "IMAGE2" + + "categoryId" + " VARCHAR" + ")"; 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 ccb59e9..e5a5e76 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -20,6 +20,7 @@ import android.preference.PreferenceManager; import android.provider.MediaStore; 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.util.Log; import android.view.LayoutInflater; @@ -87,18 +88,18 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl ArrayList empty_list = new ArrayList<>(); String _pathforcheck, _path, str, msg; private SharedPreferences preferences; - String store_id, date, intime, img_str, togglevalue = "1"; + String store_id, date, intime, img_str, togglevalue = "1",CATEGORY_ID; ImageView img_cam, img_clicked; Button btn_add, btn_close; EditText Edt_txt; MyAdaptorStock adapterData; ListView listviewlay; - String errormsg; + String errormsg,categoryName,categoryId; MyAdaptorAdditionalStock adapteradditional; AddittionalGetterSetter adGt; LinearLayout brandlayout, diaplylayout, cameralayout; //RelativeLayout skulayout; - + CardView cardvew; ////String brand_id,SKU_ID; protected void onCreate(Bundle savedInstanceState) { // TODO Auto-generated method stub @@ -114,7 +115,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl store_id = preferences.getString(CommonString.KEY_STORE_ID, null); - store_id = "2"; + categoryName = getIntent().getStringExtra("categoryName"); + categoryId = getIntent().getStringExtra("categoryId"); + + //store_id = "2"; date = preferences.getString(CommonString.KEY_DATE, null); intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, ""); @@ -122,6 +126,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl db.open(); spinner_brand_list = (Spinner) findViewById(R.id.spinner_Brand1); spinner_sku_list = (Spinner) findViewById(R.id.spinner_SkuMaster); + cardvew = (CardView) findViewById(R.id.cardviewid); + btntoggle = (ToggleButton) findViewById(R.id.btntoggle); btnimage = (ImageView) findViewById(R.id.btn_image); @@ -195,21 +201,62 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } }); - listdata = db.getAdditionalStock(store_id); + listdata = db.getAdditionalStock(store_id,categoryId); + for (int k = 0; k < listdata.size(); k++) { - String KeyID = listdata.get(k).getKey_id(); - uploadlist = db.getDialogStock(KeyID); + String tooglevalue= listdata.get(k).getBtn_toogle(); + + if(tooglevalue.equalsIgnoreCase("0")) + { + + btnaddlayout.setVisibility(View.INVISIBLE); + cardvew.setVisibility(View.INVISIBLE); + listviewlay.setVisibility(View.INVISIBLE); + btntoggle.setChecked(false); + brandlayout.setVisibility(View.INVISIBLE); + diaplylayout.setVisibility(View.INVISIBLE); + cameralayout.setVisibility(View.INVISIBLE); + btnsku.setVisibility(View.INVISIBLE); + } + + + + /* String KeyID = listdata.get(k).getKey_id(); + + uploadlist = db.getDialogStock(KeyID);*/ } + if (listdata.size() > 0) { + + for (int i = 0; i < listdata.size(); i++) { + if (listdata.get(i).getBtn_toogle().equalsIgnoreCase("0")) { + listviewlay.setVisibility(View.INVISIBLE); + cardvew.setVisibility(View.INVISIBLE); + btnaddlayout.setVisibility(View.INVISIBLE); + } else { + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + listviewlay.setAdapter(adapteradditional); + listviewlay.invalidateViews(); + btnaddlayout.setVisibility(View.VISIBLE); + cardvew.setVisibility(View.VISIBLE); + listviewlay.setVisibility(View.VISIBLE); + } + } + + } + + + + /* if (listdata.size() > 0) { adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); listviewlay.setAdapter(adapteradditional); listviewlay.invalidateViews(); - } + }*/ btnaddlayout.setOnClickListener(new View.OnClickListener() { @Override @@ -223,6 +270,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl adGt.setSku_id(sku_list_id); adGt.setStore_id(store_id); adGt.setBtn_toogle(togglevalue); + adGt.setCategoryId(categoryId); + if (validateData(adGt, defdata)) { @@ -239,7 +288,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl .setPositiveButton("Yes", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - db.InsertAdditionalData(adGt, defdata); + db.InsertAdditionalData(adGt, defdata,categoryId); spinner_brand_list.setSelection(0); @@ -253,21 +302,42 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl defdata.clear(); - btntoggle.setChecked(true); + // btntoggle.setChecked(true); btnimage.setBackgroundResource(R.mipmap.camera); - togglevalue = "1"; - brandlayout.setVisibility(View.VISIBLE); - diaplylayout.setVisibility(View.VISIBLE); - cameralayout.setVisibility(View.VISIBLE); - btnsku.setVisibility(View.VISIBLE); + // togglevalue = "1"; - listdata = db.getAdditionalStock(store_id); + + listdata = db.getAdditionalStock(store_id,categoryId); if (listdata.size() > 0) { - adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); - listviewlay.setAdapter(adapteradditional); - listviewlay.invalidateViews(); + + for(int i=0;i 0) { + + for (int i = 0; i < listdata.size(); i++) { + if (listdata.get(i).getBtn_toogle().equalsIgnoreCase("0")) { + listviewlay.setVisibility(View.INVISIBLE); + cardvew.setVisibility(View.INVISIBLE); + btnaddlayout.setVisibility(View.INVISIBLE); + } else { + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + listviewlay.setAdapter(adapteradditional); + listviewlay.invalidateViews(); + btnaddlayout.setVisibility(View.VISIBLE); + cardvew.setVisibility(View.VISIBLE); + listviewlay.setVisibility(View.VISIBLE); + } + } + } + + + } 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 9e658ee..540cffa 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -285,6 +285,7 @@ public class StoreListActivity extends AppCompatActivity { 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()); 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..c234e7a 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 @@ -26,6 +26,7 @@ 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.AdditionalVisibility; import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity; import cpm.com.gskmtorange.xmlGetterSetter.DailyDataMenuGetterSetter; @@ -125,7 +126,12 @@ public class DailyDataMenuActivity extends AppCompatActivity { data = new DailyDataMenuGetterSetter(); //data.setCategory_name("Additional Visibility"); data.setCategory_name(getResources().getString(R.string.daily_data_menu_additional_visibility)); - data.setCategory_img(R.mipmap.additional_visibility); + if (db.additionalVisibilitydata(store_id, categoryId)) { + data.setCategory_img(R.mipmap.additional_visibility_done); + } else { + data.setCategory_img(R.mipmap.additional_visibility); + } + categoryList.add(data); data = new DailyDataMenuGetterSetter(); @@ -210,6 +216,17 @@ public class DailyDataMenuActivity extends AppCompatActivity { overridePendingTransition(R.anim.activity_in, R.anim.activity_out); } + + else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.title_activity_Additional_visibility)))) { + Intent intent = new Intent(DailyDataMenuActivity.this, AdditionalVisibility.class); + intent.putExtra("categoryName", dailyData.getCategory_name()); + intent.putExtra("categoryId", categoryId); + startActivity(intent); + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); + + } + + } }); } 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..9f76527 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -447,7 +447,7 @@ public class UploadActivity extends AppCompatActivity { String additional_visibility_dialog_xml = ""; onXML = ""; String onXMLdIALOG = ""; - additionalVisibilityList = db.getAdditionalStock(coverageList.get(i).getStoreId()); + additionalVisibilityList = db.getAdditionalStockUpload(coverageList.get(i).getStoreId()); if (additionalVisibilityList.size() > 0) { for (int J = 0; J < additionalVisibilityList.size(); J++) { @@ -456,8 +456,10 @@ public class UploadActivity extends AppCompatActivity { additionalVisibilitySkuList = db.getDialogStock(KeyID); - for (int k = 0; k < additionalVisibilitySkuList.size(); k++) { + if(additionalVisibilitySkuList.size()>0) + { + for (int k = 0; k < additionalVisibilitySkuList.size(); k++) { onXMLdIALOG = "[VISIBILITY_DAILOG]" + "[MID]" + mid + "[/MID]" @@ -465,7 +467,7 @@ public class UploadActivity extends AppCompatActivity { + userId + "[/USER_ID]" + "[KEY_ID]" - + additionalVisibilitySkuList.get(k).getKEY_ID() + + additionalVisibilitySkuList.get(k).getCOMMON_ID() + "[/KEY_ID]" /* + "[DIALOG_BRAND_ID]" + additionalVisibilitySkuList.get(k).getBrand_id() @@ -480,7 +482,7 @@ public class UploadActivity extends AppCompatActivity { additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG; - } + }} onXML = "[ADDITIONAL_VISIBILITY_DATA]" + "[MID]" + mid + "[/MID]" @@ -490,6 +492,9 @@ public class UploadActivity extends AppCompatActivity { + "[KEY_ID]" + additionalVisibilityList.get(J).getKey_id() + "[/KEY_ID]" + + "[CATEGORY_ID]" + + additionalVisibilityList.get(J).getCategoryId() + + "[/CATEGORY_ID]" + "[ADDITIONAL_DISPLAY]" + additionalVisibilityList.get(J).getBtn_toogle() + "[/ADDITIONAL_DISPLAY]" @@ -600,6 +605,36 @@ public class UploadActivity extends AppCompatActivity { } } } +//// ashish visibility image start + + if (additionalVisibilityList.size() > 0) { + for (int i1 = 0; i1 < additionalVisibilityList.size(); i1++) { + + if (additionalVisibilityList.get(i1).getImage() != null && !additionalVisibilityList.get(i1).getImage().equals("")) { + if (new File(CommonString.FILE_PATH + additionalVisibilityList.get(i1).getImage()).exists()) { + + try { + result = UploadImage(additionalVisibilityList.get(i1).getImage(), "AdditionalVisibilityImages"); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "AdditionalVisibilityImages"; + } + + runOnUiThread(new Runnable() { + public void run() { + message.setText("AdditionalVisibilityImages Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } + } + + //// ashish close image + // SET COVERAGE STATUS diff --git a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml index be17555..68f45c8 100644 --- a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml +++ b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml @@ -62,7 +62,8 @@ android:id="@+id/btntoggle" android:layout_width="0dp" android:layout_height="wrap_content" - + android:textOn="Yes" + android:textOff="No" android:layout_weight=".5" /> @@ -219,7 +220,7 @@ Date: Thu, 12 Jan 2017 18:51:29 +0530 Subject: [PATCH 4/8] 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 5/8] 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 6/8] 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 7/8] 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 e4d980a5f20e3bca7ae7bf13a934aba9677d993b Mon Sep 17 00:00:00 2001 From: yadavendras Date: Fri, 13 Jan 2017 15:55:02 +0530 Subject: [PATCH 8/8] 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