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

review

Browse Source
This commit is contained in:
ashishandroid
2017-02-23 10:11:43 +05:30
parent be2f901986
commit e119cb95a0
12 changed files with 585 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+136 -18
View File
@@ -3687,7 +3687,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
BG.setBRAND_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
list.add(BG);
dbcursor.moveToNext();
dbcursor.moveToNext();
}
dbcursor.close();
return list;
@@ -3801,7 +3801,19 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public void InsertStock_Facing_PlanogramTracker(String storeId, String categoryId, String company_id, String brand_id, String sub_category_id,
List<StockFacing_PlanogramTrackerDataGetterSetter> hashMapListHeaderData,
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> hashMapListChildData) {
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> hashMapListChildData) {
//Delete child sku data
for (int i1 = 0; i1 < hashMapListHeaderData.size(); i1++) {
db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_CHILD,
"common_id='" + hashMapListHeaderData.get(i1).getKey_id() + "'", null);
}
//Delete Header shelf data
db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_HEADER,
"store_id='" + storeId + "' And category_id='" + categoryId + "' ", null);
//Insert the data
ContentValues values = new ContentValues();
ContentValues values1 = new ContentValues();
@@ -4037,7 +4049,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"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 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) {
@@ -4097,6 +4109,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
cd.setCheckbox_sku("0");
list.add(cd);
dbcursor.moveToNext();
@@ -4112,7 +4125,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
// get T2P Compliance data
// get T2P Compliance data
public ArrayList<T2PGetterSetter> getT2pCompliancedaletedata(String store_id) {
ArrayList<T2PGetterSetter> list = new ArrayList<>();
@@ -4155,12 +4168,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
" 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 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) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
CategoryPictureGetterSetter CPGS = new CategoryPictureGetterSetter();
CPGS.setSUB_CATEGORY(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
@@ -4170,6 +4184,40 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
CPGS.setSubCategoryCamera2("");
list.add(CPGS);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get Planogram Shelf Header After Save !" + e.toString());
// return list;
}
return list;
}
public ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> getPlanogramAddShelfHeaderAfterSaveData(
String store_id, String category_id) {
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Stock_Facing_Planogram_Header_Data " +
"where Store_id='" + store_id + "' and category_id='" + category_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter();
cd.setKey_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("KEY_ID")));
cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("category_id")));
cd.setSp_addShelf_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_id")));
cd.setSp_addShelf(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf")));
cd.setSp_shelfPosition(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_Position")));
list.add(cd);
dbcursor.moveToNext();
}
@@ -4178,13 +4226,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
} catch (Exception e) {
Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
Log.d("Exception ", "get Planogram Shelf Header After Save !" + e.toString());
}
return list;
}
public void InsertCategoryPictureData(CategoryPictureGetterSetter gettersetter, ArrayList<CategoryPictureGetterSetter> skulist, String categoryId) {
ContentValues values = new ContentValues();
ContentValues values1 = new ContentValues();
@@ -4199,7 +4247,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("camera_allow", gettersetter.getCamera_allow());
long key_id = db.insert(CommonString.TABLE_INSERT_CATEGORY_PICTURE, null, values);
if (skulist != null) {
@@ -4225,8 +4272,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public ArrayList<CategoryPictureGetterSetter> getCategoryPictureData(String store_id, String categoryId) {
Cursor cursordata = null;
ArrayList<CategoryPictureGetterSetter> productData = new ArrayList<CategoryPictureGetterSetter>();
@@ -4277,8 +4322,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public ArrayList<CategoryPictureGetterSetter> getCategoryPictureListData(String store_id, String categoryId,String key_id) {
public ArrayList<CategoryPictureGetterSetter> getCategoryPictureListData(String store_id, String categoryId, String key_id) {
Cursor cursordata = null;
ArrayList<CategoryPictureGetterSetter> productData = new ArrayList<CategoryPictureGetterSetter>();
@@ -4320,9 +4364,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public ArrayList<CategoryPictureGetterSetter> getCategoryPictureUpload(String store_id) {
Cursor cursordata = null;
ArrayList<CategoryPictureGetterSetter> productData = new ArrayList<CategoryPictureGetterSetter>();
@@ -4383,7 +4424,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
cursordata = db.rawQuery("Select * from Stock_CATEGORY_PICTURE_LIST " + "where COMMON_ID = '" + key_id + "'", null);
cursordata = db.rawQuery("Select * from Stock_CATEGORY_PICTURE_LIST " + "where COMMON_ID = '" + key_id + "'", null);
if (cursordata != null) {
cursordata.moveToFirst();
@@ -4421,8 +4462,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public boolean isCategoryPictureData(String store_id, String category_id) {
boolean filled = false;
Cursor dbcursor = null;
@@ -4449,11 +4488,90 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> getStockAndFacingPlanogramAfterSKUData(
String key_id) {
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
//Select * from Stock_Facing_Planogram_Child_Data where Shelf_id=1 and Shelf_Position=3
dbcursor = db.rawQuery("Select * from Stock_Facing_Planogram_Child_Data " +
"where common_id='" + key_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter();
cd.setSp_addShelf_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_id")));
cd.setSp_addShelf(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf")));
cd.setSp_shelfPosition(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_Position")));
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("sku_id")));
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("sku")));
cd.setCheckbox_sku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("checkbox_sku")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
return list;
}
return list;
}
public ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> getStockAndFacingPlanogramAfterSKU_PerShelfData(
String shelf_id, String shelf_position) {
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Stock_Facing_Planogram_Child_Data " +
"where Shelf_id='" + shelf_id + "' and Shelf_Position='" + shelf_position + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter();
cd.setSp_addShelf_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_id")));
cd.setSp_addShelf(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf")));
cd.setSp_shelfPosition(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_Position")));
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("sku_id")));
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("sku")));
cd.setCheckbox_sku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("checkbox_sku")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
return list;
}
return list;
}
public void deletePlanogramListStoreAndCategorywise(String storeId, String categoryId,
List<StockFacing_PlanogramTrackerDataGetterSetter> hashMapListHeaderData,
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> hashMapListChildData) {
for (int i1 = 0; i1 < hashMapListHeaderData.size(); i1++) {
db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_CHILD,
"common_id='" + hashMapListHeaderData.get(i1).getKey_id() + "'", null);
}
//Delete Header shelf data
db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_HEADER,
"store_id='" + storeId + "' And category_id='" + categoryId + "' ", null);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+1 -1
View File
@@ -694,7 +694,7 @@ public class LoginActivity extends AppCompatActivity {
if (language.equalsIgnoreCase("English")) {
lang = "EN";
} else if (language.equalsIgnoreCase("KSA")) {
} else if (language.equalsIgnoreCase("UAE")) {
lang = "AR";
} else {
lang = "TR";
GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java
+1 -1
View File
@@ -130,7 +130,7 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
if(language.equalsIgnoreCase("English")){
lang = "EN";
}
else if(language.equalsIgnoreCase("KSA")) {
else if(language.equalsIgnoreCase("UAE")) {
lang = "AR";
} else {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java
+218 -178
View File
@@ -7,6 +7,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -44,8 +45,10 @@ import android.widget.Toast;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
@@ -68,8 +71,8 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
List<Integer> checkHeaderArray = new ArrayList<>();
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> shelfHeaderDataList = new ArrayList<>();
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> childDataList, tempChildDataList;
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> hashMapListChildData = new HashMap<>();
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> childDataList, childDataList1;
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> hashMapListChildData = new HashMap<>();
private SharedPreferences preferences;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
@@ -77,7 +80,32 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
ExpandableListAdapter adapter1;
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> addSkuHeaderList;
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> addSkuChildList;
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> addSkuHashMapChildData;
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("UAE")) {
lang = "AR";
} else {
lang = "TR";
}
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) {
@@ -94,7 +122,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
db.open();
preferences = PreferenceManager.getDefaultSharedPreferences(this);
//updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
@@ -136,6 +164,11 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
shelfAdapter.add(shelfList.get(j).getShelf());
}
//DefaultList
prepareDefaultList();
btn_addShelf.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(final View view1) {
@@ -197,10 +230,30 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
if (!data.getSp_addShelf_id().equals("0") && !data.getSp_shelfPosition().equals("Select")) {
shelfHeaderDataList.add(data);
//Check here the shelf and position is already exists or not
//if (shelfHeaderDataList.size() > 0) {
dialog.dismiss();
prepareHeaderList(shelfHeaderDataList);
//Checking shelf is exists or not, if not add the shelf
boolean isContain = false;
for (int i = 0; i < shelfHeaderDataList.size(); i++) {
if (data.getSp_addShelf_id().equals(shelfHeaderDataList.get(i).getSp_addShelf_id())
&& data.getSp_shelfPosition().equals(shelfHeaderDataList.get(i).getSp_shelfPosition())) {
isContain = true;
break;
}
}
if (isContain) {
Snackbar.make(view, data.getSp_addShelf() +
getString(R.string.stock_planogram_shelf_position) + data.getSp_shelfPosition()
+ getString(R.string.stock_planogram_already_exists)
, Snackbar.LENGTH_LONG).setAction("Action", null).show();
} else {
shelfHeaderDataList.add(data);
dialog.dismiss();
prepareHeaderList(shelfHeaderDataList);
}
} else {
Toast.makeText(StockFacing_PlanogramTrackerActivity.this, getResources().getString(R.string.empty_field), Toast.LENGTH_SHORT).show();
}
@@ -216,8 +269,6 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
/*Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
.setAction("Action", null).show();*/
if (validateData(shelfHeaderDataList, hashMapListChildData)) {
AlertDialog.Builder builder = new AlertDialog.Builder(StockFacing_PlanogramTrackerActivity.this);
@@ -226,8 +277,8 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
/*db.InsertStock_Facing_PlanogramTracker(store_id, categoryId, company_id, brand_id,
sub_category_id, shelfHeaderDataList, hashMapListChildData);*/
db.InsertStock_Facing_PlanogramTracker(store_id, categoryId, company_id, brand_id,
sub_category_id, shelfHeaderDataList, hashMapListChildData);
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
@@ -256,7 +307,6 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
}
});
expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
@Override
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
@@ -290,104 +340,60 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
return true;
}
});
/*expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
@Override
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
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;
}
});*/
} catch (Resources.NotFoundException e) {
e.printStackTrace();
}
}
private void prepareDefaultList() {
//After save shelf header data
shelfHeaderDataList = db.getPlanogramAddShelfHeaderAfterSaveData(store_id, categoryId);
if (shelfHeaderDataList.size() > 0) {
//Sort Shelf Position wise
Collections.sort(shelfHeaderDataList, StockFacing_PlanogramTrackerDataGetterSetter.shelfPositionComparator);
//Sort Shelf wise
Collections.sort(shelfHeaderDataList, StockFacing_PlanogramTrackerDataGetterSetter.shelfComparator);
for (int i = 0; i < shelfHeaderDataList.size(); i++) {
childDataList = db.getStockAndFacingPlanogramAfterSKUData(shelfHeaderDataList.get(i).getKey_id());
//After save sku child data
if (childDataList.size() > 0) {
hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList);
}
}
}
adapter = new PlanogramExpandableListAdapter(this, shelfHeaderDataList, hashMapListChildData);
expandableListView.setAdapter(adapter);
if (childDataList != null && childDataList.size() > 0) {
for (int j = 0; j < shelfHeaderDataList.size(); j++) {
if (hashMapListChildData.get(shelfHeaderDataList.get(j)).size() > 0) {
expandableListView.expandGroup(j);
}
}
}
}
//New Shelf Add
private void prepareHeaderList(ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> shelfHeaderDataList1) {
try {
//Header Data
if (shelfHeaderDataList1.size() > 0) {
/*for (int i = 0; i < shelfHeaderDataList.size(); i++) {
hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList);
//Sort Shelf Position wise
/* Collections.sort(shelfHeaderDataList1, StockFacing_PlanogramTrackerDataGetterSetter.shelfPositionComparator);
//Sort Shelf wise
Collections.sort(shelfHeaderDataList1, StockFacing_PlanogramTrackerDataGetterSetter.shelfComparator);*/
*//*if (childDataList != null && childDataList.size() > 0) {
if (shelfHeaderDataList.get(i).getSp_addShelf_id().equals(childDataList.get(i).getSp_addShelf_id())) {
hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList);
} else {
hashMapListChildData.put(shelfHeaderDataList.get(i), tempChildDataList);
}
} else {
hashMapListChildData.put(shelfHeaderDataList.get(i), tempChildDataList);
}*//*
}*/
adapter.notifyDataSetChanged();
adapter = new PlanogramExpandableListAdapter(this, shelfHeaderDataList1, hashMapListChildData);
expandableListView.setAdapter(adapter);
if (childDataList != null && childDataList.size() > 0) {
if (childDataList1 != null && childDataList1.size() > 0) {
for (int j = 0; j < shelfHeaderDataList.size(); j++) {
if (hashMapListChildData.get(shelfHeaderDataList.get(j)).size() > 0) {
expandableListView.expandGroup(j);
@@ -400,29 +406,35 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
}
}
private void prepareSkuList(ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> childDataList1,
StockFacing_PlanogramTrackerDataGetterSetter object) {
//Sku Add in Particular Shelf with position
private void prepareSkuList(StockFacing_PlanogramTrackerDataGetterSetter object,
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> tempAddSkuHeaderList,
HashMap<StockFacing_PlanogramTrackerDataGetterSetter,
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> tempAddSkuHashMapChildData) {
try {
if (shelfHeaderDataList.size() > 0) {
childDataList1 = new ArrayList<>();
hashMapListChildData.put(object, childDataList1);
/*//Child Sku Data
for (int i = 0; i < shelfHeaderDataList.size(); i++) {
if (object.getSp_addShelf_id().equals(shelfHeaderDataList.get(i).getSp_addShelf_id())) {
hashMapListChildData.put(object, childDataList1);
} else {
hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList);
for (int i1 = 0; i1 < tempAddSkuHeaderList.size(); i1++) {
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> tempList =
tempAddSkuHashMapChildData.get(tempAddSkuHeaderList.get(i1));
for (int j = 0; j < tempList.size(); j++) {
StockFacing_PlanogramTrackerDataGetterSetter data = tempList.get(j);
data.setSp_addShelf_id(object.getSp_addShelf_id());
if (data.getCheckbox_sku().equals("1")) {
childDataList1.add(data);
}
}*/
/* adapter = new PlanogramExpandableListAdapter(this, shelfHeaderDataList, hashMapListChildData);
expandableListView.setAdapter(adapter);*/
}
}
if (shelfHeaderDataList.size() > 0) {
//Child Sku Data
hashMapListChildData.put(object, childDataList1);
adapter.notifyDataSetChanged();
//expandableListView.invalidate();
if (childDataList != null && childDataList.size() > 0) {
if (childDataList1 != null && childDataList1.size() > 0) {
for (int j = 0; j < shelfHeaderDataList.size(); j++) {
if (hashMapListChildData.get(shelfHeaderDataList.get(j)).size() > 0) {
expandableListView.expandGroup(j);
@@ -430,6 +442,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
}
}
}
} catch (Exception e) {
e.printStackTrace();
}
@@ -438,10 +451,10 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
public class PlanogramExpandableListAdapter extends BaseExpandableListAdapter {
private Context _context;
private List<StockFacing_PlanogramTrackerDataGetterSetter> _listDataHeader;
private HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> _listDataChild;
private HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> _listDataChild;
public PlanogramExpandableListAdapter(Context context, List<StockFacing_PlanogramTrackerDataGetterSetter> listDataHeader,
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> listChildData) {
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> listChildData) {
this._context = context;
this._listDataHeader = listDataHeader;
this._listDataChild = listChildData;
@@ -481,17 +494,15 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
btn_addSku.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
//Stock Facing Planogram SKU Data
tempChildDataList = db.getStockAndFacingPlanogramDefaultSKUData(categoryId, brand_id,
keyAccount_id, storeType_id, class_id);
//Stock Facing Planogram SKU Data
final Dialog dialog1 = new Dialog(StockFacing_PlanogramTrackerActivity.this);
dialog1.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog1.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
dialog1.setContentView(R.layout.dialog_stock_facing_planogram_tracker_add_sku);
//LinearLayout lin_addSku = (LinearLayout) dialog1.findViewById(R.id.lin_addSku);
Button addSKU = (Button) dialog1.findViewById(R.id.dialog_btn_addSku_Shelf);
Button addSku_Shelf = (Button) dialog1.findViewById(R.id.dialog_btn_addSku_Shelf);
Button cancel = (Button) dialog1.findViewById(R.id.dialog_btn_cancel_addSku);
ExpandableListView exp_addSkuListView = (ExpandableListView) dialog1.findViewById(R.id.exp_addSkuListView);
@@ -502,60 +513,35 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
}
});
dialogAddSkuList(exp_addSkuListView);
//Add Sku Dailog List
dialogAddSkuList(exp_addSkuListView, headerTitle);
/*childDataList = new ArrayList<>();
for (int i = 0; i < tempChildDataList.size(); i++) {
View view1 = getLayoutInflater().inflate(R.layout.item_stock_facing_planogram_child, null);
TextView txt_skuChild = (TextView) view1.findViewById(R.id.txt_skuChild);
CheckBox chk_sku = (CheckBox) view1.findViewById(R.id.chk_sku);
final StockFacing_PlanogramTrackerDataGetterSetter childData = tempChildDataList.get(i);
txt_skuChild.setText(childData.getSku());
childData.setSp_addShelf_id(headerTitle.getSp_addShelf_id());
if (childData.getCheckbox_sku().equals("0")) {
chk_sku.setChecked(false);
} else if (childData.getCheckbox_sku().equals("1")) {
chk_sku.setChecked(true);
}
chk_sku.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean isCheck) {
if (isCheck) {
childData.setCheckbox_sku("1");
} else {
childData.setCheckbox_sku("0");
}
}
});
childDataList.add(childData);
lin_addSku.addView(view1);
}*/
addSKU.setOnClickListener(new View.OnClickListener() {
addSku_Shelf.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
/*boolean flag = false;
for (int i = 0; i < childDataList.size(); i++) {
if (childDataList.get(i).getCheckbox_sku().equals("1")) {
flag = true;
break;
boolean flag = false;
for (int i1 = 0; i1 < addSkuHeaderList.size(); i1++) {
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> tempList =
addSkuHashMapChildData.get(addSkuHeaderList.get(i1));
for (int j = 0; j < tempList.size(); j++) {
StockFacing_PlanogramTrackerDataGetterSetter data = tempList.get(j);
if (data.getCheckbox_sku().equals("1")) {
flag = true;
break;
}
}
}
if (flag) {
prepareSkuList(childDataList, headerTitle);
prepareSkuList(headerTitle, addSkuHeaderList, addSkuHashMapChildData);
dialog1.dismiss();
} else {
Snackbar.make(view, "Please select atleast one sku", Snackbar.LENGTH_LONG)
Snackbar.make(view, getString(R.string.stock_planogram_data_select_one_sku), Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
}*/
}
}
});
@@ -591,7 +577,9 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
}
@Override
public View getChildView(int groupPosition, final int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
public View getChildView(int groupPosition, final int childPosition, boolean isLastChild,
View convertView, ViewGroup parent) {
StockFacing_PlanogramTrackerDataGetterSetter childData =
(StockFacing_PlanogramTrackerDataGetterSetter) getChild(groupPosition, childPosition);
ViewHolder holder = null;
@@ -610,7 +598,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
holder = (ViewHolder) convertView.getTag();
}
//holder.checkBox.setVisibility(View.GONE);
holder.checkBox.setVisibility(View.GONE);
holder.checkBox.setEnabled(false);
holder.txt_skuChild.setText(childData.getSku());
@@ -642,7 +630,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
}
boolean validateData(List<StockFacing_PlanogramTrackerDataGetterSetter> listDataHeader,
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> listDataChild) {
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> listDataChild) {
boolean flag = true;
checkHeaderArray.clear();
@@ -654,7 +642,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
}
checkflag = false;
Error_Message = "add sku shelf can not be empty";
Error_Message = getString(R.string.stock_planogram_data_add_shelf);
break;
} else {
if (listDataChild.get(listDataHeader.get(i)).size() <= 0) {
@@ -663,7 +651,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
}
flag = false;
Error_Message = "add sku shelf can not be empty";
Error_Message = getString(R.string.stock_planogram_data_add_shelf);
break;
}
}
@@ -729,8 +717,16 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
private void dialogAddSkuList(ExpandableListView exp_addSkuListView) {
//Add Sku Dailog Display List
private void dialogAddSkuList(ExpandableListView exp_addSkuListView,
StockFacing_PlanogramTrackerDataGetterSetter headerObject) {
try {
//By this headerObject we need to get the sku list
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> tempSkuList = new ArrayList<>();
tempSkuList = db.getStockAndFacingPlanogramAfterSKU_PerShelfData(headerObject.getSp_addShelf_id(),
headerObject.getSp_shelfPosition());
addSkuHeaderList = new ArrayList<>();
addSkuChildList = new ArrayList<>();
addSkuHashMapChildData = new HashMap<>();
@@ -744,10 +740,29 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
//Child Data
if (addSkuHeaderList.get(i).getCompany_id().equals("1")) {
addSkuChildList = db.getPlanogramAddSkuChildData(categoryId, addSkuHeaderList.get(i).getBrand_id(),
keyAccount_id, storeType_id, class_id);
//Default Case
if (!(tempSkuList.size() > 0)) {
addSkuChildList = db.getPlanogramAddSkuChildData(categoryId, addSkuHeaderList.get(i).getBrand_id(),
keyAccount_id, storeType_id, class_id);
addSkuHashMapChildData.put(addSkuHeaderList.get(i), addSkuChildList);
} else { //After Save Sku Data
addSkuChildList = db.getPlanogramAddSkuChildData(categoryId, addSkuHeaderList.get(i).getBrand_id(),
keyAccount_id, storeType_id, class_id);
for (int i1 = 0; i1 < addSkuChildList.size(); i1++) {
for (int j = 0; j < tempSkuList.size(); j++) {
if (addSkuChildList.get(i1).getSku_id().equals(tempSkuList.get(j).getSku_id())) {
addSkuChildList.set(i1, tempSkuList.get(j));
}
}
}
addSkuHashMapChildData.put(addSkuHeaderList.get(i), addSkuChildList);
}
addSkuHashMapChildData.put(addSkuHeaderList.get(i), addSkuChildList);
}
}
}
@@ -759,13 +774,14 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
}
}
//Add Sku Dailog Display List Adapter
public class ExpandableListAdapter extends BaseExpandableListAdapter {
private Context _context;
private List<StockFacing_PlanogramTrackerDataGetterSetter> _listDataHeader;
private HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> _listDataChild;
private HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> _listDataChild;
public ExpandableListAdapter(Context context, List<StockFacing_PlanogramTrackerDataGetterSetter> listDataHeader,
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> listChildData) {
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> listChildData) {
this._context = context;
this._listDataHeader = listDataHeader;
this._listDataChild = listChildData;
@@ -788,7 +804,8 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
@Override
public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
final StockFacing_PlanogramTrackerDataGetterSetter headerTitle = (StockFacing_PlanogramTrackerDataGetterSetter) getGroup(groupPosition);
final StockFacing_PlanogramTrackerDataGetterSetter headerTitle =
(StockFacing_PlanogramTrackerDataGetterSetter) getGroup(groupPosition);
if (convertView == null) {
LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -819,7 +836,8 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
}
@Override
public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
View convertView, ViewGroup parent) {
final StockFacing_PlanogramTrackerDataGetterSetter childData =
(StockFacing_PlanogramTrackerDataGetterSetter) getChild(groupPosition, childPosition);
@@ -840,6 +858,22 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
holder.txt_skuName.setText(childData.getSku());
holder.chk_sku.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean isCheck) {
if (isCheck) {
childData.setCheckbox_sku("1");
} else {
childData.setCheckbox_sku("0");
}
}
});
if (childData.getCheckbox_sku().equals("0")) {
holder.chk_sku.setChecked(false);
} else if (childData.getCheckbox_sku().equals("1")) {
holder.chk_sku.setChecked(true);
}
return convertView;
}
@@ -860,4 +894,10 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
TextView txt_skuName;
CheckBox chk_sku;
}
@Override
protected void onResume() {
super.onResume();
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+109 -51
View File
@@ -70,6 +70,7 @@ import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Store_wise_camera_DataGetterSetter;
@@ -100,6 +101,10 @@ public class Stock_FacingActivity extends AppCompatActivity {
String img3 = "", img4 = "", img5 = "", img6 = "";
Store_wise_camera_DataGetterSetter cameraData;
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> planogramShelfHeaderDataList = new ArrayList<>();
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> planogramSkuChildDataList;
HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> planogramHashMapListChildData = new HashMap<>();
private static boolean updateResources(Context context, String language) {
String lang;
@@ -179,7 +184,6 @@ public class Stock_FacingActivity extends AppCompatActivity {
//Camera
cameraMethod();
final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
@@ -203,12 +207,12 @@ public class Stock_FacingActivity extends AppCompatActivity {
db.open();
//Camera insert or update
if (db.isStorewiseCameraSave(store_id, categoryId)) {
/*if (db.isStorewiseCameraSave(store_id, categoryId)) {
db.updateStore_wise_camera(cameraData);
} else {
cameraData.setCheckSaveStatus("1");
db.InsertStore_wise_camera(cameraData);
}
}*/
//Stock Facing insert or update
if (db.checkStockAndFacingData(store_id, categoryId)) {
@@ -338,8 +342,26 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
//Planogram List for check and delete on backPress
private void prepareDefaultList() {
// Planogram After save shelf header data
planogramShelfHeaderDataList = db.getPlanogramAddShelfHeaderAfterSaveData(store_id, categoryId);
if (planogramShelfHeaderDataList.size() > 0) {
for (int i = 0; i < planogramShelfHeaderDataList.size(); i++) {
planogramSkuChildDataList = db.getStockAndFacingPlanogramAfterSKUData(planogramShelfHeaderDataList.get(i).getKey_id());
//After save sku child data
if (planogramSkuChildDataList.size() > 0) {
planogramHashMapListChildData.put(planogramShelfHeaderDataList.get(i), planogramSkuChildDataList);
}
}
}
}
private void cameraMethod() {
cameraData = new Store_wise_camera_DataGetterSetter();
/*cameraData = new Store_wise_camera_DataGetterSetter();
if (db.isStorewiseCameraSave(store_id, categoryId)) {
cameraData = db.getStore_wise_camera(store_id, categoryId);
@@ -428,7 +450,11 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
});
} else {
} else {*/
if (!camera_allow.equals("1")) {
findViewById(R.id.lin_camera).setVisibility(View.VISIBLE);
findViewById(R.id.view_camera2).setVisibility(View.GONE);
findViewById(R.id.view_camera3).setVisibility(View.GONE);
@@ -436,9 +462,9 @@ public class Stock_FacingActivity extends AppCompatActivity {
lin_camera3.setVisibility(View.GONE);
lin_camera4.setVisibility(View.GONE);
camera1.setBackgroundResource(R.mipmap.camera_grey);
camera1.setBackgroundResource(R.mipmap.new_no_camera);
/* lin_camera1.setOnClickListener(new View.OnClickListener() {
lin_camera1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent(Stock_FacingActivity.this, StockFacing_PlanogramTrackerActivity.class);
@@ -450,9 +476,13 @@ public class Stock_FacingActivity extends AppCompatActivity {
intent.putExtra("categoryId", categoryId);
intent.putExtra("categoryName", categoryName);
startActivity(intent);
startActivityForResult(intent, 100);
}
});*/
});
} else {
findViewById(R.id.lin_camera).setVisibility(View.GONE);
}
}
@@ -509,20 +539,20 @@ public class Stock_FacingActivity extends AppCompatActivity {
if (camera_allow.equalsIgnoreCase("1")) {
//Atleast Single camera is click
if (!cameraData.getCamera1().equals("") || !cameraData.getCamera2().equals("") ||
!cameraData.getCamera3().equals("") || !cameraData.getCamera4().equals("")) {
/*if (!cameraData.getCamera1().equals("") || !cameraData.getCamera2().equals("") ||
!cameraData.getCamera3().equals("") || !cameraData.getCamera4().equals("")) {*/
if (!stock.equals("0")) {
//if (!imagePath.equals("") || !imagePath1.equals("")) {
if (stock.equals("") || faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
flag = false;
Error_Message = getResources().getString(R.string.fill_data);
break;
if (!stock.equals("0")) {
//if (!imagePath.equals("") || !imagePath1.equals("")) {
if (stock.equals("") || faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
flag = false;
Error_Message = getResources().getString(R.string.fill_data);
break;
}
/*} else {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
@@ -532,6 +562,38 @@ public class Stock_FacingActivity extends AppCompatActivity {
Error_Message = getResources().getString(R.string.click_image);
break;
}*/
} else {
if (stock.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
flag = false;
Error_Message = getResources().getString(R.string.fill_data);
break;
}
}
/*} else {
flag = false;
Error_Message = getResources().getString(R.string.click_image);
break;
}*/
} else {
//Camera allow disable
//Planogram list is not empty
if (planogramShelfHeaderDataList.size() > 0) {
if (!stock.equals("0")) {
if (stock.equals("") || faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
flag = false;
Error_Message = getResources().getString(R.string.fill_data);
break;
}
} else {
if (stock.equals("")) {
if (!checkHeaderArray.contains(i)) {
@@ -545,33 +607,9 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
} else {
flag = false;
Error_Message = getResources().getString(R.string.click_image);
Error_Message = getResources().getString(R.string.stock_planogram_data_noCamera_data);
break;
}
} else {
//Camera allow disable
if (!stock.equals("0")) {
if (stock.equals("") || faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
flag = false;
Error_Message = getResources().getString(R.string.fill_data);
break;
}
} else {
if (stock.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
flag = false;
Error_Message = getResources().getString(R.string.fill_data);
break;
}
}
}
} else {
if (faceup.equals("")) {
@@ -928,7 +966,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
}*/
switch (requestCode) {
case 1:
/*case 1:
if (resultCode == -1) {
if (_pathforcheck != null && !_pathforcheck.equals("")) {
if (new File(str + _pathforcheck).exists()) {
@@ -1049,6 +1087,15 @@ public class Stock_FacingActivity extends AppCompatActivity {
} else {
Log.e("Stock & Facing", "User cancelled");
}
break;*/
case 100:
//Planogram List for check and delete on backPress
prepareDefaultList();
if (planogramShelfHeaderDataList.size() > 0) {
camera1.setBackgroundResource(R.mipmap.new_no_camera_done_edit);
}
break;
}
super.onActivityResult(requestCode, resultCode, data);
@@ -1072,9 +1119,6 @@ public class Stock_FacingActivity extends AppCompatActivity {
@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) {
@@ -1083,6 +1127,13 @@ public class Stock_FacingActivity extends AppCompatActivity {
builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
.setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
if (!validateData(hashMapListHeaderData, hashMapListChildData, cameraData)) {
if (!camera_allow.equals("1")) {
db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
planogramShelfHeaderDataList, planogramHashMapListChildData);
}
}
finish();
}
})
@@ -1188,6 +1239,13 @@ public class Stock_FacingActivity extends AppCompatActivity {
builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
.setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
if (!validateData(hashMapListHeaderData, hashMapListChildData, cameraData)) {
if (!camera_allow.equals("1")) {
db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
planogramShelfHeaderDataList, planogramHashMapListChildData);
}
}
finish();
}
})
@@ -1272,7 +1330,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
img_camera2.setVisibility(View.GONE);
}
//img_camera1.setVisibility(View.GONE);
img_camera1.setVisibility(View.GONE);
img_camera2.setVisibility(View.GONE);
//Camera allow enable
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+12 -12
View File
@@ -427,16 +427,16 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
if (stock_facingHeaderList.size() > 0) {
for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) {
onXML = "[STOCK_FACING_DATA]"
onXML = "[STOCK_FACING_DATA_NEW]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[BRAND_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getBrand_id()) + "[/BRAND_ID]"
+ "[IAMGE1]" + stock_facingHeaderList.get(i1).getImage1() + "[/IAMGE1]"
+ "[IAMGE2]" + stock_facingHeaderList.get(i1).getImage2() + "[/IAMGE2]"
//+ "[IAMGE1]" + stock_facingHeaderList.get(i1).getImage1() + "[/IAMGE1]"
//+ "[IAMGE2]" + stock_facingHeaderList.get(i1).getImage2() + "[/IAMGE2]"
+ "[SKU_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getSku_id()) + "[/SKU_ID]"
+ "[STOCK]" + Integer.parseInt(stock_facingHeaderList.get(i1).getStock()) + "[/STOCK]"
+ "[FACEUP]" + Integer.parseInt(stock_facingHeaderList.get(i1).getFacing()) + "[/FACEUP]"
+ "[/STOCK_FACING_DATA]";
+ "[/STOCK_FACING_DATA_NEW]";
stock_facing_xml = stock_facing_xml + onXML;
}
@@ -445,7 +445,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "STOCK_FACING_DATA");
request.addProperty("KEYS", "STOCK_FACING_DATA_NEW");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
@@ -860,13 +860,13 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[SKU_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSku_id()) + "[/SKU_ID]"
//+ "[category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/category_id]"
+ "[CATEGORY_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
//+ "[company_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCompany_id()) + "[/company_id]"
//+ "[sub_category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSub_category_id()) + "[/sub_category_id]"
+ "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]"
//+ "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]"
+ "[SHELF_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_addShelf_id()) + "[/SHELF_ID]"
+ "[SHELF_POSITION]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_shelfPosition()) + "[/SHELF_POSITION]"
+ "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]"
//+ "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]"
+ "[/STOCK_FACING_PLANOGRAM_DATA]";
stock_facing_planogram_xml = stock_facing_planogram_xml + onXML;
@@ -907,7 +907,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
//Store Wise Camera
String store_wise_camera_xml = "";
/*String store_wise_camera_xml = "";
onXML = "";
storeWiseCameraDataGetterSetters = db.getStoreWiseCameraServerUploadData(coverageList.get(i).getStoreId());
@@ -957,13 +957,13 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
}
data.value = 55;
data.name = getString(R.string.stock_planogram_data_uploading);
publishProgress(data);
publishProgress(data);*/
//Image Upload
//Store Wise Camera Images Upload
if (storeWiseCameraDataGetterSetters.size() > 0) {
/*if (storeWiseCameraDataGetterSetters.size() > 0) {
for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) {
if (storeWiseCameraDataGetterSetters.get(i1).getCamera1() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera1().equals("")) {
@@ -1050,7 +1050,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
}
}
}
}
}*/
//Stock Facing Images Upload
/*if (stock_facingHeaderList.size() > 0) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+12 -12
View File
@@ -434,16 +434,16 @@ public class UploadActivity extends AppCompatActivity {
if (stock_facingHeaderList.size() > 0) {
for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) {
onXML = "[STOCK_FACING_DATA]"
onXML = "[STOCK_FACING_DATA_NEW]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[BRAND_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getBrand_id()) + "[/BRAND_ID]"
+ "[IAMGE1]" + stock_facingHeaderList.get(i1).getImage1() + "[/IAMGE1]"
+ "[IAMGE2]" + stock_facingHeaderList.get(i1).getImage2() + "[/IAMGE2]"
//+ "[IAMGE1]" + stock_facingHeaderList.get(i1).getImage1() + "[/IAMGE1]"
//+ "[IAMGE2]" + stock_facingHeaderList.get(i1).getImage2() + "[/IAMGE2]"
+ "[SKU_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getSku_id()) + "[/SKU_ID]"
+ "[STOCK]" + Integer.parseInt(stock_facingHeaderList.get(i1).getStock()) + "[/STOCK]"
+ "[FACEUP]" + Integer.parseInt(stock_facingHeaderList.get(i1).getFacing()) + "[/FACEUP]"
+ "[/STOCK_FACING_DATA]";
+ "[/STOCK_FACING_DATA_NEW]";
stock_facing_xml = stock_facing_xml + onXML;
}
@@ -452,7 +452,7 @@ public class UploadActivity extends AppCompatActivity {
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "STOCK_FACING_DATA");
request.addProperty("KEYS", "STOCK_FACING_DATA_NEW");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
@@ -898,13 +898,13 @@ public class UploadActivity extends AppCompatActivity {
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[SKU_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSku_id()) + "[/SKU_ID]"
//+ "[category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/category_id]"
+ "[CATEGORY_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
//+ "[company_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCompany_id()) + "[/company_id]"
//+ "[sub_category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSub_category_id()) + "[/sub_category_id]"
+ "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]"
//+ "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]"
+ "[SHELF_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_addShelf_id()) + "[/SHELF_ID]"
+ "[SHELF_POSITION]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_shelfPosition()) + "[/SHELF_POSITION]"
+ "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]"
//+ "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]"
+ "[/STOCK_FACING_PLANOGRAM_DATA]";
stock_facing_planogram_xml = stock_facing_planogram_xml + onXML;
@@ -945,7 +945,7 @@ public class UploadActivity extends AppCompatActivity {
//Store Wise Camera
String store_wise_camera_xml = "";
/*String store_wise_camera_xml = "";
onXML = "";
storeWiseCameraDataGetterSetters = db.getStoreWiseCameraServerUploadData(coverageList.get(i).getStoreId());
@@ -995,13 +995,13 @@ public class UploadActivity extends AppCompatActivity {
}
data.value = 55;
data.name = getString(R.string.stock_planogram_data_uploading);
publishProgress(data);
publishProgress(data);*/
//Image Upload
//Store Wise Camera Images Upload
if (storeWiseCameraDataGetterSetters.size() > 0) {
/*if (storeWiseCameraDataGetterSetters.size() > 0) {
for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) {
if (storeWiseCameraDataGetterSetters.get(i1).getCamera1() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera1().equals("")) {
@@ -1088,7 +1088,7 @@ public class UploadActivity extends AppCompatActivity {
}
}
}
}
}*/
//Stock Facing Images Upload
/*if (stock_facingHeaderList.size() > 0) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StockFacing_PlanogramTrackerDataGetterSetter.java
+42 -1
View File
@@ -1,11 +1,12 @@
package cpm.com.gskmtorange.xmlGetterSetter;
import java.util.ArrayList;
import java.util.Comparator;
public class StockFacing_PlanogramTrackerDataGetterSetter {
String shelf_id, shelf, sp_addShelf_id, sp_addShelf, sp_shelfPosition, checkbox_sku;
String category_id, sub_category_id, sub_category, brand_id, brand,
sku_id, sku, mrp, sku_sequence, stock, facing, mbq, company_id, image1, image2, sos_target;
sku_id, sku, mrp, sku_sequence, stock, facing, mbq, company_id, image1, image2, sos_target, key_id;
public String getShelf_id() {
return shelf_id;
@@ -182,4 +183,44 @@ public class StockFacing_PlanogramTrackerDataGetterSetter {
public void setCheckbox_sku(String checkbox_sku) {
this.checkbox_sku = checkbox_sku;
}
public String getKey_id() {
return key_id;
}
public void setKey_id(String key_id) {
this.key_id = key_id;
}
//Comparator Interface
public static Comparator<StockFacing_PlanogramTrackerDataGetterSetter> shelfComparator =
new Comparator<StockFacing_PlanogramTrackerDataGetterSetter>() {
public int compare(StockFacing_PlanogramTrackerDataGetterSetter s1, StockFacing_PlanogramTrackerDataGetterSetter s2) {
String shelf1 = s1.getSp_addShelf_id();
String shelf2 = s2.getSp_addShelf_id();
//ascending order
return shelf1.compareTo(shelf2);
//descending order
//return StudentName2.compareTo(StudentName1);
}
};
public static Comparator<StockFacing_PlanogramTrackerDataGetterSetter> shelfPositionComparator =
new Comparator<StockFacing_PlanogramTrackerDataGetterSetter>() {
public int compare(StockFacing_PlanogramTrackerDataGetterSetter s1, StockFacing_PlanogramTrackerDataGetterSetter s2) {
String shelf1 = s1.getSp_shelfPosition();
String shelf2 = s2.getSp_shelfPosition();
//ascending order
return shelf1.compareTo(shelf2);
//descending order
//return StudentName2.compareTo(StudentName1);
}
};
}
GSKMTOrange/src/main/res/layout/item_stock_facing_planogram_header.xml
+2
View File
@@ -5,6 +5,8 @@
android:background="@color/white"
android:orientation="vertical">
<!--android:descendantFocusability="blocksDescendants"-->
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_view"
android:layout_width="match_parent"
GSKMTOrange/src/main/res/values-ar/string.xml
+22 -198
View File
@@ -1,204 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="title_activity_Want_save">هل أنت متأكد من أنك تريد الحفظ؟</string>
<string name="Areyou_sure_take_backup">هل أنت متأكد من أنك تريد القيام بالنسخ الاحتياطي للبيانات الخاصة بك؟</string>
<string name="DataNot">لم يتم تحميل البيانات</string>
<string name="title_activity_Want_to_delete1">هل تريد حذف البيانات</string>
<string name="title_activity_Want_to_delete">هل تريد حذف البيانات</string>
<string name="nonetwork">لا يوجد اتصال بشبكة الاتصال. الرجاء التحقق من اتصالك بالإنترنت</string>
<string name="title_activity_Want_add">الرجاء إضافة البيانات</string>
<string name="takeimage">يرجى أخذ صورة</string>
<string name="store">محل</string>
<string name="StoreVisited">زيارة المتجر</string>
<string name="add">إضافة</string>
<string name="promo_compliance_add">إضافة</string>
<string name="promo_compliance_additional_promo">العروض الترويجية الاضافية</string>
<string name="daily_data_menu_additional_visibility">مساحات العرض الاضافية</string>
<string name="title_activity_Additional_visibility">مساحات العرض الاضافية</string>
<string name="additional_data_uploading">تحميل بيانات مساحات العرض الاضافية</string>
<string name="title_activity_Want_to_add">هل أنت متأكد من أنك تريد إضافة</string>
<string name="want_add">هل أنت متأكد من أنك تريد إضافة</string>
<string name="wantcheckout">هل أنت متأكد من أنك تريد الخروج</string>
<string name="check_save_message">هل أنت متأكد من أنك تريد الحفظ</string>
<string name="msl_availability_availability">توافر الاصناف</string>
<string name="availability_data_uploading">توافر تحميل البيانات</string>
<string name="brand">العلامة التجارية</string>
<string name="brandname">اسم العلامة التجارية</string>
<string name="address">C 126, Okhla II,</string>
<string name="camera">الكاميرا</string>
<string name="cancel">إلغاء الأمر</string>
<string name="title_activity_category_list">قائمة الفئات</string>
<string name="title_activity_category_wise_performance">أداء الفئة</string>
<string name="title_activity_checkout">أنشطة الخروج</string>
<string name="checkout_successful">نجاح الخروج</string>
<string name="gpsebale">انقر فوق موافق لتمكين نظام تحديد المواقع.</string>
<string name="store_image">انقر فوق الصورة الامامية لمخزن الصورة</string>
<string name="storefront">انقر فوق الصورة الامامية لمخزن الصورة</string>
<string name="adddatatoclick">انقر فوق نعم لإضافة البيانات</string>
<string name="title_activity_click_delete">انقر فوق نعم للحذف!</string>
<string name="closed">قم بالإغلاق</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="daily_data_menu_additional_promotions">Competition Promo</string>
<string name="daily_data_menu_competition_tracking">Competition Visibility</string>
<string name="permission_rationale">تصاريح الاتصالات مطلوبة من أجل توفير دعم البريد الإلكتروني</string>
<string name="coverage_data_uploading">تحميل التغطية</string>
<string name="menu_daily_download">تنزيل البيانات اليومية</string>
<string name="daily_activity_menu">قائمة البيانات اليومية</string>
<string name="title_activity_daily_main_menu">قائمة البيانات اليومية</string>
<string name="menu_daily_route_plan">خطة الطريق اليومية</string>
<string name="title_store_list_checkout_Already_filled">تمت تعبئة البيانات بالفعل</string>
<string name="data_downloaded_successfully">تم تنزيل البيانات بنجاح</string>
<string name="menu_export">تصدير البيانات</string>
<string name="save_message">تم حفظ البيانات</string>
<string name="update_message">تم تحديث البيانات</string>
<string name="datanotfound">لم يتم العثور على البيانات</string>
<string name="data_exported_successfully">تم تصدير قاعدة البيانات بنجاح</string>
<string name="delete">حذف</string>
<string name="display">عرض</string>
<string name="Display">عرض</string>
<string name="displayname">اسم العرض</string>
<string name="title_activity_save_data">هل تريد حفظ البيانات</string>
<string name="download_data">تنزيل البيانات</string>
<string name="prompt_email">البريد الإلكتروني</string>
<string name="empty">فارغ</string>
<string name="enter_the_values">قم بإدخال القيم</string>
<string name="error">خطأ في التحميل</string>
<string name="menu_exit">خروج</string>
<string name="export_database">تصدير قاعدة البيانات</string>
<string name="check_faceup">المواجهة لا يمكن أن تكون أكبر من قيمة المخزون</string>
<string name="stock_facing_faceup">مواجهة </string>
<string name="failure">فشل</string>
<string name="empty_field">قم بتعبئة القيمة</string>
<string name="first_checkout_store">أول زيارة للمحل</string>
<string name="fill_stock_value">أول تعبئة لقيمة المخزون</string>
<string name="first_geotag_the_store">أول تحديد لموقع المتجر الجغرافي</string>
<string name="gallery">معرض الصور</string>
<string name="gaps">الثغرات</string>
<string name="menu_geotag">العلامة الجغرافية</string>
<string name="title_activity_store_geotag">العلامة الجغرافية</string>
<string name="gps">تم تعطيل نظام تحديد المواقع...</string>
<string name="app_name">محلات أورانج الخاصى بـ GSK</string>
<string name="GSKMT">مخزن أورانج الخاصة بـ GSK MT </string>
<string name="main_menu_activity_name">محلات أورانج الخاصى بـ GSK</string>
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="image">الصورة</string>
<string name="promo_compliance_inStock">في المخزون</string>
<string name="AdditionalDisplay">هل هناك أي "مساحات عرض إضافية"</string>
<string name="action_sign_in">تسجيل الدخول</string>
<string name="category_performance_lsv">LSV ( آخر زيارة للمحل)</string>
<string name="category_performance_ltm">LTM ( آخر ثلاثة شهور)</string>
<string name="msl_availability_mbq">MBQ (أقل كمية أساسية )</string>
<string name="category_performance_msl_availability"> MSL (قائمة المخزون الأساسية)</string>
<string name="daily_data_menu_msl_availability"> MSL (قائمة المخزون الأساسية)</string>
<string name="category_performance_mtd"> MTD (المبيعات الشهرية حتى اليوم)</string>
<string name="title_activity_msl__availability">المخزون الواجب توافره</string>
<string name="NetworkError">خطأ في شبكة الاتصال</string>
<string name="new_update_available">تحديث جديد متوفر</string>
<string name="no">لا</string>
<string name="NodataAvailable">لا توجد بيانات متاحة</string>
<string name="no_data_for_upload">لا توجد بيانات للتحميل</string>
<string name="title_activity_Non_Work">سبب غير عامل</string>
<string name="ok">موافق</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="category_performance_oss">OSS</string>
<string name="dialog_title">Parinaam</string>
<string name="prompt_password">كلمة المرور</string>
<string name="category_performance_period">الفترة</string>
<string name="Photo">صور</string>
<string name="category_performance_PLANOGRAM">بلانوجرام</string>
<string name="title_store_list_checkout_current">الرجاء الخروج من المتجر الحالي</string>
<string name="click_image">الرجاء انقر فوق الصورة</string>
<string name="clickimage">الرجاء انقر فوق الصورة</string>
<string name="Pleasedownaloaddata">الرجاء تنزيل البيانات</string>
<string name="title_store_list_download_data">الرجاء تنزيل البيانات الأولى</string>
<string name="title_activity_enter_quantity">الرجاء إدخال كمية</string>
<string name="fill_data">الرجاء تعبئة جميع البيانات</string>
<string name="title_activity_fill_brand">يرجى ملء بيانات العلامة التجارية</string>
<string name="fill_gaps_data">يرجى ملء الفجوة في البيانات</string>
<string name="pleaseenterRemarks">يرجى ملء الملاحظات</string>
<string name="fill_sku_data">يرجى ملء بيانات الصنف</string>
<string name="title_activity_fill_sku">يرجى ملء بيانات الصنف</string>
<string name="title_activity_select_dropdown">الرجاء تحديد القائمة المنسدلة</string>
<string name="select_language">الرجاء تحديد اللغة</string>
<string name="title_activity_take_image">يرجى أخذ صورة</string>
<string name="title_store_list_activity_store_again_uploaded">الرجاء تحميل البيانات مرة أخرى</string>
<string name="previous_data_upload">الرجاء تحميل بيانات الأيام السابقة أولا</string>
<string name="present">الوقت الحالي</string>
<string name="category_performance_promo">العروض الترويجية</string>
<string name="promo_compliance_promoAnnouncer">مذيع العروض</string>
<string name="daily_data_menu_promo_compliance">مطابقة العروض الترويجية لقوانين الشركة</string>
<string name="promo_data_uploading">تحميل بيانات العروض الترويجية</string>
<string name="promo_add">تم إضافة العروض الترويجية</string>
<string name="promo_compliance_promo">العروض الترويجية</string>
<string name="promo_compliance_promos_sku">أصناف العروض الترويجية</string>
<string name="title_activity_promo_compliance">مطابقة العروض الترويجية لقوانين الشركة</string>
<string name="quantity">الكمية</string>
<string name="reason">السبب</string>
<string name="ref_image">الصورة المرجعية</string>
<string name="stock_facing_planogram_dialog_title">الصورة المرجعية</string>
<string name="stock_facing_reference_image">الصورة المرجعية</string>
<string name="Remark">ملاحظة</string>
<string name="promo_compliance_runningPOS">قيد التشغيل على نقاط البيع</string>
<string name="save">حفظ</string>
<string name="DELETE_ALERT_MESSAGE">سيتم فقدان البيانات المحفوظة--هل تريد الاستمرار؟</string>
<string name="select">حدد</string>
<string name="select_promo">حدد</string>
<string name="select_language_item">حدد اللغة</string>
<string name="title_activity_select_language">حدد اللغة</string>
<string name="select_reason">حدد السبب</string>
<string name="select_promo_value">حدد قيمة العروض</string>
<string name="title_activity_service">خدمة</string>
<string name="menu_services">الخدمات</string>
<string name="action_settings">إعدادات</string>
<string name="menu_setting">إعدادات</string>
<string name="title_activity_settings">إعدادات</string>
<string name="prompt_password">كلمة السر (اختياري)</string>
<string name="action_sign_in">تسجيل الدخول أو التسجيل</string>
<string name="action_sign_in_short">تسجيل الدخول</string>
<string name="title_activity_login">تسجيل الدخول</string>
<string name="promo_compliance_sku">الصنف</string>
<string name="sku">الصنف</string>
<string name="msl_availability_sku">إسم الصنف</string>
<string name="skuname">إسم الصنف</string>
<string name="stock_facing_sku_name">إسم الصنف</string>
<string name="category_performance_sos">SOS (حصة المساحة من الرف )</string>
<string name="stock_facing_sos">SOS (حصة المساحة من الرف )</string>
<string name="stock_facing_sos_target">SOS (هدف حصة المساحة من الرف )</string>
<string name="stock">المخزون</string>
<string name="stock_facing_stock">المخزون</string>
<string name="daily_data_menu_stock_facing">المخزون والمواجهة</string>
<string name="title_activity_stock_facing">المخزون والمواجهة</string>
<string name="stock_data_uploading">تحميل بيانات المخزون</string>
<string name="title_store_list_activity_store_already_checkout">تم الخروج بالفعل من المتجر</string>
<string name="title_store_list_activity_already_store_closed">تم إغلاق المتجر بالفعل</string>
<string name="title_geo_tag_activity_geo_already_done">تمت اضافة علامات جغرافية لتحديد مواقع المتجرات </string>
<string name="title_store_list_activity_store_already_done">تم تحميل المتجر بالفعل</string>
<string name="title_store_list_activity_store_closed">المتجر مغلق</string>
<string name="title_store_list_activity_store_data_uploaded">تم تحميل بيانات المتجر</string>
<string name="title_activity_store_image">مخزن استقبال الصورة</string>
<string name="title_geo_tag_activity_geo_data">تم تحميل العلامات الجغرافية للمتجر</string>
<string name="title_activity_store_list">قائمة المتجر</string>
<string name="title_geo_tag_activity_upload_data">تم تحميل المتجر</string>
<string name="store_visited">زيارة المتجر</string>
<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="t2p_data_uploading">تحميل بيانات مواد الدعاية T2P</string>
<string name="title_activity_t2p_brand__avaibility">تواجد مواد الدعاية</string>
<string name="notsuppoted">هذا الجهاز غير معتمد.</string>
<string name="error_invalid_email">عنوان البريد الإلكتروني هذا غير صالح</string>
<string name="error_field_required">هذا الحقل مطلوب</string>
<string name="error_incorrect_password">كلمة المرور غير صحيحة</string>
<string name="error_invalid_password">كلمة المرور قصيرة جداً</string>
<string name="error_incorrect_username">هذا اسم المستخدم غير صحيح</string>
<string name="menu_upload_data">تحميل البيانات</string>
<string name="title_activity_upload">تحميل البيانات</string>
<string name="uploadeddata">البيانات التي تم تحميلها</string>
<string name="uploaddata">تحميل البيانات</string>
<string name="geotagdata">تحميل بيانات جغرافية...</string>
<string name="uploadimge">تحميل صور جغرافية</string>
<string name="prompt_userid">اسم المستخدم</string>
<string name="data_will_be_lost">هل ترغب في الاستمرار؟ سيتم حذف البيانات الغير المحفوظة</string>
<string name="yes">نعم</string>
<string name="error_invalid_password">هذه كلمة المرور قصيرة جدا</string>
<string name="error_incorrect_password">هذه كلمة المرور غير صحيحة</string>
<string name="error_field_required">هذه الخانة مطلوبه</string>
<string name="permission_rationale">"هناك حاجة إلى صلات الأذونات لتوفير البريد الإلكتروني
        الاكمال."
</string>
<string name="menu_daily_route_plan">خطة الطريق اليومية</string>
<string name="menu_daily_download">يوميا تحميل البيانات</string>
<string name="menu_upload_data">البيانات تحميل</string>
<string name="menu_geotag">الجغرافية الكلمات الدلالية</string>
<string name="menu_exit">خروج</string>
<string name="menu_setting">ضبط</string>
<string name="menu_services">خدمات</string>
</resources>
GSKMTOrange/src/main/res/values-tr/string.xml
+16
View File
@@ -238,6 +238,22 @@
<string name="datanotfound">Içinde bulunmayan veri</string>
<string name="title_activity_fill_brand">Lütfen marka verilerini doldurun</string>
<string name="category_performance_PLANOGRAM">PLANOGRAM</string>
<!--Stock Facing Planogram Tracker-->
<string name="stock_planogram_data_uploading">Stok Planogram Veri Gönderimi</string>
<string name="daily_data_menu_category_picture">Kategori Resimleri</string>
<string name="title_activity_category_picture">KategoriResimleri</string>
<string name="stock_planogram_data_noCamera_data">Lütfen kamera yok datasını doldurun</string>
<string name="stock_planogram_shelf">Raf </string>
<string name="stock_planogram_shelf_position"> Konum </string>
<string name="stock_planogram_already_exists">Zaten var</string>
<string name="stock_planogram_data_select_one_sku">En azindan 1 SKU seçmelisiniz</string>
<string name="stock_planogram_data_add_shelf">SKU ekleyin, raf boş olamaz</string>
<string name="language">English</string>
<string name="language_return">TR</string>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+11
View File
@@ -275,7 +275,18 @@
<!--Stock Facing Planogram Tracker-->
<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="stock_planogram_data_noCamera_data">Please fill the no camera data</string>
<string name="stock_planogram_shelf">Shelf </string>
<string name="stock_planogram_shelf_position"> Position </string>
<string name="stock_planogram_already_exists">is already exists</string>
<string name="stock_planogram_data_select_one_sku">Please select atleast one sku</string>
<string name="stock_planogram_data_add_shelf">Add sku, shelf can not be empty</string>
<string name="language">English</string>
<string name="language_return">EN</string>
</resources>