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

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
This commit is contained in:
Gagan290
2017-01-12 12:04:18 +05:30
parent 4a73e327ed
commit 9384adeec3
4 changed files with 133 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+24 -46
View File
@@ -119,7 +119,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public void deleteTableWithStoreID(String storeid) {
db.delete( CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
}
@@ -920,7 +920,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
cd.setMrp(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MRP")));
cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
cd.setToggleValue("0");
cd.setToggleValue("1");
list.add(cd);
dbcursor.moveToNext();
@@ -1017,11 +1017,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
dbcursor.close();
if (list.size() > 0) {
return true;
} else {
return false;
}
return list.size() > 0;
}
} catch (Exception e) {
Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
@@ -1063,7 +1059,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND " +
dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID " +
"from MAPPING_STOCK M " +
"inner join SKU_MASTER SK " +
"on M.SKU_ID=SK.SKU_ID " +
@@ -1074,13 +1070,14 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"inner join CATEGORY_MASTER CA " +
"on SB.CATEGORY_ID=CA.CATEGORY_ID " +
"where CA.CATEGORY_ID='" + category_id + "' " +
"order by SB.SUB_CATEGORY,BR.BRAND", null);
"order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
Stock_FacingGetterSetter cd = new Stock_FacingGetterSetter();
cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
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")));
@@ -1158,6 +1155,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values1.put("Store_Id", storeId);
values1.put("Category_Id", categoryId);
values1.put("COMPANY_ID", data1.getCompany_id());
values1.put("SUB_CATEGORY_ID", data1.getSub_category_id());
values1.put("SUB_CATEGORY", data1.getSub_category());
values1.put("BRAND_ID", data1.getBrand_id());
@@ -1204,6 +1202,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
while (!dbcursor.isAfterLast()) {
Stock_FacingGetterSetter cd = new Stock_FacingGetterSetter();
cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
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")));
@@ -1312,11 +1311,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
dbcursor.close();
if (list.size() > 0) {
return true;
} else {
return false;
}
return list.size() > 0;
}
} catch (Exception e) {
Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
@@ -1530,7 +1525,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
public void InsertPromoSkuData(ArrayList<Promo_Compliance_DataGetterSetter> promoSkuListData, String category_id) {
ContentValues values = new ContentValues();
try {
@@ -1577,11 +1571,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
dbcursor.close();
if (list.size() > 0) {
return true;
} else {
return false;
}
return list.size() > 0;
}
} catch (Exception e) {
Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
@@ -1679,7 +1669,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " +
"where VISIT_DATE ='" + date + "' AND STORE_ID'="+ store_id +"'", null);
"where VISIT_DATE ='" + date + "' AND STORE_ID'=" + store_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -2111,7 +2101,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
//Gagan end new code 1
public void InsertStockDialog(AdditionalDialogGetterSetter data) {
public void InsertStockDialog(AdditionalDialogGetterSetter data) {
ContentValues values = new ContentValues();
try {
@@ -2121,16 +2111,16 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put(CommonString.KEY_BRAND, data.getBrand());
values.put(CommonString.KEY_BRAND_ID, data.getBrand_id());
// values.put(CommonString.KEY_DISPLAY_ID, data.getDisplay_id());
// values.put(CommonString.KEY_DISPLAY_ID, data.getDisplay_id());
values.put(CommonString.KEY_QUANTITY, data.getQuantity());
values.put(CommonString.KEY_SKU_ID, data.getSku_id());
values.put(CommonString.KEY_SKUNAME, data.getSku_name());
// values.put(CommonString.UNIQUE_KEY_ID, data.getUnique_id());
// values.put(CommonString.UNIQUE_KEY_ID, data.getUnique_id());
// values.put(CommonString.KEY_CATEGORY_ID, data.getCategory_id());
// values.put(CommonString.KEY_CATEGORY_ID, data.getCategory_id());
// values.put(CommonString.KEY_PROCESS_ID, data.getProcess_id());
// values.put(CommonString.KEY_PROCESS_ID, data.getProcess_id());
db.insert(CommonString.TABLE_INSERT_STOCK_DIALOG, null, values);
@@ -2148,7 +2138,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE COMMON_ID = '"+keyid + "'", null);
cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE COMMON_ID = '" + keyid + "'", null);
if (cursordata != null) {
cursordata.moveToFirst();
@@ -2171,7 +2161,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setSku_id(cursordata.getString(cursordata
.getColumnIndexOrThrow(CommonString.KEY_SKU_ID)));
sb.setSku_name(cursordata.getString(cursordata
sb.setSku_name(cursordata.getString(cursordata
.getColumnIndexOrThrow(CommonString.KEY_SKUNAME)));
@@ -2209,8 +2199,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public ArrayList<BrandMasterGetterSetter> getBrandMasterData(String store_id) {
Cursor cursordata = null;
ArrayList<BrandMasterGetterSetter> Data = new ArrayList<BrandMasterGetterSetter>();
@@ -2231,7 +2219,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setSUB_CATEGORY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
sb.setCOMPANY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("COMPANY_ID")));
sb.setBRAND_SEQUENCE(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_SEQUENCE")));
@@ -2252,7 +2239,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public ArrayList<SkuMasterGetterSetter> getSKUMasterData(String store_id) {
Cursor cursordata = null;
ArrayList<SkuMasterGetterSetter> Data = new ArrayList<SkuMasterGetterSetter>();
@@ -2273,7 +2259,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setBRAND_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_ID")));
sb.setMRP(cursordata.getString(cursordata.getColumnIndexOrThrow("MRP")));
sb.setSKU_SEQUENCE(cursordata.getString(cursordata.getColumnIndexOrThrow("SKU_SEQUENCE")));
@@ -2293,7 +2278,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public void InsertAdditionalData(AddittionalGetterSetter data,ArrayList<AdditionalDialogGetterSetter> dialog) {
public void InsertAdditionalData(AddittionalGetterSetter data, ArrayList<AdditionalDialogGetterSetter> dialog) {
ContentValues values = new ContentValues();
ContentValues values1 = new ContentValues();
try {
@@ -2307,10 +2292,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("sku_name", data.getSku());
values.put("toggle_value", data.getBtn_toogle());
long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, null, values);
long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, null, values);
for(int i=0;i<dialog.size();i++)
{
for (int i = 0; i < dialog.size(); i++) {
values1.put(CommonString.KEY_Common_ID, key_id);
values1.put(CommonString.KEY_STORE_ID, dialog.get(i).getStore_id());
values1.put(CommonString.KEY_BRAND, dialog.get(i).getBrand());
@@ -2323,16 +2307,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.insert(CommonString.TABLE_INSERT_STOCK_DIALOG, null, values1);
}
} catch (Exception ex) {
Log.d("Database Exception ", ex.getMessage());
}
@@ -2346,7 +2323,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility WHERE Store_Id = '"+store_id + "'", null);
cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility WHERE Store_Id = '" + store_id + "'", null);
if (cursordata != null) {
@@ -2395,8 +2372,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return productData;
}
public void updateStoreStatus(String storeid, String visitdate,
String status) {
String status) {
try {
ContentValues values = new ContentValues();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+3
View File
@@ -235,6 +235,9 @@ public class CommonString {
+ "Category_Id"
+ " VARCHAR,"
+ "COMPANY_ID"
+ " VARCHAR,"
+ "SUB_CATEGORY_ID"
+ " VARCHAR,"
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+102 -59
View File
@@ -72,7 +72,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
boolean checkflag = true;
private SharedPreferences preferences;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -98,6 +98,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
@@ -315,62 +316,75 @@ public class Stock_FacingActivity extends AppCompatActivity {
txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD);
txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
img_camera1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
//String date = new Date().toLocaleString().toString();
//String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-');
_pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
child_position = groupPosition;
path = str + _pathforcheck;
startCameraActivity1(groupPosition);
}
});
if (!img1.equalsIgnoreCase("")) {
if (groupPosition == child_position) {
headerTitle.setImage1(img1);
img1 = "";
}
if (headerTitle.getCompany_id().equals("1")) {
txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
} else {
txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black));
}
if (headerTitle.getImage1().equals("")) {
//Camera allow enable
if (camera_allow.equalsIgnoreCase("1")) {
img_camera1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
//String date = new Date().toLocaleString().toString();
//String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-');
_pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
child_position = groupPosition;
path = str + _pathforcheck;
startCameraActivity1(groupPosition);
}
});
if (!img1.equalsIgnoreCase("")) {
if (groupPosition == child_position) {
headerTitle.setImage1(img1);
img1 = "";
}
}
if (headerTitle.getImage1().equals("")) {
img_camera1.setBackgroundResource(R.mipmap.camera);
} else {
img_camera1.setBackgroundResource(R.mipmap.camera_done);
}
img_camera2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
//String date = new Date().toLocaleString().toString();
//String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-');
_pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
child_position = groupPosition;
path = str + _pathforcheck;
startCameraActivity2(groupPosition);
}
});
if (!img2.equalsIgnoreCase("")) {
if (groupPosition == child_position) {
headerTitle.setImage2(img2);
img2 = "";
}
}
if (headerTitle.getImage2().equals("")) {
img_camera2.setBackgroundResource(R.mipmap.camera);
} else {
img_camera2.setBackgroundResource(R.mipmap.camera_done);
}
} else {
//Camera allow disable
img_camera1.setBackgroundResource(R.mipmap.camera);
} else {
img_camera1.setBackgroundResource(R.mipmap.camera_done);
}
img_camera2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
//String date = new Date().toLocaleString().toString();
//String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-');
_pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
child_position = groupPosition;
path = str + _pathforcheck;
startCameraActivity2(groupPosition);
}
});
if (!img2.equalsIgnoreCase("")) {
if (groupPosition == child_position) {
headerTitle.setImage2(img2);
img2 = "";
}
}
if (headerTitle.getImage2().equals("")) {
img_camera2.setBackgroundResource(R.mipmap.camera);
} else {
img_camera2.setBackgroundResource(R.mipmap.camera_done);
}
if (!checkflag) {
if (checkHeaderArray.contains(groupPosition)) {
txt_stockFaceupHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
@@ -571,7 +585,43 @@ public class Stock_FacingActivity extends AppCompatActivity {
String stock = listDataChild.get(listDataHeader.get(i)).get(j).getStock();
String faceup = listDataChild.get(listDataHeader.get(i)).get(j).getFacing();
if (!imagePath.equals("") || !imagePath1.equals("")) {
//Camera allow enable
if (camera_allow.equalsIgnoreCase("1")) {
if (!imagePath.equals("") || !imagePath1.equals("")) {
if (!stock.equals("0")) {
if (stock.equals("") || faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
flag = false;
Error_Message = "Please fill all the data";
break;
}
} else {
if (stock.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
flag = false;
Error_Message = "Please fill all the data";
break;
}
}
} else {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
flag = false;
Error_Message = "Please click either 1 image";
break;
}
} else {
//Camera allow disable
if (!stock.equals("0")) {
if (stock.equals("") || faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
@@ -593,14 +643,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
break;
}
}
} else {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
flag = false;
Error_Message = "Please click either 1 image";
break;
}
}
GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml
+4 -4
View File
@@ -57,15 +57,15 @@
android:id="@+id/img_camera1"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp"
android:src="@drawable/ic_menu_camera" />
android:layout_marginRight="10dp" />
<!--android:src="@drawable/ic_menu_camera"-->
<ImageView
android:id="@+id/img_camera2"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp"
android:src="@drawable/ic_menu_camera" />
android:layout_marginRight="10dp" />
<!--android:src="@drawable/ic_menu_camera"-->
<ImageView
android:id="@+id/img_edit"