AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue_ksa_resolve

Browse Source
This commit is contained in:
CPM
2020-12-07 14:36:32 +05:30
parent 855148ca23
commit a3be6bc8cc
6 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/caches/build_file_checksums.ser
Generated
BIN
View File
Binary file not shown.
GSKMTOrange/build.gradle
+6 -4
View File
@@ -36,9 +36,11 @@ android {
/* versionCode 25 /* versionCode 25
versionName "3.6"*/ versionName "3.6"*/
/* //For KSA //For KSA
versionCode 28 /* versionCode 28
versionName "4.0"*/ versionName "4.0"*/
versionCode 27
versionName "3.8"
//For SA //For SA
/* versionCode 28 /* versionCode 28
@@ -49,8 +51,8 @@ android {
versionName "3.4"*/ versionName "3.4"*/
//Kenya //Kenya
versionCode 1 /* versionCode 2
versionName "1.0" versionName "1.1"*/
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+15 -10
View File
@@ -95,7 +95,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
*/ */
public class GSKOrangeDB extends SQLiteOpenHelper { public class GSKOrangeDB extends SQLiteOpenHelper {
public static final String DATABASE_NAME = "GSK_ORANGE_DB65"; public static final String DATABASE_NAME = "GSK_ORANGE_DB66";
public static final int DATABASE_VERSION = 15; public static final int DATABASE_VERSION = 15;
TableBean tableBean; TableBean tableBean;
private SQLiteDatabase db; private SQLiteDatabase db;
@@ -5493,7 +5493,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
//get Sub Category Master //get Sub Category Master
public ArrayList<MSL_AvailabilityStockFacingGetterSetter> getSubCategoryMaster( public ArrayList<MSL_AvailabilityStockFacingGetterSetter> getSubCategoryMaster(
String category_id,String store_id) { String category_id,String store_id,String countery_id) {
ArrayList<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>(); ArrayList<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null; Cursor dbcursor = null;
@@ -5502,13 +5502,18 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
// dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '" + category_id + "'", null); // dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '" + category_id + "'", null);
//kenya //kenya
dbcursor = db.rawQuery("SELECT DISTINCT BR.sub_category_id, SUB_Category FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " + if (countery_id.equalsIgnoreCase("7")||countery_id.equalsIgnoreCase("8")){
"INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " + dbcursor = db.rawQuery("SELECT DISTINCT BR.sub_category_id, SUB_Category FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " +
"INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " + "INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " +
"INNER JOIN " + "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " +
"(SELECT DISTINCT SKU_ID FROM MAPPING_STOCK_STOREWISE WHERE STORE_ID = '" + store_id + "') A " + "INNER JOIN " +
"ON SK.SKU_ID = A.SKU_ID " + "(SELECT DISTINCT SKU_ID FROM MAPPING_STOCK_STOREWISE WHERE STORE_ID = '" + store_id + "') A " +
"WHERE BR.COMPANY_ID =1 AND CA.CATEGORY_ID ='" + category_id + "'", null); "ON SK.SKU_ID = A.SKU_ID " +
"WHERE BR.COMPANY_ID =1 AND CA.CATEGORY_ID ='" + category_id + "'", null);
}else {
dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '" + category_id + "'", null);
}
if (dbcursor != null) { if (dbcursor != null) {
dbcursor.moveToFirst(); dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) { while (!dbcursor.isAfterLast()) {
@@ -5559,7 +5564,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
} catch (Exception ex) { } catch (Exception ex) {
Log.d("Exception ", " in Insert NO CAMERA " + ex.toString());
} }
return Data; return Data;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+4 -4
View File
@@ -206,8 +206,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
mPasswordView.setText("cpm123");*/ mPasswordView.setText("cpm123");*/
//KSA //KSA
/* museridView.setText("mohamed.o"); museridView.setText("Esmail.d");
mPasswordView.setText("cpm@123");*/ mPasswordView.setText("cpm@123");
/* museridView.setText("testksa"); /* museridView.setText("testksa");
mPasswordView.setText("cpm123");*/ mPasswordView.setText("cpm123");*/
@@ -223,8 +223,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
//Kenya //Kenya
// museridView.setText("test.Kenya"); // museridView.setText("test.Kenya");
museridView.setText("testkenya"); /* museridView.setText("testkenya");
mPasswordView.setText("cpm123"); mPasswordView.setText("cpm123");*/
mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() { mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override @Override
public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) { public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java
+4 -3
View File
@@ -46,7 +46,7 @@ public class CreateSelfActivity extends AppCompatActivity {
GSKOrangeDB db; GSKOrangeDB db;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, store_flag_str; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, store_flag_str;
String categoryName, categoryId; String categoryName, categoryId,country_id;
private SharedPreferences preferences; private SharedPreferences preferences;
MSL_AvailabilityStockFacingGetterSetter brand_selected; MSL_AvailabilityStockFacingGetterSetter brand_selected;
int number_of_rows=0; int number_of_rows=0;
@@ -73,6 +73,7 @@ public class CreateSelfActivity extends AppCompatActivity {
visit_date = preferences.getString(CommonString.KEY_DATE, null); visit_date = preferences.getString(CommonString.KEY_DATE, null);
username = preferences.getString(CommonString.KEY_USERNAME, null); username = preferences.getString(CommonString.KEY_USERNAME, null);
store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null); store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
//Intent data //Intent data
categoryName = getIntent().getStringExtra("categoryName"); categoryName = getIntent().getStringExtra("categoryName");
@@ -106,7 +107,7 @@ public class CreateSelfActivity extends AppCompatActivity {
added_sub_category_list = new ArrayList<>(); added_sub_category_list = new ArrayList<>();
//kenya use //kenya use
ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId,store_id); ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId,store_id,country_id);
for(int i=0; i<sub_category_list.size(); i++){ for(int i=0; i<sub_category_list.size(); i++){
@@ -151,7 +152,7 @@ public class CreateSelfActivity extends AppCompatActivity {
public void showSkuDialog() { public void showSkuDialog() {
final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId,store_id); final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId,store_id,country_id);
MSL_AvailabilityStockFacingGetterSetter brand = new MSL_AvailabilityStockFacingGetterSetter(); MSL_AvailabilityStockFacingGetterSetter brand = new MSL_AvailabilityStockFacingGetterSetter();
brand.setSub_category("select"); brand.setSub_category("select");
sub_category_list.add(0, brand); sub_category_list.add(0, brand);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
+2 -2
View File
@@ -221,7 +221,7 @@ public class CategoryListActivity extends AppCompatActivity {
} }
else { else {
final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(category_id,store_id); final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(category_id,store_id,country_id);
//if Sub Group Data exists for any Sub Category of the Category //if Sub Group Data exists for any Sub Category of the Category
boolean isSubGroupDataExists = false; boolean isSubGroupDataExists = false;
@@ -626,7 +626,7 @@ public class CategoryListActivity extends AppCompatActivity {
} }
}else { }else {
final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(category_id,store_id); final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(category_id,store_id,country_id);
//if Sub Group Data exists for any Sub Category of the Category //if Sub Group Data exists for any Sub Category of the Category
boolean isSubGroupDataExists = false; boolean isSubGroupDataExists = false;