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

uae_pharma

Browse Source
This commit is contained in:
CPM
2021-01-29 18:07:05 +05:30
parent 4fed5b0c28
commit 864c690d52
7 changed files with 135 additions and 38 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
+2 -2
View File
@@ -28,8 +28,8 @@ android {
versionName "4.3"*/ versionName "4.3"*/
//For UAE //For UAE
versionCode 25 versionCode 26
versionName "3.7" versionName "3.8"
//For Turkey //For Turkey
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+1 -1
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_DB67"; public static final String DATABASE_NAME = "GSK_ORANGE_DB68";
public static final int DATABASE_VERSION = 15; public static final int DATABASE_VERSION = 15;
TableBean tableBean; TableBean tableBean;
private SQLiteDatabase db; private SQLiteDatabase db;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+9 -2
View File
@@ -202,8 +202,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
mPasswordView.setText("cpm123");*/ mPasswordView.setText("cpm123");*/
//UAE //UAE
museridView.setText("testuae"); /*museridView.setText("testuae");
mPasswordView.setText("cpm123"); mPasswordView.setText("cpm123");*/
//KSA //KSA
/* museridView.setText("Esmail.d"); /* museridView.setText("Esmail.d");
@@ -227,6 +228,12 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
// museridView.setText("test.Kenya"); // museridView.setText("test.Kenya");
/* museridView.setText("testkenya"); /* museridView.setText("testkenya");
mPasswordView.setText("cpm123");*/ mPasswordView.setText("cpm123");*/
/*museridView.setText("rajesh.r");
mPasswordView.setText("cpm123");*/
/* museridView.setText("testuae1");
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/gsk_dailyentry/CategoryListActivity.java
+52 -13
View File
@@ -40,10 +40,8 @@ import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
public class CategoryListActivity extends AppCompatActivity { public class CategoryListActivity extends AppCompatActivity {
RecyclerView recyclerView; RecyclerView recyclerView;
TextView txt_categoryName; TextView txt_categoryName;
ArrayList<CategoryGetterSetter> categoryList; ArrayList<CategoryGetterSetter> categoryList;
CategoryListAdapter adapter; CategoryListAdapter adapter;
GSKOrangeDB db; GSKOrangeDB db;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id,camera_allow, country_id, store_flag_str, pog_type_id; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id,camera_allow, country_id, store_flag_str, pog_type_id;
private SharedPreferences preferences; private SharedPreferences preferences;
@@ -52,16 +50,11 @@ public class CategoryListActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_category_list); setContentView(R.layout.activity_category_list);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
db = new GSKOrangeDB(this); db = new GSKOrangeDB(this);
db.open(); db.open();
preferences = PreferenceManager.getDefaultSharedPreferences(this); preferences = PreferenceManager.getDefaultSharedPreferences(this);
CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null); store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null); visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null);
@@ -255,12 +248,32 @@ public class CategoryListActivity extends AppCompatActivity {
} }
} }
//new add UAE pharma
if(flag){ if(flag){
if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
/* if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) { if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
flag = false; flag = false;
} }
}*/
if (country_id.equals("2")){
if (camera_allow.equals("1")){
if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
flag = false;
}
}
} else {
flag = true;
}
}else {
if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
flag = false;
}
}
} }
} }
if (flag){ if (flag){
@@ -307,9 +320,9 @@ public class CategoryListActivity extends AppCompatActivity {
}else if (category_id.equals("8")) { }else if (category_id.equals("8")) {
categoryList.get(i).setCategory_img(R.mipmap.first_aid_tick); categoryList.get(i).setCategory_img(R.mipmap.first_aid_tick);
}else if (category_id.equals("9")) { }else if (category_id.equals("9")) {
categoryList.get(i).setCategory_img(R.mipmap.pain_relief_tick); categoryList.get(i).setCategory_img(R.mipmap.analgesics_tick);
} else if (category_id.equals("10")) { } else if (category_id.equals("10")) {
categoryList.get(i).setCategory_img(R.mipmap.respiratory_health_tick); categoryList.get(i).setCategory_img(R.mipmap.cough_n_cold_tick);
} }
} else { } else {
if (category_id.equals("1")) { if (category_id.equals("1")) {
@@ -329,9 +342,9 @@ public class CategoryListActivity extends AppCompatActivity {
}else if (category_id.equals("8")) { }else if (category_id.equals("8")) {
categoryList.get(i).setCategory_img(R.mipmap.first_aid); categoryList.get(i).setCategory_img(R.mipmap.first_aid);
}else if (category_id.equals("9")) { }else if (category_id.equals("9")) {
categoryList.get(i).setCategory_img(R.mipmap.pain_relief); categoryList.get(i).setCategory_img(R.mipmap.analgesics);
} else if (category_id.equals("10")) { } else if (category_id.equals("10")) {
categoryList.get(i).setCategory_img(R.mipmap.respiratory_health); categoryList.get(i).setCategory_img(R.mipmap.cough_n_cold);
} }
} }
} }
@@ -661,11 +674,37 @@ public class CategoryListActivity extends AppCompatActivity {
} }
} }
if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) { //add UAE pharma No camera pog disable
/* if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) { if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
flag_filled = false; flag_filled = false;
break; break;
} }
}*/
if (country_id.equals("2")){
if (camera_allow.equals("1")){
if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
flag_filled = false;
break;
}
}
}/*else {
if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
flag_filled = true;
break;
}
}
}*/
}else {
if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
flag_filled = false;
break;
}
}
} }
//Counterfeit Product Option - Egypt //Counterfeit Product Option - Egypt
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
+71 -8
View File
@@ -321,7 +321,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
categoryList.add(data); categoryList.add(data);
//POG //POG
data = new DailyDataMenuGetterSetter(); /* data = new DailyDataMenuGetterSetter();
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) { if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, categoryId).size() > 0) { if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, categoryId).size() > 0) {
data.setCategory_img(R.mipmap.msl_availability_done); data.setCategory_img(R.mipmap.msl_availability_done);
@@ -331,6 +331,34 @@ public class DailyDataMenuActivity extends AppCompatActivity {
} else { } else {
data.setCategory_img(R.mipmap.msl_availability_grey); data.setCategory_img(R.mipmap.msl_availability_grey);
}*/
//new add UAE Pharma
data = new DailyDataMenuGetterSetter();
if (country_id.equals("2")){
if (camera_allow.equals("1")){
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, categoryId).size() > 0) {
data.setCategory_img(R.mipmap.msl_availability_done);
} else {
data.setCategory_img(R.mipmap.msl_availability);
}
} else {
data.setCategory_img(R.mipmap.msl_availability_grey);
}
}else {
data.setCategory_img(R.mipmap.msl_availability_grey);
}
}else {
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, categoryId).size() > 0) {
data.setCategory_img(R.mipmap.msl_availability_done);
} else {
data.setCategory_img(R.mipmap.msl_availability);
}
} else {
data.setCategory_img(R.mipmap.msl_availability_grey);
}
} }
data.setCategory_name(getString(R.string.pog)); data.setCategory_name(getString(R.string.pog));
@@ -594,12 +622,32 @@ public class DailyDataMenuActivity extends AppCompatActivity {
} }
} else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.pog))) { } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.pog))) {
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) { //new add UAE pharma
/*if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
} else { } else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}*/
if (country_id.equals("2")){
if (camera_allow.equals("1")){
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
} else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
}else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
}else{
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
} else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
} }
} }
holder.lay_menu.setOnClickListener(new View.OnClickListener() { holder.lay_menu.setOnClickListener(new View.OnClickListener() {
@@ -722,12 +770,27 @@ public class DailyDataMenuActivity extends AppCompatActivity {
} else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.pog))) { } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.pog))) {
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) { //add uae pharma
Intent intent = new Intent(DailyDataMenuActivity.this, POGQuestionsActivity.class); if (country_id.equals("2")){
intent.putExtra("categoryName", dailyData.getCategory_name()); if (camera_allow.equals("1")){
intent.putExtra("categoryId", categoryId); if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
startActivity(intent); Intent intent = new Intent(DailyDataMenuActivity.this, POGQuestionsActivity.class);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out); intent.putExtra("categoryName", dailyData.getCategory_name());
intent.putExtra("categoryId", categoryId);
startActivity(intent);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
}
}else {
if (db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, null).size() > 0) {
Intent intent = new Intent(DailyDataMenuActivity.this, POGQuestionsActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
intent.putExtra("categoryId", categoryId);
startActivity(intent);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
} }
} else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.title_activity_counterfeit_products))) { } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.title_activity_counterfeit_products))) {
library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java
-12
View File
@@ -1,12 +0,0 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.androidbuts.multispinnerfilter;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "com.androidbuts.multispinnerfilter";
public static final String BUILD_TYPE = "debug";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "1.0";
}