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

Merge pull request #66 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_t2p_valid

Browse Source 
T2P upload data newss
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-18 15:27:55 +05:30
committed by GitHub
parent f544705714 ff799a122f
commit e28cb3cdbd
13 changed files with 243 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+59 -2
View File
@@ -51,7 +51,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
*/
public class GSKOrangeDB extends SQLiteOpenHelper {
public static final String DATABASE_NAME = "GSK_ORANGE";
public static final String DATABASE_NAME = "GSK_ORANGE_DB";
public static final int DATABASE_VERSION = 13;
TableBean tableBean;
private SQLiteDatabase db;
@@ -130,6 +130,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
}
public void deleteAllTables() {
@@ -191,7 +197,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
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 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 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);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
@@ -210,6 +216,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
t2p.setDisplay(dbcursor.getString(dbcursor
.getColumnIndexOrThrow("DISPLAY")));
t2p.setRef_image_url(dbcursor.getString(dbcursor
.getColumnIndexOrThrow("IMAGE_URL")));
t2p.setRef_image_path(dbcursor.getString(dbcursor
.getColumnIndexOrThrow("IMAGE_PATH")));
t2p.setImage("");
t2p.setRemark("");
@@ -483,6 +495,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("DISPLAY_ID", data.getDISPLAY_ID().get(i));
values.put("DISPLAY", data.getDISPLAY().get(i));
values.put("IMAGE_URL", data.getIMAGE_URL().get(i));
values.put("IMAGE_PATH", data.getIMAGE_PATH().get(i));
db.insert("DISPLAY_MASTER", null, values);
}
@@ -2471,6 +2484,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put(CommonString.KEY_BRAND_ID, data.get(i).getBrand_id());
values.put(CommonString.KEY_BRAND, data.get(i).getBrand());
values.put(CommonString.KEY_DISPLAY, data.get(i).getDisplay());
values.put(CommonString.KEY_IMAGE_URL, data.get(i).getRef_image_url());
values.put(CommonString.KEY_IMAGE_PATH, data.get(i).getRef_image_path());
values.put(CommonString.KEY_IMAGE, data.get(i).getImage());
values.put(CommonString.KEY_REMARK, data.get(i).getRemark());
values.put(CommonString.KEY_PRESENT, data.get(i).isPresent());
@@ -2512,6 +2527,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
public boolean additionalVisibilitydata(String store_id, String category_id) {
Log.d("AdditionalVisibility ", "AdditionalVisibility data--------------->Start<------------");
ArrayList<AddittionalGetterSetter> list = new ArrayList<>();
@@ -2712,6 +2728,47 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
T2PGetterSetter tp = new T2PGetterSetter();
tp.setKey_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_ID)));
tp.setDisplay_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY_ID)));
tp.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID)));
tp.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND)));
tp.setDisplay(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY)));
tp.setRef_image_url(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE_URL)));
tp.setRef_image_path(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE_PATH)));
tp.setImage(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE)));
tp.setRemark(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_REMARK)));
tp.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID)));
tp.setPresent((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)).equalsIgnoreCase("1")));
list.add(tp);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
return list;
}
return list;
}
// get T2P Compliance store wise data
public ArrayList<T2PGetterSetter> getT2pComplianceStorewiseData(String store_id) {
ArrayList<T2PGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " +
CommonString.KEY_STORE_ID + "='" + store_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+3
View File
@@ -50,6 +50,7 @@ public class CommonString {
public static final String KEY_COVERAGE_REMARK = "REMARK";
public static final String KEY_IMAGE = "IMAGE";
public static final String KEY_IMAGE_URL = "IMAGE_URL";
public static final String KEY_IMAGE_PATH = "IMAGE_PATH";
public static final String KEY_ID = "Id";
public static final String KEY_MERCHANDISER_ID = "MERCHANDISER_ID";
@@ -493,6 +494,8 @@ public class CommonString {
+ KEY_BRAND_ID + " INTEGER,"
+ KEY_DISPLAY_ID + " INTEGER,"
+ KEY_BRAND + " VARCHAR,"
+ KEY_IMAGE_URL + " VARCHAR,"
+ KEY_IMAGE_PATH+ " VARCHAR,"
+ KEY_DISPLAY + " VARCHAR,"
+ KEY_IMAGE + " VARCHAR,"
+ KEY_REMARK + " VARCHAR,"
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+1 -1
View File
@@ -257,7 +257,7 @@ public class NonWorkingReason extends AppCompatActivity implements
if (_pathforcheck != null && !_pathforcheck.equals("")) {
if (new File(str + _pathforcheck).exists()) {
camera.setImageDrawable(getResources().getDrawable(R.drawable.cam_deactive));
camera.setImageDrawable(getResources().getDrawable(R.mipmap.camera_green));
image1 = _pathforcheck;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+1 -5
View File
@@ -528,17 +528,13 @@ public class StoreListActivity extends AppCompatActivity {
public boolean setcheckedmenthod(String store_cd) {
boolean result_flag = false;
for (int i = 0; i < coverage.size(); i++) {
if (store_cd.equals(coverage.get(i).getStoreId())) {
if (coverage.get(i).getOutTime() != null) {
result_flag = true;
break;
}
} else {
result_flag = false;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+68 -28
View File
@@ -102,7 +102,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
//preference data
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);
@@ -174,7 +174,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
protected void onResume() {
super.onResume();
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
@@ -218,7 +218,18 @@ public class T2PComplianceActivity extends AppCompatActivity {
@Override
public void onClick(View v) {
mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes)));
if (((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes))) {
mItem.setPresent(true);
} else {
mItem.setPresent(false);
mItem.getGapsChecklist().clear();
mItem.getSkulist().clear();
if (!mItem.getImage().equals("")) {
new File(str + mItem.getImage()).delete();
mItem.setImage("");
}
}
t2PAdapter.notifyDataSetChanged();
}
@@ -239,7 +250,14 @@ public class T2PComplianceActivity extends AppCompatActivity {
}
}
if(camera_allow.equals("1")){
holder.btn_ref_img.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
}
});
if (camera_allow.equals("1")) {
holder.img_cam.setOnClickListener(new View.OnClickListener() {
@Override
@@ -253,28 +271,49 @@ public class T2PComplianceActivity extends AppCompatActivity {
});
if (mItem.getImage().equals("")) {
holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
if (mItem.isPresent()) {
holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
} else {
//if not present camera disabled
holder.img_cam.setBackgroundResource(R.mipmap.camera_grey);
}
} else {
holder.img_cam.setBackgroundResource(R.mipmap.camera_green);
}
}
else {
} else {
holder.img_cam.setBackgroundResource(R.mipmap.camera_grey);
}
holder.toggle_btn.setChecked(mItem.isPresent());
boolean is_enabled = mItem.isPresent();
holder.toggle_btn.setChecked(is_enabled);
holder.img_cam.setEnabled(is_enabled);
holder.btn_gaps.setEnabled(is_enabled);
holder.btn_sku.setEnabled(is_enabled);
if (mItem.getGapsChecklist().size() > 0) {
holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.green));
} else {
holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
if(mItem.isPresent()){
holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
}
else {
holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.grey_background));
}
}
if (mItem.getSkulist().size() > 0) {
holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green));
} else {
holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
if(mItem.isPresent()){
holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
}
else {
holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.grey_background));
}
}
}
@@ -635,19 +674,22 @@ public class T2PComplianceActivity extends AppCompatActivity {
for (int i = 0; i < t2PGetterSetters.size(); i++) {
if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) {
flag = false;
error_msg = getResources().getString(R.string.click_image);
break;
} else if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) {
flag = false;
error_msg = getResources().getString(R.string.fill_gaps_data);
break;
} else if (t2PGetterSetters.get(i).getSkulist().size() == 0) {
flag = false;
error_msg = getResources().getString(R.string.fill_sku_data);
break;
if(t2PGetterSetters.get(i).isPresent()){
if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) {
flag = false;
error_msg = getResources().getString(R.string.click_image);
break;
} else if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) {
flag = false;
error_msg = getResources().getString(R.string.fill_gaps_data);
break;
} else if (t2PGetterSetters.get(i).getSkulist().size() == 0) {
flag = false;
error_msg = getResources().getString(R.string.fill_sku_data);
break;
}
}
}
return flag;
@@ -914,15 +956,13 @@ public class T2PComplianceActivity extends AppCompatActivity {
private static boolean updateResources(Context context, String language) {
String lang ;
String lang;
if(language.equalsIgnoreCase("English")){
if (language.equalsIgnoreCase("English")) {
lang = "EN";
}
else if(language.equalsIgnoreCase("UAE")) {
} else if (language.equalsIgnoreCase("UAE")) {
lang = "AR";
}
else {
} else {
lang = "TR";
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+55
View File
@@ -772,6 +772,61 @@ public class DownloadActivity extends AppCompatActivity {
//Gagan end code
//Display Master Image save into folder
if (displayMasterGetterSetter != null) {
for (int i = 0; i < displayMasterGetterSetter.getIMAGE_URL().size(); i++) {
//publishing image download
data.value = data.value + 1;
if (data.value < 100) {
publishProgress(data);
}
String image_name = displayMasterGetterSetter.getIMAGE_URL().get(i);
String img_url = displayMasterGetterSetter.getIMAGE_PATH().get(i);
if (!img_url.equalsIgnoreCase("") && !image_name.equalsIgnoreCase("")) {
URL url = new URL(img_url + 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();
}
}
}
}
}
db.open();
db.InsertJCP(jcpgettersetter);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DisplayMasterGetterSetter.java
+9
View File
@@ -13,6 +13,7 @@ public class DisplayMasterGetterSetter {
ArrayList<String> DISPLAY_ID = new ArrayList<>();
ArrayList<String> DISPLAY = new ArrayList<>();
ArrayList<String> IMAGE_URL = new ArrayList<>();
ArrayList<String> IMAGE_PATH = new ArrayList<>();
public String getTable_DISPLAY_MASTER() {
return table_DISPLAY_MASTER;
@@ -45,4 +46,12 @@ public class DisplayMasterGetterSetter {
public void setIMAGE_URL(String IMAGE_URL) {
this.IMAGE_URL.add(IMAGE_URL);
}
public ArrayList<String> getIMAGE_PATH() {
return IMAGE_PATH;
}
public void setIMAGE_PATH(String IMAGE_PATH) {
this.IMAGE_PATH.add(IMAGE_PATH);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
+17 -1
View File
@@ -8,7 +8,7 @@ import java.util.ArrayList;
public class T2PGetterSetter {
String brand_id, display_id, brand, display, image, remark, key_id, category_id;
String brand_id, display_id, brand, display, image, remark, key_id, category_id, ref_image_url, ref_image_path;
boolean isPresent;
ArrayList<GapsChecklistGetterSetter> gapsChecklist = new ArrayList<>();
@@ -101,4 +101,20 @@ public class T2PGetterSetter {
public void setCategory_id(String category_id) {
this.category_id = category_id;
}
public String getRef_image_url() {
return ref_image_url;
}
public void setRef_image_url(String ref_image_url) {
this.ref_image_url = ref_image_url;
}
public String getRef_image_path() {
return ref_image_path;
}
public void setRef_image_path(String ref_image_path) {
this.ref_image_path = ref_image_path;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+4
View File
@@ -363,6 +363,10 @@ public class XMLHandlers {
if (xpp.getName().equals("IMAGE_URL")) {
display.setIMAGE_URL(xpp.nextText());
}
if (xpp.getName().equals("IMAGE_PATH")) {
display.setIMAGE_PATH(xpp.nextText());
}
}
xpp.next();
}
GSKMTOrange/src/main/res/layout/nonworking.xml
+1 -1
View File
@@ -73,7 +73,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:background="@null"
android:src="@drawable/cam_active" />
android:src="@mipmap/camera_orange" />
</RelativeLayout>
<RelativeLayout
GSKMTOrange/src/main/res/mipmap-hdpi/export.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

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

After

Width:  |  Height:  |  Size: 4.2 KiB

GSKMTOrange/src/main/res/values-tr/string.xml
+25 -1
View File
@@ -126,6 +126,31 @@
<string name="title_activity_Want_to_delete1"> Verileri silmek istiyor musun</string>
<string name="title_activity_click_delete">Silme için Evet tıklayın</string>
<string name="title_activity_select_dropdown">Please Select dropdown</string>
<string name="title_activity_take_image">Please Take a image</string>
<string name="title_activity_fill_sku">Please fill sku data</string>
<string name="title_activity_enter_quantity">Please enter Quantity</string>
<string name="title_activity_save_data">Do you want to save the data</string>
<string name="clickimage">Please click the image</string>
<string name="gps">GPS IS DISABLED...</string>
<string name="gpsebale">Click ok to enable GPS.</string>
<string name="takeimage"> Please Take Image Before Save</string>
<string name="notsuppoted">This device is not supported.</string>
<string name="uploaddata">Uploading Data</string>
<string name="geotagdata">Uploading Geotag Data...</string>
<string name="failure">failure</string>
<string name="uploadimge">Uploading Geotag Images</string>
<string name="success">success</string>
<string name="wantcheckout">Are you sure you want to Checkout</string>
<string name="nonetwork"> No Network</string>
<string name="click_image">Please click image</string>
<string name="export_database">Veritabanı Aktar</string>
<string name="title_activity_service">Servisler</string>
<string name="title_activity_take_image">En az bir fotoğraf çekiniz</string>
<string name="title_activity_fill_sku">Ürün ekle</string>
@@ -175,7 +200,6 @@
<string name="dialog_title">Parinaam</string>
<!--Gagan end new code 2-->
</resources>