diff --git a/.idea/misc.xml b/.idea/misc.xml
index b15ecee..a643425 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,9 +4,6 @@
-
-
-
@@ -31,17 +28,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle
index da5a9ad..56f8214 100644
--- a/GSKMTOrange/build.gradle
+++ b/GSKMTOrange/build.gradle
@@ -10,6 +10,10 @@ android {
disable 'MissingTranslation'
}
+ configurations {
+ all*.exclude module: 'okio'
+ }
+
defaultConfig {
applicationId "cpm.com.gskmtorange"
minSdkVersion 17
@@ -17,6 +21,7 @@ android {
versionCode 11
versionName "2.4"
+ multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
@@ -44,5 +49,8 @@ dependencies {
compile 'com.android.support:support-v4:24.2.1'
compile 'com.google.code.gson:gson:2.7'
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'
+
+ compile 'com.squareup.retrofit:converter-gson:2.0.0-beta1'
+
testCompile 'junit:junit:4.12'
}
diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index 3013347..386252f 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -82,7 +82,7 @@
@@ -210,12 +210,17 @@
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan" />
-
+ android:windowSoftInputMode="adjustPan" />
+
\ No newline at end of file
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 e9f980c..24b3af9 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -26,6 +26,7 @@ import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.ADDITIONAL_DISPLAY_MASTERGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.CategoryImagesAllowed;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter;
@@ -39,13 +40,16 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramCountrywiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.RowColumnGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
@@ -64,7 +68,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
*/
public class GSKOrangeDB extends SQLiteOpenHelper {
- public static final String DATABASE_NAME = "GSK_ORANGE_DB12";
+ public static final String DATABASE_NAME = "GSK_ORANGE_DB14";
public static final int DATABASE_VERSION = 13;
TableBean tableBean;
private SQLiteDatabase db;
@@ -152,6 +156,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(CommonString.CREATE_TABLE_INSERT_CATEGORY_PICTURE);
db.execSQL(TableBean.getMappingSubCategoryImageAllow());
+ db.execSQL(TableBean.getMappingCategoryImageAllow());
+ //db.execSQL(TableBean.getMappingCountrywisePlanogram());
db.execSQL(TableBean.getSkugroupMaster());
//15-03-2017
@@ -203,6 +209,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE_LIST, "Store_Id='" + storeid + "'", null);
db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, "Store_Id='" + storeid + "'", null);
+
+ db.delete(CommonString.TABLE_INSERT_NO_CAMERA_FACING_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
+
}
public void deleteAllTables() {
@@ -234,6 +243,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE, null, null);
db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE_LIST, null, null);
db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, null, null);
+ db.delete(CommonString.TABLE_INSERT_NO_CAMERA_FACING_DATA, null, null);
}
public void InsertJCP(JourneyPlanGetterSetter data) {
@@ -3121,11 +3131,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
- public ArrayList getMappingPlanogramData(String category_id) {
+ public ArrayList getMappingPlanogramData(String category_id, String store_type_id, String class_id) {
ArrayList list = new ArrayList<>();
Cursor dbcursor = null;
try {
- dbcursor = db.rawQuery("SELECT * FROM MAPPING_PLANOGRAM where CATEGORY_ID='" + category_id + "'", null);
+ dbcursor = db.rawQuery("SELECT * FROM MAPPING_PLANOGRAM where CATEGORY_ID='" + category_id + "' AND STORETYPE_ID ='" + store_type_id
+ +"' AND CLASS_ID ='" + class_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -4235,7 +4246,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Cursor dbcursor = null;
try {
- dbcursor = db.rawQuery("SELECT DISTINCT SB.SUB_CATEGORY_ID, MIA.IMAGE_ALLOW,SB.SUB_CATEGORY FROM MAPPING_STOCK M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" +
+ dbcursor = db.rawQuery("SELECT DISTINCT SB.SUB_CATEGORY_ID, MIA.IMAGE_ALLOW,SB.SUB_CATEGORY FROM MAPPING_STOCK M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" +
" INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID" +
" INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID" +
" INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID" +
@@ -4793,6 +4804,27 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
+ //MAPPING_CATEGORY_IMAGE_ALLOW
+ public void InsertMappingCategoryImageAllow(MappingCategoryImageAllowGetterSetter data) {
+ db.delete("MAPPING_CATEGORY_IMAGE_ALLOW", null, null);
+
+ ContentValues values = new ContentValues();
+ try {
+ for (int i = 0; i < data.getCATEGORY_ID().size(); i++) {
+
+ values.put("COUNTRY_ID", data.getCOUNTRY_ID().get(i));
+ values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i));
+ values.put("IMAGE1_ALLOW", data.getIMAGE1_ALLOW().get(i));
+ values.put("IMAGE2_ALLOW", data.getIMAGE2_ALLOW().get(i));
+ values.put("IMAGE3_ALLOW", data.getIMAGE3_ALLOW().get(i));
+ values.put("IMAGE4_ALLOW", data.getIMAGE4_ALLOW().get(i));
+
+ db.insert("MAPPING_CATEGORY_IMAGE_ALLOW", null, values);
+ }
+ } catch (Exception ex) {
+ Log.d("Exception ", " in MAPPING_CATEGORY_IMAGE_ALLOW " + ex.toString());
+ }
+ }
//14-03-2017
//MSL_Availability_StockFacing
@@ -5176,11 +5208,15 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public void InsertNoCameraAddedData(
String storeId, String categoryId, String sub_category_id, int row_count, HashMap> hashMapRowData) {
+
+ db.delete(CommonString.TABLE_INSERT_NO_CAMERA_FACING_DATA, " STORE_ID = '" + storeId
+ + "' AND CATEGORY_ID = '" + categoryId + "' AND SUB_CATEGORY_ID = '" + sub_category_id + "'", null);
+
ContentValues values = new ContentValues();
try {
db.beginTransaction();
- for (int i = 1; i < row_count; i++) {
+ for (int i = 1; i <=row_count; i++) {
for (int j = 0; j < hashMapRowData.get(i).size(); j++) {
NoCameraDataGetterSetter data = hashMapRowData.get(i).get(j);
@@ -5311,4 +5347,128 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Log.d("Exception ", " in SKUGROUP_MASTER " + ex.toString());
}
}
+
+ //get Row and column count no camera
+ public ArrayList getrowColumnNoCamera(String store_id, String category_id, String sub_category_id) {
+
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+
+ dbcursor = db.rawQuery("SELECT ROW_NO, MAX(COLUMN_NO) as COLUMN_NO FROM NO_CAMERA_FACING_DATA WHERE " +
+ "STORE_ID = '" + store_id + "' AND CATEGORY_ID = '" + category_id + "' AND SUB_CATEGORY_ID = '" + sub_category_id +
+ "' GROUP BY ROW_NO", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ RowColumnGetterSetter rc = new RowColumnGetterSetter();
+
+ rc.setRow(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("ROW_NO")));
+ rc.setColumn(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("COLUMN_NO")));
+
+ list.add(rc);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get row column!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+
+ //get Sub group master for sub category id , row and column
+
+ public NoCameraDataGetterSetter getRowSkuGroupCamera(String store_id, String category_id, String sub_category_id, int row, int column) {
+
+ NoCameraDataGetterSetter column_data = new NoCameraDataGetterSetter();
+ Cursor dbcursor = null;
+
+ try {
+
+ dbcursor = db.rawQuery("SELECT NC.SKU_GROUP_ID, SM.SKUGROUP_NAME, NC.FACING FROM NO_CAMERA_FACING_DATA NC " +
+ "INNER JOIN SKUGROUP_MASTER SM ON NC.SKU_GROUP_ID = SM.SKUGROUP_ID " +
+ "WHERE NC.STORE_ID = '"+store_id +"' AND NC.CATEGORY_ID = '"+ category_id +"' AND NC.SUB_CATEGORY_ID = '"+ sub_category_id +"' AND ROW_NO = '"
+ + row +"' AND COLUMN_NO = '" + column + "'", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+
+ column_data.setSKUGROUP_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_GROUP_ID")));
+ column_data.setSKUGROUP_NAME(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKUGROUP_NAME")));
+ column_data.setFacing(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("FACING")));
+
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return column_data;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "get row column!" + e.toString());
+ return column_data;
+ }
+ return column_data;
+ }
+
+ //Category Images Allowed
+ public ArrayList getCategoryPictureAllowedData(String categoryId) {
+ Cursor cursordata = null;
+ ArrayList imageAllowData = new ArrayList<>();
+
+ try {
+
+ cursordata = db.rawQuery("Select * from MAPPING_CATEGORY_IMAGE_ALLOW " + "where CATEGORY_ID ='" + categoryId + "'", null);
+
+ if (cursordata != null) {
+ cursordata.moveToFirst();
+ while (!cursordata.isAfterLast()) {
+ CategoryImagesAllowed sb = new CategoryImagesAllowed();
+
+ sb.setImg_cam1(cursordata.getString(cursordata
+ .getColumnIndexOrThrow("IMAGE1_ALLOW")).equals("1"));
+ sb.setImg_cam2(cursordata.getString(cursordata
+ .getColumnIndexOrThrow("IMAGE2_ALLOW")).equals("1"));
+ sb.setImg_cam3(cursordata.getString(cursordata
+ .getColumnIndexOrThrow("IMAGE3_ALLOW")).equals("1"));
+ sb.setImg_cam4(cursordata.getString(cursordata
+ .getColumnIndexOrThrow("IMAGE4_ALLOW")).equals("1"));
+
+ imageAllowData.add(sb);
+ cursordata.moveToNext();
+ }
+ cursordata.close();
+
+ }
+
+
+ } catch (Exception ex) {
+
+ }
+ return imageAllowData;
+
+ }
+
+ //MAPPING_COUNTRYWISE_PLANOGRAM
+ public void InsertMappingCountrywisePlanogram(MappingPlanogramCountrywiseGetterSetter data) {
+ db.delete("MAPPING_COUNTRYWISE_PLANOGRAM", null, null);
+
+ ContentValues values = new ContentValues();
+ try {
+ for (int i = 0; i < data.getCOUNTRY_ID().size(); i++) {
+
+ values.put("COUNTRY_ID", data.getCOUNTRY_ID().get(i));
+ values.put("FILE_PATH", data.getFILE_PATH().get(i));
+ values.put("PLANOGRAM_URL", data.getPLANOGRAM_URL().get(i));
+
+ db.insert("MAPPING_COUNTRYWISE_PLANOGRAM", null, values);
+ }
+ } catch (Exception ex) {
+ Log.d("Exception ", " in MAPPING_COUNTRYWISE_PLANOGRAM " + ex.toString());
+ }
+ }
}
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 cab7689..e6cf39a 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
@@ -76,6 +76,7 @@ import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.GeotaggingBeans;
@@ -132,14 +133,16 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
*/
private GoogleApiClient client;
+ Toolbar toolbar;
+
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_geo_tag);
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
username = preferences.getString(CommonString.KEY_USERNAME, null);
storeid = preferences.getString(CommonString.KEY_STORE_ID, null);
@@ -255,7 +258,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
}
}*/
- _pathforcheck = storeid +"GeoTag" + visitData.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+ _pathforcheck = storeid +"GeoTag" + visitData.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck;
@@ -393,7 +396,8 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ toolbar.setTitle(getResources().getString(R.string.title_activity_store_geotag));
/* checkPlayServices();
// Resuming the periodic location updates
@@ -421,7 +425,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
stopLocationUpdates();
}
- /*public String getCurrentTime() {
+ /*public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
@@ -449,7 +453,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
return new String(chars);
}
- public String getCurrentTime() {
+ public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
@@ -1072,50 +1076,4 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
return result.toString();
}
-
-
-
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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 fbbded4..f5c9720 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java
@@ -30,6 +30,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.download.DownloadActivity;
@@ -72,7 +73,7 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
date = preferences.getString(CommonString.KEY_DATE, null);
visit_status = preferences.getString(CommonString.KEY_STOREVISITED_STATUS, "");
@@ -254,53 +255,9 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi
@Override
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(getString(R.string.title_activity_store_geotag));
}
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- } else {
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
index a558418..70d94fc 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
@@ -57,6 +57,7 @@ import java.util.List;
import java.util.Locale;
import cpm.com.gskmtorange.autoupdate.AutoUpdateActivity;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter;
@@ -127,7 +128,7 @@ public class LoginActivity extends AppCompatActivity {
e.printStackTrace();
}
- tv_version.setText("Version/Versiyon - " + app_ver+"T1");
+ tv_version.setText("Version/Versiyon - " + app_ver+"T3");
preferences = PreferenceManager.getDefaultSharedPreferences(this);
editor = preferences.edit();
@@ -175,7 +176,6 @@ public class LoginActivity extends AppCompatActivity {
// Create a Folder for Images
-
File file = new File(Environment.getExternalStorageDirectory(), "GSK_MT_ORANGE_IMAGES");
if (!file.isDirectory()) {
file.mkdir();
@@ -431,10 +431,10 @@ public class LoginActivity extends AppCompatActivity {
String userauth_xml = "[DATA]" + "[USER_DATA][USER_ID]"
+ userid + "[/USER_ID]" + "[PASSWORD]" + password
- + "[/PASSWORD]" + "[IN_TIME]" + getCurrentTime()
+ + "[/PASSWORD]" + "[IN_TIME]" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext())
+ "[/IN_TIME]" + "[LATITUDE]" + lat
+ "[/LATITUDE]" + "[LONGITUDE]" + lon
- + "[/LONGITUDE]" + "[APP_VERSION]" + app_ver
+ + "[/LONGITUDE]" + "[APP_VERSION]" + app_ver+"T3"
+ "[/APP_VERSION]" + "[ATT_MODE]OnLine[/ATT_MODE]"
+ "[NETWORK_STATUS]" + "LoginStatus"
+ "[/NETWORK_STATUS]" + "[/USER_DATA][/DATA]";
@@ -627,7 +627,7 @@ public class LoginActivity extends AppCompatActivity {
finish();
} else {
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
Intent intent = new Intent(getBaseContext(),
MainActivity.class);
@@ -672,7 +672,7 @@ public class LoginActivity extends AppCompatActivity {
alert.show();
}
- /*public String getCurrentTime() {
+ /*public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
@@ -695,7 +695,7 @@ public class LoginActivity extends AppCompatActivity {
return new String(chars);
}
- public String getCurrentTime() {
+ public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
@@ -710,51 +710,5 @@ public class LoginActivity extends AppCompatActivity {
return cdate;
}
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }
- else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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 445aff8..7b328f0 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
@@ -35,8 +35,10 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GeoTag.GeoTagStoreList;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.dailyentry.FutureJCPActivity;
+import cpm.com.gskmtorange.dailyentry.PlanogramPDFActivity;
import cpm.com.gskmtorange.dailyentry.ServiceActivity;
import cpm.com.gskmtorange.dailyentry.SettingsActivity;
import cpm.com.gskmtorange.dailyentry.StoreListActivity;
@@ -71,7 +73,7 @@ public class MainActivity extends AppCompatActivity
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
date = preferences.getString(CommonString.KEY_DATE, null);
imageView = (ImageView) findViewById(R.id.img_main);
@@ -132,7 +134,7 @@ public class MainActivity extends AppCompatActivity
coverageList = db.getCoverageData(date);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(getString(R.string.main_menu_activity_name));
db.open();
@@ -303,6 +305,19 @@ public class MainActivity extends AppCompatActivity
startActivity(startDownload);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }else if(id == R.id.nav_planogram){
+
+ if(checkNetIsAvailable()){
+ Intent planogram_pdf = new Intent(this, PlanogramPDFActivity.class);
+ startActivity(planogram_pdf);
+
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }else {
+
+ Snackbar.make(webView, getResources().getString(R.string.nonetwork), Snackbar.LENGTH_SHORT)
+ .setAction("Action", null).show();
+ }
+
}
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -386,49 +401,4 @@ 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("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }
- else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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/SelectLanguageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java
index e33fb47..2123d1a 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java
@@ -20,6 +20,7 @@ import com.google.gson.Gson;
import java.util.ArrayList;
import java.util.Locale;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter;
@@ -94,7 +95,7 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
selected_flag = true;
- updateResources(getApplicationContext(), language.get(0));
+ CommonFunctions.updateLangResources(getApplicationContext(), language.get(0));
btn_lang_1.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
btn_lang_2.setBackgroundColor(getResources().getColor(R.color.grey_background));
@@ -110,7 +111,7 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
selected_flag = true;
- updateResources(getApplicationContext(), language.get(1));
+ CommonFunctions.updateLangResources(getApplicationContext(), language.get(1));
btn_lang_1.setBackgroundColor(getResources().getColor(R.color.grey_background));
btn_lang_2.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
@@ -124,49 +125,6 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
}
}
- private static boolean updateResources(Context context, String language) {
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
-
- 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;
- }
private void setDataFromSharedPreferences(LoginGetterSetter lgs) {
Gson gson = new Gson();
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/MyAdapter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/MyAdapter.java
index 94d1941..79d3b1d 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/MyAdapter.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/MyAdapter.java
@@ -27,12 +27,14 @@ public class MyAdapter extends RecyclerView.Adapter {
List data = Collections.emptyList();
private Listener listener;
+ RecyclerView rec;
- public MyAdapter(Context context, List data, Listener listener) {
+ public MyAdapter(Context context, List data, Listener listener, RecyclerView rec) {
inflator = LayoutInflater.from(context);
this.data = data;
this.listener = listener;
+ this.rec = rec;
}
@@ -46,7 +48,7 @@ public class MyAdapter extends RecyclerView.Adapter {
}
@Override
- public void onBindViewHolder(MyViewHolder holder, int position) {
+ public void onBindViewHolder(MyViewHolder holder, final int position) {
final NoCameraDataGetterSetter current = data.get(position);
@@ -60,6 +62,15 @@ public class MyAdapter extends RecyclerView.Adapter {
//holder.linear_parent.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
holder.linear_parent.setOnDragListener(new DragListener(listener));
+ holder.linear_parent.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View view) {
+ listener.deleteItem(view, position, rec);
+ return false;
+ }
+
+ });
+
}
public DragListener getDragInstance() {
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java
index baf6c88..293c931 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java
@@ -30,6 +30,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.LoginActivity;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
public class AutoUpdateActivity extends AppCompatActivity {
@@ -58,7 +59,7 @@ public class AutoUpdateActivity extends AppCompatActivity {
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Parinaam");
@@ -288,49 +289,5 @@ public class AutoUpdateActivity extends AppCompatActivity {
alert.show();
}
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
-
- 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/constant/CommonFunctions.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonFunctions.java
new file mode 100644
index 0000000..4e9f556
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonFunctions.java
@@ -0,0 +1,82 @@
+package cpm.com.gskmtorange.constant;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.preference.PreferenceManager;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Locale;
+
+/**
+ * Created by yadavendras on 13-11-2017.
+ */
+
+public class CommonFunctions {
+
+ public static boolean updateLangResources(Context context, String language) {
+
+ String lang;
+
+ if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
+ lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
+
+ } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
+ lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
+
+ } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
+ lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
+
+ } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
+ lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
+ }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
+ lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
+ }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_EGYPT)) {
+ lang = CommonString.KEY_RETURN_LANGUAGE_EGYPT;
+ }else{
+ lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
+ }
+
+ 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;
+ }
+
+ public static String getCurrentTimeWithLanguage(Context context) {
+
+ SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss"); Calendar m_cal = Calendar.getInstance();
+
+ String cdate = formatter.format(m_cal.getTime());
+ SharedPreferences preferences = preferences = PreferenceManager.getDefaultSharedPreferences(context);;
+ if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)
+ || preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)
+ || preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_EGYPT)) {
+ cdate = arabicToenglish(cdate);
+ }
+
+ return cdate;
+ }
+
+ private static String arabicToenglish(String number) {
+ char[] chars = new char[number.length()];
+ for (int i = 0; i < number.length(); i++) {
+ char ch = number.charAt(i);
+ if (ch >= 0x0660 && ch <= 0x0669)
+ ch -= 0x0660 - '0';
+ else if (ch >= 0x06f0 && ch <= 0x06F9)
+ ch -= 0x06f0 - '0';
+ chars[i] = ch;
+ }
+ return new String(chars);
+ }
+}
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 9a35826..e400ecf 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
@@ -10,6 +10,9 @@ import org.xmlpull.v1.XmlPullParserException;
public class CommonString {
+ public static final String BACKUP_PATH = Environment.getExternalStorageDirectory().getPath()+ "/gsk_orange_backup";
+ // String path = Environment.getExternalStorageDirectory().getPath()+ "/gsk_orange_backup";
+
// webservice constants
// preferenec keys
@@ -109,6 +112,7 @@ public class CommonString {
public static final String KEY_NUMBER_OF_ROWS = "NUMBER_OF_ROWS";
public static final String KEY_SUB_CATEGORY = "SUB_CATEGORY";
public static final String KEY_SUB_CATEGORY_ID = "SUB_CATEGORY_ID";
+ public static final String KEY_FROM = "FROM";
public static final String KEY_NO_DATA = "NODATA";
@@ -216,6 +220,7 @@ public class CommonString {
//File Path
public static final String FILE_PATH = Environment.getExternalStorageDirectory() + "/GSK_MT_ORANGE_IMAGES/";
+ public static final String FILE_PATH_PDF = Environment.getExternalStorageDirectory() + "/GSK_MT_ORANGE_Planogram/";
//Table
@@ -770,7 +775,9 @@ public class CommonString {
public static final String KEY_LANGUAGE_OMAN = "English";
public static final String KEY_RETURE_LANGUAGE_OMAN = "EN";
+ public static final String KEY_RETURN_LANGUAGE_EGYPT = "AR";
public static final String KEY_LANGUAGE_ARABIC_UAE = "ARABIC-UAE";
+ public static final String KEY_LANGUAGE_ARABIC_EGYPT = "ARABIC-EGYPT";
public static final String KEY_RETURE_LANGUAGE_UAE_ARABIC = "AR";
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 121ecc3..4941d41 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
@@ -52,6 +52,7 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.ADDITIONAL_DISPLAY_MASTERGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
@@ -109,13 +110,15 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
String gallery_package = "";
Uri outputFileUri;
+ Toolbar toolbar;
+
////String brand_id,SKU_ID;
protected void onCreate(Bundle savedInstanceState) {
// TODO Auto-generated method stub
super.onCreate(savedInstanceState);
setContentView(R.layout.additionalvisibilitylayout);
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
@@ -127,7 +130,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
store_type_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
key_account_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
@@ -750,10 +753,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
btnimage.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- _pathforcheck1 = store_id + categoryId + "AdditionalImage1" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+ _pathforcheck1 = store_id + categoryId + "AdditionalImage1" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck1;
- intime = getCurrentTime();
+ intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
startCameraActivity();
}
@@ -762,10 +765,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
btnimage1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- _pathforcheck2 = store_id + categoryId + "AdditionalImage2" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+ _pathforcheck2 = store_id + categoryId + "AdditionalImage2" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck2;
- intime = getCurrentTime();
+ intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
startCameraActivity();
}
@@ -774,10 +777,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
btnimage2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- _pathforcheck3 = store_id + categoryId + "AdditionalImage3" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+ _pathforcheck3 = store_id + categoryId + "AdditionalImage3" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck3;
- intime = getCurrentTime();
+ intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
startCameraActivity();
}
@@ -813,7 +816,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
return new String(chars);
}
- public String getCurrentTime() {
+ public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
@@ -1667,44 +1670,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
@Override
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
-
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ toolbar.setTitle(getResources().getString(R.string.title_activity_Additional_visibility));
}
- private static boolean updateResources(Context context, String language) {
-
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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/CategoryPicture.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
index 304f78f..f976e9b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
@@ -9,8 +9,6 @@ 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;
@@ -36,15 +34,14 @@ 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.AdditionalDialogGetterSetter;
-import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
import cpm.com.gskmtorange.GetterSetter.CategoryPictureGetterSetter;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
-import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
+import cpm.com.gskmtorange.constant.CommonFunctions;
+import cpm.com.gskmtorange.gsk_dailyentry.MSL_Availability_StockFacingActivity;
+import cpm.com.gskmtorange.xmlGetterSetter.CategoryImagesAllowed;
public class CategoryPicture extends AppCompatActivity {
String _pathforcheck1, _pathforcheck2, _pathforcheck3, _pathforcheck4, Camerapath1, Camerapath2, _path, CaMpath, str, msg, categoryName, categoryId;
@@ -59,12 +56,15 @@ public class CategoryPicture extends AppCompatActivity {
int Adapterposition;
ArrayList listdat = new ArrayList();
CategoryAdapter adapteradditional;
+ Toolbar toolbar;
+
+ ArrayList categoryImagesAllowed = new ArrayList<>();
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_category_picture);
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -74,7 +74,7 @@ public class CategoryPicture extends AppCompatActivity {
store_type_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
key_account_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
@@ -96,6 +96,7 @@ public class CategoryPicture extends AppCompatActivity {
adddata = db.getCategoryPictureData(store_id, categoryId);
+ categoryImagesAllowed = db.getCategoryPictureAllowedData(categoryId);
if (adddata.size() != 0) {
@@ -152,15 +153,22 @@ public class CategoryPicture extends AppCompatActivity {
}
-
adapteradditional = new CategoryPicture.CategoryAdapter(CategoryPicture.this, listdat);
listview.setAdapter(adapteradditional);
+ if(categoryImagesAllowed.size()>0){
+ setCamAllowImage(categoryImagesAllowed.get(0).isImg_cam1(), im1);
+ setCamAllowImage(categoryImagesAllowed.get(0).isImg_cam2(), im2);
+ setCamAllowImage(categoryImagesAllowed.get(0).isImg_cam2(), im3);
+ setCamAllowImage(categoryImagesAllowed.get(0).isImg_cam3(), im4);
+ }
+
+
fab.setOnClickListener(new View.OnClickListener() {
@Override
- public void onClick(View view) {
+ public void onClick(final View view) {
- CategoryPictureGetterSetter CP = new CategoryPictureGetterSetter();
+ final CategoryPictureGetterSetter CP = new CategoryPictureGetterSetter();
CP.setCategoryImage1(img_str1);
CP.setCategoryImage2(img_str2);
@@ -169,15 +177,31 @@ public class CategoryPicture extends AppCompatActivity {
CP.setStore_ID(store_id);
CP.setCamera_allow(camera_allow);
-
if (validateData(CP, listdat)) {
- db.InsertCategoryPictureData(CP, listdat, categoryId);
+ AlertDialog.Builder builder = new AlertDialog.Builder(CategoryPicture.this);
+ builder.setMessage(getResources().getString(R.string.check_save_message))
+ .setCancelable(false)
+ .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ db.open();
+
+ db.InsertCategoryPictureData(CP, listdat, categoryId);
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+ })
+ .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.cancel();
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
- finish();
} else {
- Snackbar.make(view, "Please take image", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+ Snackbar.make(view, R.string.title_activity_take_image, Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
@@ -191,10 +215,10 @@ public class CategoryPicture extends AppCompatActivity {
public void onClick(View view) {
- _pathforcheck1 = store_id + "CategoryPicture1" + categoryId + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+ _pathforcheck1 = store_id + "CategoryPicture1" + categoryId + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck1;
- intime = getCurrentTime();
+ intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
startCameraActivity();
@@ -205,10 +229,10 @@ public class CategoryPicture extends AppCompatActivity {
@Override
public void onClick(View view) {
- _pathforcheck2 = store_id + "CategoryPicture2" + categoryId + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+ _pathforcheck2 = store_id + "CategoryPicture2" + categoryId + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck2;
- intime = getCurrentTime();
+ intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
startCameraActivity();
@@ -218,10 +242,10 @@ public class CategoryPicture extends AppCompatActivity {
@Override
public void onClick(View view) {
- _pathforcheck3 = store_id + "CategoryPicture3" + categoryId + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+ _pathforcheck3 = store_id + "CategoryPicture3" + categoryId + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck3;
- intime = getCurrentTime();
+ intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
startCameraActivity();
@@ -231,10 +255,10 @@ public class CategoryPicture extends AppCompatActivity {
@Override
public void onClick(View view) {
- _pathforcheck4 = store_id + "CategoryPicture4" + categoryId + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+ _pathforcheck4 = store_id + "CategoryPicture4" + categoryId + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck4;
- intime = getCurrentTime();
+ intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
startCameraActivity();
@@ -255,7 +279,7 @@ public class CategoryPicture extends AppCompatActivity {
return new String(chars);
}
- public String getCurrentTime() {
+ public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
@@ -271,42 +295,6 @@ public class CategoryPicture extends AppCompatActivity {
return cdate;
}
- private static boolean updateResources(Context context, String language) {
-
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
-
-
- 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;
- }
protected void startCameraActivity() {
try {
@@ -505,11 +493,11 @@ public class CategoryPicture extends AppCompatActivity {
@Override
public void onClick(View v) {
- Camerapath1 = store_id + "CategoryPicture" + list.get(position1).getSUB_CATEGORY_ID().toString() + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+ Camerapath1 = store_id + "CategoryPicture" + list.get(position1).getSUB_CATEGORY_ID().toString() + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
Adapterposition = position1;
_path = CommonString.FILE_PATH + Camerapath1;
- intime = getCurrentTime();
+ intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
startCameraActivity();
listview.invalidateViews();
@@ -524,10 +512,10 @@ public class CategoryPicture extends AppCompatActivity {
@Override
public void onClick(View v) {
- Camerapath2 = store_id + "CategoryPicture" + list.get(position1).getSUB_CATEGORY_ID().toString() + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+ Camerapath2 = store_id + "CategoryPicture" + list.get(position1).getSUB_CATEGORY_ID().toString() + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
Adapterposition = position1;
_path = CommonString.FILE_PATH + Camerapath2;
- intime = getCurrentTime();
+ intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
startCameraActivity();
listview.invalidateViews();
}
@@ -656,4 +644,21 @@ public class CategoryPicture extends AppCompatActivity {
android.app.AlertDialog alert = builder.create();
alert.show();
}
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ toolbar.setTitle(getResources().getString(R.string.title_activity_category_picture));
+ }
+
+ public void setCamAllowImage(boolean isAllowed, ImageView img_cam){
+
+ if(isAllowed){
+ img_cam.setBackgroundResource(R.drawable.camera_orange_star_green);
+ }
+ else{
+ img_cam.setBackgroundResource(R.mipmap.camera_green);
+ }
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
index adb7470..87d1e63 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
@@ -33,6 +33,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.download.DownloadActivity;
@@ -51,12 +52,13 @@ public class CheckoutActivity extends AppCompatActivity {
CoverageBean coverageBean;
String lat, lon, checkOutImagePath = "";
+ Toolbar toolbar;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_checkout);
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
db = new GSKOrangeDB(this);
@@ -66,7 +68,7 @@ public class CheckoutActivity extends AppCompatActivity {
visit_date = preferences.getString(CommonString.KEY_DATE, null);
username = preferences.getString(CommonString.KEY_USERNAME, null);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = getIntent().getStringExtra(CommonString.KEY_STORE_ID);
checkOutImagePath = getIntent().getStringExtra(CommonString.KEY_CHECKOUT_IMAGE);
@@ -131,7 +133,7 @@ public class CheckoutActivity extends AppCompatActivity {
+ "[LATITUDE]" + lat + "[/LATITUDE]"
+ "[LOGITUDE]" + lon + "[/LOGITUDE]"
+ "[CHECKOUT_DATE]" + visit_date + "[/CHECKOUT_DATE]"
- + "[CHECK_OUTTIME]" + getCurrentTime() + "[/CHECK_OUTTIME]"
+ + "[CHECK_OUTTIME]" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()) + "[/CHECK_OUTTIME]"
+ "[CHECK_INTIME]" + coverageBean.getInTime() + "[/CHECK_INTIME]"
+ "[CREATED_BY]" + username + "[/CREATED_BY]"
+ "[/STORE_CHECK_OUT_STATUS]";
@@ -169,7 +171,7 @@ public class CheckoutActivity extends AppCompatActivity {
if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
- db.updateCheckoutOuttime(store_id, getCurrentTime(), CommonString.KEY_Y, checkOutImagePath);
+ db.updateCheckoutOuttime(store_id, CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()), CommonString.KEY_Y, checkOutImagePath);
SharedPreferences.Editor editor = preferences.edit();
editor.putString(CommonString.KEY_STORE_ID, "");
@@ -281,45 +283,11 @@ public class CheckoutActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ toolbar.setTitle(getResources().getString(R.string.title_activity_checkout));
}
- private static boolean updateResources(Context context, String language) {
-
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else {
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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;
- }
-
- /*public String getCurrentTime() {
+ /*public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
@@ -342,7 +310,7 @@ public class CheckoutActivity extends AppCompatActivity {
return new String(chars);
}
- public String getCurrentTime() {
+ public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java
index 331196d..a2ebeba 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java
@@ -50,6 +50,10 @@ public class CreateSelfActivity extends AppCompatActivity {
MSL_AvailabilityStockFacingGetterSetter brand_selected;
int number_of_rows=0;
RecyclerView rec_sub_category;
+ static int FROM_DIALOG = 0;
+ static int FROM_CLICK = 1;
+
+ ArrayList added_sub_category_list;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -97,15 +101,18 @@ public class CreateSelfActivity extends AppCompatActivity {
db.open();
- ArrayList added_sub_category_list = new ArrayList<>();
+ added_sub_category_list = new ArrayList<>();
ArrayList sub_category_list = db.getSubCategoryMaster(categoryId);
- for(int i=0;i0){
- added_sub_category_list.add(sub_category_list.get(i).getSub_category());
+ MSL_AvailabilityStockFacingGetterSetter subCategory = new MSL_AvailabilityStockFacingGetterSetter();
+ subCategory.setSub_category(sub_category_list.get(i).getSub_category());
+ subCategory.setSub_category_id(sub_category_list.get(i).getSub_category_id());
+ added_sub_category_list.add(subCategory);
}
}
@@ -118,6 +125,13 @@ public class CreateSelfActivity extends AppCompatActivity {
}
+ @Override
+ public void onBackPressed() {
+
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+
public void showSkuDialog() {
final ArrayList sub_category_list = db.getSubCategoryMaster(categoryId);
@@ -148,14 +162,33 @@ public class CreateSelfActivity extends AppCompatActivity {
Snackbar.make(btn_create,"Please select number of rows",Snackbar.LENGTH_SHORT).show();
}
else {
- Intent in = new Intent(getApplicationContext(), NoCameraActivity.class);
- in.putExtra("categoryName", categoryName);
- in.putExtra("categoryId", categoryId);
- in.putExtra(CommonString.KEY_NUMBER_OF_ROWS, number_of_rows);
- in.putExtra(CommonString.KEY_SUB_CATEGORY, brand_selected);
- startActivity(in);
- overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
- dialog.cancel();
+
+ boolean sub_category_already_filled = false;
+ if(added_sub_category_list.size()>0){
+ for(int k=0;k {
- private ArrayList list;
+ private ArrayList list;
- public SubcategoryAdapter(ArrayList skuList) {
+ public SubcategoryAdapter(ArrayList skuList) {
list = skuList;
}
@@ -410,7 +444,21 @@ public class CreateSelfActivity extends AppCompatActivity {
@Override
public void onBindViewHolder(final SubcategoryAdapter.ViewHolder holder, final int position) {
- holder.tv_sub_category.setText(list.get(position));
+ holder.tv_sub_category.setText(list.get(position).getSub_category());
+
+ holder.parentLayout.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent in = new Intent(getApplicationContext(), NoCameraActivity.class);
+ in.putExtra("categoryName", categoryName);
+ in.putExtra("categoryId", categoryId);
+ in.putExtra(CommonString.KEY_NUMBER_OF_ROWS, 0);
+ in.putExtra(CommonString.KEY_SUB_CATEGORY, list.get(position));
+ in.putExtra(CommonString.KEY_FROM, FROM_CLICK);
+ startActivity(in);
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }
+ });
}
@Override
@@ -420,7 +468,7 @@ public class CreateSelfActivity extends AppCompatActivity {
public class ViewHolder extends RecyclerView.ViewHolder {
public final View mView;
- //public final LinearLayout parentLayout;
+ public final LinearLayout parentLayout;
public final TextView tv_sub_category;
public ViewHolder(View view) {
@@ -429,7 +477,7 @@ public class CreateSelfActivity extends AppCompatActivity {
mView = view;
tv_sub_category = (TextView) mView.findViewById(R.id.tv_sub_category);
- //parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout);
+ parentLayout = (LinearLayout) mView.findViewById(R.id.linear_parent);
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java
index 6932e13..964c103 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java
@@ -41,6 +41,7 @@ import java.util.Calendar;
import java.util.Locale;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.messgae.AlertMessage;
import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
@@ -150,7 +151,7 @@ public class FutureJCPActivity extends AppCompatActivity implements View.OnClick
culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, "");
progressDialog = new ProgressDialog(FutureJCPActivity.this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
// AsyncTask asyncTask = new AsyncTask() {
@@ -327,40 +328,4 @@ public class FutureJCPActivity extends AppCompatActivity implements View.OnClick
}
}
- private static boolean updateResources(Context context, String language) {
-
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
-
-
- 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/NoCameraActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java
index f172bbc..1c4f03f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java
@@ -4,6 +4,9 @@ import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.preference.PreferenceManager;
@@ -16,19 +19,26 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.DragEvent;
+import android.view.Menu;
+import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewTreeObserver;
import android.view.Window;
+import android.view.WindowManager;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.EditText;
+import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.ScrollView;
import android.widget.Spinner;
import android.widget.TextView;
+import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -38,18 +48,21 @@ import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.adapter.ListAdapter;
import cpm.com.gskmtorange.adapter.MyAdapter;
import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.gsk_dailyentry.Stock_FacingActivity;
import cpm.com.gskmtorange.listener.Listener;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DynamycIdsGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.RowColumnGetterSetter;
public class NoCameraActivity extends AppCompatActivity implements Listener {
GSKOrangeDB db;
- String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
+ String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, str;
String categoryName, categoryId;
- int number_of_rows;
+ int number_of_rows, FROM;
private SharedPreferences preferences;
LinearLayout linear_bottom_parent;
ArrayList ids = new ArrayList<>();
@@ -91,19 +104,22 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
}
});
-
-
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
username = preferences.getString(CommonString.KEY_USERNAME, null);
+ storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+ class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
+
+ str = CommonString.FILE_PATH;
//Intent data
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
number_of_rows = getIntent().getIntExtra(CommonString.KEY_NUMBER_OF_ROWS, 0);
+ FROM = getIntent().getIntExtra(CommonString.KEY_FROM, 0);
sub_category_data = (MSL_AvailabilityStockFacingGetterSetter) getIntent().getSerializableExtra(CommonString.KEY_SUB_CATEGORY);
db = new GSKOrangeDB(NoCameraActivity.this);
@@ -117,63 +133,143 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
//tvEmptyListTop.setOnDragListener(topListAdapter.getDragInstance());
rvTop.setOnDragListener(topListAdapter.getDragInstance());
- for (int i = 1; i <= number_of_rows; i++) {
+ if(FROM==1){
+ ArrayList rows_data = db.getrowColumnNoCamera(store_id, categoryId,sub_category_data.getSub_category_id());
+ number_of_rows = rows_data.size();
+ for(int i=1;i<=rows_data.size();i++){
- DynamycIdsGetterSetter dynamic_ids = new DynamycIdsGetterSetter();
+ DynamycIdsGetterSetter dynamic_ids = new DynamycIdsGetterSetter();
- // first Button
- RelativeLayout rLayout = new RelativeLayout(getApplicationContext());
- RelativeLayout.LayoutParams lprams = new RelativeLayout.LayoutParams(
- RelativeLayout.LayoutParams.MATCH_PARENT,
- RelativeLayout.LayoutParams.WRAP_CONTENT);
- TextView tv = new TextView(getApplicationContext());
- tv.setHeight(60);
- tv.setTextSize(18);
- tv.setBackgroundColor(getResources().getColor(R.color.grey_textview));
- tv.setText("Drop SKU Groups Here ");
- tv.setPadding(5, 5, 0, 0);
- tv.setLayoutParams(lprams);
- int tv_id = View.generateViewId();
- tv.setId(tv_id);
+ // first Button
+ RelativeLayout rLayout = new RelativeLayout(getApplicationContext());
+ RelativeLayout.LayoutParams lprams = new RelativeLayout.LayoutParams(
+ RelativeLayout.LayoutParams.MATCH_PARENT,
+ RelativeLayout.LayoutParams.WRAP_CONTENT);
+ TextView tv = new TextView(getApplicationContext());
+ tv.setHeight(60);
+ tv.setTextSize(18);
+ tv.setBackgroundColor(getResources().getColor(R.color.grey_textview));
+ tv.setText("Drop SKU Groups Here ");
+ tv.setPadding(5, 5, 0, 0);
+ tv.setLayoutParams(lprams);
+ int tv_id = View.generateViewId();
+ tv.setId(tv_id);
- //set dynamic textview id to object
- dynamic_ids.setTextview_id(tv_id);
+ //set dynamic textview id to object
+ dynamic_ids.setTextview_id(tv_id);
- RecyclerView rec_bottom = new RecyclerView(getApplicationContext());
- int rec_id = View.generateViewId();
+ RecyclerView rec_bottom = new RecyclerView(getApplicationContext());
+ int rec_id = View.generateViewId();
- //set dynamic recycler id to object
- dynamic_ids.setRecycler_id(rec_id);
+ //set dynamic recycler id to object
+ dynamic_ids.setRecycler_id(rec_id);
- rec_bottom.setLayoutParams(lprams);
- rec_bottom.setPadding(0, 0, 0, 2);
+ rec_bottom.setLayoutParams(lprams);
+ rec_bottom.setPadding(0, 0, 0, 2);
- rec_bottom.setVisibility(View.GONE);
+ rec_bottom.setVisibility(View.GONE);
- rec_bottom.setId(rec_id);
- rec_bottom.setBackgroundColor(getResources().getColor(R.color.grey_background));
+ rec_bottom.setId(rec_id);
+ rec_bottom.setBackgroundColor(getResources().getColor(R.color.grey_background));
- RelativeLayout.LayoutParams lprams2 = new RelativeLayout.LayoutParams(
- RelativeLayout.LayoutParams.MATCH_PARENT,
- RelativeLayout.LayoutParams.WRAP_CONTENT);
- lprams2.height = 2;
- View view = new View(getApplicationContext());
- view.setBackgroundColor(getResources().getColor(R.color.white));
- view.setLayoutParams(lprams2);
+ RelativeLayout.LayoutParams lprams2 = new RelativeLayout.LayoutParams(
+ RelativeLayout.LayoutParams.MATCH_PARENT,
+ RelativeLayout.LayoutParams.WRAP_CONTENT);
+ lprams2.height = 2;
+ View view = new View(getApplicationContext());
+ view.setBackgroundColor(getResources().getColor(R.color.white));
+ view.setLayoutParams(lprams2);
- rLayout.addView(tv);
- rLayout.addView(rec_bottom);
- rLayout.addView(view);
- rLayout.setBackgroundColor(getResources().getColor(R.color.white));
+ rLayout.addView(tv);
+ rLayout.addView(rec_bottom);
+ rLayout.addView(view);
+ rLayout.setBackgroundColor(getResources().getColor(R.color.white));
- linear_bottom_parent.addView(rLayout);
+ linear_bottom_parent.addView(rLayout);
- ids.add(dynamic_ids);
+ ids.add(dynamic_ids);
- rec_bottom.setLayoutManager(new LinearLayoutManager(
- this, LinearLayoutManager.HORIZONTAL, false));
+ rec_bottom.setLayoutManager(new LinearLayoutManager(
+ this, LinearLayoutManager.HORIZONTAL, false));
- List bottomList = new ArrayList<>();
+ List bottomList = new ArrayList<>();
+
+ List sku_group_master = new ArrayList<>();
+
+ for(int j=1; j<=rows_data.get(i-1).getColumn(); j++){
+ NoCameraDataGetterSetter column_data = new NoCameraDataGetterSetter();
+ column_data = db.getRowSkuGroupCamera(store_id, categoryId,sub_category_data.getSub_category_id(), i, j);
+ sku_group_master.add(column_data);
+ }
+
+ MyAdapter adapter = new MyAdapter(getApplicationContext(), sku_group_master, this, rec_bottom);
+ rec_bottom.setAdapter(adapter);
+
+ tv.setOnDragListener(adapter.getDragInstance());
+ rec_bottom.setOnDragListener(adapter.getDragInstance());
+
+ setEmptyListBottom(false,tv.getId(),rec_bottom);
+ }
+
+ }
+ else {
+ for (int i = 1; i <= number_of_rows; i++) {
+
+ DynamycIdsGetterSetter dynamic_ids = new DynamycIdsGetterSetter();
+
+ // first Button
+ RelativeLayout rLayout = new RelativeLayout(getApplicationContext());
+ RelativeLayout.LayoutParams lprams = new RelativeLayout.LayoutParams(
+ RelativeLayout.LayoutParams.MATCH_PARENT,
+ RelativeLayout.LayoutParams.WRAP_CONTENT);
+ TextView tv = new TextView(getApplicationContext());
+ //tv.setHeight(60);
+ tv.setTextSize(20);
+ tv.setBackgroundColor(getResources().getColor(R.color.grey_textview));
+ tv.setText("Drop SKU Groups Here ");
+ tv.setPadding(5, 20, 0, 20);
+ tv.setLayoutParams(lprams);
+ int tv_id = View.generateViewId();
+ tv.setId(tv_id);
+
+ //set dynamic textview id to object
+ dynamic_ids.setTextview_id(tv_id);
+
+ RecyclerView rec_bottom = new RecyclerView(getApplicationContext());
+ int rec_id = View.generateViewId();
+
+ //set dynamic recycler id to object
+ dynamic_ids.setRecycler_id(rec_id);
+
+ rec_bottom.setLayoutParams(lprams);
+ rec_bottom.setPadding(0, 0, 0, 2);
+
+ rec_bottom.setVisibility(View.GONE);
+
+ rec_bottom.setId(rec_id);
+ rec_bottom.setBackgroundColor(getResources().getColor(R.color.grey_background));
+
+ RelativeLayout.LayoutParams lprams2 = new RelativeLayout.LayoutParams(
+ RelativeLayout.LayoutParams.MATCH_PARENT,
+ RelativeLayout.LayoutParams.WRAP_CONTENT);
+ lprams2.height = 2;
+ View view = new View(getApplicationContext());
+ view.setBackgroundColor(getResources().getColor(R.color.white));
+ view.setLayoutParams(lprams2);
+
+ rLayout.addView(tv);
+ rLayout.addView(rec_bottom);
+ rLayout.addView(view);
+ rLayout.setBackgroundColor(getResources().getColor(R.color.white));
+
+ linear_bottom_parent.addView(rLayout);
+
+ ids.add(dynamic_ids);
+
+ rec_bottom.setLayoutManager(new LinearLayoutManager(
+ this, LinearLayoutManager.HORIZONTAL, false));
+
+ List bottomList = new ArrayList<>();
/* bottomList.add("C");
bottomList.add("D");*/
@@ -182,15 +278,19 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
ListAdapter bottomListAdapter = new ListAdapter(bottomList, this);
rvBottom.setAdapter(bottomListAdapter);*/
- List brands = new ArrayList<>();
+ List brands = new ArrayList<>();
- MyAdapter adapter = new MyAdapter(getApplicationContext(), brands, this);
- rec_bottom.setAdapter(adapter);
+ MyAdapter adapter = new MyAdapter(getApplicationContext(), brands, this, rec_bottom);
+ rec_bottom.setAdapter(adapter);
- tv.setOnDragListener(adapter.getDragInstance());
- rec_bottom.setOnDragListener(adapter.getDragInstance());
+ tv.setOnDragListener(adapter.getDragInstance());
+ rec_bottom.setOnDragListener(adapter.getDragInstance());
+
+ }
}
+
+
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -239,6 +339,99 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
rv.setVisibility(visibility ? View.GONE : View.VISIBLE);
}
+ @Override
+ public void deleteItem(View v, final int column_no, final RecyclerView rec) {
+
+ final Dialog dialog = new Dialog(NoCameraActivity.this);
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+ dialog.setContentView(R.layout.no_camera_edit_or_delete_dialog);
+
+ final Button btn_edit = (Button) dialog.findViewById(R.id.btn_edit);
+ final Button btn_delete = (Button) dialog.findViewById(R.id.btn_delete);
+
+ btn_edit.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ final MyAdapter adapterMYTarget = (MyAdapter) rec.getAdapter();
+ final List customListMyTarget = adapterMYTarget.getList();
+
+ final Dialog dialog_facing = new Dialog(NoCameraActivity.this);
+ dialog_facing.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ dialog_facing.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+ dialog_facing.setContentView(R.layout.add_facing_custom_dialog);
+ //pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
+ //dialog.setCancelable(false);
+ final EditText et_facing = (EditText) dialog_facing.findViewById(R.id.et_facing);
+
+ final Button btn_ok = (Button) dialog_facing.findViewById(R.id.btn_ok);
+
+ btn_ok.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ String facing = et_facing.getText().toString();
+
+ if (facing.equals("")) {
+ Snackbar.make(btn_ok, R.string.please_facing, Snackbar.LENGTH_SHORT).show();
+ } else {
+ int facing_int = Integer.parseInt(facing);
+ customListMyTarget.get(column_no).setFacing(facing_int);
+
+ adapterMYTarget.updateList(customListMyTarget);
+ adapterMYTarget.notifyDataSetChanged();
+ dialog_facing.cancel();
+ }
+
+ }
+ });
+
+ //dialog.setCancelable(false);
+ dialog_facing.show();
+
+ dialog.cancel();
+
+ }
+ });
+
+ btn_delete.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ dialog.cancel();
+
+ MyAdapter adapterMYTarget = (MyAdapter) rec.getAdapter();
+ List customListMyTarget = adapterMYTarget.getList();
+ customListMyTarget.remove(column_no);
+
+ adapterMYTarget.updateList(customListMyTarget);
+ adapterMYTarget.notifyDataSetChanged();
+ if(customListMyTarget.size()==0){
+
+ int view_id = rec.getId();
+ int tv_id =0;
+ for (int i = 0; i < ids.size(); i++) {
+
+ if (ids.get(i).getRecycler_id() == view_id) {
+ tv_id = ids.get(i).getTextview_id();
+ }
+ }
+
+ if(tv_id!=0){
+ ((TextView) findViewById(tv_id)).setVisibility(View.VISIBLE);
+ rec.setVisibility(View.GONE);
+ }
+ }
+
+ }
+ });
+
+ //dialog.setCancelable(false);
+ dialog.show();
+
+ }
+
@Override
public void addNUpdateRow(View v, int view_id, NoCameraDataGetterSetter parent_item) {
@@ -291,6 +484,16 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
}*/
}
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ MenuInflater inflater = getMenuInflater();
+ inflater.inflate(R.menu.planogram, menu);
+
+ // return true so that the menu pop up is opened
+ return true;
+ }
+
public void showAddFacingDialog(final MyAdapter adapterMYTarget, final List customListMyTarget, final NoCameraDataGetterSetter parent_item) {
// ArrayList skuMasterGetterSetterArrayList = db.getSkuT2PData("1", "1", "1",)
@@ -342,6 +545,59 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
+ if (id == R.id.action_planogram) {
+
+ final Dialog dialog = new Dialog(NoCameraActivity.this);
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ //dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+ dialog.setContentView(R.layout.planogram_dialog_layout);
+ dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+ dialog.setCancelable(false);
+
+ ArrayList mappingPlanogramList = db.getMappingPlanogramData(categoryId, storeType_id, class_id);
+
+ //ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram);
+ WebView webView = (WebView) dialog.findViewById(R.id.webview);
+ webView.setWebViewClient(new MyWebViewClient());
+
+ webView.getSettings().setAllowFileAccess(true);
+ webView.getSettings().setJavaScriptEnabled(true);
+ webView.getSettings().setBuiltInZoomControls(true);
+
+ String planogram_image = "";
+ if (mappingPlanogramList.size() > 0) {
+ planogram_image = mappingPlanogramList.get(0).getPLANOGRAM_IMAGE();
+ }
+ if (!planogram_image.equals("")) {
+ if (new File(str + planogram_image).exists()) {
+ Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image);
+ // img_planogram.setRotation(90);
+ //img_planogram.setImageBitmap(bmp);
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
+ String imagePath = "file://" + CommonString.FILE_PATH + "/" + planogram_image;
+ String html = "![](\"")
";
+ webView.loadDataWithBaseURL("", html, "text/html", "utf-8", "");
+
+ dialog.show();
+ } /*else {
+ //webView.loadUrl(String.valueOf(R.drawable.sad_cloud));
+
+ //img_planogram.setBackgroundResource(R.drawable.sad_cloud);
+ }*/
+ }
+
+
+ ImageView cancel = (ImageView) dialog.findViewById(R.id.img_cancel);
+ cancel.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ dialog.dismiss();
+ }
+ });
+ }
+
if (id == android.R.id.home) {
android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(NoCameraActivity.this);
@@ -396,4 +652,24 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
android.app.AlertDialog alert = builder.create();
alert.show();
}
+
+ private class MyWebViewClient extends WebViewClient {
+
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
+ view.loadUrl(url);
+ return true;
+ }
+
+ @Override
+ public void onPageFinished(WebView view, String url) {
+ super.onPageFinished(view, url);
+ view.clearCache(true);
+ }
+
+ @Override
+ public void onPageStarted(WebView view, String url, Bitmap favicon) {
+ super.onPageStarted(view, url, favicon);
+ }
+ }
}
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 fa26da3..bb50654 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
@@ -65,6 +65,7 @@ import cpm.com.gskmtorange.GeoTag.GeoTagStoreList;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.download.DownloadActivity;
import cpm.com.gskmtorange.messgae.AlertMessage;
@@ -130,7 +131,7 @@ public class NonWorkingReason extends AppCompatActivity implements
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
_UserId = preferences.getString(CommonString.KEY_USERNAME, "");
visit_date = preferences.getString(CommonString.KEY_DATE, null);
@@ -169,7 +170,7 @@ public class NonWorkingReason extends AppCompatActivity implements
}
- intime = getCurrentTime();
+ intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
camera.setOnClickListener(this);
save.setOnClickListener(this);
@@ -362,7 +363,7 @@ public class NonWorkingReason extends AppCompatActivity implements
// TODO Auto-generated method stub
if (v.getId() == R.id.imgcam) {
- _pathforcheck = store_id + "NonWorking" + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+ _pathforcheck = store_id + "NonWorking" + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck;
@@ -405,7 +406,7 @@ public class NonWorkingReason extends AppCompatActivity implements
cdata.setVisitDate(visit_date);
cdata.setUserId(_UserId);
cdata.setInTime(intime);
- cdata.setOutTime(getCurrentTime());
+ cdata.setOutTime(CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()));
cdata.setReason(reasonname);
cdata.setReasonid(reasonid);
cdata.setLatitude("0.0");
@@ -437,7 +438,7 @@ public class NonWorkingReason extends AppCompatActivity implements
cdata.setVisitDate(visit_date);
cdata.setUserId(_UserId);
cdata.setInTime(intime);
- cdata.setOutTime(getCurrentTime());
+ cdata.setOutTime(CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()));
cdata.setReason(reasonname);
cdata.setReasonid(reasonid);
cdata.setLatitude("0.0");
@@ -533,7 +534,7 @@ public class NonWorkingReason extends AppCompatActivity implements
return new String(chars);
}
- public String getCurrentTime() {
+ public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
@@ -571,45 +572,7 @@ public class NonWorkingReason extends AppCompatActivity implements
@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(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
-
-
- 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;
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PlanogramPDFActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PlanogramPDFActivity.java
new file mode 100644
index 0000000..bb2f3a5
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PlanogramPDFActivity.java
@@ -0,0 +1,348 @@
+package cpm.com.gskmtorange.dailyentry;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.Window;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.ksoap2.SoapEnvelope;
+import org.ksoap2.SoapFault;
+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.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.ProtocolException;
+import java.net.URL;
+import java.text.DecimalFormat;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramCountrywiseGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
+import cpm.com.gskmtorange.xmlHandlers.XMLHandlers;
+
+public class PlanogramPDFActivity extends AppCompatActivity {
+
+ private Dialog dialog;
+ private ProgressBar pb;
+ private TextView percentage, message;
+ private Data data;
+ int eventType;
+ GSKOrangeDB db;
+ String userId, culture_id;
+ private SharedPreferences preferences = null;
+ FloatingActionButton fab;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_planogram_pdf);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ fab = (FloatingActionButton) findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ if(checkNetIsAvailable()){
+ new DowloadAsync(getApplicationContext()).execute();
+ }
+ else {
+ Snackbar.make(fab, getResources().getString(R.string.nonetwork), Snackbar.LENGTH_SHORT)
+ .setAction("Action", null).show();
+ }
+ }
+ });
+
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ userId = preferences.getString(CommonString.KEY_USERNAME, null);
+ culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, "");
+ new DowloadAsync(getApplicationContext()).execute();
+ }
+
+ //region Download doc
+ private class DowloadAsync extends AsyncTask {
+
+ private Context context;
+
+ DowloadAsync(Context context) {
+ this.context = context;
+ }
+
+
+ @Override
+ protected void onPreExecute() {
+ super.onPreExecute();
+
+ dialog = new Dialog(PlanogramPDFActivity.this);
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ dialog.setContentView(R.layout.custom);
+ //dialog.setTitle("Download Files");
+ dialog.setCancelable(false);
+ dialog.show();
+ pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
+ percentage = (TextView) dialog.findViewById(R.id.percentage);
+ message = (TextView) dialog.findViewById(R.id.message);
+ }
+
+ @Override
+ protected String doInBackground(Void... params) {
+
+ data = new Data();
+ String resultHttp = "";
+
+ // JCP
+
+ try {
+
+ XmlPullParserFactory factory = null;
+ factory = XmlPullParserFactory
+ .newInstance();
+
+ factory.setNamespaceAware(true);
+ XmlPullParser xpp = factory.newPullParser();
+
+ SoapObject request = new SoapObject(CommonString.NAMESPACE,
+ CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+ request.addProperty("UserName", userId);
+ request.addProperty("Type", "MAPPING_COUNTRYWISE_PLANOGRAM");
+ request.addProperty("cultureid", culture_id);
+
+
+ SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(
+ SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ HttpTransportSE androidHttpTransport = new HttpTransportSE(
+ CommonString.URL);
+
+ androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL,
+ envelope);
+ Object result = (Object) envelope.getResponse();
+
+ if (result.toString() != null) {
+
+ xpp.setInput(new StringReader(result.toString()));
+ xpp.next();
+ eventType = xpp.getEventType();
+
+ MappingPlanogramCountrywiseGetterSetter document = XMLHandlers.MAPPING_COUNTRYWISE_PLANOGRAM_XMLHandler(xpp, eventType);
+
+ if (document.getCOUNTRY_ID().size() > 0) {
+ resultHttp = CommonString.KEY_SUCCESS;
+ String document_Table = document.getTable_MAPPING_COUNTRYWISE_PLANOGRAM();
+ TableBean.setMappingCountrywisePlanogram(document_Table);
+
+ } else {
+ return "HR_DOCUMENTS";
+ }
+
+ data.value = 10;
+ data.name = "JCP Data Downloading";
+
+ if(document.getCOUNTRY_ID().size()>0){
+
+ String extStorageDirectory = Environment.getExternalStorageDirectory().toString();
+ File folder = new File(extStorageDirectory, "Planogram_Documents");
+ folder.mkdir();
+
+ boolean flag = downloadFile(document.getFILE_PATH().get(0), document.getPLANOGRAM_URL().get(0), folder);
+
+ if(flag)
+ return CommonString.KEY_SUCCESS+ ":"+ folder.getAbsolutePath()+"/"+document.getPLANOGRAM_URL().get(0);
+
+ }
+
+ /* db.open();
+ db.InsertMappingCountrywisePlanogram(document);*/
+
+ }
+
+ publishProgress(data);
+
+ } catch (XmlPullParserException e) {
+ e.printStackTrace();
+ } catch (SoapFault soapFault) {
+ soapFault.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return resultHttp;
+ }
+
+ @Override
+ protected void onPostExecute(String result) {
+ super.onPostExecute(result);
+
+ dialog.cancel();
+
+ if (result.contains(CommonString.KEY_SUCCESS)) {
+
+ String file_path = result.substring(result.indexOf(":")+1);
+
+ File file = new File(file_path);
+ Intent intent = new Intent(Intent.ACTION_VIEW);
+ intent.setDataAndType(Uri.fromFile(file),"application/pdf");
+ intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
+ startActivity(intent);
+ finish();
+
+ } else {
+ Toast.makeText(getApplicationContext(), "Downloaded Failed", Toast.LENGTH_SHORT).show();
+ }
+
+ //finish();
+ }
+
+ @Override
+ protected void onProgressUpdate(Data... values) {
+ // TODO Auto-generated method stub
+
+ pb.setProgress(values[0].value);
+ percentage.setText(values[0].value + "%");
+ message.setText(values[0].name);
+
+ }
+ }
+ //endregion
+
+ class Data {
+ int value;
+ String name;
+ }
+
+ public boolean downloadFile(String fileUrl, String directory, File folder_path) {
+
+ boolean flag = true;
+
+ try {
+ final int MEGABYTE = 1024 * 1024;
+ URL url = new URL(fileUrl + directory);
+ HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
+ urlConnection.setRequestMethod("GET");
+ urlConnection.getResponseCode();
+ urlConnection.connect();
+
+ if (urlConnection.getResponseCode() == 200) {
+
+ int length = urlConnection.getContentLength();
+
+ String size = new DecimalFormat("##.##")
+ .format((double) ((double) length / 1024))
+ + " KB";
+
+ /* String PATH = Environment
+ .getExternalStorageDirectory()
+ + "/GT_GSK_Images/";*/
+
+ if (!new File( folder_path.getPath()+"/" + directory).exists()
+ && !size.equalsIgnoreCase("0 KB")) {
+
+ File outputFile = new File(folder_path,
+ directory);
+ FileOutputStream fos = new FileOutputStream(
+ outputFile);
+ InputStream is1 = (InputStream) urlConnection
+ .getInputStream();
+
+ int bytes = 0;
+ byte[] buffer = new byte[1024];
+ int len1 = 0;
+
+ while ((len1 = is1.read(buffer)) != -1) {
+
+ bytes = (bytes + len1);
+
+ // data.value = (int) ((double) (((double)
+ // bytes) / length) * 100);
+
+ fos.write(buffer, 0, len1);
+
+ }
+
+ fos.close();
+ is1.close();
+
+ }
+ }
+
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ flag = false;
+ } catch (ProtocolException e) {
+ e.printStackTrace();
+ flag = false;
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ flag = false;
+ } catch (IOException e) {
+ e.printStackTrace();
+ flag = false;
+ }
+
+ return flag;
+ }
+
+ @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) {
+
+ // NavUtils.navigateUpFromSameTask(this);
+ finish();
+
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
+ public boolean checkNetIsAvailable() {
+ ConnectivityManager cm =
+ (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+
+ NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
+ boolean isConnected = activeNetwork != null &&
+ activeNetwork.isConnectedOrConnecting();
+ return isConnected;
+ }
+
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java
index 9a1788e..f0debfe 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java
@@ -16,18 +16,20 @@ import android.view.View;
import java.util.Locale;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.fragment.ServiceActivityFragment;
public class ServiceActivity extends AppCompatActivity {
private SharedPreferences preferences;
+ Toolbar toolbar;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_service);
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -35,7 +37,7 @@ public class ServiceActivity extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
/* ServiceActivityFragment fragment = new ServiceActivityFragment();
getSupportFragmentManager().beginTransaction().add(R.id.fragment,fragment).commit();*/
@@ -79,44 +81,8 @@ public class ServiceActivity extends AppCompatActivity {
@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(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
-
-
- 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;
+ CommonFunctions.updateLangResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ toolbar.setTitle(R.string.title_activity_service);
}
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java
index ac1e500..e94c13a 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java
@@ -20,6 +20,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.MainActivity;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.fragment.SelectLanguageFragment;
import cpm.com.gskmtorange.fragment.SettingsActivityFragment;
@@ -49,7 +50,7 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag
preferences = PreferenceManager.getDefaultSharedPreferences(this);
editor = preferences.edit();
- updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
/* SettingsActivityFragment fragment = new SettingsActivityFragment();
getSupportFragmentManager().beginTransaction().add(R.id.fragment,fragment).commit();*/
@@ -65,7 +66,7 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag
.setAction("Action", null).show();
} else {
- updateResources(getApplicationContext(),selected_lang);
+ CommonFunctions.updateLangResources(getApplicationContext(),selected_lang);
editor.putString(CommonString.KEY_LANGUAGE, selected_lang);
editor.putString(CommonString.KEY_CULTURE_ID, culture_id);
@@ -132,43 +133,9 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag
@Override
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(R.string.title_activity_settings);
}
- private static boolean updateResources(Context context, String language) {
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
-
- 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/StoreCheckoutImageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java
index 6362964..fefcd9b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java
@@ -62,6 +62,7 @@ import javax.xml.parsers.SAXParserFactory;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
@@ -103,7 +104,7 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie
setContentView(R.layout.activity_store_checkout_image);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
@@ -183,9 +184,9 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie
switch (id) {
case R.id.img_cam_selfie:
- _pathforcheck = checkOutStore_id + "CHK_SI_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ _pathforcheck = checkOutStore_id + "CHK_SI_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck;
- intime = getCurrentTime();
+ intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
startCameraActivity();
break;
@@ -316,7 +317,7 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie
super.onActivityResult(requestCode, resultCode, data);
}
- public String getCurrentTime() {
+ public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
@@ -353,7 +354,7 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie
@Override
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(R.string.title_activity_store_checkout_image);
}
@@ -367,51 +368,6 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie
super.onStop();
}
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
-
- 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;
- }
-
public class GeoTagUpload extends AsyncTask {
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 e4ab79a..564ca48 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
@@ -40,6 +40,7 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.download.DownloadActivity;
import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity;
@@ -77,7 +78,7 @@ public class StoreListActivity extends AppCompatActivity {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
date = preferences.getString(CommonString.KEY_DATE, null);
visit_status = preferences.getString(CommonString.KEY_STOREVISITED_STATUS, "");
@@ -108,7 +109,7 @@ public class StoreListActivity extends AppCompatActivity {
// TODO Auto-generated method stub
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(getString(R.string.title_activity_store_list));
db.open();
storelist = db.getStoreData(date);
@@ -193,8 +194,8 @@ public class StoreListActivity extends AppCompatActivity {
viewHolder.chkbtn.setBackgroundResource(R.mipmap.checkout);
}
-
storeid = current.getSTORE_ID();
+ CoverageBean coverageObj = db.getCoverageSpecificData(date,storeid);
//viewHolder.txt.setText(current.txt);
viewHolder.txt.setText(current.getSTORE_NAME());
@@ -208,27 +209,50 @@ public class StoreListActivity extends AppCompatActivity {
viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.tick);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
+ viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
} else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_D)) {
viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
+ viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
} else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_Y)) {
viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
+ viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
} else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_P)) {
viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
+ viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
} else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_L)) {
viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
+ viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
} else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) {
viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
+ viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
+ }else if(coverageObj.getStatus()!=null && coverageObj.getStatus().equalsIgnoreCase(CommonString.KEY_VALID)){
+ viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
+ viewHolder.chkbtn.setVisibility(View.VISIBLE);
+ viewHolder.imageview.setVisibility(View.INVISIBLE);
+
+ }else if(coverageObj.getStatus()!=null && coverageObj.getStatus().equalsIgnoreCase(CommonString.KEY_INVALID)){
+ viewHolder.imageview.setVisibility(View.INVISIBLE);
+ viewHolder.chkbtn.setVisibility(View.INVISIBLE);
+ viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.green));
+
+ }else if(coverageObj.getStatus()!=null && coverageObj.getStatus().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) {
+
+ viewHolder.imageview.setVisibility(View.VISIBLE);
+ viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
+ viewHolder.chkbtn.setVisibility(View.INVISIBLE);
+ viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
+
}/* else if (checkleavestatus(storeid)) {
viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
@@ -237,7 +261,7 @@ public class StoreListActivity extends AppCompatActivity {
/*else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_INVALID)) {
}*/
- else if (coverage.size() > 0) {
+ /* else if (coverage.size() > 0) {
String statusleave = "";
for (int i = 0; i < coverage.size(); i++) {
@@ -275,7 +299,7 @@ public class StoreListActivity extends AppCompatActivity {
}
- /* if (coverage.get(i).getInTime() != null) {
+ *//* if (coverage.get(i).getInTime() != null) {
if (coverage.get(i).getOutTime() == null) {
@@ -290,11 +314,11 @@ public class StoreListActivity extends AppCompatActivity {
break;
}
- }*/
+ }*//*
}
- } else {
+ }*/ else {
viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
viewHolder.imageview.setVisibility(View.INVISIBLE);
@@ -606,50 +630,6 @@ public class StoreListActivity extends AppCompatActivity {
}
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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;
- }
-
public void UpdateStore(String storeid) {
db.open();
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 723c148..5ed5b33 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
@@ -66,6 +66,7 @@ import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
@@ -120,7 +121,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
setContentView(R.layout.activity_storeimage);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
@@ -366,11 +367,11 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
case R.id.img_cam_selfie:
- _pathforcheck = store_id + "SI_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ _pathforcheck = store_id + "SI_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck;
- intime = getCurrentTime();
+ intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext());
startCameraActivity();
@@ -527,15 +528,15 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
super.onActivityResult(requestCode, resultCode, data);
}
- public String getCurrentTime() {
+ public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime());
- if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- cdate = arabicToenglish(cdate);
- }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
+ if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)
+ || preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)
+ || preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_EGYPT)) {
cdate = arabicToenglish(cdate);
}
@@ -547,7 +548,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
@Override
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(R.string.title_activity_store_image);
// Resuming the periodic location updates
@@ -567,50 +568,6 @@ 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("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
-
- 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;
- }
@Override
public void onLocationChanged(Location location) {
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 e082001..d88eb5f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
@@ -59,6 +59,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.BrandAvabilityGetterSetter;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
@@ -116,7 +117,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
@@ -217,7 +218,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
@@ -514,7 +515,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
public void onClick(View v) {
_pathforcheck = "T2P_Image_" + store_id + categoryId + "_" + mItem.getBrand_id() +
mItem.getDisplay_id() + visit_date.replace("/", "") + "_" +
- getCurrentTime().replace(":", "") + ".jpg";
+ CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
child_position = position;
path = str + _pathforcheck;
@@ -543,7 +544,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
public void onClick(View v) {
_pathforcheck1 = "T2P_Image1_" + store_id + categoryId + "_" + mItem.getBrand_id() +
mItem.getDisplay_id() + visit_date.replace("/", "") + "_" +
- getCurrentTime().replace(":", "") + ".jpg";
+ CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
child_position1 = position;
path = str + _pathforcheck1;
@@ -572,7 +573,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
public void onClick(View v) {
_pathforcheck2 = "T2P_Image2_" + store_id + categoryId + "_" + mItem.getBrand_id() +
mItem.getDisplay_id() + visit_date.replace("/", "") + "_" +
- getCurrentTime().replace(":", "") + ".jpg";
+ CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
child_position2 = position;
path = str + _pathforcheck2;
@@ -961,7 +962,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
return new String(chars);
}
- public String getCurrentTime() {
+ public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
@@ -1457,50 +1458,6 @@ 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("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- } else {
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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;
- }
-
public void showPlanogram(String planogram_image) {
final Dialog dialog = new Dialog(T2PComplianceActivity.this);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java
index b1de628..63a8a98 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java
@@ -41,6 +41,7 @@ import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
import cpm.com.gskmtorange.GetterSetter.BrandAvabilityGetterSetter;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
@@ -73,7 +74,7 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
@@ -234,49 +235,6 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
}
}
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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;
- }
public class ValueAdapter 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 b9ad3cf..68a15f3 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
@@ -43,6 +43,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.ADDITIONAL_DISPLAY_MASTERGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
@@ -54,7 +55,9 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramCountrywiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
@@ -90,8 +93,10 @@ public class DownloadActivity extends AppCompatActivity {
ADDITIONAL_DISPLAY_MASTERGetterSetter additional_display_getter_setter;
MAPPING_SOS_TARGET_MasterGetterSetter mapping_sos_target_masterGetterSetter;
MAPPING_PLANOGRAM_MasterGetterSetter mapping_planogram_masterGetterSetter;
+ MappingPlanogramCountrywiseGetterSetter mappingPlanogramCountrywiseGetterSetter;
ShelfMasterGetterSetter shelfMasterGetterSetter;
MappingSubCategoryImageAllowGetterSetter mappingSubCategoryImageAllowGetterSetter;
+ MappingCategoryImageAllowGetterSetter mappingCategoryImageAllowGetterSetter;
SkuGroupMasterGetterSetter skuGroupMasterGetterSetter;
private Dialog dialog;
@@ -114,7 +119,7 @@ public class DownloadActivity extends AppCompatActivity {
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
userId = preferences.getString(CommonString.KEY_USERNAME, null);
culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, "");
@@ -887,8 +892,74 @@ public class DownloadActivity extends AppCompatActivity {
publishProgress(data);
+ //MAPPING_CATEGORY_IMAGE_ALLOW
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+ request.addProperty("UserName", userId);
+ request.addProperty("Type", "MAPPING_CATEGORY_IMAGE_ALLOW");
+ request.addProperty("cultureid", culture_id);
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
+
+ result = envelope.getResponse();
+
+ if (result.toString() != null) {
+ xpp.setInput(new StringReader(result.toString()));
+ xpp.next();
+ eventType = xpp.getEventType();
+ mappingCategoryImageAllowGetterSetter = XMLHandlers.mappingCategoryImageAllowXMLHandler(xpp, eventType);
+
+ String table_category_img_allow = mappingCategoryImageAllowGetterSetter.getTable_MAPPING_CATEGORY_IMAGE_ALLOW();
+ if (table_category_img_allow != null) {
+ resultHttp = CommonString.KEY_SUCCESS;
+ TableBean.setMappingCategoryImageAllow(table_category_img_allow);
+ }
+
+ if (mappingCategoryImageAllowGetterSetter.getCATEGORY_ID().size() > 0) {
+ data.value = 97;
+ data.name = "MAPPING_CATEGORY_IMAGE_ALLOW " + getResources().getString(R.string.download_data);
+ }
+ }
+ publishProgress(data);
+
+ /* //MAPPING_COUNTRYWISE_PLANOGRAM
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+ request.addProperty("UserName", userId);
+ request.addProperty("Type", "MAPPING_COUNTRYWISE_PLANOGRAM");
+ request.addProperty("cultureid", culture_id);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
+
+ result = envelope.getResponse();
+
+ if (result.toString() != null) {
+ xpp.setInput(new StringReader(result.toString()));
+ xpp.next();
+ eventType = xpp.getEventType();
+ mappingPlanogramCountrywiseGetterSetter = XMLHandlers.MAPPING_COUNTRYWISE_PLANOGRAM_XMLHandler(xpp, eventType);
+
+ String table_mapping_planogram = mappingPlanogramCountrywiseGetterSetter.getTable_MAPPING_COUNTRYWISE_PLANOGRAM();
+ if (table_mapping_planogram != null) {
+ resultHttp = CommonString.KEY_SUCCESS;
+ TableBean.setMappingCountrywisePlanogram(table_mapping_planogram);
+ }
+ if (mappingPlanogramCountrywiseGetterSetter.getCOUNTRY_ID().size() > 0) {
+ data.value = 92;
+ data.name = "MAPPING_COUNTRYWISE_PLANOGRAM Data Download";
+ } else {
+ //return "MAPPING_COUNTRYWISE_PLANOGRAM";
+ }
+ }
+ publishProgress(data);*/
//Images DownLoads
@@ -897,8 +968,9 @@ public class DownloadActivity extends AppCompatActivity {
for (int i = 0; i < mapping_planogram_masterGetterSetter.getIMAGE_PATH().size(); i++) {
//publishing image download
- data.value = data.value + 1;
+
if (data.value < 100) {
+ data.value = data.value + 1;
publishProgress(data);
}
@@ -955,8 +1027,9 @@ public class DownloadActivity extends AppCompatActivity {
for (int i = 0; i < displayMasterGetterSetter.getIMAGE_URL().size(); i++) {
//publishing image download
- data.value = data.value + 1;
+
if (data.value < 100) {
+ data.value = data.value + 1;
publishProgress(data);
}
@@ -1006,6 +1079,120 @@ public class DownloadActivity extends AppCompatActivity {
}
}
+ //MAPPING_PLANOGRAM Image save into folder
+ if (mapping_planogram_masterGetterSetter != null) {
+
+ for (int i = 0; i < mapping_planogram_masterGetterSetter.getIMAGE_PATH().size(); i++) {
+ //publishing image download
+
+ if (data.value < 100) {
+ data.value = data.value + 1;
+ publishProgress(data);
+ }
+
+ String image_name = mapping_planogram_masterGetterSetter.getPLANOGRAM_IMAGE().get(i);
+ String path = mapping_planogram_masterGetterSetter.getIMAGE_PATH().get(i);
+
+ if (!image_name.equalsIgnoreCase("NA") && !image_name.equalsIgnoreCase("")) {
+ URL url = new URL(path + "/" + image_name);
+ HttpURLConnection c = (HttpURLConnection) url.openConnection();
+ c.setRequestMethod("GET");
+ c.getResponseCode();
+ c.connect();
+
+ if (c.getResponseCode() == 200) {
+ int length = c.getContentLength();
+
+ String size = new DecimalFormat("##.##").format((double) length / 1024) + " KB";
+
+ //String PATH = Environment.getExternalStorageDirectory() + "/Download/GT_GSK_Images/";
+ String PATH = CommonString.FILE_PATH;
+ File file = new File(PATH);
+ if (!file.isDirectory()) {
+ file.mkdir();
+ }
+
+ // Environment.getExternalStorageDirectory() + "/GT_GSK_Images/" + _pathforcheck1;
+ if (!new File(PATH + image_name).exists() && !size.equalsIgnoreCase("0 KB")) {
+ File outputFile = new File(file, image_name);
+ FileOutputStream fos = new FileOutputStream(outputFile);
+ InputStream is1 = c.getInputStream();
+
+ int bytes = 0;
+ byte[] buffer = new byte[1024];
+ int len1 = 0;
+
+ while ((len1 = is1.read(buffer)) != -1) {
+ bytes = (bytes + len1);
+ // data.value = (int) ((double) (((double)
+ // bytes) / length) * 100);
+ fos.write(buffer, 0, len1);
+ }
+ fos.close();
+ is1.close();
+ }
+ }
+ }
+ }
+ }
+
+ //MAPPING_COUNTRYWISE_PLANOGRAM file save into folder
+ /*if (mappingPlanogramCountrywiseGetterSetter != null) {
+
+ for (int i = 0; i < mappingPlanogramCountrywiseGetterSetter.getFILE_PATH().size(); i++) {
+ //publishing image download
+
+ if (data.value < 100) {
+ data.value = data.value + 1;
+ publishProgress(data);
+ }
+
+ String file_name = mappingPlanogramCountrywiseGetterSetter.getPLANOGRAM_URL().get(i);
+ String path = mappingPlanogramCountrywiseGetterSetter.getFILE_PATH().get(i);
+
+ if (!file_name.equalsIgnoreCase("NA") && !file_name.equalsIgnoreCase("")) {
+ URL url = new URL(path + "/" + file_name);
+ HttpURLConnection c = (HttpURLConnection) url.openConnection();
+ c.setRequestMethod("GET");
+ c.getResponseCode();
+ c.connect();
+
+ if (c.getResponseCode() == 200) {
+ int length = c.getContentLength();
+
+ String size = new DecimalFormat("##.##").format((double) length / 1024) + " KB";
+
+ //String PATH = Environment.getExternalStorageDirectory() + "/Download/GT_GSK_Images/";
+ String PATH = CommonString.FILE_PATH_PDF;
+ File file = new File(PATH);
+ if (!file.isDirectory()) {
+ file.mkdir();
+ }
+
+ // Environment.getExternalStorageDirectory() + "/GT_GSK_Images/" + _pathforcheck1;
+ if (!new File(PATH + file_name).exists() && !size.equalsIgnoreCase("0 KB")) {
+ File outputFile = new File(file, file_name);
+ FileOutputStream fos = new FileOutputStream(outputFile);
+ InputStream is1 = c.getInputStream();
+
+ int bytes = 0;
+ byte[] buffer = new byte[1024];
+ int len1 = 0;
+
+ while ((len1 = is1.read(buffer)) != -1) {
+ bytes = (bytes + len1);
+ // data.value = (int) ((double) (((double)
+ // bytes) / length) * 100);
+ fos.write(buffer, 0, len1);
+ }
+ fos.close();
+ is1.close();
+ }
+ }
+ }
+ }
+ }*/
+
db.open();
db.InsertJCP(jcpgettersetter);
db.InsertCategory(categoryMasterGetterSetter);
@@ -1029,6 +1216,8 @@ public class DownloadActivity extends AppCompatActivity {
db.InsertSHELF_MASTER(shelfMasterGetterSetter);
db.InsertMappingSubCategoryImageAllow(mappingSubCategoryImageAllowGetterSetter);
+ db.InsertMappingCategoryImageAllow(mappingCategoryImageAllowGetterSetter);
+ // db.InsertMappingCountrywisePlanogram(mappingPlanogramCountrywiseGetterSetter);
db.InsertSkuGroupMaster(skuGroupMasterGetterSetter);
} catch (MalformedURLException e) {
@@ -1118,52 +1307,8 @@ public class DownloadActivity extends AppCompatActivity {
super.onResume();
toolbar.setTitle(getString(R.string.main_menu_activity_name));
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(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("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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/fragment/SelectLanguageFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java
index b6ecb66..c12e24e 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java
@@ -4,7 +4,6 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.content.res.Resources;
-import android.net.Uri;
import android.os.Bundle;
@@ -20,11 +19,11 @@ import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
import java.util.ArrayList;
-import java.util.List;
import java.util.Locale;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter;
/**
@@ -163,7 +162,7 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
//selected_flag = true;
onButtonPressed(language.get(0),culture_id.get(0),login_data.getNOTICE_URL().get(0));
- updateResources(getActivity(), language.get(0));
+ CommonFunctions.updateLangResources(getActivity(), language.get(0));
btn_lang_1.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
btn_lang_2.setBackgroundColor(getResources().getColor(R.color.grey_background));
@@ -181,7 +180,7 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
onButtonPressed(language.get(1),culture_id.get(1),login_data.getNOTICE_URL().get(1));
- updateResources(getActivity(), language.get(1));
+ CommonFunctions.updateLangResources(getActivity(), language.get(1));
btn_lang_1.setBackgroundColor(getResources().getColor(R.color.grey_background));
btn_lang_2.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
@@ -225,46 +224,4 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
//return ;
}
- private static boolean updateResources(Context context, String language) {
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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/fragment/ServiceActivityFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java
index 5d0240a..6cc355a 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java
@@ -1,10 +1,13 @@
package cpm.com.gskmtorange.fragment;
+import android.content.Context;
import android.content.DialogInterface;
import android.os.Environment;
+import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
+import android.support.v7.util.SortedList;
import android.support.v7.widget.CardView;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@@ -14,21 +17,39 @@ import android.view.ViewGroup;
import android.widget.TextView;
import android.widget.Toast;
+import com.squareup.okhttp.MediaType;
+import com.squareup.okhttp.MultipartBuilder;
+import com.squareup.okhttp.RequestBody;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.net.UnknownHostException;
import java.nio.channels.FileChannel;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.dailyentry.ServiceActivity;
+
+import cpm.com.gskmtorange.messgae.AlertMessage;
+import cpm.com.gskmtorange.retrofit.PostApiForFile;
+import cpm.com.gskmtorange.retrofit.StringConverterFactory;
+import retrofit.Call;
+import retrofit.Callback;
+import retrofit.Response;
+import retrofit.Retrofit;
+
+
/**
* A placeholder fragment containing a simple view.
*/
public class ServiceActivityFragment extends Fragment {
+ String result = "";
+ boolean isvalid = false;
public ServiceActivityFragment() {
}
@@ -143,7 +164,7 @@ public class ServiceActivityFragment extends Fragment {
}
public void showExportDialog(){
-
+ String path;
AlertDialog.Builder builder1 = new AlertDialog.Builder(getActivity());
builder1.setMessage(R.string.Areyou_sure_take_backup)
.setCancelable(false)
@@ -187,6 +208,27 @@ public class ServiceActivityFragment extends Fragment {
dst.close();
}
}
+
+ //usk
+ // File dir = new File(CommonString.BACKUP_PATH);
+ File dir = new File(CommonString.BACKUP_PATH);
+
+ ArrayList list = new ArrayList();
+ list = getFileNames(dir.listFiles());
+ if (list.size() > 0) {
+ for (int i1 = 0; i1 < list.size(); i1++) {
+ if (list.get(i1).contains("gsk_orange_backup")) {
+ File originalFile = new File(CommonString.BACKUP_PATH + list.get(i1));
+ Object result = uploadBackup(getActivity(), originalFile.getName(), "DBBackup");
+ if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+
+ }
+ }
+ }
+ }
+ Toast.makeText(getActivity(), getString(R.string.databasexported), Toast.LENGTH_SHORT).show();
+
+
} catch (Exception e) {
System.out.println(e.getMessage());
}
@@ -200,4 +242,59 @@ public class ServiceActivityFragment extends Fragment {
AlertDialog alert1 = builder1.create();
alert1.show();
}
+ public ArrayList getFileNames(File[] file) {
+ ArrayList arrayFiles = new ArrayList();
+ if (file.length > 0) {
+ for (int i = 0; i < file.length; i++)
+ arrayFiles.add(file[i].getName());
+ }
+ return arrayFiles;
+ }
+
+
+ private String uploadBackup(final Context context, String file_name, String folder_name) {
+ RequestBody body1;
+ result = "";
+ isvalid = false;
+ final File originalFile = new File(CommonString.BACKUP_PATH + file_name);
+ RequestBody photo = RequestBody.create(MediaType.parse("application/octet-stream"), originalFile);
+ body1 = new MultipartBuilder().type(MultipartBuilder.FORM)
+ .addFormDataPart("file", originalFile.getName(), photo)
+ .addFormDataPart("Foldername", folder_name)
+ .build();
+ Retrofit adapter = new Retrofit.Builder()
+ .baseUrl(CommonString.URL+"/")
+ .addConverterFactory(new StringConverterFactory())
+ .build();
+ PostApiForFile api = adapter.create(PostApiForFile.class);
+ Call call = api.getUploadImage(body1);
+ call.enqueue(new Callback() {
+ @Override
+ public void onResponse(Response response) {
+ if (response.toString() != null) {
+ if (response.body().contains(CommonString.KEY_SUCCESS)) {
+ isvalid = true;
+ result = CommonString.KEY_SUCCESS;
+ originalFile.delete();
+ } else {
+ result = "Servererror!";
+ }
+ } else {
+ result = "Servererror!";
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable t) {
+ isvalid = true;
+ if (t instanceof UnknownHostException) {
+ result = AlertMessage.MESSAGE_SOCKETEXCEPTION;
+ } else {
+ result = AlertMessage.MESSAGE_SOCKETEXCEPTION;
+ }
+ Toast.makeText(context, originalFile.getName() + " not uploaded", Toast.LENGTH_SHORT).show();
+ }
+ });
+ return result;
+ }
}
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 c7b6cc8..7a1e59e 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
@@ -29,6 +29,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryGetterSetter;
@@ -55,7 +56,7 @@ public class CategoryListActivity extends AppCompatActivity {
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
@@ -89,7 +90,7 @@ public class CategoryListActivity extends AppCompatActivity {
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
categoryList = new ArrayList<>();
@@ -270,51 +271,6 @@ public class CategoryListActivity extends AppCompatActivity {
}
}
-
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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;
- }
-
public void updateStatus() {
//Update Checkout Status
boolean flag_filled = false;
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 976e439..cd19887 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
@@ -26,6 +26,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
@@ -56,8 +57,8 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
db.open();
//preference data
- preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ CommonFunctions.updateLangResources(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);
@@ -98,7 +99,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
protected void onResume() {
super.onResume();
try {
- updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
categoryWisePerformanceList = db.getCategoryWisePerformance(store_id, categoryId);
adapter = new CategoryWisePerformaceAdapter(CategoryWisePerformanceActivity.this, categoryWisePerformanceList);
@@ -191,48 +192,4 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
}
}
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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 29cb397..4b180a5 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
@@ -28,6 +28,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.CategoryPictureGetterSetter;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.dailyentry.AdditionalVisibility;
import cpm.com.gskmtorange.dailyentry.CategoryPicture;
@@ -65,7 +66,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
@@ -103,7 +104,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
try {
categoryList = new ArrayList<>();
@@ -423,49 +424,6 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
}
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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 8447464..01f814c 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
@@ -39,6 +39,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
@@ -76,7 +77,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(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);
@@ -226,7 +227,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
private void prepareList() {
@@ -365,7 +366,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
String date = new Date().toLocaleString().toString();
String TempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-');
- _pathforcheck = "Stock" + headerTitle.getBrand_cd() + "_" + store_cd + "_" + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+ _pathforcheck = "Stock" + headerTitle.getBrand_cd() + "_" + store_cd + "_" + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
child_position = groupPosition;
path = str + _pathforcheck;
@@ -489,48 +490,4 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
}
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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_Availability_StockFacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
index 3098447..1cf524e 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
@@ -55,6 +55,7 @@ import java.util.regex.Pattern;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
@@ -117,7 +118,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(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);
@@ -184,7 +185,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
builder.setMessage(Error_Message)
.setCancelable(false)
- .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+ .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
expandableListView.smoothScrollToPosition(scrollPosition);
@@ -204,6 +205,9 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
@Override
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+
+ expandableListView.invalidate();
+
int lastItem = firstVisibleItem + visibleItemCount;
if (firstVisibleItem == 0) {
@@ -224,7 +228,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
getCurrentFocus().clearFocus();
}
- //expandableListView.invalidateViews();
+ expandableListView.invalidateViews();
}
});
@@ -324,7 +328,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
dialog.setCancelable(false);
- ArrayList mappingPlanogramList = db.getMappingPlanogramData(categoryId);
+ ArrayList mappingPlanogramList = db.getMappingPlanogramData(categoryId, storeType_id, class_id);
//ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram);
WebView webView = (WebView) dialog.findViewById(R.id.webview);
@@ -444,7 +448,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
_pathforcheck = "Stock_Camera1_" + store_id + "_" + categoryId
- + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(3);
@@ -455,7 +459,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
_pathforcheck = "Stock_Camera2_" + store_id + "_" + categoryId
- + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(4);
@@ -466,7 +470,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
_pathforcheck = "Stock_Camera3_" + store_id + "_" + categoryId
- + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(5);
@@ -477,7 +481,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
_pathforcheck = "Stock_Camera4_" + store_id + "_" + categoryId
- + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(6);
@@ -546,7 +550,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
private void prepareList() {
@@ -819,7 +823,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
- holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary));
holder.txt_mbq.setVisibility(View.VISIBLE);
holder.toggle_available.setVisibility(View.VISIBLE);
@@ -833,9 +836,8 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
holder.stock_view.setVisibility(View.VISIBLE);
}
} else {
- holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
- holder.txt_skuName.setTextColor(getResources().getColor(R.color.black));
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
holder.txt_mbq.setVisibility(View.GONE);
holder.toggle_available.setVisibility(View.GONE);
holder.facing.setVisibility(View.VISIBLE);
@@ -843,6 +845,21 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
holder.stock_view.setVisibility(View.GONE);
}
+ if(childData.getCompany_id().equals("1")){
+
+ if(childData.getMust_have().equals("1")){
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary));
+ }
+ else{
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.blue));
+ }
+
+ }
+ else{
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.black));
+ }
+
+
/* if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
} else {
@@ -864,7 +881,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
/*childData.setStock("");
childData.setFacing("");*/
} else {
- /*childData.setStock("");
+ /* childData.setStock("");
childData.setFacing("");*/
childData.setToggleValue("0");
finalHolder.stock.setVisibility(View.VISIBLE);
@@ -911,45 +928,66 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
if (!edStock.equals("")) {
String stock = edStock;
+ int mbq = Integer.parseInt(childData.getMbq());
+ if(mbq!=0){
+ if (Integer.parseInt(stock) >= 0 && Integer.parseInt(stock) < mbq) {
- if (Integer.parseInt(stock) >= 0 && Integer.parseInt(stock) < Integer.parseInt(childData.getMbq())) {
+ if (!childData.getFacing().equals("")) {
+ if (Integer.parseInt(stock) >= 0 && Double.parseDouble(childData.getFacing()) <= Integer.parseInt(stock)) {
- if (!childData.getFacing().equals("")) {
- if (Integer.parseInt(stock) >= 0 && Double.parseDouble(childData.getFacing()) <= Integer.parseInt(stock)) {
+ childData.setStock(stock);
+ } else {
+ AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
+ builder.setMessage(getString(R.string.check_faceup))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finalHolder.stock.setText("");
+ dialog.dismiss();
- childData.setStock(stock);
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
} else {
+ childData.setStock(stock);
+ }
+ } else {
+ if (isDialogOpen) {
+ isDialogOpen = !isDialogOpen;
AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setMessage(getString(R.string.check_faceup))
+ builder.setMessage(getString(R.string.check_stock))
.setCancelable(false)
.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
finalHolder.stock.setText("");
dialog.dismiss();
-
+ isDialogOpen = !isDialogOpen;
}
});
AlertDialog alert = builder.create();
alert.show();
}
- } else {
- childData.setStock(stock);
}
- } else {
- if (isDialogOpen) {
- isDialogOpen = !isDialogOpen;
- AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setMessage(getString(R.string.check_stock))
- .setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- finalHolder.stock.setText("");
- dialog.dismiss();
- isDialogOpen = !isDialogOpen;
- }
- });
- AlertDialog alert = builder.create();
- alert.show();
+ }
+ else{
+ if(Integer.parseInt(stock) > 0){
+ if (isDialogOpen) {
+ isDialogOpen = !isDialogOpen;
+ AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
+ builder.setMessage(getString(R.string.check_stock))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finalHolder.stock.setText("");
+ dialog.dismiss();
+ isDialogOpen = !isDialogOpen;
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
}
}
} else {
@@ -1006,58 +1044,80 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
alert.show();
} else {*/
if (edFaceup != null && !edFaceup.equals("")) {
+ int mbq = Integer.parseInt(childData.getMbq());
+ if(mbq!=0){
+ if (Double.parseDouble(edFaceup) >= 0 && Double.parseDouble(edFaceup) < mbq) {
+ if (!childData.getStock().equals("")) {
- if (Double.parseDouble(edFaceup) >= 0 && Double.parseDouble(edFaceup) < Integer.parseInt(childData.getMbq())) {
- if (!childData.getStock().equals("")) {
+ //if (edFaceup != null && !edFaceup.equals("")) {
- //if (edFaceup != null && !edFaceup.equals("")) {
+ String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
- String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
+ if (Double.parseDouble(faceup) <= Integer.parseInt(childData.getStock())) {
- if (Double.parseDouble(faceup) <= Integer.parseInt(childData.getStock())) {
-
- isFill = true;
+ isFill = true;
/* if (!edFaceup.equals("")) {
childData.setFacing(faceup);
} else {
childData.setFacing("");
}*/
+ } else {
+ AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
+ builder.setMessage(getString(R.string.check_faceup))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finalHolder1.facing.setText("");
+ dialog.dismiss();
+ finalHolder2.facing.setText("");
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ // }
} else {
+ isFill = true;
+ }
+ } else {
+ if (isDialogOpen) {
+ isDialogOpen = !isDialogOpen;
AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setMessage(getString(R.string.check_faceup))
+ builder.setMessage(getString(R.string.check_faceing))
.setCancelable(false)
.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
- finalHolder1.facing.setText("");
+ finalHolder.facing.setText("");
dialog.dismiss();
- finalHolder2.facing.setText("");
+ isDialogOpen = !isDialogOpen;
}
});
AlertDialog alert = builder.create();
alert.show();
}
- // }
- } else {
- isFill = true;
- }
- } else {
- if (isDialogOpen) {
- isDialogOpen = !isDialogOpen;
- AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setMessage(getString(R.string.check_faceing))
- .setCancelable(false)
- .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- finalHolder.facing.setText("");
- dialog.dismiss();
- isDialogOpen = !isDialogOpen;
- }
- });
- AlertDialog alert = builder.create();
- alert.show();
}
}
+ else {
+ if(Double.parseDouble(edFaceup) > 0){
+ if (isDialogOpen) {
+ isDialogOpen = !isDialogOpen;
+ AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
+ builder.setMessage(getString(R.string.check_faceing))
+ .setCancelable(false)
+ .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finalHolder.facing.setText("");
+ dialog.dismiss();
+ isDialogOpen = !isDialogOpen;
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ }
+ }
+
}
//}
} else{
@@ -1195,50 +1255,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
View stock_view;
}
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- } else {
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
-
- 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;
- }
@SuppressLint("LongLogTag")
@Override
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 cae2cd0..21e2bea 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
@@ -47,6 +47,7 @@ import java.util.logging.StreamHandler;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity;
import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
@@ -78,50 +79,6 @@ public class PromoComplianceActivity extends AppCompatActivity {
String error_msg;
Promo_Compliance_DataGetterSetter cd;
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- } else {
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
-
- 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;
- }
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -152,7 +109,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(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);
@@ -194,15 +151,15 @@ public class PromoComplianceActivity extends AppCompatActivity {
public void onItemSelected(AdapterView adapterView, View view, int i, long l) {
if (i == 1) {
cd.setIn_stock("1");
- img_addPromotion.setBackgroundResource(R.mipmap.camera_orange);
if (camera_allow.equals("1")) {
+ img_addPromotion.setBackgroundResource(R.mipmap.camera_orange);
img_addPromotion.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
_pathforcheck = "AddPromo_Image_" + store_id + categoryId + "_"
+ visit_date.replace("/", "") + "_" +
- getCurrentTime().replace(":", "") + ".jpg";
+ CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(2);
@@ -391,7 +348,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
}
}
if (!flag) {
- Snackbar.make(view, getResources().getString(R.string.please_select_answer), Snackbar.LENGTH_LONG)
+ Snackbar.make(view, getResources().getString(R.string.title_activity_select_dropdown), Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
}
}
@@ -465,7 +422,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
private void prepareList() {
@@ -596,14 +553,15 @@ public class PromoComplianceActivity extends AppCompatActivity {
case 1:
data.setIn_stock("1");
img_promotion.setClickable(true);
- img_promotion.setBackgroundResource(R.mipmap.camera_orange);
if (camera_allow.equals("1")) {
+
+ img_promotion.setBackgroundResource(R.mipmap.camera_orange);
img_promotion.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
_pathforcheck = "Promo_Image_" + store_id + categoryId + "_" + data.getSku_id() +
data.getPromo_id() + visit_date.replace("/", "") + "_" +
- getCurrentTime().replace(":", "") + ".jpg";
+ CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
//child_position = position;
child_position = finalI;
path = str + _pathforcheck;
@@ -652,7 +610,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
public void onClick(View v) {
_pathforcheck = "Promo_Image_" + store_id + categoryId + "_" + data.getSku_id() +
data.getPromo_id() + visit_date.replace("/", "") + "_" +
- getCurrentTime().replace(":", "") + ".jpg";
+ CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
//child_position = position;
child_position = finalI;
path = str + _pathforcheck;
@@ -1085,7 +1043,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
return new String(chars);
}
- public String getCurrentTime() {
+ public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java
index 840cf79..da858ba 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java
@@ -52,6 +52,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
@@ -82,49 +83,6 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
ArrayList addSkuChildList;
HashMap> addSkuHashMapChildData;
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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;
- }
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -142,7 +100,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
db.open();
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
@@ -916,6 +874,6 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
}
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 72b3d13..52a8211 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
@@ -66,6 +66,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
@@ -105,49 +106,6 @@ public class Stock_FacingActivity extends AppCompatActivity {
ArrayList planogramSkuChildDataList;
HashMap> planogramHashMapListChildData = new HashMap<>();
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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;
- }
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -175,7 +133,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(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);
@@ -431,7 +389,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
_pathforcheck = "Stock_Camera1_" + store_id + "_" + categoryId
- + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(3);
@@ -442,7 +400,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
_pathforcheck = "Stock_Camera2_" + store_id + "_" + categoryId
- + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(4);
@@ -453,7 +411,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
_pathforcheck = "Stock_Camera3_" + store_id + "_" + categoryId
- + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(5);
@@ -464,7 +422,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
_pathforcheck = "Stock_Camera4_" + store_id + "_" + categoryId
- + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(6);
@@ -1126,7 +1084,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
super.onActivityResult(requestCode, resultCode, data);
}
- /*public String getCurrentTime() {
+ /*public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
String cdate = formatter.format(m_cal.getTime());
@@ -1148,7 +1106,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
return new String(chars);
}
- public String getCurrentTime() {
+ public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
@@ -1213,7 +1171,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
dialog.setCancelable(false);
- ArrayList mappingPlanogramList = db.getMappingPlanogramData(categoryId);
+ ArrayList mappingPlanogramList = db.getMappingPlanogramData(categoryId, storeType_id, class_id);
//ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram);
WebView webView = (WebView) dialog.findViewById(R.id.webview);
@@ -1315,7 +1273,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
public class ExpandableListAdapter extends BaseExpandableListAdapter {
@@ -1397,7 +1355,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
//String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-');
_pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id()
- + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
child_position = groupPosition;
path = str + _pathforcheck;
@@ -1426,7 +1384,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
//String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-');
_pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id()
- + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
child_position = groupPosition;
path = str + _pathforcheck;
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
index 39f6cde..bcb1842 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
@@ -26,6 +26,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.StoreWisePerformaceGetterSetter;
@@ -41,49 +42,6 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
private SharedPreferences preferences;
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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;
- }
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -99,7 +57,7 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(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);
@@ -133,7 +91,7 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
protected void onResume() {
super.onResume();
try {
- updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
storeWisePerformanceList = db.getStoreWisePerformance(store_id);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/Listener.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/Listener.java
index cb3b869..59a0b12 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/Listener.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/Listener.java
@@ -19,4 +19,5 @@ public interface Listener {
void setEmptyListBottom(boolean visibility, int tv, RecyclerView rv);
void addNUpdateRow(View v, int view_id, NoCameraDataGetterSetter parent_item);
void smoothScrollToRow(View v, DragEvent event);
+ void deleteItem(View v, int column_no, RecyclerView rec);
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/messgae/AlertMessage.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/messgae/AlertMessage.java
index be9b4da..c13cc1f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/messgae/AlertMessage.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/messgae/AlertMessage.java
@@ -20,6 +20,10 @@ public class AlertMessage {
public static final String MESSAGE_DATA_NOT = "Data Not Uploaded , ";
+ public static final String MESSAGE_SOCKETEXCEPTION = "Network Communication Failure. Check Your Network Connection";
+
+
+
private Exception exception;
String value;
private String data, condition,exceptionString;
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/retrofit/PostApi.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/retrofit/PostApi.java
new file mode 100644
index 0000000..22efb74
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/retrofit/PostApi.java
@@ -0,0 +1,12 @@
+package cpm.com.gskmtorange.retrofit;
+
+
+/**
+ * Created by jeevanp on 19-05-2017.
+ */
+
+public interface PostApi {
+ /* @POST("Uploadimages")
+ Call getUploadImage(@Body RequestBody reqesBody);*/
+}
+
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/retrofit/PostApiForFile.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/retrofit/PostApiForFile.java
new file mode 100644
index 0000000..f288e55
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/retrofit/PostApiForFile.java
@@ -0,0 +1,17 @@
+package cpm.com.gskmtorange.retrofit;
+
+
+import com.squareup.okhttp.RequestBody;
+
+import retrofit.Call;
+import retrofit.http.Body;
+import retrofit.http.POST;
+
+/**
+ * Created by jeevanp on 05-10-2017.
+ */
+
+public interface PostApiForFile {
+ @POST("Uploadimages")
+ Call getUploadImage(@Body RequestBody reqesBody);
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/retrofit/StringConverterFactory.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/retrofit/StringConverterFactory.java
new file mode 100644
index 0000000..4906adf
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/retrofit/StringConverterFactory.java
@@ -0,0 +1,54 @@
+package cpm.com.gskmtorange.retrofit;
+
+
+
+import com.squareup.okhttp.MediaType;
+import com.squareup.okhttp.RequestBody;
+import com.squareup.okhttp.ResponseBody;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Type;
+
+import retrofit.Converter;
+
+
+/**
+ * Created by jeevanp on 19-05-2017.
+ */
+
+public class StringConverterFactory implements Converter.Factory {
+ public StringConverterFactory() {
+ }
+ @Override
+ public Converter get(Type type) {
+ Class cls = (Class) type;
+ if (String.class.isAssignableFrom(cls)) {
+ return new StringConverter();
+ }
+ return null;
+ }
+}
+
+class StringConverter implements Converter {
+ private static final MediaType PLAIN_TEXT = MediaType.parse("text/plain; charset=UTF-8");
+
+ @Override
+ public String fromBody(ResponseBody body) throws IOException {
+ return new String(body.bytes());
+ }
+
+ @Override
+ public RequestBody toBody(String value) {
+ return RequestBody.create(PLAIN_TEXT, convertToBytes(value));
+ }
+
+ private static byte[] convertToBytes(String string) {
+ try {
+ return string.getBytes("UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
index 4387289..7223be5 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
@@ -44,6 +44,7 @@ import cpm.com.gskmtorange.GetterSetter.CategoryPictureGetterSetter;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
@@ -100,7 +101,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
date = preferences.getString(CommonString.KEY_DATE, null);
userId = preferences.getString(CommonString.KEY_USERNAME, null);
@@ -1514,52 +1515,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(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("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- } else {
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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;
- }
public void showAlert(String str) {
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 6283924..bb653e5 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -45,6 +45,7 @@ import cpm.com.gskmtorange.GetterSetter.CategoryPictureGetterSetter;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
@@ -103,7 +104,7 @@ public class UploadActivity extends AppCompatActivity {
preferences = PreferenceManager.getDefaultSharedPreferences(this);
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
date = preferences.getString(CommonString.KEY_DATE, null);
userId = preferences.getString(CommonString.KEY_USERNAME, null);
@@ -420,6 +421,7 @@ public class UploadActivity extends AppCompatActivity {
//MSL_Availability_StockFacing
String mslAvailability_stockFacing_xml = "";
onXML = "";
+ db.open();
msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerData(coverageList.get(i).getStoreId());
if (msl_availabilityStockFacingList.size() > 0) {
@@ -476,6 +478,7 @@ public class UploadActivity extends AppCompatActivity {
//Promo Compliance - Promotion Data
String promoition_data_xml = "";
onXML = "";
+ db.open();
promotionSkuList = db.getPromoComplianceSkuServerUploadData(coverageList.get(i).getStoreId());
if (promotionSkuList.size() > 0) {
@@ -528,6 +531,7 @@ public class UploadActivity extends AppCompatActivity {
//Promo Compliance -Additional Promotion Data
String additional_promoition_data_xml = "";
onXML = "";
+ db.open();
additionalPromotionList = db.getAdditionalPromotionServerUploadData(coverageList.get(i).getStoreId());
if (additionalPromotionList.size() > 0) {
@@ -584,6 +588,7 @@ public class UploadActivity extends AppCompatActivity {
String onXMLdIALOG = "";
String imageV1, imageV2, imageV3;
+ db.open();
additionalVisibilityList = db.getAdditionalStockUpload(coverageList.get(i).getStoreId());
if (additionalVisibilityList.size() > 0) {
@@ -679,6 +684,7 @@ public class UploadActivity extends AppCompatActivity {
//T2p Upload Data
String t2p_data_xml = "";
onXML = "";
+ db.open();
t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null);
if (t2PGetterSetters.size() > 0) {
@@ -797,6 +803,7 @@ public class UploadActivity extends AppCompatActivity {
//Stock Facing Planogram Tracker
String stock_facing_planogram_xml = "";
onXML = "";
+ db.open();
stockFacingPlanogramDataList = db.getStockAndFacingPlanogramServerUploadData(coverageList.get(i).getStoreId());
if (stockFacingPlanogramDataList.size() > 0) {
@@ -851,6 +858,7 @@ public class UploadActivity extends AppCompatActivity {
String CategoryLISTDATA = "";
String image1, image2, image3, image4;
+ db.open();
adddata = db.getCategoryPictureUpload(coverageList.get(i).getStoreId());
if (adddata.size() > 0) {
@@ -938,6 +946,7 @@ public class UploadActivity extends AppCompatActivity {
}
else{
+ db.open();
ArrayList nocamera_data_list = db.getNoCameraCategoryStoreWiseDataInserted(coverageList.get(i).getStoreId());
if(nocamera_data_list.size()>0){
@@ -1064,7 +1073,7 @@ public class UploadActivity extends AppCompatActivity {
for (int J = 0; J < adddata.size(); J++) {
String KeyID = adddata.get(J).getKEY_ID();
-
+ db.open();
listdat = db.getCategoryPictureListUploaded(KeyID);
if (listdat.size() > 0) {
@@ -1556,61 +1565,18 @@ public class UploadActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
- updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(getString(R.string.title_activity_upload));
}
- private static boolean updateResources(Context context, String language) {
-
- /*String lang;
-
- if (language.equalsIgnoreCase("English")) {
- lang = "EN";
- } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
- lang = "AR";
- } else {
- lang = "TR";
- }*/
-
- String lang;
-
- if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
- } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
- }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
- lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
- }else{
- lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
- }
-
- 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;
- }
public void showAlert(String str) {
AlertDialog.Builder builder = new AlertDialog.Builder(UploadActivity.this);
builder.setTitle("Parinaam");
builder.setMessage(str).setCancelable(false)
- .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+ .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
/* Intent i = new Intent(activity, StorelistActivity.class);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryImagesAllowed.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryImagesAllowed.java
new file mode 100644
index 0000000..4abe03b
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryImagesAllowed.java
@@ -0,0 +1,42 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+/**
+ * Created by yadavendras on 02-01-2018.
+ */
+
+public class CategoryImagesAllowed {
+
+ boolean img_cam1, img_cam2, img_cam3, img_cam4;
+
+ public boolean isImg_cam1() {
+ return img_cam1;
+ }
+
+ public void setImg_cam1(boolean img_cam1) {
+ this.img_cam1 = img_cam1;
+ }
+
+ public boolean isImg_cam2() {
+ return img_cam2;
+ }
+
+ public void setImg_cam2(boolean img_cam2) {
+ this.img_cam2 = img_cam2;
+ }
+
+ public boolean isImg_cam3() {
+ return img_cam3;
+ }
+
+ public void setImg_cam3(boolean img_cam3) {
+ this.img_cam3 = img_cam3;
+ }
+
+ public boolean isImg_cam4() {
+ return img_cam4;
+ }
+
+ public void setImg_cam4(boolean img_cam4) {
+ this.img_cam4 = img_cam4;
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingCategoryImageAllowGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingCategoryImageAllowGetterSetter.java
new file mode 100644
index 0000000..a106d67
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingCategoryImageAllowGetterSetter.java
@@ -0,0 +1,76 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+/**
+ * Created by yadavendras on 30-12-2017.
+ */
+
+public class MappingCategoryImageAllowGetterSetter {
+
+ String table_MAPPING_CATEGORY_IMAGE_ALLOW;
+
+ ArrayList COUNTRY_ID = new ArrayList<>();
+ ArrayList CATEGORY_ID = new ArrayList<>();
+ ArrayList IMAGE1_ALLOW = new ArrayList<>();
+ ArrayList IMAGE2_ALLOW = new ArrayList<>();
+ ArrayList IMAGE3_ALLOW = new ArrayList<>();
+ ArrayList IMAGE4_ALLOW = new ArrayList<>();
+
+
+ public String getTable_MAPPING_CATEGORY_IMAGE_ALLOW() {
+ return table_MAPPING_CATEGORY_IMAGE_ALLOW;
+ }
+
+ public void setTable_MAPPING_CATEGORY_IMAGE_ALLOW(String table_MAPPING_CATEGORY_IMAGE_ALLOW) {
+ this.table_MAPPING_CATEGORY_IMAGE_ALLOW = table_MAPPING_CATEGORY_IMAGE_ALLOW;
+ }
+
+ public ArrayList getCOUNTRY_ID() {
+ return COUNTRY_ID;
+ }
+
+ public void setCOUNTRY_ID(String COUNTRY_ID) {
+ this.COUNTRY_ID.add(COUNTRY_ID);
+ }
+
+ public ArrayList getCATEGORY_ID() {
+ return CATEGORY_ID;
+ }
+
+ public void setCATEGORY_ID(String CATEGORY_ID) {
+ this.CATEGORY_ID.add(CATEGORY_ID);
+ }
+
+ public ArrayList getIMAGE1_ALLOW() {
+ return IMAGE1_ALLOW;
+ }
+
+ public void setIMAGE1_ALLOW(String IMAGE1_ALLOW) {
+ this.IMAGE1_ALLOW.add(IMAGE1_ALLOW);
+ }
+
+ public ArrayList getIMAGE2_ALLOW() {
+ return IMAGE2_ALLOW;
+ }
+
+ public void setIMAGE2_ALLOW(String IMAGE2_ALLOW) {
+ this.IMAGE2_ALLOW.add(IMAGE2_ALLOW);
+ }
+
+ public ArrayList getIMAGE3_ALLOW() {
+ return IMAGE3_ALLOW;
+ }
+
+ public void setIMAGE3_ALLOW(String IMAGE3_ALLOW) {
+ this.IMAGE3_ALLOW.add(IMAGE3_ALLOW);
+ }
+
+ public ArrayList getIMAGE4_ALLOW() {
+ return IMAGE4_ALLOW;
+ }
+
+ public void setIMAGE4_ALLOW(String IMAGE4_ALLOW) {
+ this.IMAGE4_ALLOW.add(IMAGE4_ALLOW);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingPlanogramCountrywiseGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingPlanogramCountrywiseGetterSetter.java
new file mode 100644
index 0000000..7e7df26
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingPlanogramCountrywiseGetterSetter.java
@@ -0,0 +1,48 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+/**
+ * Created by yadavendras on 05-01-2018.
+ */
+
+public class MappingPlanogramCountrywiseGetterSetter {
+
+ String table_MAPPING_COUNTRYWISE_PLANOGRAM;
+
+ ArrayList COUNTRY_ID = new ArrayList<>();
+ ArrayList FILE_PATH = new ArrayList<>();
+ ArrayList PLANOGRAM_URL = new ArrayList<>();
+
+ public String getTable_MAPPING_COUNTRYWISE_PLANOGRAM() {
+ return table_MAPPING_COUNTRYWISE_PLANOGRAM;
+ }
+
+ public void setTable_MAPPING_COUNTRYWISE_PLANOGRAM(String table_MAPPING_COUNTRYWISE_PLANOGRAM) {
+ this.table_MAPPING_COUNTRYWISE_PLANOGRAM = table_MAPPING_COUNTRYWISE_PLANOGRAM;
+ }
+
+ public ArrayList getCOUNTRY_ID() {
+ return COUNTRY_ID;
+ }
+
+ public void setCOUNTRY_ID(String COUNTRY_ID) {
+ this.COUNTRY_ID.add(COUNTRY_ID);
+ }
+
+ public ArrayList getFILE_PATH() {
+ return FILE_PATH;
+ }
+
+ public void setFILE_PATH(String FILE_PATH) {
+ this.FILE_PATH.add(FILE_PATH);
+ }
+
+ public ArrayList getPLANOGRAM_URL() {
+ return PLANOGRAM_URL;
+ }
+
+ public void setPLANOGRAM_URL(String PLANOGRAM_URL) {
+ this.PLANOGRAM_URL.add(PLANOGRAM_URL);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NoCameraDataGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NoCameraDataGetterSetter.java
index 210002e..6cf424a 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NoCameraDataGetterSetter.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NoCameraDataGetterSetter.java
@@ -27,6 +27,7 @@ public class NoCameraDataGetterSetter {
String CATEGORY_ID;
String SUB_CATEGORY_ID;
+ String SUB_CATEGORY;
int facing, row_no, column_no;
public int getFacing() {
@@ -68,4 +69,12 @@ public class NoCameraDataGetterSetter {
public void setSUB_CATEGORY_ID(String SUB_CATEGORY_ID) {
this.SUB_CATEGORY_ID = SUB_CATEGORY_ID;
}
+
+ public String getSUB_CATEGORY() {
+ return SUB_CATEGORY;
+ }
+
+ public void setSUB_CATEGORY(String SUB_CATEGORY) {
+ this.SUB_CATEGORY = SUB_CATEGORY;
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/RowColumnGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/RowColumnGetterSetter.java
new file mode 100644
index 0000000..546b02f
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/RowColumnGetterSetter.java
@@ -0,0 +1,28 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+/**
+ * Created by yadavendras on 30-10-2017.
+ */
+
+public class RowColumnGetterSetter {
+
+ int row, column;
+
+ public int getRow() {
+ return row;
+ }
+
+ public void setRow(int row) {
+ this.row = row;
+ }
+
+ public int getColumn() {
+ return column;
+ }
+
+ public void setColumn(int column) {
+ this.column = column;
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
index bc64ded..3f1002d 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
@@ -28,6 +28,10 @@ public class TableBean {
public static String MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
public static String SKUGROUP_MASTER;
+ //YSY
+ public static String MAPPING_CATEGORY_IMAGE_ALLOW;
+ public static String MAPPING_COUNTRYWISE_PLANOGRAM;
+
public static String getAdditionalDisplay() {
return ADDITIONAL_DISPLAY;
@@ -197,4 +201,20 @@ public class TableBean {
public static void setSkugroupMaster(String skugroupMaster) {
SKUGROUP_MASTER = skugroupMaster;
}
+
+ public static String getMappingCategoryImageAllow() {
+ return MAPPING_CATEGORY_IMAGE_ALLOW;
+ }
+
+ public static void setMappingCategoryImageAllow(String mappingCategoryImageAllow) {
+ MAPPING_CATEGORY_IMAGE_ALLOW = mappingCategoryImageAllow;
+ }
+
+ public static String getMappingCountrywisePlanogram() {
+ return MAPPING_COUNTRYWISE_PLANOGRAM;
+ }
+
+ public static void setMappingCountrywisePlanogram(String mappingCountrywisePlanogram) {
+ MAPPING_COUNTRYWISE_PLANOGRAM = mappingCountrywisePlanogram;
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
index dd4fafb..3ff52aa 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
@@ -17,7 +17,9 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramCountrywiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
@@ -856,6 +858,46 @@ public class XMLHandlers {
return st;
}
+ //MAPPING_CATEGORY_IMAGE_ALLOW
+ public static MappingCategoryImageAllowGetterSetter mappingCategoryImageAllowXMLHandler(XmlPullParser xpp, int eventType) {
+ MappingCategoryImageAllowGetterSetter st = new MappingCategoryImageAllowGetterSetter();
+
+ try {
+ while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+ if (xpp.getEventType() == XmlPullParser.START_TAG) {
+
+ if (xpp.getName().equals("META_DATA")) {
+ st.setTable_MAPPING_CATEGORY_IMAGE_ALLOW(xpp.nextText());
+ }
+ if (xpp.getName().equals("COUNTRY_ID")) {
+ st.setCOUNTRY_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("CATEGORY_ID")) {
+ st.setCATEGORY_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("IMAGE1_ALLOW")) {
+ st.setIMAGE1_ALLOW(xpp.nextText());
+ }
+ if (xpp.getName().equals("IMAGE2_ALLOW")) {
+ st.setIMAGE2_ALLOW(xpp.nextText());
+ }
+ if (xpp.getName().equals("IMAGE3_ALLOW")) {
+ st.setIMAGE3_ALLOW(xpp.nextText());
+ }
+ if (xpp.getName().equals("IMAGE4_ALLOW")) {
+ st.setIMAGE4_ALLOW(xpp.nextText());
+ }
+ }
+ xpp.next();
+ }
+ } catch (XmlPullParserException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return st;
+ }
+
//SKUGROUP_MASTER
public static SkuGroupMasterGetterSetter skuGroupMasterXMLHandler(XmlPullParser xpp, int eventType) {
SkuGroupMasterGetterSetter st = new SkuGroupMasterGetterSetter();
@@ -893,4 +935,35 @@ public class XMLHandlers {
}
return st;
}
+
+ //MAPPING_COUNTRYWISE_PLANOGRAM
+ public static MappingPlanogramCountrywiseGetterSetter MAPPING_COUNTRYWISE_PLANOGRAM_XMLHandler(XmlPullParser xpp, int eventType) {
+ MappingPlanogramCountrywiseGetterSetter st = new MappingPlanogramCountrywiseGetterSetter();
+
+ try {
+ while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+ if (xpp.getEventType() == XmlPullParser.START_TAG) {
+
+ if (xpp.getName().equals("META_DATA")) {
+ st.setTable_MAPPING_COUNTRYWISE_PLANOGRAM(xpp.nextText());
+ }
+ if (xpp.getName().equals("COUNTRY_ID")) {
+ st.setCOUNTRY_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("FILE_PATH")) {
+ st.setFILE_PATH(xpp.nextText());
+ }
+ if (xpp.getName().equals("PLANOGRAM_URL")) {
+ st.setPLANOGRAM_URL(xpp.nextText());
+ }
+ }
+ xpp.next();
+ }
+ } catch (XmlPullParserException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return st;
+ }
}
diff --git a/GSKMTOrange/src/main/res/layout/activity_category_picture.xml b/GSKMTOrange/src/main/res/layout/activity_category_picture.xml
index 74b1e73..6542273 100644
--- a/GSKMTOrange/src/main/res/layout/activity_category_picture.xml
+++ b/GSKMTOrange/src/main/res/layout/activity_category_picture.xml
@@ -21,8 +21,6 @@
-
-
+
+
diff --git a/GSKMTOrange/src/main/res/layout/activity_planogram_pdf.xml b/GSKMTOrange/src/main/res/layout/activity_planogram_pdf.xml
new file mode 100644
index 0000000..74f7f54
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/activity_planogram_pdf.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/content_category_picture.xml b/GSKMTOrange/src/main/res/layout/content_category_picture.xml
index b80c9d3..3b0b302 100644
--- a/GSKMTOrange/src/main/res/layout/content_category_picture.xml
+++ b/GSKMTOrange/src/main/res/layout/content_category_picture.xml
@@ -30,7 +30,7 @@
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
- android:background="@drawable/camera_orange_star_green" />
+ android:background="@mipmap/camera_orange" />
diff --git a/GSKMTOrange/src/main/res/layout/content_planogram_pdf.xml b/GSKMTOrange/src/main/res/layout/content_planogram_pdf.xml
new file mode 100644
index 0000000..a058305
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/content_planogram_pdf.xml
@@ -0,0 +1,11 @@
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/custom.xml b/GSKMTOrange/src/main/res/layout/custom.xml
index 3ff50fa..e165aaf 100644
--- a/GSKMTOrange/src/main/res/layout/custom.xml
+++ b/GSKMTOrange/src/main/res/layout/custom.xml
@@ -35,7 +35,7 @@
android:layout_marginTop="15dp"
android:paddingBottom="20dp"
android:paddingLeft="5dp"
- android:text="@string/uploaddata"
+ android:text="@string/download_data"
android:textSize="@dimen/text_size_small" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
index 49ba52c..974e009 100644
--- a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
+++ b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
@@ -24,6 +24,11 @@
android:icon="@drawable/ic_date_range_black"
android:title="@string/future_route_plan" />
+ - Settings
Services
- T2P - Monthly Visibility
+ Visibility/T2P
Category List
@@ -76,7 +76,7 @@
SKU Availability
Stock and Facing
- T2P - Monthly Visibility
+ Visibility/T2P
Additional Visibility
Promo Compliance
Competition Visibility
@@ -225,6 +225,9 @@
Export Database
Database Exported Successfully
+ Database Exported And Uploaded Successfully
+
+
Uploaded Data
Please Upload Previous Data First
@@ -278,7 +281,7 @@
Stock Planogram Data Uploading
Category Pictures
- CategoryPicture
+ Category Picture
Please fill the no camera data
Shelf
@@ -322,6 +325,9 @@
Enter Facing
Please fill Facing
Please add atleast one Sub Group to every row
+ Edit
+ Select an option
+ Planogram Document