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

Merge pull request #52 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSK_MT_Orange_egypt_T6

Browse Source 
Gsk mt orange egypt t6
This commit is contained in:
YadavendraSinghYaduvanshi
2018-02-14 15:27:32 +05:30
committed by GitHub
parent aa26a15d15 d53bca0e29
commit c28d247438
95 changed files with 5910 additions and 1662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1 -14
View File
@@ -4,9 +4,6 @@
<option name="VM_OPTIONS" value="-Xmx512m" />
<option name="MAX_HEAP_SIZE" value="1024" />
</component>
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -31,17 +28,7 @@
</value>
</option>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
GSKMTOrange/build.gradle
+21 -9
View File
@@ -1,8 +1,8 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 24
buildToolsVersion '25.0.0'
compileSdkVersion 26
buildToolsVersion '26.0.2'
useLibrary 'org.apache.http.legacy'
@@ -10,13 +10,18 @@ android {
disable 'MissingTranslation'
}
configurations {
all*.exclude module: 'okio'
}
defaultConfig {
applicationId "cpm.com.gskmtorange"
minSdkVersion 15
minSdkVersion 17
targetSdkVersion 22
versionCode 10
versionName "2.3"
versionCode 11
versionName "2.4"
multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
@@ -35,14 +40,21 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:design:24.2.1'
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support:design:26.1.0'
implementation 'com.android.support:cardview-v7:26.1.0'
implementation 'com.android.support:recyclerview-v7:26.1.0'
compile 'com.google.android.gms:play-services-location:9.8.0'
compile 'com.google.android.gms:play-services-maps:9.8.0'
compile 'com.android.support:cardview-v7:24.2.1'
compile 'com.google.android.gms:play-services-appindexing:9.8.0'
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'
}
GSKMTOrange/src/main/AndroidManifest.xml
+26 -2
View File
@@ -82,7 +82,7 @@
<activity
android:name=".dailyentry.T2PComplianceActivity"
android:configChanges="screenSize|orientation|keyboardHidden"
android:label="@string/title_activity_t2_pcompliance"
android:label="@string/daily_data_menu_t2p"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
@@ -202,7 +202,31 @@
android:name=".dailyentry.FutureJCPActivity"
android:label=""
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"></activity>
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".dailyentry.CreateSelfActivity"
android:configChanges="screenSize|orientation|keyboardHidden"
android:label="@string/title_activity_create_self"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".dailyentry.NoCameraActivity"
android:configChanges="screenSize|orientation|keyboardHidden"
android:label="@string/title_activity_create_self"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".dailyentry.PlanogramPDFActivity"
android:label="@string/title_activity_planogram_pdf"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".dailyentry.StockDataActivity"
android:label="@string/title_activity_stock_data"
android:configChanges="screenSize|orientation|keyboardHidden"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan"></activity>
</application>
</manifest>
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+438 -7
View File
@@ -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,15 +40,20 @@ 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;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGroupMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
@@ -62,7 +68,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
*/
public class GSKOrangeDB extends SQLiteOpenHelper {
public static final String DATABASE_NAME = "GSK_ORANGE_DB5";
public static final String DATABASE_NAME = "GSK_ORANGE_DB14";
public static final int DATABASE_VERSION = 13;
TableBean tableBean;
private SQLiteDatabase db;
@@ -150,9 +156,13 @@ 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
db.execSQL(CommonString.CREATE_TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING);
db.execSQL(CommonString.CREATE_TABLE_INSERT_NO_CAMERA_FACING_DATA);
} catch (SQLException e) {
e.printStackTrace();
@@ -199,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() {
@@ -230,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) {
@@ -281,14 +295,19 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
public ArrayList<T2PGetterSetter> getT2PDefaultData(String store_id) {
public ArrayList<T2PGetterSetter> getT2PDefaultData(String store_id, String category_id) {
ArrayList<T2PGetterSetter> t2PList = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, DM.DISPLAY_ID As DISPLAY_ID, DM.IMAGE_URL As IMAGE_URL, DM.IMAGE_PATH As IMAGE_PATH, T.CATEGORY_FIXTURE As CATEGORY_FIXTURE from BRAND_MASTER BM INNER JOIN MAPPING_T2P T ON BM.BRAND_ID = T.BRAND_ID INNER JOIN DISPLAY_MASTER DM ON T.DISPLAY_ID= DM.DISPLAY_ID WHERE T.STORE_ID = '" + store_id + "'", null);
dbcursor = db.rawQuery("Select BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, " +
"DM.DISPLAY_ID As DISPLAY_ID, DM.IMAGE_URL As IMAGE_URL, DM.IMAGE_PATH As IMAGE_PATH, " +
"T.CATEGORY_FIXTURE As CATEGORY_FIXTURE from BRAND_MASTER BM INNER JOIN MAPPING_T2P T " +
"ON BM.BRAND_ID = T.BRAND_ID INNER JOIN DISPLAY_MASTER DM " +
"ON T.DISPLAY_ID= DM.DISPLAY_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BM.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID " +
"WHERE T.STORE_ID = '" + store_id + "' AND SCM.CATEGORY_ID ='"+ category_id +"'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
@@ -3112,11 +3131,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
public ArrayList<MAPPING_PLANOGRAM_DataGetterSetter> getMappingPlanogramData(String category_id) {
public ArrayList<MAPPING_PLANOGRAM_DataGetterSetter> getMappingPlanogramData(String category_id, String store_type_id, String class_id) {
ArrayList<MAPPING_PLANOGRAM_DataGetterSetter> 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();
@@ -4226,12 +4246,12 @@ 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" +
" INNER JOIN MAPPING_SUB_CATEGORY_IMAGE_ALLOW MIA ON SB.SUB_CATEGORY_ID=MIA.SUB_CATEGORY_ID " +
" WHERE M.KEYACCOUNT_ID = '" + key_account_id + " 'AND M.STORETYPE_ID = '" + store_type_id + "' AND M.CLASS_ID = '" + class_id + "' AND CA.CATEGORY_ID = '" + categoryId + "'", null);
" WHERE M.KEYACCOUNT_ID = '" + key_account_id + " ' AND M.STORETYPE_ID = '" + store_type_id + "' AND M.CLASS_ID = '" + class_id + "' AND CA.CATEGORY_ID = '" + categoryId + "'", null);
if (dbcursor != null) {
@@ -4302,6 +4322,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
ContentValues values1 = new ContentValues();
try {
db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE,
"Store_Id='" + gettersetter.getStore_ID() + "' And categoryId='" + categoryId + "' ", null);
db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE_LIST,
"Store_Id='" + gettersetter.getStore_ID() + "' And categoryId='" + categoryId + "' ", null);
values.put("Store_Id", gettersetter.getStore_ID());
values.put("categoryId", categoryId);
values.put("CategoryImage1", gettersetter.getCategoryImage1());
@@ -4784,6 +4809,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
@@ -5095,4 +5141,389 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
return list;
}
//get Sub Category Master
public ArrayList<MSL_AvailabilityStockFacingGetterSetter> getSubCategoryMaster(
String category_id) {
ArrayList<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '"+ category_id +"'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
return list;
}
return list;
}
//Sku Group Master Data for No camera
public ArrayList<NoCameraDataGetterSetter> getSkuGroupMasterData(String category_id, String sub_category_id) {
Cursor cursordata = null;
ArrayList<NoCameraDataGetterSetter> Data = new ArrayList<>();
try {
cursordata = db.rawQuery("SELECT * FROM SKUGROUP_MASTER " +
"WHERE CATEGORY_ID ='" + category_id + "' AND SUB_CATEGORY_ID ='"+ sub_category_id +"' ORDER BY SKUGROUP_SEQUENCE", null);
if (cursordata != null) {
cursordata.moveToFirst();
while (!cursordata.isAfterLast()) {
NoCameraDataGetterSetter sb = new NoCameraDataGetterSetter();
sb.setSKUGROUP_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("SKUGROUP_ID")));
sb.setSKUGROUP_NAME(cursordata.getString(cursordata.getColumnIndexOrThrow("SKUGROUP_NAME")));
Data.add(sb);
cursordata.moveToNext();
}
cursordata.close();
}
} catch (Exception ex) {
}
return Data;
}
//insert no camera category data drag drop
public void InsertNoCameraAddedData(
String storeId, String categoryId, String sub_category_id, int row_count, HashMap<Integer,
List<NoCameraDataGetterSetter>> 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 j = 0; j < hashMapRowData.get(i).size(); j++) {
NoCameraDataGetterSetter data = hashMapRowData.get(i).get(j);
values.put(CommonString.KEY_STORE_ID, storeId);
values.put(CommonString.KEY_CATEGORY_ID, categoryId);
values.put(CommonString.KEY_SUB_CATEGORY_ID, sub_category_id);
values.put(CommonString.KEY_SKU_GROUP_ID, data.getSKUGROUP_ID());
values.put(CommonString.KEY_ROW_NO, i);
values.put(CommonString.KEY_COLUMN_NO, j+1);
values.put(CommonString.KEY_FACING, data.getFacing());
db.insert(CommonString.TABLE_INSERT_NO_CAMERA_FACING_DATA, null, values);
}
}
db.setTransactionSuccessful();
db.endTransaction();
} catch (Exception ex) {
Log.d("Exception ", " in Insert NO CAMERA " + ex.toString());
}
}
//get no camera category drag drop
//get for specific sub category id
public ArrayList<NoCameraDataGetterSetter> getNoCameraCategoryDataInserted(
String store_id, String category_id, String subcategory_id) {
ArrayList<NoCameraDataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
if(subcategory_id==null){
dbcursor = db.rawQuery("SELECT * FROM "+ CommonString.TABLE_INSERT_NO_CAMERA_FACING_DATA+" WHERE " + CommonString.KEY_STORE_ID + " = '"+ store_id
+"' AND "+ CommonString.KEY_CATEGORY_ID + " ='"+ category_id
+"'", null);
}
else {
dbcursor = db.rawQuery("SELECT * FROM "+ CommonString.TABLE_INSERT_NO_CAMERA_FACING_DATA+" WHERE " + CommonString.KEY_STORE_ID + " = '"+ store_id
+"' AND "+ CommonString.KEY_CATEGORY_ID + " ='"+ category_id
+"' AND "+ CommonString.KEY_SUB_CATEGORY_ID + " ='"+ subcategory_id +"'", null);
}
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
NoCameraDataGetterSetter cd = new NoCameraDataGetterSetter();
cd.setSKUGROUP_ID(dbcursor.getInt(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SKU_GROUP_ID))+"");
cd.setRow_no(dbcursor.getInt(dbcursor.getColumnIndexOrThrow(CommonString.KEY_ROW_NO)));
cd.setColumn_no(dbcursor.getInt(dbcursor.getColumnIndexOrThrow(CommonString.KEY_COLUMN_NO)));
cd.setFacing(dbcursor.getInt(dbcursor.getColumnIndexOrThrow(CommonString.KEY_FACING)));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
return list;
}
return list;
}
//get no camera category drag drop
//get for specific sub category id
public ArrayList<NoCameraDataGetterSetter> getNoCameraCategoryStoreWiseDataInserted(
String store_id) {
ArrayList<NoCameraDataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("SELECT * FROM "+ CommonString.TABLE_INSERT_NO_CAMERA_FACING_DATA+" WHERE " +
CommonString.KEY_STORE_ID + " = '"+ store_id +"'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
NoCameraDataGetterSetter cd = new NoCameraDataGetterSetter();
cd.setCATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID)));
cd.setSUB_CATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SUB_CATEGORY_ID)));
cd.setSKUGROUP_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SKU_GROUP_ID)));
cd.setRow_no(Integer.parseInt(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_ROW_NO))));
cd.setColumn_no(Integer.parseInt(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_COLUMN_NO))));
cd.setFacing(Integer.parseInt(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_FACING))));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
return list;
}
return list;
}
//Sku Group Master
public void InsertSkuGroupMaster(SkuGroupMasterGetterSetter data) {
db.delete("SKUGROUP_MASTER", null, null);
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getSUB_CATEGORY_ID().size(); i++) {
values.put("SKUGROUP_ID", data.getSKUGROUP_ID().get(i));
values.put("SKUGROUP_NAME", data.getSKUGROUP_NAME().get(i));
values.put("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i));
values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i));
values.put("SKUGROUP_SEQUENCE", data.getSKUGROUP_SEQUENCE().get(i));
db.insert("SKUGROUP_MASTER", null, values);
}
} catch (Exception ex) {
Log.d("Exception ", " in SKUGROUP_MASTER " + ex.toString());
}
}
//get Row and column count no camera
public ArrayList<RowColumnGetterSetter> getrowColumnNoCamera(String store_id, String category_id, String sub_category_id) {
ArrayList<RowColumnGetterSetter> 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<CategoryImagesAllowed> getCategoryPictureAllowedData(String categoryId) {
Cursor cursordata = null;
ArrayList<CategoryImagesAllowed> 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());
}
}
//Stock N Facing
public ArrayList<MSL_AvailabilityStockFacingGetterSetter> getStockFacingHeaderData(
String category_id, String keyAccount_id, String storeType_id, String class_id) {
ArrayList<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," +
" (SELECT SUM(SOS_TARGET) FROM MAPPING_SOS_TARGET WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " +
"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 " +
"where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id +
"' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID='"+ 1 +"' "+
"order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
cd.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND")));
cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
return list;
}
return list;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
+10 -53
View File
@@ -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;
@@ -92,7 +93,6 @@ import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallback, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener {
String result, errormsg = "";
;
private ProgressBar pb;
private GoogleMap mMap;
double latitude = 0.0;
@@ -133,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);
@@ -256,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;
@@ -394,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
@@ -422,7 +425,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
stopLocationUpdates();
}
/*public String getCurrentTime() {
/*public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
@@ -450,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");
@@ -1073,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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java
+3 -46
View File
@@ -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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+8 -53
View File
@@ -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+"T6");
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+"T6"
+ "[/APP_VERSION]" + "[ATT_MODE]OnLine[/ATT_MODE]"
+ "[NETWORK_STATUS]" + "LoginStatus"
+ "[/NETWORK_STATUS]" + "[/USER_DATA][/DATA]";
@@ -543,6 +543,7 @@ public class LoginActivity extends AppCompatActivity {
editor.putString(CommonString.KEY_PATH, lgs.getAPP_PATH());
editor.putString(CommonString.KEY_DATE, lgs.getCURRENTDATE());
editor.putString(CommonString.KEY_COUNTRY_ID, lgs.getCOUNTRY_ID());
//editor.putString(CommonString.KEY_DATE, "01/21/2017");
editor.commit();
@@ -627,7 +628,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 +673,7 @@ public class LoginActivity extends AppCompatActivity {
alert.show();
}
/*public String getCurrentTime() {
/*public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
@@ -695,7 +696,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 +711,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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+17 -47
View File
@@ -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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java
+3 -45
View File
@@ -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();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/ListAdapter.java
+98
View File
@@ -0,0 +1,98 @@
package cpm.com.gskmtorange.adapter;
import android.content.ClipData;
import android.os.Build;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
import java.util.List;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.listener.DragListener;
import cpm.com.gskmtorange.listener.Listener;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
public class ListAdapter extends RecyclerView.Adapter<ListAdapter.ListViewHolder>
implements View.OnTouchListener {
private List<NoCameraDataGetterSetter> list;
private Listener listener;
public ListAdapter(List<NoCameraDataGetterSetter> list, Listener listener) {
this.list = list;
this.listener = listener;
}
@Override
public ListViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(
parent.getContext()).inflate(R.layout.brand_item_top_item, parent, false);
return new ListViewHolder(view);
}
@Override
public void onBindViewHolder(ListViewHolder holder, int position) {
holder.text.setText(list.get(position).getSKUGROUP_NAME());
holder.linear_parent.setTag(position);
holder.linear_parent.setOnTouchListener(this);
holder.linear_parent.setOnDragListener(new DragListener(listener));
}
@Override
public int getItemCount() {
return list.size();
}
@Override
public boolean onTouch(View v, MotionEvent event) {
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
ClipData data = ClipData.newPlainText("", "");
View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(v);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
v.startDragAndDrop(data, shadowBuilder, v, 0);
} else {
v.startDrag(data, shadowBuilder, v, 0);
}
return true;
}
return false;
}
public List<NoCameraDataGetterSetter> getList() {
return list;
}
void updateList(List<NoCameraDataGetterSetter> list) {
this.list = list;
}
public DragListener getDragInstance() {
if (listener != null) {
return new DragListener(listener);
} else {
Log.e("ListAdapter", "Listener wasn't initialized!");
return null;
}
}
class ListViewHolder extends RecyclerView.ViewHolder {
TextView text;
LinearLayout linear_parent;
ListViewHolder(View itemView) {
super(itemView);
text = (TextView) itemView.findViewById(R.id.tv_brand);
linear_parent = (LinearLayout) itemView.findViewById(R.id.linear_parent);
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/MyAdapter.java
+114
View File
@@ -0,0 +1,114 @@
package cpm.com.gskmtorange.adapter;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
import java.util.Collections;
import java.util.List;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.listener.DragListener;
import cpm.com.gskmtorange.listener.Listener;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
/**
* Created by yadavendras on 17-10-2017.
*/
public class MyAdapter extends RecyclerView.Adapter<MyAdapter.MyViewHolder> {
private LayoutInflater inflator;
List<NoCameraDataGetterSetter> data = Collections.emptyList();
private Listener listener;
RecyclerView rec;
public MyAdapter(Context context, List<NoCameraDataGetterSetter> data, Listener listener, RecyclerView rec) {
inflator = LayoutInflater.from(context);
this.data = data;
this.listener = listener;
this.rec = rec;
}
@Override
public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = inflator.inflate(R.layout.brand_item, parent, false);
MyAdapter.MyViewHolder holder = new MyAdapter.MyViewHolder(view);
return holder;
}
@Override
public void onBindViewHolder(MyViewHolder holder, final int position) {
final NoCameraDataGetterSetter current = data.get(position);
final String name = current.getSKUGROUP_NAME();
holder.name.setText(name);
holder.tv_facing.setText(current.getFacing()+"");
holder.linear_parent.setTag(position);
//holder.linear_parent.getLayoutParams().width = 100;
//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() {
if (listener != null) {
return new DragListener(listener);
} else {
Log.e("ListAdapter", "Listener wasn't initialized!");
return null;
}
}
@Override
public int getItemCount() {
return data.size();
}
public List<NoCameraDataGetterSetter> getList() {
return data;
}
public void updateList(List<NoCameraDataGetterSetter> list) {
this.data = list;
}
class MyViewHolder extends RecyclerView.ViewHolder {
TextView name;
TextView tv_facing;
LinearLayout linear_parent;
public MyViewHolder(View itemView) {
super(itemView);
name = (TextView) itemView.findViewById(R.id.tv_brand);
tv_facing = (TextView) itemView.findViewById(R.id.tv_facing);
linear_parent = (LinearLayout) itemView.findViewById(R.id.linear_parent);
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java
+2 -45
View File
@@ -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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonFunctions.java
+82
View File
@@ -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);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+30
View File
@@ -10,12 +10,16 @@ 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
public static final String KEY_USERNAME = "username";
public static final String KEY_PASSWORD = "password";
public static final String KEY_DATE = "date";
public static final String KEY_COUNTRY_ID = "COUNTRY_ID";
public static final String KEY_STOREVISITED_STATUS = "STOREVISITED_STATUS";
@@ -76,6 +80,7 @@ public class CommonString {
public static final String KEY_DISPLAY_ID = "DISPLAY_ID";
public static final String KEY_QUANTITY = "QUANTITY";
public static final String KEY_SKU_ID = "SKU_ID";
public static final String KEY_SKU_GROUP_ID = "SKU_GROUP_ID";
public static final String KEY_SKUNAME = "SKUNAME";
public static final String UNIQUE_KEY_ID = "UNIQUE_KEY_ID";
public static final String KEY_CATEGORY_ID = "CATEGORY_ID";
@@ -105,6 +110,11 @@ public class CommonString {
public static final String KEY_FALSE = "False";
public static final String KEY_CHANGED = "Changed";
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";
public static String URL = "http://gskme.parinaam.in/Gskwebservice.asmx";
@@ -211,6 +221,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
@@ -765,12 +776,16 @@ 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";
public static final String TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING = "Msl_Availability_Stock_Facing_Data";
public static final String TABLE_INSERT_NO_CAMERA_FACING_DATA = "NO_CAMERA_FACING_DATA";
public static final String CREATE_TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING = "CREATE TABLE IF NOT EXISTS "
+ TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING
+ "("
@@ -814,4 +829,19 @@ public class CommonString {
+ " VARCHAR"
+ ")";
public static final String KEY_ROW_NO = "ROW_NO";
public static final String KEY_COLUMN_NO = "COLUMN_NO";
public static final String KEY_FACING = "FACING";
public static final String CREATE_TABLE_INSERT_NO_CAMERA_FACING_DATA = "CREATE TABLE IF NOT EXISTS " + TABLE_INSERT_NO_CAMERA_FACING_DATA
+ " ("
+ KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+ KEY_STORE_ID + " INTEGER, "
+ KEY_CATEGORY_ID + " INTEGER,"
+ KEY_SUB_CATEGORY_ID + " INTEGER,"
+ KEY_SKU_GROUP_ID + " INTEGER,"
+ KEY_ROW_NO + " INTEGER,"
+ KEY_COLUMN_NO + " INTEGER,"
+ KEY_FACING + " INTEGER)";
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+20 -48
View File
@@ -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;
@@ -93,13 +94,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
ArrayList<SkuGetterSetter> empty_list = new ArrayList<>();
String _pathforcheck1, _pathforcheck2, _pathforcheck3, _path, str, msg;
private SharedPreferences preferences;
String store_id, date, intime, img_str1, img_str2, img_str3, togglevalue = "1", CATEGORY_ID, camera_allow, store_type_id, class_id, key_account_id;
String store_id, date, intime, img_str1="", img_str2="", img_str3="", togglevalue = "1", CATEGORY_ID, camera_allow, store_type_id, class_id, key_account_id;
ImageView img_cam, img_clicked;
Button btn_add, btn_close;
EditText Edt_txt;
MyAdaptorStock adapterData;
ListView listviewlay;
String errormsg, categoryName, categoryId;
String errormsg, categoryName, categoryId,country_id;
MyAdaptorAdditionalStock adapteradditional;
AddittionalGetterSetter adGt, newadd;
LinearLayout brandlayout, diaplylayout, cameralayout;
@@ -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,10 @@ 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, ""));
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
@@ -750,10 +756,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 +768,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 +780,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 +819,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");
@@ -1610,7 +1616,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
errormsg = getResources().getString(R.string.title_activity_select_dropdown);
} else if (camera_allow.equals("1")) {
if (imageu == null || imageu.equalsIgnoreCase("")) {
if (!country_id.equals("6") && (imageu == null || imageu.equalsIgnoreCase(""))) {
flag = false;
errormsg = getResources().getString(R.string.title_activity_take_image);
@@ -1667,44 +1673,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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
+107 -97
View File
@@ -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,21 +34,20 @@ 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;
ImageView im1, im2, im3, im4;
ListView listview;
String store_id, date, intime, img_str1, img_str2, img_str3, img_str4, togglevalue = "1", CATEGORY_ID, camera_allow, store_type_id, class_id, key_account_id;
String store_id, date, intime, img_str1="", img_str2="", img_str3="", img_str4="", togglevalue = "1", CATEGORY_ID, camera_allow, store_type_id, class_id, key_account_id;
private SharedPreferences preferences;
Uri outputFileUri;
String gallery_package = "";
@@ -59,12 +56,15 @@ public class CategoryPicture extends AppCompatActivity {
int Adapterposition;
ArrayList<CategoryPictureGetterSetter> listdat = new ArrayList<CategoryPictureGetterSetter>();
CategoryAdapter adapteradditional;
Toolbar toolbar;
ArrayList<CategoryImagesAllowed> 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,71 +96,61 @@ public class CategoryPicture extends AppCompatActivity {
adddata = db.getCategoryPictureData(store_id, categoryId);
categoryImagesAllowed = db.getCategoryPictureAllowedData(categoryId);
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);
}
if (adddata.size() != 0) {
for (int k = 0; k < adddata.size(); k++) {
String key_id = adddata.get(k).getKEY_ID();
String key_id = adddata.get(0).getKEY_ID();
listdat = db.getCategoryPictureListData(store_id, categoryId, key_id);
String image1 = adddata.get(k).getCategoryImage1();
String image2 = adddata.get(k).getCategoryImage2();
String image3 = adddata.get(k).getCategoryImage3();
String image4 = adddata.get(k).getCategoryImage4();
String image1 = adddata.get(0).getCategoryImage1();
String image2 = adddata.get(0).getCategoryImage2();
String image3 = adddata.get(0).getCategoryImage3();
String image4 = adddata.get(0).getCategoryImage4();
if (image1 != null) {
if (image1 != null && !image1.equals("")) {
im1.setBackgroundResource(R.mipmap.camera_green);
img_str1 = image1;
} else {
im1.setBackgroundResource(R.drawable.camera_orange_star_green);
}
if (image2 != null) {
if (image2 != null && !image2.equals("")) {
im2.setBackgroundResource(R.mipmap.camera_green);
img_str2 = image2;
} else {
im2.setBackgroundResource(R.mipmap.camera_orange);
}
if (image3 != null) {
if (image3 != null && !image3.equals("")) {
im3.setBackgroundResource(R.mipmap.camera_green);
img_str3 = image3;
} else {
im3.setBackgroundResource(R.mipmap.camera_orange);
}
if (image4 != null) {
if (image4 != null && !image4.equals("")) {
im4.setBackgroundResource(R.mipmap.camera_green);
img_str4 = image4;
} else {
im4.setBackgroundResource(R.mipmap.camera_orange);
}
}
} else {
listdat = db.getCategoryPicturedata(categoryId, key_account_id, store_type_id, class_id);
}
adapteradditional = new CategoryPicture.CategoryAdapter(CategoryPicture.this, listdat);
listview.setAdapter(adapteradditional);
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 +159,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 +197,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 +211,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 +224,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 +237,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 +261,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 +277,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 +475,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 +494,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();
}
@@ -568,11 +538,34 @@ public class CategoryPicture extends AppCompatActivity {
boolean validateData(CategoryPictureGetterSetter data, ArrayList<CategoryPictureGetterSetter> list) {
boolean flag = true;
String cameraImage1 = data.getCategoryImage1();
if(categoryImagesAllowed.get(0).isImg_cam1()){
if(data.getCategoryImage1().equals("")){
flag = false;
}
}
if(flag){
if(categoryImagesAllowed.get(0).isImg_cam2()){
if(data.getCategoryImage2().equals("")){
flag = false;
}
}
}
if (cameraImage1 == null) {
flag = false;
if(flag){
if(categoryImagesAllowed.get(0).isImg_cam3()){
if(data.getCategoryImage3().equals("")){
flag = false;
}
}
}
if(flag){
if(categoryImagesAllowed.get(0).isImg_cam4()){
if(data.getCategoryImage4().equals("")){
flag = false;
}
}
}
@@ -656,4 +649,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_orange);
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
+10 -42
View File
@@ -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");
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java
+486
View File
@@ -0,0 +1,486 @@
package cpm.com.gskmtorange.dailyentry;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
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.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
import java.util.ArrayList;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.adapter.ListAdapter;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SelectGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
public class CreateSelfActivity extends AppCompatActivity {
GSKOrangeDB db;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
String categoryName, categoryId;
private SharedPreferences preferences;
MSL_AvailabilityStockFacingGetterSetter brand_selected;
int number_of_rows=0;
RecyclerView rec_sub_category;
static int FROM_DIALOG = 0;
static int FROM_CLICK = 1;
ArrayList<MSL_AvailabilityStockFacingGetterSetter> added_sub_category_list;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_create_self);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
rec_sub_category = (RecyclerView) findViewById(R.id.rec_sub_category);
//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);
//Intent data
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
db = new GSKOrangeDB(CreateSelfActivity.this);
db.open();
keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
showSkuDialog();
}
});
}
@Override
protected void onResume() {
super.onResume();
number_of_rows=0;
brand_selected = null;
db.open();
added_sub_category_list = new ArrayList<>();
ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId);
for(int i=0; i<sub_category_list.size(); i++){
if(db.getNoCameraCategoryDataInserted(store_id, categoryId, sub_category_list.get(i).getSub_category_id()).size()>0){
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);
}
}
if(added_sub_category_list.size()>0){
rec_sub_category.setLayoutManager(new GridLayoutManager(this, 3));
SubcategoryAdapter skuAdapter = new SubcategoryAdapter(added_sub_category_list);
rec_sub_category.setAdapter(skuAdapter);
}
}
@Override
public void onBackPressed() {
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
public void showSkuDialog() {
final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId);
MSL_AvailabilityStockFacingGetterSetter brand = new MSL_AvailabilityStockFacingGetterSetter();
brand.setSub_category("select");
sub_category_list.add(0, brand);
// ArrayList<SkuMasterGetterSetter> skuMasterGetterSetterArrayList = db.getSkuT2PData("1", "1", "1",)
final Dialog dialog = new Dialog(CreateSelfActivity.this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
dialog.setContentView(R.layout.create_self_dialog_layout);
//pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
//dialog.setCancelable(false);
final Spinner spinner_sub_category = (Spinner) dialog.findViewById(R.id.spinner_sub_category);
final Spinner spinner_sku = (Spinner) dialog.findViewById(R.id.spinner_no_rows);
final Button btn_create = (Button) dialog.findViewById(R.id.btn_create);
Button btn_cancel = (Button) dialog.findViewById(R.id.btn_cancel);
btn_create.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if(brand_selected==null){
Snackbar.make(btn_create,"Please select Sub Category",Snackbar.LENGTH_SHORT).show();
}
else if(number_of_rows==0){
Snackbar.make(btn_create,"Please select number of rows",Snackbar.LENGTH_SHORT).show();
}
else {
boolean sub_category_already_filled = false;
if(added_sub_category_list.size()>0){
for(int k=0;k<added_sub_category_list.size();k++){
if(added_sub_category_list.get(k).getSub_category_id().equals(brand_selected.getSub_category_id())){
sub_category_already_filled = true;
break;
}
}
}
if(sub_category_already_filled){
Snackbar.make(btn_create,"Sub Category already added",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);
in.putExtra(CommonString.KEY_FROM, FROM_DIALOG);
startActivity(in);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
dialog.cancel();
}
}
}
});
btn_cancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dialog.cancel();
}
});
// Create custom adapter object ( see below CustomAdapter.java )
CustomAdapter adapter = new CustomAdapter(CreateSelfActivity.this, R.layout.custom_spinner_item, sub_category_list);
// Set adapter to spinner
spinner_sub_category.setAdapter(adapter);
final ArrayList<String> no_of_rows = new ArrayList<>();
no_of_rows.add(getString(R.string.select));
for(int i=1; i<9; i++){
no_of_rows.add(i + "");
}
CustomSpinnerAdapter skuadapter = new CustomSpinnerAdapter(CreateSelfActivity.this, R.layout.custom_spinner_item, no_of_rows);
spinner_sku.setAdapter(skuadapter);
spinner_sub_category.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
if (position != 0) {
brand_selected = sub_category_list.get(position);
}
else{
brand_selected = null;
}
}
@Override
public void onNothingSelected(AdapterView<?> parent) {
}
});
spinner_sku.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
if (position != 0) {
number_of_rows = Integer.parseInt(no_of_rows.get(position));
}
else {
number_of_rows = 0;
}
}
@Override
public void onNothingSelected(AdapterView<?> parent) {
}
});
dialog.setCancelable(false);
dialog.show();
}
public class CustomSpinnerAdapter extends ArrayAdapter<String> {
String tempValues = null;
LayoutInflater inflater;
private Activity activity;
private ArrayList data;
/*************
* CustomAdapter Constructor
*****************/
public CustomSpinnerAdapter(
CreateSelfActivity activitySpinner,
int textViewResourceId,
ArrayList objects
) {
super(activitySpinner, textViewResourceId, objects);
/********** Take passed values **********/
activity = activitySpinner;
data = objects;
/*********** Layout inflator to call external xml layout () **********************/
inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
}
@Override
public View getDropDownView(int position, View convertView, ViewGroup parent) {
return getCustomView(position, convertView, parent);
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
return getCustomView(position, convertView, parent);
}
// This funtion called for each row ( Called data.size() times )
public View getCustomView(int position, View convertView, ViewGroup parent) {
/********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
/***** Get each Model object from Arraylist ********/
tempValues = null;
tempValues = (String) data.get(position);
TextView label = (TextView) row.findViewById(R.id.tv_text);
if (position == 0) {
// Default selected Spinner item
label.setText(getString(R.string.select));
//sub.setText("");
} else {
// Set values for spinner each row
label.setText(tempValues);
}
return row;
}
}
public class CustomAdapter extends ArrayAdapter<String> {
MSL_AvailabilityStockFacingGetterSetter tempValues = null;
LayoutInflater inflater;
private Activity activity;
private ArrayList data;
/*************
* CustomAdapter Constructor
*****************/
public CustomAdapter(
CreateSelfActivity activitySpinner,
int textViewResourceId,
ArrayList objects
) {
super(activitySpinner, textViewResourceId, objects);
/********** Take passed values **********/
activity = activitySpinner;
data = objects;
/*********** Layout inflator to call external xml layout () **********************/
inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
}
@Override
public View getDropDownView(int position, View convertView, ViewGroup parent) {
return getCustomView(position, convertView, parent);
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
return getCustomView(position, convertView, parent);
}
// This funtion called for each row ( Called data.size() times )
public View getCustomView(int position, View convertView, ViewGroup parent) {
/********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
/***** Get each Model object from Arraylist ********/
tempValues = null;
tempValues = (MSL_AvailabilityStockFacingGetterSetter) data.get(position);
TextView label = (TextView) row.findViewById(R.id.tv_text);
if (position == 0) {
// Default selected Spinner item
label.setText(getString(R.string.select));
//sub.setText("");
} else {
// Set values for spinner each row
label.setText(tempValues.getSub_category());
}
return row;
}
}
@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) {
/* android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(CreateSelfActivity.this);
builder.setTitle("Parinaam");
builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
})
.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
}
});
android.app.AlertDialog alert = builder.create();
alert.show();*/
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
//noinspection SimplifiableIfStatement
if (id == R.id.action_settings) {
return true;
}
return super.onOptionsItemSelected(item);
}
//Adapte sub category
public class SubcategoryAdapter extends RecyclerView.Adapter<SubcategoryAdapter.ViewHolder> {
private ArrayList<MSL_AvailabilityStockFacingGetterSetter> list;
public SubcategoryAdapter(ArrayList<MSL_AvailabilityStockFacingGetterSetter> skuList) {
list = skuList;
}
@Override
public SubcategoryAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.sub_category_item_list, parent, false);
return new SubcategoryAdapter.ViewHolder(view);
}
@Override
public void onBindViewHolder(final SubcategoryAdapter.ViewHolder holder, final int 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
public int getItemCount() {
return list.size();
}
public class ViewHolder extends RecyclerView.ViewHolder {
public final View mView;
public final LinearLayout parentLayout;
public final TextView tv_sub_category;
public ViewHolder(View view) {
super(view);
mView = view;
tv_sub_category = (TextView) mView.findViewById(R.id.tv_sub_category);
parentLayout = (LinearLayout) mView.findViewById(R.id.linear_parent);
}
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java
+2 -37
View File
@@ -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<String, String, String>() {
@@ -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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java
+675
View File
@@ -0,0 +1,675 @@
package cpm.com.gskmtorange.dailyentry;
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;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.GridLayoutManager;
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;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
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, str;
String categoryName, categoryId;
int number_of_rows, FROM;
private SharedPreferences preferences;
LinearLayout linear_bottom_parent;
ArrayList<DynamycIdsGetterSetter> ids = new ArrayList<>();
ArrayList<NoCameraDataGetterSetter> top_list = new ArrayList<>();
RecyclerView rvTop;
MSL_AvailabilityStockFacingGetterSetter sub_category_data;
FloatingActionButton fab;
ScrollView scroll_no_camera;
int mScrollDistance = 0;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_no_camera);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
fab = (FloatingActionButton) findViewById(R.id.fab);
rvTop = (RecyclerView) findViewById(R.id.rvTop);
linear_bottom_parent = (LinearLayout) findViewById(R.id.lin_bottom_parent);
scroll_no_camera = (ScrollView) findViewById(R.id.scroll_no_camera);
//SCROLLVIEW
scroll_no_camera.getViewTreeObserver().addOnScrollChangedListener(new ViewTreeObserver.OnScrollChangedListener() {
@Override
public void onScrollChanged() {
mScrollDistance = scroll_no_camera.getScrollY(); // For ScrollView
// DO SOMETHING WITH THE SCROLL COORDINATES
}
});
//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);
db.open();
top_list = prepareTopList(categoryId);
rvTop.setLayoutManager(new GridLayoutManager(this, 3));
ListAdapter topListAdapter = new ListAdapter(top_list, this);
rvTop.setAdapter(topListAdapter);
//tvEmptyListTop.setOnDragListener(topListAdapter.getDragInstance());
rvTop.setOnDragListener(topListAdapter.getDragInstance());
if(FROM==1){
ArrayList<RowColumnGetterSetter> 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();
// 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);
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<BrandMasterGetterSetter> bottomList = new ArrayList<>();
List<NoCameraDataGetterSetter> 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<BrandMasterGetterSetter> bottomList = new ArrayList<>();
/* bottomList.add("C");
bottomList.add("D");*/
/*setEmptyListBottom(true);
ListAdapter bottomListAdapter = new ListAdapter(bottomList, this);
rvBottom.setAdapter(bottomListAdapter);*/
List<NoCameraDataGetterSetter> brands = new ArrayList<>();
MyAdapter adapter = new MyAdapter(getApplicationContext(), brands, this, rec_bottom);
rec_bottom.setAdapter(adapter);
tv.setOnDragListener(adapter.getDragInstance());
rec_bottom.setOnDragListener(adapter.getDragInstance());
}
}
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
boolean flag_all_rows_filled = true;
HashMap<Integer, List<NoCameraDataGetterSetter>> hashMapRowData = new HashMap<>();
for(int i=0; i < number_of_rows;i++){
int rec_id = ids.get(i).getRecycler_id();
RecyclerView target = (RecyclerView) findViewById(rec_id);
MyAdapter adapterMYTarget = (MyAdapter) target.getAdapter();
List<NoCameraDataGetterSetter> customListMyTarget = adapterMYTarget.getList();
if(customListMyTarget.size()==0){
flag_all_rows_filled = false;
break;
}
else{
hashMapRowData.put(i+1, customListMyTarget);
}
}
if(flag_all_rows_filled){
db.open();
db.InsertNoCameraAddedData(store_id, categoryId, sub_category_data.getSub_category_id(), number_of_rows, hashMapRowData);
finish();
}
else {
Snackbar.make(linear_bottom_parent,R.string.please_add_subgroup_facing,Snackbar.LENGTH_SHORT).show();
}
}
});
}
public ArrayList<NoCameraDataGetterSetter> prepareTopList(String category_id) {
return db.getSkuGroupMasterData(category_id, sub_category_data.getSub_category_id());
}
@Override
public void setEmptyListBottom(boolean visibility, int tv, RecyclerView rv) {
((TextView) findViewById(tv)).setVisibility(visibility ? View.VISIBLE : View.GONE);
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<NoCameraDataGetterSetter> 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<NoCameraDataGetterSetter> 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) {
int rv_id = 0;
if (v instanceof TextView) {
for (int i = 0; i < ids.size(); i++) {
if (ids.get(i).getTextview_id() == view_id) {
rv_id = ids.get(i).getRecycler_id();
}
}
RecyclerView target = (RecyclerView) v.getRootView().findViewById(rv_id);
((TextView) findViewById(view_id)).setVisibility(false ? View.VISIBLE : View.GONE);
target.setVisibility(false ? View.GONE : View.VISIBLE);
} else {
rv_id = view_id;
}
RecyclerView target;
target = (RecyclerView) v.getRootView().findViewById(rv_id);
MyAdapter adapterMYTarget = (MyAdapter) target.getAdapter();
List<NoCameraDataGetterSetter> customListMyTarget = adapterMYTarget.getList();
showAddFacingDialog(adapterMYTarget, customListMyTarget, parent_item);
}
@Override
public void smoothScrollToRow(View v, DragEvent event) {
//no action necessary
int y = Math.round(v.getY())+Math.round(event.getY());
int translatedY = y - mScrollDistance;
//Log.i("translated",""+translatedY+" "+ mScrollDistance+" "+y);
int threshold =50 ;
// make a scrolling up due the y has passed the threshold
/* if (translatedY < 200) {
// make a scroll up by 30 px
scroll_no_camera.smoothScrollBy(0, -15);
}
// make a autoscrolling down due y has passed the 500 px border
if (translatedY + threshold > 500) {
// make a scroll down by 30 px
scroll_no_camera.smoothScrollBy(0, 15);
}*/
}
@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<NoCameraDataGetterSetter> customListMyTarget, final NoCameraDataGetterSetter parent_item) {
// ArrayList<SkuMasterGetterSetter> skuMasterGetterSetterArrayList = db.getSkuT2PData("1", "1", "1",)
final Dialog dialog = new Dialog(NoCameraActivity.this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
dialog.setContentView(R.layout.add_facing_custom_dialog);
//pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
//dialog.setCancelable(false);
final EditText et_facing = (EditText) dialog.findViewById(R.id.et_facing);
final Button btn_ok = (Button) dialog.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);
parent_item.setFacing(facing_int);
NoCameraDataGetterSetter item = new NoCameraDataGetterSetter();
item.setSKUGROUP_ID(parent_item.getSKUGROUP_ID());
item.setSKUGROUP_NAME(parent_item.getSKUGROUP_NAME());
item.setFacing(facing_int);
customListMyTarget.add(item);
adapterMYTarget.updateList(customListMyTarget);
adapterMYTarget.notifyDataSetChanged();
dialog.cancel();
}
}
});
//dialog.setCancelable(false);
dialog.show();
}
@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 == 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<MAPPING_PLANOGRAM_DataGetterSetter> 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 = "<html><head></head><body><img src=\"" + imagePath + "\"></body></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);
builder.setTitle("Parinaam");
builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
})
.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
}
});
android.app.AlertDialog alert = builder.create();
alert.show();
}
//noinspection SimplifiableIfStatement
if (id == R.id.action_settings) {
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
public void onBackPressed() {
// super.onBackPressed();
android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(NoCameraActivity.this);
builder.setTitle("Parinaam");
builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
})
.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
}
});
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);
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+8 -45
View File
@@ -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, ""));
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PlanogramPDFActivity.java
+446
View File
@@ -0,0 +1,446 @@
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.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.LinearLayout;
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 java.util.Collections;
import java.util.List;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.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;
MappingPlanogramCountrywiseGetterSetter document;
MyRecyclerAdapter adapter;
RecyclerView rec;
String Path = Environment.getExternalStorageDirectory().toString() + "/Planogram_Documents/";
@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);
rec = (RecyclerView) findViewById(R.id.rec);
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<Void, Data, String> {
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 = "";
boolean flag = true;
// 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();
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();
for(int i = 0; i<document.getFILE_PATH().size();i++){
flag = downloadFile(document.getFILE_PATH().get(i), document.getPLANOGRAM_URL().get(i), folder);
if(!flag)
//return CommonString.KEY_SUCCESS+ ":"+ folder.getAbsolutePath()+"/"+document.getPLANOGRAM_URL().get(0);
return getString(R.string.Download_pdf_Error);
}
}
/* db.open();
db.InsertMappingCountrywisePlanogram(document);*/
}
publishProgress(data);
} catch (XmlPullParserException e) {
e.printStackTrace();
resultHttp = getString(R.string.nonetwork);
flag = false;
} catch (SoapFault soapFault) {
soapFault.printStackTrace();
resultHttp = getString(R.string.nonetwork);
flag = false;
} catch (IOException e) {
e.printStackTrace();
resultHttp = getString(R.string.nonetwork);
flag = false;
}
catch ( Exception e){
resultHttp = getString(R.string.nonetwork);
flag = false;
}
if(flag)
return CommonString.KEY_SUCCESS;
else
return resultHttp;
}
@Override
protected void onPostExecute(String result) {
super.onPostExecute(result);
dialog.cancel();
if (result.contains(CommonString.KEY_SUCCESS)) {
if(document.getPLANOGRAM_URL().size()>0){
adapter = new MyRecyclerAdapter(getApplicationContext(), document);
rec.setAdapter(adapter);
rec.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
}
} else {
Snackbar.make(fab, result, 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;
}
class MyRecyclerAdapter extends RecyclerView.Adapter<MyRecyclerAdapter.MyViewHolder> {
private LayoutInflater inflator;
MappingPlanogramCountrywiseGetterSetter data = new MappingPlanogramCountrywiseGetterSetter();
public MyRecyclerAdapter(Context context, MappingPlanogramCountrywiseGetterSetter data) {
inflator = LayoutInflater.from(context);
this.data = data;
}
@Override
public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = inflator.inflate(R.layout.pdf_planogram_item, parent, false);
MyRecyclerAdapter.MyViewHolder holder = new MyRecyclerAdapter.MyViewHolder(view);
return holder;
}
@Override
public void onBindViewHolder(MyViewHolder holder, final int position) {
//final MappingPlanogramCountrywiseGetterSetter current = data.get(position);
final String name = data.getPLANOGRAM_URL().get(position);
holder.name.setText(name);
//holder.detail.setText(current.getDocument_descriiption().get(0));
holder.parent_layout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String file_path = Path + name;
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();
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
});
}
@Override
public int getItemCount() {
return document.getFILE_PATH().size();
}
class MyViewHolder extends RecyclerView.ViewHolder {
TextView name, detail;
LinearLayout parent_layout;
public MyViewHolder(View itemView) {
super(itemView);
name = (TextView) itemView.findViewById(R.id.tv_name);
detail = (TextView) itemView.findViewById(R.id.tv_details);
parent_layout = (LinearLayout) itemView.findViewById(R.id.layout_parent);
}
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java
+6 -40
View File
@@ -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);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java
+4 -37
View File
@@ -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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java
+770
View File
@@ -0,0 +1,770 @@
package cpm.com.gskmtorange.dailyentry;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.graphics.Typeface;
import android.os.Bundle;
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.CardView;
import android.support.v7.widget.Toolbar;
import android.text.InputFilter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
import android.widget.AbsListView;
import android.widget.BaseExpandableListAdapter;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.ExpandableListView;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.ToggleButton;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
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.gsk_dailyentry.MSL_Availability_StockFacingActivity;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
public class StockDataActivity extends AppCompatActivity {
GSKOrangeDB db;
String categoryName, categoryId, storeId, Error_Message = "";
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
boolean isDialogOpen = true;
private SharedPreferences preferences;
int scrollPosition = 0;
ExpandableListView expandableListView;
ExpandableListAdapter adapter;
ArrayList<MSL_AvailabilityStockFacingGetterSetter> headerDataList;
ArrayList<MSL_AvailabilityStockFacingGetterSetter> childDataList;
List<MSL_AvailabilityStockFacingGetterSetter> hashMapListHeaderData;
HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> hashMapListChildData;
List<Integer> checkHeaderArray = new ArrayList<>();
boolean checkflag = true;
FloatingActionButton fab;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_stock_data);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
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);
username = preferences.getString(CommonString.KEY_USERNAME, null);
intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
db = new GSKOrangeDB(this);
db.open();
//Intent data
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
//txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability));
toolbar.setTitle(getResources().getString(R.string.title_activity_stock_data));
fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
expandableListView.clearFocus();
if (validateData(hashMapListHeaderData, hashMapListChildData)) {
AlertDialog.Builder builder = new AlertDialog.Builder(StockDataActivity.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();
if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) {
db.updateMSL_Availability_StockFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
Snackbar.make(expandableListView, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
} else {
db.InsertMSL_Availability_StockFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
Snackbar.make(expandableListView, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
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();
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(StockDataActivity.this);
builder.setMessage(Error_Message)
.setCancelable(false)
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
expandableListView.smoothScrollToPosition(scrollPosition);
if (!expandableListView.isGroupExpanded(scrollPosition)) {
expandableListView.expandGroup(scrollPosition);
}
dialog.dismiss();
}
});
AlertDialog alert = builder.create();
alert.show();
}
}
});
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) {
fab.setVisibility(View.VISIBLE);
} else if (lastItem == totalItemCount) {
fab.setVisibility(View.INVISIBLE);
} else {
fab.setVisibility(View.VISIBLE);
}
}
@Override
public void onScrollStateChanged(AbsListView arg0, int arg1) {
InputMethodManager inputManager = (InputMethodManager) getApplicationContext()
.getSystemService(Context.INPUT_METHOD_SERVICE);
if (getCurrentFocus() != null) {
inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
getCurrentFocus().clearFocus();
}
expandableListView.invalidateViews();
}
});
// Listview Group click listener
expandableListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
@Override
public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
return false;
}
});
// Listview Group expanded listener
expandableListView.setOnGroupExpandListener(new ExpandableListView.OnGroupExpandListener() {
@Override
public void onGroupExpand(int groupPosition) {
InputMethodManager inputManager = (InputMethodManager) getApplicationContext()
.getSystemService(Context.INPUT_METHOD_SERVICE);
if (getWindow().getCurrentFocus() != null) {
inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
getCurrentFocus().clearFocus();
}
}
});
// Listview Group collasped listener
expandableListView.setOnGroupCollapseListener(new ExpandableListView.OnGroupCollapseListener() {
@Override
public void onGroupCollapse(int groupPosition) {
InputMethodManager inputManager = (InputMethodManager) getApplicationContext()
.getSystemService(Context.INPUT_METHOD_SERVICE);
if (getWindow().getCurrentFocus() != null) {
inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
getCurrentFocus().clearFocus();
}
}
});
// Listview on child click listener
expandableListView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
@Override
public boolean onChildClick(ExpandableListView parent, View v, int groupPosition,
int childPosition, long id) {
return false;
}
});
}
@Override
protected void onResume() {
super.onResume();
prepareList();
}
private void prepareList() {
try {
hashMapListHeaderData = new ArrayList<>();
hashMapListChildData = new HashMap<>();
//Header
headerDataList = db.getStockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id);
if (headerDataList.size() > 0) {
for (int i = 0; i < headerDataList.size(); i++) {
hashMapListHeaderData.add(headerDataList.get(i));
//childDataList = new ArrayList<>();
childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
if (!(childDataList.size() > 0)) {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id);
}
hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
}
}
adapter = new ExpandableListAdapter(this, hashMapListHeaderData, hashMapListChildData);
expandableListView.setAdapter(adapter);
} catch (Exception e) {
e.printStackTrace();
}
}
public class ExpandableListAdapter extends BaseExpandableListAdapter {
private Context _context;
private List<MSL_AvailabilityStockFacingGetterSetter> _listDataHeader;
private HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> _listDataChild;
public ExpandableListAdapter(Context context, List<MSL_AvailabilityStockFacingGetterSetter> listDataHeader,
HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> listChildData) {
this._context = context;
this._listDataHeader = listDataHeader;
this._listDataChild = listChildData;
}
@Override
public Object getGroup(int groupPosition) {
return this._listDataHeader.get(groupPosition);
}
@Override
public int getGroupCount() {
return this._listDataHeader.size();
}
@Override
public long getGroupId(int groupPosition) {
return groupPosition;
}
@Override
public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
MSL_AvailabilityStockFacingGetterSetter headerTitle = (MSL_AvailabilityStockFacingGetterSetter) getGroup(groupPosition);
if (convertView == null) {
LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
convertView = infalInflater.inflate(R.layout.item_msl_availability_stock_facing_header, null, false);
}
TextView txt_categoryHeader = (TextView) convertView.findViewById(R.id.txt_categoryHeader);
RelativeLayout rel_header = (RelativeLayout) convertView.findViewById(R.id.rel_categoryHeader);
ImageView img_camera = (ImageView) convertView.findViewById(R.id.img_camera);
CardView card_view = (CardView) convertView.findViewById(R.id.card_view);
txt_categoryHeader.setTypeface(null, Typeface.BOLD);
if (headerTitle.getCompany_id().equals("1")) {
txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
} else {
txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
}
txt_categoryHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
if (!checkflag) {
if (checkHeaderArray.contains(groupPosition)) {
card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
} else {
card_view.setCardBackgroundColor(getResources().getColor(R.color.grey_background));
}
}
//empty check color change
/*if (headerTitle.getCompany_id().equals("1")) {
if (!checkflag) {
if (checkHeaderArray.contains(groupPosition)) {
//card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
} else {
txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
}
}
} else {
if (!checkflag) {
if (checkHeaderArray.contains(groupPosition)) {
txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
} else {
txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
}
}
}*/
return convertView;
}
@Override
public Object getChild(int groupPosition, int childPosititon) {
return this._listDataChild.get(this._listDataHeader.get(groupPosition)).get(childPosititon);
}
@Override
public int getChildrenCount(int groupPosition) {
return this._listDataChild.get(this._listDataHeader.get(groupPosition)).size();
}
@Override
public long getChildId(int groupPosition, int childPosition) {
return childPosition;
}
@Override
public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
View convertView, ViewGroup parent) {
final MSL_AvailabilityStockFacingGetterSetter childData =
(MSL_AvailabilityStockFacingGetterSetter) getChild(groupPosition, childPosition);
ViewHolder holder = null;
if (convertView == null) {
LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
convertView = infalInflater.inflate(R.layout.stock_facing_child, null, false);
holder = new ViewHolder();
holder.cardView = (CardView) convertView.findViewById(R.id.card_view);
holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category);
holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName);
//holder.txt_mbq = (TextView) convertView.findViewById(R.id.txt_mbq);
//holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available)
holder.facing = (EditText) convertView.findViewById(R.id.ed_facing);
//holder.facing.setFilters(new InputFilter[]{new DecimalDigitsInputFilter(6, 1)});
holder.stock = (EditText) convertView.findViewById(R.id.ed_stock);
holder.stock_view = convertView.findViewById(R.id.stock_view);
convertView.setTag(holder);
} else {
holder = (ViewHolder) convertView.getTag();
}
holder.txt_skuName.setText(childData.getSku());
//holder.txt_mbq.setText(childData.getMbq());
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
/* holder.txt_mbq.setVisibility(View.VISIBLE);
holder.toggle_available.setVisibility(View.VISIBLE);
holder.facing.setVisibility(View.VISIBLE);
if (childData.getToggleValue().equals("1")) {
holder.stock.setVisibility(View.GONE);
holder.stock_view.setVisibility(View.GONE);
} else {
holder.stock.setVisibility(View.VISIBLE);
holder.stock_view.setVisibility(View.VISIBLE);
}*/
} else {
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);*/
/* holder.stock.setVisibility(View.GONE);
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 {
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);
holder.stock.setVisibility(View.GONE);*//*
}*/
/* holder.toggle_available.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) {
childData.setToggleValue("1");
finalHolder.stock.setVisibility(View.GONE);
*//*childData.setStock("");
childData.setFacing("");*//*
} else {
*//* childData.setStock("");
childData.setFacing("");*//*
childData.setToggleValue("0");
finalHolder.stock.setVisibility(View.VISIBLE);
//If MBQ Value is 0
if (Integer.parseInt(childData.getMbq()) == 0) {
childData.setStock("0");
childData.setFacing("0");
}*//* else {
if (finalHolder.facing.getText().toString() != null && !finalHolder.facing.getText().toString().equals("")) {
if (Integer.parseInt(finalHolder.facing.getText().toString()) >= 0
&& Integer.parseInt(finalHolder.facing.getText().toString()) >= Integer.parseInt(childData.getMbq())) {
childData.setFacing("");
finalHolder.facing.setText("");
}
}
}*//*
}
expandableListView.clearFocus();
expandableListView.invalidateViews();
}
});
if (childData.getToggleValue().equals("1")) {
holder.toggle_available.setChecked(true);
finalHolder.stock.setVisibility(View.GONE);
childData.setStock("");
} else {
holder.toggle_available.setChecked(false);
finalHolder.stock.setVisibility(View.VISIBLE);
}
*/
final ViewHolder finalHolder = holder;
holder.stock.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {
final EditText caption = (EditText) v;
String edStock = caption.getText().toString().replaceFirst("^0+(?!$)", "");
/*if (!childData.getFacing().equals("") && Integer.parseInt(stock) >= 0 && Integer.parseInt(childData.getFacing()) < Integer.parseInt(stock)) {
}*/
if (!edStock.equals("")) {
String stock = edStock;
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(StockDataActivity.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();
}
});
AlertDialog alert = builder.create();
alert.show();
}
} else {
childData.setStock(stock);
}
} else {
childData.setStock("");
}
}
});
holder.stock.setText(childData.getStock());
final ViewHolder finalHolder1 = holder;
holder.facing.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {
final EditText caption = (EditText) v;
boolean isFill = false;
String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", "");
if (edFaceup != null && !edFaceup.equals("")) {
if (!childData.getStock().equals("")) {
if (Double.parseDouble(edFaceup) <= Integer.parseInt(childData.getStock())) {
isFill = true;
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(StockDataActivity.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();
}
});
AlertDialog alert = builder.create();
alert.show();
}
} else {
childData.setFacing(edFaceup);
}
if (isFill) {
childData.setFacing(edFaceup);
}
} else {
childData.setFacing("");
}
}
});
holder.facing.setText(childData.getFacing());
//empty check color change
if (!checkflag) {
boolean tempflag = false;
if (childData.getCompany_id().equals("1")) {
/* if (childData.getToggleValue().equals("0")) {
if (holder.stock.getText().toString().equals("")) {
holder.stock.setBackgroundColor(getResources().getColor(R.color.white));
holder.stock.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
holder.stock.setHint(getString(R.string.empty));
tempflag = true;
}
*//* if (holder.facing.getText().toString().equals("")) {
holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
holder.facing.setHint(getString(R.string.empty));
tempflag = true;
}*//*
} else {
if (childData.getMust_have().equals("1")) {
if (holder.facing.getText().toString().equals("")) {
holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
holder.facing.setHint(getString(R.string.empty));
*//* if (childData.getCompany_id().equals("1") && !childData.getMust_have().equals("0")) {
}else{
holder.facing.setHint("");
}*//*
tempflag = true;
}
} else {
holder.facing.setHint("");
}
}*/
if (tempflag) {
//holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
} else {
//holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
}
} else {
/* if (holder.facing.getText().toString().equals("")) {
holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
holder.facing.setHint(getString(R.string.empty));
tempflag = true;
}*/
if (tempflag) {
//holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
} else {
//holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
}
}
}
return convertView;
}
@Override
public boolean hasStableIds() {
return false;
}
@Override
public boolean isChildSelectable(int groupPosition, int childPosition) {
return true;
}
}
public class ViewHolder {
CardView cardView;
TextView txt_skuName;
LinearLayout lin_category;
EditText stock;
EditText facing;
View stock_view;
}
boolean validateData(List<MSL_AvailabilityStockFacingGetterSetter> listDataHeader,
HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> listDataChild) {
boolean flag = true;
checkHeaderArray.clear();
for (int i = 0; i < listDataHeader.size(); i++) {
for (int j = 0; j < listDataChild.get(listDataHeader.get(i)).size(); j++) {
MSL_AvailabilityStockFacingGetterSetter data = listDataChild.get(listDataHeader.get(i)).get(j);
String stock = data.getStock();
String faceup = data.getFacing();
if (faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
//expandableListView.smoothScrollToPosition(i);
scrollPosition = i;
flag = false;
Error_Message = getResources().getString(R.string.faceup_value);
break;
} else if (stock.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
//expandableListView.smoothScrollToPosition(i);
scrollPosition = i;
flag = false;
Error_Message = getResources().getString(R.string.stock_value);
break;
}
//Company_id
/* if (listDataChild.get(listDataHeader.get(i)).get(j).getCompany_id().equals("1")) {
if (data.getMust_have().equals("1")) {
*//*if (!camera_allow.equalsIgnoreCase("1")) {
if (!(planogramShelfHeaderDataList.size() > 0)) {
flag = false;
Error_Message = getResources().getString(R.string.stock_planogram_data_noCamera_data);
break;
}
}*//*
if (faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
//expandableListView.smoothScrollToPosition(i);
scrollPosition = i;
flag = false;
Error_Message = getResources().getString(R.string.faceup_value);
break;
} else {
if (data.getToggleValue().equals("0")) {
if (stock.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
//expandableListView.smoothScrollToPosition(i);
scrollPosition = i;
flag = false;
Error_Message = getResources().getString(R.string.stock_value);
break;
}
}
}
}
} else {
if (faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
//expandableListView.smoothScrollToPosition(i);
scrollPosition = i;
flag = false;
Error_Message = getResources().getString(R.string.faceup_value);
break;
}
}*/
}
if (flag == false) {
checkflag = false;
break;
} else {
checkflag = true;
}
}
adapter.notifyDataSetChanged();
return checkflag;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java
+6 -50
View File
@@ -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<Void, Void, String> {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+31 -52
View File
@@ -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);
@@ -444,7 +468,6 @@ public class StoreListActivity extends AppCompatActivity {
chkbtn = (Button) itemView.findViewById(R.id.chkout);
Cardbtn = (CardView) itemView.findViewById(R.id.card_view);
}
}
@@ -607,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();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
+9 -61
View File
@@ -14,7 +14,6 @@ import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.location.Geocoder;
import android.location.Location;
import android.location.LocationManager;
import android.net.Uri;
@@ -36,7 +35,6 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import com.google.android.gms.appindexing.AppIndex;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GooglePlayServicesUtil;
import com.google.android.gms.common.api.GoogleApiClient;
@@ -44,11 +42,6 @@ import com.google.android.gms.location.LocationListener;
import com.google.android.gms.location.LocationRequest;
import com.google.android.gms.location.LocationServices;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.MarkerOptions;
import org.ksoap2.SoapEnvelope;
import org.ksoap2.serialization.SoapObject;
import org.ksoap2.serialization.SoapSerializationEnvelope;
@@ -72,12 +65,11 @@ import java.util.Locale;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import cpm.com.gskmtorange.GeoTag.GeoTagActivity;
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;
import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity;
import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
@@ -129,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);
@@ -375,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();
@@ -536,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);
}
@@ -556,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
@@ -576,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) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+11 -53
View File
@@ -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;
@@ -77,7 +78,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
RecyclerView rec_t2p;
MyAdaptorStock adapterData;
String categoryName, categoryId;
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, country_id;
String str = CommonString.FILE_PATH,
path = "", path1 = "", path2 = "",
_pathforcheck = "", _pathforcheck1 = "", _pathforcheck2 = "",
@@ -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);
@@ -127,6 +128,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
rec_t2p = (RecyclerView) findViewById(R.id.rec_t2p);
@@ -177,7 +179,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
t2PGetterSetters = db.getT2pComplianceData(store_id, categoryId);
if (t2PGetterSetters.size() == 0) {
t2PGetterSetters = db.getT2PDefaultData(store_id);
t2PGetterSetters = db.getT2PDefaultData(store_id, categoryId);
} else {
for (int i = 0; i < t2PGetterSetters.size(); i++) {
@@ -217,7 +219,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 +516,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 +545,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 +574,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 +963,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");
@@ -1110,7 +1112,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
flag = false;
error_msg = getResources().getString(R.string.fill_gaps_data);
break;
} else if (camera_allow.equals("1") && (t2PGetterSetters.get(i).getImage().equals("") &&
} else if (!country_id.equals("6") && camera_allow.equals("1") && (t2PGetterSetters.get(i).getImage().equals("") &&
t2PGetterSetters.get(i).getImage1().equals("") &&
t2PGetterSetters.get(i).getImage2().equals(""))) {
flag = false;
@@ -1457,50 +1459,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);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java
+2 -44
View File
@@ -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<T2pBrand_Avaibility.ValueAdapter.MyViewHolder> {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+233 -48
View File
@@ -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,13 +55,16 @@ 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;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGroupMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
@@ -89,8 +93,11 @@ 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;
private ProgressBar pb;
@@ -112,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, "");
@@ -850,6 +857,109 @@ public class DownloadActivity extends AppCompatActivity {
publishProgress(data);
//SKUGROUP_MASTER
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "SKUGROUP_MASTER");
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();
skuGroupMasterGetterSetter = XMLHandlers.skuGroupMasterXMLHandler(xpp, eventType);
String table_skuGrpMaster = skuGroupMasterGetterSetter.getTable_SKUGROUP_MASTER();
if (table_skuGrpMaster != null) {
resultHttp = CommonString.KEY_SUCCESS;
TableBean.setSkugroupMaster(table_skuGrpMaster);
}
if (skuGroupMasterGetterSetter.getSUB_CATEGORY_ID().size() > 0) {
data.value = 97;
data.name = "SKUGROUP_MASTER " + getResources().getString(R.string.download_data);
}
}
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
@@ -858,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);
}
@@ -916,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);
}
@@ -967,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);
@@ -990,6 +1216,9 @@ public class DownloadActivity extends AppCompatActivity {
db.InsertSHELF_MASTER(shelfMasterGetterSetter);
db.InsertMappingSubCategoryImageAllow(mappingSubCategoryImageAllowGetterSetter);
db.InsertMappingCategoryImageAllow(mappingCategoryImageAllowGetterSetter);
// db.InsertMappingCountrywisePlanogram(mappingPlanogramCountrywiseGetterSetter);
db.InsertSkuGroupMaster(skuGroupMasterGetterSetter);
} catch (MalformedURLException e) {
@@ -1078,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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java
+3 -46
View File
@@ -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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java
+126 -1
View File
@@ -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() {
}
@@ -85,6 +106,7 @@ public class ServiceActivityFragment extends Fragment {
}
else{
showExportDialog();
//restoreBackup();
}
@@ -142,8 +164,35 @@ public class ServiceActivityFragment extends Fragment {
}
}
public void showExportDialog(){
public void restoreBackup(){
try {
File sd = Environment.getExternalStorageDirectory();
File data = Environment.getDataDirectory();
if (sd.canWrite()) {
String currentDBPath = "//data//cpm.com.gskmtorange//databases//" + GSKOrangeDB.DATABASE_NAME;
String backupDBPath = "GSKMT_ORANGE_Database_backup.dat";
File currentDB = new File(data, currentDBPath);
File backupDB = new File(sd, backupDBPath);
if (currentDB.exists()) {
FileChannel src = new FileInputStream(backupDB).getChannel();
FileChannel dst = new FileOutputStream(currentDB).getChannel();
dst.transferFrom(src, 0, src.size());
src.close();
dst.close();
Toast.makeText(getActivity(), "Database Restored successfully", Toast.LENGTH_SHORT).show();
}
}
} catch (Exception e) {
System.out.println(e.getMessage());
}
}
public void showExportDialog(){
String path;
AlertDialog.Builder builder1 = new AlertDialog.Builder(getActivity());
builder1.setMessage(R.string.Areyou_sure_take_backup)
.setCancelable(false)
@@ -187,6 +236,27 @@ public class ServiceActivityFragment extends Fragment {
dst.close();
}
}
//usk
// File dir = new File(CommonString.BACKUP_PATH);
File dir = new File(CommonString.BACKUP_PATH);
ArrayList<String> 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 +270,59 @@ public class ServiceActivityFragment extends Fragment {
AlertDialog alert1 = builder1.create();
alert1.show();
}
public ArrayList<String> getFileNames(File[] file) {
ArrayList<String> arrayFiles = new ArrayList<String>();
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<String> call = api.getUploadImage(body1);
call.enqueue(new Callback<String>() {
@Override
public void onResponse(Response<String> 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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
+3 -47
View File
@@ -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;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
+4 -47
View File
@@ -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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
+69 -64
View File
@@ -28,9 +28,12 @@ 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;
import cpm.com.gskmtorange.dailyentry.CreateSelfActivity;
import cpm.com.gskmtorange.dailyentry.StockDataActivity;
import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity;
import cpm.com.gskmtorange.xmlGetterSetter.DailyDataMenuGetterSetter;
@@ -42,7 +45,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
GSKOrangeDB db;
String categoryName = "", categoryId;
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, country_id;
private SharedPreferences preferences;
ArrayList<CategoryPictureGetterSetter> category_camera_list;
@@ -64,7 +67,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);
@@ -75,6 +78,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
//Intent data
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
@@ -102,24 +106,41 @@ 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<>();
DailyDataMenuGetterSetter data = new DailyDataMenuGetterSetter();
data = new DailyDataMenuGetterSetter();
data.setCategory_name(getResources().getString(R.string.daily_data_menu_msl_availability));
if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) {
data.setCategory_img(R.mipmap.msl_availability_done);
if(country_id.equals("6") && categoryId.equals("3")){
data = new DailyDataMenuGetterSetter();
data.setCategory_name(getResources().getString(R.string.daily_data_menu_stock_facing));
if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) {
data.setCategory_img(R.mipmap.msl_availability_done);
} else {
data.setCategory_img(R.mipmap.msl_availability);
}
} else {
data.setCategory_img(R.mipmap.msl_availability);
data.setCategory_img(R.mipmap.msl_availability_grey);
}
} else {
data.setCategory_img(R.mipmap.msl_availability_grey);
categoryList.add(data);
}
else {
data = new DailyDataMenuGetterSetter();
data.setCategory_name(getResources().getString(R.string.daily_data_menu_msl_availability));
if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) {
data.setCategory_img(R.mipmap.msl_availability_done);
} else {
data.setCategory_img(R.mipmap.msl_availability);
}
} else {
data.setCategory_img(R.mipmap.msl_availability_grey);
}
categoryList.add(data);
}
categoryList.add(data);
/*data.setCategory_name(getResources().getString(R.string.daily_data_menu_msl_availability));
@@ -194,20 +215,29 @@ public class DailyDataMenuActivity extends AppCompatActivity {
data.setCategory_name(getResources().getString(R.string.daily_data_menu_category_picture));
//category_camera_list = db.getCategoryPicturedata(categoryId, keyAccount_id, storeType_id, class_id);
if (camera_allow.equalsIgnoreCase("1")) {
//if (category_camera_list.size()>0) {
//if (category_camera_list.size()>0) {
if (db.isCategoryPictureData(store_id, categoryId)) {
data.setCategory_img(R.mipmap.picturecatogory_done);
} else {
data.setCategory_img(R.mipmap.picturecatogory);
}
} else {
// }
} /*else {
data.setCategory_img(R.mipmap.picturecatogory_grey);
}*/
}
else {
if (db.getNoCameraCategoryDataInserted(store_id, categoryId, null).size()>0) {
data.setCategory_img(R.mipmap.picturecatogory_done);
} else {
data.setCategory_img(R.mipmap.picturecatogory);
// }
}
}
categoryList.add(data);
/*data = new DailyDataMenuGetterSetter();
data.setCategory_name(getResources().getString(R.string.daily_data_menu_competition_tracking));
//data.setCategory_name("Competition Tracking");
@@ -308,18 +338,23 @@ public class DailyDataMenuActivity extends AppCompatActivity {
} else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_category_picture)))) {
if (camera_allow.equalsIgnoreCase("1")) {
holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
} else {
} /*else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
}*/
}else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
} else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
}else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_stock_facing))) {
if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
} else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
}
holder.lay_menu.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -371,8 +406,13 @@ public class DailyDataMenuActivity extends AppCompatActivity {
intent.putExtra("categoryId", categoryId);
startActivity(intent);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
} /*else {
}*/
} else {
Intent intent = new Intent(DailyDataMenuActivity.this, CreateSelfActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
intent.putExtra("categoryId", categoryId);
startActivity(intent);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
} else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
@@ -382,6 +422,14 @@ public class DailyDataMenuActivity extends AppCompatActivity {
startActivity(intent);
}
}else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_stock_facing))) {
if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
Intent intent = new Intent(DailyDataMenuActivity.this, StockDataActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
intent.putExtra("categoryId", categoryId);
startActivity(intent);
}
}
}
@@ -407,49 +455,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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
+4 -47
View File
@@ -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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
+168 -124
View File
@@ -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;
@@ -79,7 +80,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
GSKOrangeDB db;
String categoryName, categoryId, storeId, Error_Message = "";
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, country_id;
boolean isDialogOpen = true;
private SharedPreferences preferences;
int scrollPosition = 0;
@@ -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);
@@ -127,6 +128,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
//Intent data
categoryName = getIntent().getStringExtra("categoryName");
@@ -184,7 +186,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 +206,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 +229,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
getCurrentFocus().clearFocus();
}
//expandableListView.invalidateViews();
expandableListView.invalidateViews();
}
});
@@ -324,7 +329,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
dialog.setCancelable(false);
ArrayList<MAPPING_PLANOGRAM_DataGetterSetter> mappingPlanogramList = db.getMappingPlanogramData(categoryId);
ArrayList<MAPPING_PLANOGRAM_DataGetterSetter> 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 +449,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 +460,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 +471,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 +482,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);
@@ -487,7 +492,8 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
} else {*/
if (!camera_allow.equals("1")) {
findViewById(R.id.lin_camera).setVisibility(View.VISIBLE);
findViewById(R.id.lin_camera).setVisibility(View.GONE);
/* findViewById(R.id.lin_camera).setVisibility(View.VISIBLE);
findViewById(R.id.view_camera2).setVisibility(View.GONE);
findViewById(R.id.view_camera3).setVisibility(View.GONE);
@@ -518,7 +524,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
startActivityForResult(intent, 100);
}
});
});*/
} else {
findViewById(R.id.lin_camera).setVisibility(View.GONE);
}
@@ -545,7 +551,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() {
@@ -593,13 +599,13 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
//Company_id
if (listDataChild.get(listDataHeader.get(i)).get(j).getCompany_id().equals("1")) {
if (data.getMust_have().equals("1")) {
if (!camera_allow.equalsIgnoreCase("1")) {
/*if (!camera_allow.equalsIgnoreCase("1")) {
if (!(planogramShelfHeaderDataList.size() > 0)) {
flag = false;
Error_Message = getResources().getString(R.string.stock_planogram_data_noCamera_data);
break;
}
}
}*/
if (faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
@@ -818,7 +824,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);
@@ -832,9 +837,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);
@@ -842,6 +846,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 {
@@ -863,7 +882,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);
@@ -902,53 +921,74 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
@Override
public void onFocusChange(View v, boolean hasFocus) {
final EditText caption = (EditText) v;
String edStock = caption.getText().toString();
String edStock = caption.getText().toString().replaceFirst("^0+(?!$)", "");
/*if (!childData.getFacing().equals("") && Integer.parseInt(stock) >= 0 && Integer.parseInt(childData.getFacing()) < Integer.parseInt(stock)) {
}*/
if (!edStock.equals("")) {
String stock = edStock.replaceFirst("^0+(?!$)", "");
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 {
@@ -978,8 +1018,11 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
faceint = 5;
edFaceup = String.valueOf(num + faceint / 10.0);
finalHolder2.facing.setText(edFaceup);
}
}
/*Double faceup = Double.parseDouble(edFaceup);
DecimalFormat twoDForm = new DecimalFormat(".#");
faceup= Double.valueOf(twoDForm.format(faceup));*/
@@ -1005,73 +1048,118 @@ 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();
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 {
} else{
isFill = true;
/*if (!edFaceup.equals("")) {
String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
childData.setFacing(faceup);
} else {
childData.setFacing("");
}*/
}
/* //If toggle is yes then facing cannot be 0
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")
&& !edFaceup.equals("") && edFaceup.equals("0")) {
AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
builder.setMessage(getString(R.string.check_faceup_not_zero))
.setCancelable(false)
.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
finalHolder1.facing.setText("");
dialog.dismiss();
}
});
AlertDialog alert = builder.create();
alert.show();
} else {
isFill = true;
}*/
if (isFill) {
if (!edFaceup.equals("")) {
String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
String faceup = "";
if(edFaceup.equals("0")){
faceup = edFaceup;
}
else{
faceup = edFaceup.replaceFirst("^0+(?!$)", "");
//faceup = new DecimalFormat("##.#").format(Double.parseDouble(faceup));
}
// String str2 = PerfectDecimal(faceup, 3, 1);
childData.setFacing(faceup);
} else {
@@ -1179,50 +1267,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
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+11 -53
View File
@@ -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");
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java
+3 -45
View File
@@ -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<StockFacing_PlanogramTrackerDataGetterSetter> addSkuChildList;
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> 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, ""));
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+12 -54
View File
@@ -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<StockFacing_PlanogramTrackerDataGetterSetter> planogramSkuChildDataList;
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> 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<MAPPING_PLANOGRAM_DataGetterSetter> mappingPlanogramList = db.getMappingPlanogramData(categoryId);
ArrayList<MAPPING_PLANOGRAM_DataGetterSetter> 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;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
+3 -45
View File
@@ -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);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/DragListener.java
+77
View File
@@ -0,0 +1,77 @@
package cpm.com.gskmtorange.listener;
import android.support.v7.widget.RecyclerView;
import android.view.DragEvent;
import android.view.View;
import android.widget.TextView;
import java.util.ArrayList;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.adapter.ListAdapter;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
/**
* Created by yadavendras on 25-10-2017.
*/
public class DragListener implements View.OnDragListener {
private boolean isDropped = false;
private Listener listener;
public DragListener(Listener listener) {
this.listener = listener;
}
@Override
public boolean onDrag(View v, DragEvent event) {
View viewSource = (View) event.getLocalState();
int viewId = v.getId();
final int rvTop = R.id.rvTop;
switch (event.getAction()) {
case DragEvent.ACTION_DROP:
isDropped = true;
int positionTarget = -1;
if( v instanceof TextView || v instanceof RecyclerView){
if (viewSource != null) {
RecyclerView source = (RecyclerView) viewSource.getParent();
ListAdapter adapterSource = (ListAdapter) source.getAdapter();
int positionSource = (int) viewSource.getTag();
int sourceId = source.getId();
NoCameraDataGetterSetter parent_item = adapterSource.getList().get(positionSource);
if(viewId != rvTop){
listener.addNUpdateRow(v, viewId, parent_item);
}
}
}
break;
case DragEvent.ACTION_DRAG_LOCATION:
if(viewId == rvTop){
listener.smoothScrollToRow(v, event);
}
break;
}
if (!isDropped && event.getLocalState() != null) {
((View) event.getLocalState()).setVisibility(View.VISIBLE);
}
return true;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/Listener.java
+23
View File
@@ -0,0 +1,23 @@
package cpm.com.gskmtorange.listener;
import android.support.v7.widget.RecyclerView;
import android.view.DragEvent;
import android.view.View;
import android.widget.ScrollView;
import java.util.ArrayList;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
/**
* Created by yadavendras on 25-10-2017.
*/
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);
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/messgae/AlertMessage.java
+4
View File
@@ -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;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/retrofit/PostApi.java
+12
View File
@@ -0,0 +1,12 @@
package cpm.com.gskmtorange.retrofit;
/**
* Created by jeevanp on 19-05-2017.
*/
public interface PostApi {
/* @POST("Uploadimages")
Call<String> getUploadImage(@Body RequestBody reqesBody);*/
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/retrofit/PostApiForFile.java
+17
View File
@@ -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<String> getUploadImage(@Body RequestBody reqesBody);
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/retrofit/StringConverterFactory.java
+54
View File
@@ -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<String> get(Type type) {
Class<?> cls = (Class<?>) type;
if (String.class.isAssignableFrom(cls)) {
return new StringConverter();
}
return null;
}
}
class StringConverter implements Converter<String> {
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);
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+6 -47
View File
@@ -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);
@@ -245,7 +246,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
for (int i = 0; i < coverageList.size(); i++) {
storeData = db.getSpecificStoreData(date, coverageList.get(i).getStoreId());
storeData = db.getSpecificStoreData(coverageList.get(i).getVisitDate(), coverageList.get(i).getStoreId());
if (storeData.getSTORE_ID() != null) {
if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_Y) ||
@@ -1500,10 +1501,11 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
}*/
dialog.dismiss();
db.deleteAllTables();
if (result.contains(CommonString.KEY_SUCCESS)) {
//db.deleteAllTables();
showAlert(getString(R.string.menu_upload_data));
db.deleteAllTables();
//showAlert(getString(R.string.menu_upload_data));
} else {
showAlert(getString(R.string.error) + result.toString());
@@ -1514,52 +1516,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) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+59 -48
View File
@@ -45,11 +45,13 @@ 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;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
@@ -87,7 +89,7 @@ public class UploadActivity extends AppCompatActivity {
Object result = "";
Toolbar toolbar;
ArrayList<CategoryPictureGetterSetter> adddata = new ArrayList<CategoryPictureGetterSetter>();
ArrayList<CategoryPictureGetterSetter> listdat = new ArrayList<CategoryPictureGetterSetter>();
ArrayList<CategoryPictureGetterSetter> listdat = new ArrayList<>();
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> stockFacingPlanogramDataList;
ArrayList<Store_wise_camera_DataGetterSetter> storeWiseCameraDataGetterSetters;
@@ -102,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);
@@ -419,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) {
@@ -475,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) {
@@ -527,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) {
@@ -583,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) {
@@ -678,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) {
@@ -796,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) {
@@ -850,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) {
@@ -934,6 +943,51 @@ public class UploadActivity extends AppCompatActivity {
/*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}*/
}
else{
db.open();
ArrayList<NoCameraDataGetterSetter> nocamera_data_list = db.getNoCameraCategoryStoreWiseDataInserted(coverageList.get(i).getStoreId());
if(nocamera_data_list.size()>0){
String onXml_nodata="", No_camera_data="";
for(int n=0; n<nocamera_data_list.size(); n++){
onXml_nodata = "[NO_CAMERA_POG_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[CATEGORY_ID]" + nocamera_data_list.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
+ "[SUB_CATEGORY_ID]" + nocamera_data_list.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
+ "[SKU_GROUP_ID]" + nocamera_data_list.get(n).getSKUGROUP_ID() + "[/SKU_GROUP_ID]"
+ "[ROW_NO]" + nocamera_data_list.get(n).getRow_no() + "[/ROW_NO]"
+ "[COLUMN_NO]" + nocamera_data_list.get(n).getColumn_no() + "[/COLUMN_NO]"
+ "[FACING]" + nocamera_data_list.get(n).getFacing() + "[/FACING]"
+ "[/NO_CAMERA_POG_DATA]";
No_camera_data = No_camera_data + onXml_nodata;
}
final String sos_xml = "[DATA]" + No_camera_data + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "NO_CAMERA_POG");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
}
}
data.value = 60;
data.name = getString(R.string.additional_data_uploading);
@@ -1019,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) {
@@ -1511,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);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CategoryImagesAllowed.java
+42
View File
@@ -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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DynamycIdsGetterSetter.java
+27
View File
@@ -0,0 +1,27 @@
package cpm.com.gskmtorange.xmlGetterSetter;
/**
* Created by yadavendras on 25-10-2017.
*/
public class DynamycIdsGetterSetter {
int recycler_id = 0;
int textview_id = 0;
public int getRecycler_id() {
return recycler_id;
}
public void setRecycler_id(int recycler_id) {
this.recycler_id = recycler_id;
}
public int getTextview_id() {
return textview_id;
}
public void setTextview_id(int textview_id) {
this.textview_id = textview_id;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/LoginGetterSetter.java
+9 -1
View File
@@ -9,7 +9,7 @@ import java.util.ArrayList;
public class LoginGetterSetter implements Serializable{
String RIGHT_NAME, APP_VERSION, APP_PATH, CURRENTDATE;
String RIGHT_NAME, APP_VERSION, APP_PATH, CURRENTDATE,COUNTRY_ID;
ArrayList<String> CULTURE_ID = new ArrayList<>();
ArrayList<String> CULTURE_NAME = new ArrayList<>();
@@ -71,4 +71,12 @@ public class LoginGetterSetter implements Serializable{
public void setNOTICE_URL(String NOTICE_URL) {
this.NOTICE_URL.add(NOTICE_URL);
}
public String getCOUNTRY_ID() {
return COUNTRY_ID;
}
public void setCOUNTRY_ID(String COUNTRY_ID) {
this.COUNTRY_ID = COUNTRY_ID;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MSL_AvailabilityStockFacingGetterSetter.java
+4 -2
View File
@@ -1,12 +1,14 @@
package cpm.com.gskmtorange.xmlGetterSetter;
import java.io.Serializable;
/**
* Created by gagang on 23-12-2016.
*/
public class MSL_AvailabilityStockFacingGetterSetter {
public class MSL_AvailabilityStockFacingGetterSetter implements Serializable{
String sub_category_id, sub_category, brand_id, brand,
sku_id, sku, mrp, sku_sequence, toggleValue, mbq, category_id, facing, stock,company_id,must_have;
sku_id, sku, mrp, sku_sequence, toggleValue, mbq, category_id, facing="", stock,company_id,must_have;
public String getSub_category_id() {
return sub_category_id;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingCategoryImageAllowGetterSetter.java
+76
View File
@@ -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<String> COUNTRY_ID = new ArrayList<>();
ArrayList<String> CATEGORY_ID = new ArrayList<>();
ArrayList<String> IMAGE1_ALLOW = new ArrayList<>();
ArrayList<String> IMAGE2_ALLOW = new ArrayList<>();
ArrayList<String> IMAGE3_ALLOW = new ArrayList<>();
ArrayList<String> 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<String> getCOUNTRY_ID() {
return COUNTRY_ID;
}
public void setCOUNTRY_ID(String COUNTRY_ID) {
this.COUNTRY_ID.add(COUNTRY_ID);
}
public ArrayList<String> getCATEGORY_ID() {
return CATEGORY_ID;
}
public void setCATEGORY_ID(String CATEGORY_ID) {
this.CATEGORY_ID.add(CATEGORY_ID);
}
public ArrayList<String> getIMAGE1_ALLOW() {
return IMAGE1_ALLOW;
}
public void setIMAGE1_ALLOW(String IMAGE1_ALLOW) {
this.IMAGE1_ALLOW.add(IMAGE1_ALLOW);
}
public ArrayList<String> getIMAGE2_ALLOW() {
return IMAGE2_ALLOW;
}
public void setIMAGE2_ALLOW(String IMAGE2_ALLOW) {
this.IMAGE2_ALLOW.add(IMAGE2_ALLOW);
}
public ArrayList<String> getIMAGE3_ALLOW() {
return IMAGE3_ALLOW;
}
public void setIMAGE3_ALLOW(String IMAGE3_ALLOW) {
this.IMAGE3_ALLOW.add(IMAGE3_ALLOW);
}
public ArrayList<String> getIMAGE4_ALLOW() {
return IMAGE4_ALLOW;
}
public void setIMAGE4_ALLOW(String IMAGE4_ALLOW) {
this.IMAGE4_ALLOW.add(IMAGE4_ALLOW);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingPlanogramCountrywiseGetterSetter.java
+48
View File
@@ -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<String> COUNTRY_ID = new ArrayList<>();
ArrayList<String> FILE_PATH = new ArrayList<>();
ArrayList<String> 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<String> getCOUNTRY_ID() {
return COUNTRY_ID;
}
public void setCOUNTRY_ID(String COUNTRY_ID) {
this.COUNTRY_ID.add(COUNTRY_ID);
}
public ArrayList<String> getFILE_PATH() {
return FILE_PATH;
}
public void setFILE_PATH(String FILE_PATH) {
this.FILE_PATH.add(FILE_PATH);
}
public ArrayList<String> getPLANOGRAM_URL() {
return PLANOGRAM_URL;
}
public void setPLANOGRAM_URL(String PLANOGRAM_URL) {
this.PLANOGRAM_URL.add(PLANOGRAM_URL);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NoCameraDataGetterSetter.java
+80
View File
@@ -0,0 +1,80 @@
package cpm.com.gskmtorange.xmlGetterSetter;
/**
* Created by yadavendras on 26-10-2017.
*/
public class NoCameraDataGetterSetter {
String SKUGROUP_ID;
String SKUGROUP_NAME;
public String getSKUGROUP_ID() {
return SKUGROUP_ID;
}
public void setSKUGROUP_ID(String SKUGROUP_ID) {
this.SKUGROUP_ID = SKUGROUP_ID;
}
public String getSKUGROUP_NAME() {
return SKUGROUP_NAME;
}
public void setSKUGROUP_NAME(String SKUGROUP_NAME) {
this.SKUGROUP_NAME = SKUGROUP_NAME;
}
String CATEGORY_ID;
String SUB_CATEGORY_ID;
String SUB_CATEGORY;
int facing, row_no, column_no;
public int getFacing() {
return facing;
}
public void setFacing(int facing) {
this.facing = facing;
}
public int getRow_no() {
return row_no;
}
public void setRow_no(int row_no) {
this.row_no = row_no;
}
public int getColumn_no() {
return column_no;
}
public void setColumn_no(int column_no) {
this.column_no = column_no;
}
public String getCATEGORY_ID() {
return CATEGORY_ID;
}
public void setCATEGORY_ID(String CATEGORY_ID) {
this.CATEGORY_ID = CATEGORY_ID;
}
public String getSUB_CATEGORY_ID() {
return SUB_CATEGORY_ID;
}
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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/RowColumnGetterSetter.java
+28
View File
@@ -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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SkuGroupMasterGetterSetter.java
+68
View File
@@ -0,0 +1,68 @@
package cpm.com.gskmtorange.xmlGetterSetter;
import java.util.ArrayList;
/**
* Created by yadavendras on 27-10-2017.
*/
public class SkuGroupMasterGetterSetter {
public String getTable_SKUGROUP_MASTER() {
return table_SKUGROUP_MASTER;
}
public void setTable_SKUGROUP_MASTER(String table_SKUGROUP_MASTER) {
this.table_SKUGROUP_MASTER = table_SKUGROUP_MASTER;
}
String table_SKUGROUP_MASTER;
ArrayList<String> SKUGROUP_ID = new ArrayList<>();
ArrayList<String> SKUGROUP_NAME = new ArrayList<>();
public ArrayList<String> getSKUGROUP_ID() {
return SKUGROUP_ID;
}
public void setSKUGROUP_ID(String SKUGROUP_ID) {
this.SKUGROUP_ID.add(SKUGROUP_ID);
}
public ArrayList<String> getSKUGROUP_NAME() {
return SKUGROUP_NAME;
}
public void setSKUGROUP_NAME(String SKUGROUP_NAME) {
this.SKUGROUP_NAME.add(SKUGROUP_NAME);
}
public ArrayList<String> getSUB_CATEGORY_ID() {
return SUB_CATEGORY_ID;
}
public void setSUB_CATEGORY_ID(String SUB_CATEGORY_ID) {
this.SUB_CATEGORY_ID.add(SUB_CATEGORY_ID);
}
public ArrayList<String> getCATEGORY_ID() {
return CATEGORY_ID;
}
public void setCATEGORY_ID(String CATEGORY_ID) {
this.CATEGORY_ID.add(CATEGORY_ID);
}
public ArrayList<String> getSKUGROUP_SEQUENCE() {
return SKUGROUP_SEQUENCE;
}
public void setSKUGROUP_SEQUENCE(String SKUGROUP_SEQUENCE) {
this.SKUGROUP_SEQUENCE.add(SKUGROUP_SEQUENCE);
}
ArrayList<String> SUB_CATEGORY_ID = new ArrayList<>();
ArrayList<String> CATEGORY_ID = new ArrayList<>();
ArrayList<String> SKUGROUP_SEQUENCE = new ArrayList<>();
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
+29
View File
@@ -26,6 +26,11 @@ public class TableBean {
public static String MAPPING_SOS_TARGET;
public static String SHELF_MASTER;
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() {
@@ -188,4 +193,28 @@ public class TableBean {
public static void setMappingSubCategoryImageAllow(String mappingSubCategoryImageAllow) {
MAPPING_SUB_CATEGORY_IMAGE_ALLOW = mappingSubCategoryImageAllow;
}
public static String getSkugroupMaster() {
return SKUGROUP_MASTER;
}
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;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+114
View File
@@ -17,13 +17,16 @@ 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;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGroupMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter;
@@ -92,6 +95,9 @@ public class XMLHandlers {
lgs.setNOTICE_URL(xpp.nextText());
}
if (xpp.getName().equals("COUNTRY_ID")) {
lgs.setCOUNTRY_ID(xpp.nextText());
}
}
xpp.next();
}
@@ -855,4 +861,112 @@ 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();
try {
while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
if (xpp.getEventType() == XmlPullParser.START_TAG) {
if (xpp.getName().equals("META_DATA")) {
st.setTable_SKUGROUP_MASTER(xpp.nextText());
}
if (xpp.getName().equals("SKUGROUP_ID")) {
st.setSKUGROUP_ID(xpp.nextText());
}
if (xpp.getName().equals("SKUGROUP_NAME")) {
st.setSKUGROUP_NAME(xpp.nextText());
}
if (xpp.getName().equals("CATEGORY_ID")) {
st.setCATEGORY_ID(xpp.nextText());
}
if (xpp.getName().equals("SUB_CATEGORY_ID")) {
st.setSUB_CATEGORY_ID(xpp.nextText());
}
if (xpp.getName().equals("SKUGROUP_SEQUENCE")) {
st.setSKUGROUP_SEQUENCE(xpp.nextText());
}
}
xpp.next();
}
} catch (XmlPullParserException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
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;
}
}
GSKMTOrange/src/main/res/layout/activity_category_picture.xml
+2 -2
View File
@@ -21,8 +21,6 @@
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_category_picture" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
@@ -31,4 +29,6 @@
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/save_icon" />
<include layout="@layout/content_category_picture" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_create_self.xml
+35
View File
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="cpm.com.gskmtorange.dailyentry.CreateSelfActivity"
android:fitsSystemWindows="true">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_create_self" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@mipmap/ic_create_white_48dp" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_daily_data_menu.xml
+2 -1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
GSKMTOrange/src/main/res/layout/activity_no_camera.xml
+35
View File
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="cpm.com.gskmtorange.dailyentry.NoCameraActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_no_camera_individual" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/save_icon" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_planogram_pdf.xml
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="cpm.com.gskmtorange.dailyentry.PlanogramPDFActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_planogram_pdf" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@mipmap/download_grey" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_stock_data.xml
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="cpm.com.gskmtorange.dailyentry.StockDataActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_stock_data" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/save_icon" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/add_facing_custom_dialog.xml
+90
View File
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
card_view:cardBackgroundColor="@color/colorPrimary"
card_view:cardCornerRadius="10dp"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="10dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:textColor="@color/white"
android:textSize="@dimen/text_size_normal"
android:text="@string/enter_facing"
android:gravity="center"
android:textStyle="bold"
android:layout_marginTop="10dp"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="4"
android:layout_marginTop="15dp"
android:paddingBottom="20dp"
android:text="@string/stock_facing_faceup"
android:layout_marginLeft="5dp"
android:textColor="@color/white"
android:textSize="@dimen/text_size_normal" />
<EditText
android:id="@+id/et_facing"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="6"
android:inputType="number"
android:maxLength="3"
android:layout_gravity="center_vertical"></EditText>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="5dp">
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<Button
android:id="@+id/btn_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ok"
android:layout_centerInParent="true"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/brand_item.xml
+56
View File
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/linear_parent"
android:layout_marginBottom="10dp"
>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/white"
android:layout_margin="2dp">
<LinearLayout
android:layout_width="80dp"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<TextView
android:id="@+id/tv_facing"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_margin="2dp"
android:padding="7dp"
android:text="5"
android:textColor="@color/white"
android:textSize="14sp"
android:background="@color/blue"/>
</RelativeLayout>
<TextView
android:id="@+id/tv_brand"
android:textColor="@color/colorAccent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:textSize="14sp"
android:gravity="center"
/>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/brand_item_top_item.xml
+50
View File
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/linear_parent">
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/white"
android:layout_margin="2dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_centerInParent="true"
android:layout_margin="3dp"
android:background="@mipmap/ic_subtitles_black_48dp"
android:visibility="gone"
/>
</RelativeLayout>
<TextView
android:id="@+id/tv_brand"
android:textColor="@color/colorAccent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="14sp"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_category_picture.xml
+1 -1
View File
@@ -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" />
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_create_self.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="cpm.com.gskmtorange.dailyentry.CreateSelfActivity"
tools:showIn="@layout/activity_create_self">
<android.support.v7.widget.RecyclerView
android:id="@+id/rec_sub_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
</RelativeLayout>
GSKMTOrange/src/main/res/layout/content_no_camera.xml
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_no_camera">
<ScrollView
android:id="@+id/scroll_no_camera"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<include layout="@layout/content_no_camera_top_rec" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"/>
<include layout="@layout/content_no_camera_bottom_layout"/>
</LinearLayout>
</ScrollView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_no_camera_bottom_layout.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/lin_bottom_parent"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_no_camera"
tools:context="cpm.com.gskmtorange.dailyentry.NoCameraActivity">
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_no_camera_individual.xml
+48
View File
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_no_camera">
<android.support.v7.widget.RecyclerView
android:id="@+id/rvTop"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3.5" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#cccccc" />
<!-- <View
android:layout_width="match_parent"
android:layout_height="10dp"/>-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="6.5">
<ScrollView
android:id="@+id/scroll_no_camera"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/lin_bottom_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:orientation="vertical" />
</ScrollView>
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_no_camera_top_rec.xml
+52
View File
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_alignParentTop="true"
android:background="@color/cardview_light_background"
android:gravity="center_horizontal"
android:orientation="vertical"
android:layout_margin="5dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_no_camera"
tools:context="cpm.com.gskmtorange.dailyentry.NoCameraActivity">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="10dp"
android:paddingTop="20dp"
android:text="Top RecyclerView"
android:textSize="25sp"
android:visibility="gone" />
<TextView
android:id="@+id/tvEmptyListTop"
android:layout_width="match_parent"
android:layout_height="110dp"
android:background="#cccccc"
android:gravity="center"
android:text="Top List is Empty!"
android:textSize="20sp"
android:visibility="gone" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rvTop"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_horizontal_margin"
android:layout_marginRight="20dp"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#cccccc" />
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_planogram_pdf.xml
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="cpm.com.gskmtorange.dailyentry.PlanogramPDFActivity"
tools:showIn="@layout/activity_planogram_pdf">
<android.support.v7.widget.RecyclerView
android:id="@+id/rec"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_stock_data.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="cpm.com.gskmtorange.dailyentry.StockDataActivity"
tools:showIn="@layout/activity_stock_data">
<ExpandableListView
android:id="@+id/expandableListView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:cacheColorHint="#00000000"
android:divider="@null"
android:dividerHeight="0dp"
android:scrollingCache="false" />
</android.support.constraint.ConstraintLayout>
GSKMTOrange/src/main/res/layout/create_self_dialog_layout.xml
+113
View File
@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
card_view:cardBackgroundColor="@color/colorPrimary"
card_view:cardCornerRadius="10dp"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="4"
android:layout_marginTop="15dp"
android:paddingBottom="20dp"
android:text="@string/sub_category"
android:layout_marginLeft="5dp"
android:textColor="@color/white"
android:textSize="@dimen/text_size_normal" />
<Spinner
android:id="@+id/spinner_sub_category"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="6"
android:layout_gravity="center_vertical"></Spinner>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="6"
android:layout_marginTop="15dp"
android:paddingBottom="20dp"
android:text="@string/no_of_rows_on_shelf"
android:layout_marginLeft="5dp"
android:textColor="@color/white"
android:textSize="@dimen/text_size_normal" />
<Spinner
android:id="@+id/spinner_no_rows"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="4"
android:layout_gravity="center_vertical"></Spinner>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="5dp">
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<Button
android:id="@+id/btn_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:layout_centerInParent="true"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<Button
android:id="@+id/btn_create"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/create"
android:layout_centerInParent="true"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/custom.xml
+1 -1
View File
@@ -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" />
<ProgressBar
GSKMTOrange/src/main/res/layout/no_camera_edit_or_delete_dialog.xml
+70
View File
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
card_view:cardBackgroundColor="@color/colorPrimary"
card_view:cardCornerRadius="10dp"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="10dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:textColor="@color/white"
android:textSize="@dimen/text_size_normal"
android:text="@string/select_option"
android:gravity="center"
android:textStyle="bold"
android:layout_marginTop="10dp"
/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_centerInParent="true">
<Button
android:id="@+id/btn_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit"
/>
<Button
android:layout_marginLeft="10dp"
android:id="@+id/btn_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/delete"
/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/pdf_planogram_item.xml
+79
View File
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/cardview_shadow_end_color">
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginTop="2dp"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="5dp">
<LinearLayout
android:id="@+id/layout_parent"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:orientation="horizontal"
android:padding="10sp"
android:weightSum="10">
<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<ImageView
android:id="@+id/storelistviewxml_storeico"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_centerInParent="true"
android:layout_marginRight="6sp"
android:layout_weight="1"
android:background="@mipmap/ic_import_contacts_black_48dp" />
</RelativeLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="9"
android:orientation="vertical">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Title"
android:textColor="#1F3A6C"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_details"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/storelistviewxml_storename"
android:layout_below="@+id/storelistviewxml_storename"
android:text="Details"
android:textColor="#666666"
android:textSize="10sp"
android:textStyle="normal" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/stock_facing_child.xml
+158
View File
@@ -0,0 +1,158 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
card_view:cardCornerRadius="10dp"
android:elevation="5dp">
<LinearLayout
android:id="@+id/lin_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:weightSum="5">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="2.5"
android:orientation="vertical">
<TextView
android:id="@+id/txt_skuName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="15dp"
android:paddingTop="5dp"
android:text="SKU Name Value "
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="1">
<!-- <LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".25"
android:orientation="vertical">
<TextView
android:id="@+id/txt_mbq"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="0"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
android:textColorHint="#666" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".25"
android:orientation="vertical">
<ToggleButton
android:id="@+id/toggle_available"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/toggle_selector_background"
android:textOff="@string/no"
android:textOn="@string/yes" />
</LinearLayout>
-->
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_weight=".5"
android:gravity="center_vertical"
android:orientation="vertical">
<EditText
android:id="@+id/ed_facing"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:gravity="center"
android:inputType="numberDecimal"
android:maxLength="6"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:hint="@string/stock_facing_faceup"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
android:textColorHint="#666" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/black" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginRight="5dp"
android:layout_weight=".5"
android:gravity="center_vertical"
android:orientation="vertical">
<EditText
android:id="@+id/ed_stock"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:gravity="center"
android:inputType="number"
android:maxLength="5"
android:hint="@string/stock"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
android:textColorHint="#666"
/>
<View
android:id="@+id/stock_view"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/black" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/sub_category_item_list.xml
+49
View File
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/linear_parent">
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/white"
android:layout_margin="2dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_margin="10dp"
android:padding="10dp"
android:background="@mipmap/ic_subtitles_black_48dp"
/>
</RelativeLayout>
<TextView
android:id="@+id/tv_sub_category"
android:textColor="@color/colorAccent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
+5
View File
@@ -24,6 +24,11 @@
android:icon="@drawable/ic_date_range_black"
android:title="@string/future_route_plan" />
<item
android:id="@+id/nav_planogram"
android:icon="@mipmap/ic_view_quilt_black_48dp"
android:title="@string/category_performance_PLANOGRAM" />
<item
android:id="@+id/nav_exit"
android:icon="@mipmap/exit_grey"
GSKMTOrange/src/main/res/mipmap-hdpi/ic_import_contacts_black_48dp.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 603 B

GSKMTOrange/src/main/res/mipmap-mdpi/ic_subtitles_black_48dp.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 223 B

GSKMTOrange/src/main/res/mipmap-xxhdpi/ic_view_quilt_black_48dp.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 140 B

GSKMTOrange/src/main/res/mipmap-xxxhdpi/ic_create_white_48dp.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 653 B

GSKMTOrange/src/main/res/values-ar/string.xml
+3 -2
View File
@@ -182,8 +182,8 @@
<string name="title_activity_store_wise_performance">أداء المتجر</string>
<string name="success">نجاح</string>
<string name="category_performance_t2p">مواد الدعاية في المتاجر</string>
<string name="daily_data_menu_t2p">المتاح او المتوفر الشهري</string>
<string name="title_activity_t2_pcompliance">مطابقة مواد الدعاية لقوانين الشركة</string>
<string name="daily_data_menu_t2p">أدوات العرض</string>
<string name="title_activity_t2_pcompliance"> T2P - مطابقة مواد الدعاية لقوانين الشركة</string>
<string name="t2p_data_uploading">تحميل بيانات مواد الدعاية T2P</string>
<string name="title_activity_t2p_brand__avaibility">تواجد مواد الدعاية</string>
<string name="notsuppoted">هذا الجهاز غير معتمد.</string>
@@ -235,4 +235,5 @@
<string name="future_route_plan">بحث عن خط السير</string>
<string name="select_date">اختيار التاريخ</string>
<string name="no_route_plan_for_day">لا يوجد خط سير لليوم</string>
<string name="check_faceup_not_zero">لا يمكن ان يكون عدد أوجه الأصناف صفر علي الرف اذا كانت الأصناف متوفره</string>
</resources>
GSKMTOrange/src/main/res/values-tr/string.xml
+2 -2
View File
@@ -39,7 +39,7 @@
<string name="select">Seçiniz</string>
<string name="title_activity_t2_pcompliance">Kalıcı Teşhir</string>
<string name="title_activity_t2_pcompliance">T2P - Kalıcı Teşhir</string>
<string name="yes">Evet</string>
<string name="no">Hayır</string>
@@ -66,7 +66,7 @@
<string name="daily_data_menu_msl_availability">SKU bulunurluğu</string>
<string name="daily_data_menu_stock_facing">Raf Payı</string>
<string name="daily_data_menu_t2p">Kalıcı Teşhir</string>
<string name="daily_data_menu_t2p">T2P - Kalıcı Teşhir</string>
<string name="daily_data_menu_additional_visibility">Ek Teşhir</string>
<string name="daily_data_menu_promo_compliance">Promosyon</string>
<string name="daily_data_menu_competition_tracking">Rakip Bilgisi</string>
GSKMTOrange/src/main/res/values/colors.xml
+2
View File
@@ -12,6 +12,8 @@
<color name="green">#FF27A404</color>
<color name="blue">#2196F3</color>
<color name="grey_textview">#cccccc</color>
<color name="colorOrange">#FFE0B2</color>
GSKMTOrange/src/main/res/values/strings.xml
+22 -4
View File
@@ -57,7 +57,7 @@
<string name="menu_daily_route_plan">Daily Route Plan</string>
<string name="menu_daily_download">Daily Data Download</string>
<string name="menu_upload_data">Upload Data</string>
<string name="menu_upload_data">Data Uploaded Successfully</string>
<string name="menu_geotag">Geo Tag</string>
<string name="menu_export">Data Export</string>
@@ -65,7 +65,7 @@
<string name="menu_setting">Settings</string>
<string name="menu_services">Services</string>
<string name="title_activity_t2_pcompliance">Monthly Visibility</string>
<string name="title_activity_t2_pcompliance">Visibility/T2P</string>
<!--Gagan start code-->
<string name="title_activity_category_list">Category List</string>
@@ -76,7 +76,7 @@
<string name="daily_data_menu_msl_availability">SKU Availability</string>
<string name="daily_data_menu_stock_facing">Stock and Facing</string>
<string name="daily_data_menu_t2p">Monthly Visibility</string>
<string name="daily_data_menu_t2p">Visibility/T2P</string>
<string name="daily_data_menu_additional_visibility">Additional Visibility</string>
<string name="daily_data_menu_promo_compliance">Promo Compliance</string>
<string name="daily_data_menu_competition_tracking">Competition Visibility</string>
@@ -225,6 +225,9 @@
<string name="export_database">Export Database</string>
<string name="data_exported_successfully">Database Exported Successfully</string>
<string name="databasexported">Database Exported And Uploaded Successfully</string>
<string name="uploadeddata">Uploaded Data</string>
<string name="previous_data_upload">Please Upload Previous Data First</string>
@@ -244,6 +247,7 @@
<!--Gagan start code 3-->
<string name="empty">Empty</string>
<string name="check_faceup">Faceup can not be greater than stock value</string>
<string name="check_faceup_not_zero">Faceup cannot be zero in this case</string>
<string name="fill_stock_value">First fill the stock value</string>
<string name="want_add">Are you sure you want to add</string>
<string name="promo_add">promo is added</string>
@@ -277,7 +281,7 @@
<string name="stock_planogram_data_uploading">Stock Planogram Data Uploading</string>
<string name="daily_data_menu_category_picture">Category Pictures</string>
<string name="title_activity_category_picture">CategoryPicture</string>
<string name="title_activity_category_picture">Category Picture</string>
<string name="stock_planogram_data_noCamera_data">Please fill the no camera data</string>
<string name="stock_planogram_shelf">Shelf </string>
@@ -312,6 +316,20 @@
<string name="msg_select_present">Please select present </string>
<string name="please_select_answer">Please select answer</string>
<string name="title_activity_create_self">No Camera Option</string>
<string name="create_self">Create Shelf</string>
<string name="create">Create</string>
<string name="no_of_rows_on_shelf">No. of Rows on Shelf</string>
<string name="sub_category">Sub Category</string>
<string name="enter_facing">Enter Facing</string>
<string name="please_facing">Please fill Facing</string>
<string name="please_add_subgroup_facing">Please add atleast one Sub Group to every row</string>
<string name="edit">Edit</string>
<string name="select_option">Select an option</string>
<string name="title_activity_planogram_pdf">Planogram Document</string>
<string name="Download_pdf_Error">File not downloaded</string>
<string name="title_activity_stock_data">Stock</string>
</resources>
build.gradle
+3 -1
View File
@@ -2,10 +2,11 @@
buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.android.tools.build:gradle:3.0.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -14,6 +15,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
}
}
gradle/wrapper/gradle-wrapper.properties
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
#Wed Apr 12 12:10:11 IST 2017
#Thu Jan 18 12:31:40 IST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip