From cc1a3e9dce6412154e3077b97af7cd2385d56572 Mon Sep 17 00:00:00 2001 From: CPM Date: Sat, 28 Nov 2020 15:13:54 +0530 Subject: [PATCH] Kenya --- .idea/caches/build_file_checksums.ser | Bin 592 -> 592 bytes GSKMTOrange/build.gradle | 18 +- .../cpm/com/gskmtorange/LoginActivity.java | 11 +- .../dailyentry/AdditionalVisibility.java | 4 +- .../dailyentry/T2PComplianceActivity.java | 2 +- .../download/DownloadActivity.java | 4 +- .../gsk_dailyentry/CategoryListActivity.java | 2 +- .../gsk_dailyentry/DailyDataMenuActivity.java | 2 +- .../MSL_Availability_StockFacingActivity.java | 4 +- .../src/main/res/values-en-rKE/string.xml | 433 ++++++++++++++++++ 10 files changed, 462 insertions(+), 18 deletions(-) create mode 100644 GSKMTOrange/src/main/res/values-en-rKE/string.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index b63a62e099bd0800850e074d59a4249a0b64baaa..079968e66d4e9aa938a479e14541a2d43abbf9b5 100644 GIT binary patch delta 37 vcmV+=0NVf11kePKmj!kV*q1IJ!Ahbil)lOX~xEtwB} diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index ab47358..874fc35 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -29,21 +29,25 @@ android { versionName "3.8"*/ - /* //For Turkey - versionCode 26 - versionName "3.8"*/ + //For Turkey + /* versionCode 25 + versionName "3.6"*/ /* //For KSA versionCode 28 versionName "4.0"*/ //For SA - versionCode 28 + /* versionCode 28 versionName "3.9" +*/ + //sa + /* versionCode 22 + versionName "3.4"*/ - /* versionCode 23 - versionName "3.5"*/ - + //Kenya + versionCode 1 + versionName "1.0" multiDexEnabled true testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index 32ae18a..f922e9f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -219,8 +219,15 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. //turkey /* museridView.setText("testmer"); - mPasswordView.setText("cpm123");*/ - /* museridView.setText("testksa"); + mPasswordView.setText("cpm123"); +*/ + //sa + /* museridView.setText("testsa"); + mPasswordView.setText("cpm123"); +*/ + + //Kenya + /* museridView.setText("test.Kenya"); mPasswordView.setText("cpm123");*/ mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() { 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 ee2920c..000c4a5 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -1318,7 +1318,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id, categoryId, store_id); }*/ - if (country_id.equals("7")) { + if (country_id.equals("7")||country_id.equals("8")) { brandList = db.getBrandT2PData(null, null, null, categoryId, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id, categoryId, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC); @@ -1458,7 +1458,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl brand_id = brandList.get(position).getBRAND_ID().get(0); brand_name = brandList.get(position).getBRAND().get(0); - if(country_id.equals("7")){ + if(country_id.equals("7")||country_id.equals("8")){ sku_list = db.getSkuT2PData(null, null, null, brand_id, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)){ 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 0cfbbd2..532d479 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -1662,7 +1662,7 @@ public class T2PComplianceActivity extends AppCompatActivity { public void showBrandAvabilitydialog(final ArrayList brandGetdata) { final ArrayList brandList; - if (country_id.equals("7")) { + if (country_id.equals("7")||country_id.equals("8")) { brandList = db.getBrandAvailbilitydata(store_id, categoryId, null, null, null, CommonString.TABLE_MAPPING_STOCK_STOREWISE); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)){ brandList = db.getBrandAvailbilitydata(store_id, categoryId, keyAccount_id, class_id, storeType_id, CommonString.TABLE_MAPPING_STOCK_ADHOC); 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 85e88e6..b6d54ce 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -607,7 +607,7 @@ public class DownloadActivity extends AppCompatActivity { //Added on 04/12/2018 // MAPPING_STOCK_STOREWISE - if (country_id.equals("7")) { + if (country_id.equals("7")||country_id.equals("8")) { request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); request.addProperty("UserName", userId); request.addProperty("Type", "MAPPING_STOCK_STOREWISE"); @@ -970,7 +970,7 @@ public class DownloadActivity extends AppCompatActivity { TableBean.setAdditionalDisplay(table_store_display); } } else { - //return "ADDITIONAL_DISPLAY_MASTER"; + return "ADDITIONAL_DISPLAY_MASTER"; } data.value = 90; data.name = "ADDITIONAL_DISPLAY_MASTER Data Download"; 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 04420a0..ec801a5 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 @@ -99,7 +99,7 @@ public class CategoryListActivity extends AppCompatActivity { recyclerView = (RecyclerView) findViewById(R.id.recyclerView); categoryList = new ArrayList<>(); - if(country_id.equals("7")){ + if(country_id.equals("7")||country_id.equals("8")){ categoryList = db.getCategoryListData(null, null, null, store_id, "MAPPING_STOCK_STOREWISE"); } else if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)){ 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 8ab2ecf..dbea374 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 @@ -783,7 +783,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { boolean isMappingStockData() { boolean flag; - if (country_id.equals("7")) { + if (country_id.equals("7")||country_id.equals("8")) { flag = db.isMappingStockDataStockFacing(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { flag = db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java index 37199aa..944b82d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java @@ -671,7 +671,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl hashMapListChildData = new HashMap<>(); //Header - if (country_id.equals("7")) { + if (country_id.equals("7")||country_id.equals("8")) { headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC); @@ -687,7 +687,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl //childDataList = new ArrayList<>(); childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id); if (!(childDataList.size() > 0)) { - if (country_id.equals("7")) { + if (country_id.equals("7")||country_id.equals("8")) { childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC); diff --git a/GSKMTOrange/src/main/res/values-en-rKE/string.xml b/GSKMTOrange/src/main/res/values-en-rKE/string.xml new file mode 100644 index 0000000..355f5c5 --- /dev/null +++ b/GSKMTOrange/src/main/res/values-en-rKE/string.xml @@ -0,0 +1,433 @@ + + GSK MT Orange + GSK Orange Stores + Open navigation drawer + Close navigation drawer + Settings + Sign in + + + E Mail + Username/Kullanıcı Adı/اسم المستخدم + Password/Şifre/كلمة المرور + Login/Giriş Yap + Sign in + This email address is invalid + This password is too short + This password is incorrect + This field is required + "Contacts permissions are needed for providing email + completions." + + + Save + + Brand + Display + Image + Gaps + Sku + Ref. Image + Present + Stock + Select + Add + Cancel + + Yes + No + Brand Name + SKU Name + Quantity + Delete + Store Visited + GSK MT ORANGE STORE + Click Store Front Image + Please select language + Select Language + Store List + Geo Tag + Daily Route Plan + Daily Data Download + Upload Data + Geo Tag + Data Export + Exit + Settings + Services + Visibility/T2P + + + Category List + Categorywise Performance + Daily Data Menu + SKU Availability + Stock and Facing + SKU Availability + Stock and Facing + Visibility/T2P + Additional Visibility + Promo Compliance + Competition Visibility + Competition Promo + SKU Name + MBQ + Availability + Reference Image + SKU Name + Stock + Facing + SOS Target + SOS + + + Store Uploaded + Store Geo Data Uploaded + Store Already Geotagged + Store Already Uploaded + Store Data Uploaded + Store Already Checkout + Please Upload data again + Store Closed + Store Already Closed + Please checkout from current store + Data already filled + Please Download Data First + Enter the values + Upload Data + No Data For Upload + First checkout of store + + + Promotion Compliance + + Additional Promos + Promos + Promos SKU + SKU + In Stock + Promo Announcer + Running on POS + Add + Period + MSL + SOS + T2P + Promo + OSS + Planogram + LTM + MTD + LSV + Store wise Performance + + + + Is there any Additional Display + Display + Photo + Additional Visibility + Are you sure you want to save + Please Add Data + Are you sure you want to add + Do You Want To Delete Data + store + Do You Want To Delete + Click Yes To Delete! + Please Select dropdown + Please Take a image + Please fill sku data + Please enter Quantity + Do you want to save the data + Please click the image + GPS IS DISABLED... + Click ok to enable GPS. + Please Take Image + This device is not supported. + Uploading Data + Uploading Geotag Data... + failure + Uploading Geotag Images + success + Are you sure you want to Checkout + No Network Connection. Please Check Your Internet Connection + Non Working Reason + Close + Please click image + Please fill SKU data + Please fill GAP data + Do you Want to proceed? Unsaved Data will be deleted. + Downloading Data + Store Visited + Click Store Front Image + Store Front Image + Reason + Select Reason + Daily Data Menu + + + Reference Image + Settings + OK + Are you sure you want to save + Data has been saved + Data has been updated + Fill the value + Please fill all the data + Parinaam + + + Select language + + + Hello blank fragment + Checkout Activity + Checkout Success + Network Error , + Data Not Uploaded , + Display Name + Click Yes To Add Data + Remark + Please fill Remark + Service + Data downloaded successfully + Export Database + Database Exported Successfully + Database Exported And Uploaded Successfully + Data Uploaded Successfully + Uploaded Data + Please Upload Previous Data First + This username is incorrect + Error Uploading + Gallery + Camera + Saved data will be lost - Do you want to continue? + No data available + Please download data + + + Empty + Faceup can not be greater than stock value + Faceup cannot be zero in this case + First fill the stock value + Are you sure you want to add + promo is added + Select the promo value + Select + + + + //text for uploading screen + Coverage Uploading + Availability Data Uploading + Stock Data Uploading + T2P Data Uploading + Additional Visibility Data Uploading + Promo Data Uploading + + Are you sure you want to take the backup of your data + + First geotag the store + + New Update Available \n\n Yeni güncelleme var + + Planogram Tracker + + Data not found in + + T2pBrand_Avaibility + Please fill brand data + + + Stock Planogram Data Uploading + + Category Pictures + Category Picture + + Please fill the no camera data + Shelf + Position + is already exists + Please select at least one sku + Add sku, shelf can not be empty + + Shelf/ Position already exists + + Add Shelf + Add Sku + Add Sku to Shelf + Planogram Tracker + Position on Shelf + + + Store Check out Image + Click Store CheckOut Image + Please fill faceup value or fill 0 + Please fill stock value or fill 0 + Stock can not be greater equal than MBQ value + Please first fill the stock value + + Faceup can not be greater than or equal to MBQ value + Future JCP + + Route Plan Lookup + + Select Date + No Route Plan for the day + Please select present + + Please select answer + No Camera Option + + Create Shelf + Create + No. of Rows on Shelf + Sub Category + Enter Facing + Please fill Facing + Please add at least one Sub Group to every row + Edit + Select an option + Planogram Document + + File not downloaded + Stock + + No App found for opening PDF + AuditActivity + Please add a Sub Group to empty spaces + Audit + "Please answer all questions" + + //notification + fcm_default_channel + + News + POG + POG + Placement + Vertical + Horizontal + Invalid facing + Map + Map + Map + Cannot add Horizontal Separator to filled row + Cannot add to row already having Horizontal Separator + + Ad hoc Visits + Messages + Please select Non T2P reason + Conversations + Please enter reply + Ad hoc - Store List + JCP(Journey Plan) + Ad hoc + Type response + + + You need to be in the store to Checkin/Checkout + Distance from Store + meters + Coaching Visit + Select Supervisor + Coaching Visit + Please save data + Delivery Calls + Add Store + Please fill + Address + Customer Store Name + Please click + In time image + Out time image + Select Coach + AdditionalPromoSKUwiseActivity + Discount Percentage + Please select Sub category + Please select Brand + Please select Promotion Type + Please select SKU + Please enter discount percentage + Please enter price + Please select price flasher + Exists + Price flasher available? + Change Password + Do you want to download data + Do you want to upload data + Do you want to exit + + + Submit + Old Password + New Password + Confirm Password + Password Rules + 1. Must be between 6 to 8 characters long. \n\n 2. Must contain following combinations \n\n a. Uppercase characters(A-Z) \n b. Lowercase characters(a-z) \n c. Numbers(0-9) \n d. Special characters(@#$%) + Invalid Password + Password and confirm password does not match + Space is not allowed in password + New password should not be equal to old password + Password updated successfully + MPin + This pin is incorrect + Add SKU + Is there any Promo running + First click compulsory image + What is the store planogram type? + Incorrect MPin limit reached + Need to reset MPin + Counterfeit Products + Competition Promo + Is there counterfeit products in Store? + Please enter SKU name + Please enter comment + Please enter Stock + Please select Competitor + + + Forgot MPin + Please Enter Four Digit MPin + Set MPin + Please Set Four Digit MPin + Attempt left + Reset + clear + StockActivity + + + Pharmacy Stores + Pharma Activity + Store Detail + Additional Stores + GSK + SOS Detail + Stock Pricing + + Price + + Please fill Stock Count + Counterfeit Indicators + Additional Stores - Adhoc + + + Promo Type + Competitor Name + Comment + Competition Promotion + NewStockDataActivity + + First Fragment + Second Fragment + Next + Previous + + Hello first fragment + Hello second fragment. Arg: %1$s + + +