diff --git a/.idea/misc.xml b/.idea/misc.xml
index b15ecee..b8dc4d6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -41,7 +41,7 @@
-
+
diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index 96b324b..36ec310 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -111,11 +111,15 @@
-
+
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
index e9dad01..9ad1cfe 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -11,17 +11,18 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.GeotaggingBeans;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
+import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
-import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
@@ -80,7 +81,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(CommonString.CREATE_TABLE_STORE_GEOTAGGING);
db.execSQL(CommonString.CREATE_TABLE_COVERAGE_DATA);
-
db.execSQL(TableBean.getDisplayChecklistMaster());
db.execSQL(TableBean.getMappingDisplayChecklist());
@@ -88,6 +88,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_HEADER);
db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_CHILD);
+ db.execSQL(CommonString.CREATE_TABLE_STOCK_DIALOG);
+ db.execSQL(CommonString.CREATE_TABLE_STOCK_ADDITIONAL_STOCK_DATA);
}
@@ -254,7 +256,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
- dbcursor = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='"+key_account_id +"' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = "+ class_id +"'",null);
+ dbcursor = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='"+key_account_id +"' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '"+ class_id +"'",null);
if(dbcursor != null){
dbcursor.moveToFirst();
while(!dbcursor.isAfterLast()){
@@ -294,7 +296,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
- dbcursor = db.rawQuery("SELECT DISTINCT SM.SKU, SM.SKU_ID, BR.BRAND_ID FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='"+key_account_id +"' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = "+ class_id +"' AND SM.BRAND_ID='"+ brand_id + "'",null);
+ dbcursor = db.rawQuery("SELECT DISTINCT SM.SKU, SM.SKU_ID, BR.BRAND_ID FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='"+key_account_id +"' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '"+ class_id +"' AND SM.BRAND_ID='"+ brand_id + "'",null);
if(dbcursor != null){
dbcursor.moveToFirst();
while(!dbcursor.isAfterLast()){
@@ -333,8 +335,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Cursor dbcursor = null;
try {
- dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " +
- "where VISIT_DATE ='" + date + "'", null);
+ dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " + "where VISIT_DATE ='" + date + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -1421,6 +1422,286 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
+ public void InsertStockDialog(AdditionalDialogGetterSetter data) {
+ ContentValues values = new ContentValues();
+
+ try {
+
+
+ values.put(CommonString.KEY_STORE_ID, data.getStore_id());
+ 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_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.KEY_CATEGORY_ID, data.getCategory_id());
+
+ // values.put(CommonString.KEY_PROCESS_ID, data.getProcess_id());
+
+
+ db.insert(CommonString.TABLE_INSERT_STOCK_DIALOG, null, values);
+
+
+ } catch (Exception ex) {
+ Log.d("Database Exception ", ex.getMessage());
+ }
+
+ }
+
+ public ArrayList getDialogStock(String store_id) {
+ Cursor cursordata = null;
+ ArrayList productData = new ArrayList();
+
+ try {
+
+ cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE STORE_ID = '"+store_id + "'", null);
+
+ /* cursordata = db.rawQuery("SELECT * from "
+ + CommonString.TABLE_INSERT_STOCK_TOT + " WHERE "
+ + CommonString.KEY_STORE_ID + "='" + store_id + "' AND "
+ + CommonString.KEY_CATEGORY_ID + "='" + cate_id + "' AND "
+ + CommonString.KEY_PROCESS_ID + " ='" + process_id + "' AND "
+ + CommonString.KEY_DISPLAY_ID + "= '" + display_id + "' AND "
+ + CommonString.UNIQUE_KEY_ID + "= '" + unique_id + "'",
+ null);*/
+
+ if (cursordata != null) {
+ cursordata.moveToFirst();
+ while (!cursordata.isAfterLast()) {
+ AdditionalDialogGetterSetter sb = new AdditionalDialogGetterSetter();
+
+ sb.setKEY_ID(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_ID)));
+
+ sb.setBrand_id(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_BRAND_ID)));
+
+ sb.setBrand(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_BRAND)));
+
+ /*sb.setCategory_id(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID)));
+
+
+ sb.setDisplay_id(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_DISPLAY_ID)));*/
+
+ sb.setQuantity(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_QUANTITY)));
+
+ sb.setSku_id(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_SKU_ID)));
+
+ sb.setSku_name(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_SKUNAME)));
+
+ /* sb.setProcess_id(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_PROCESS_ID)));
+
+ sb.setUnique_id(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.UNIQUE_KEY_ID)));*/
+
+
+ productData.add(sb);
+ cursordata.moveToNext();
+ }
+ cursordata.close();
+
+ }
+
+
+ } catch (Exception ex) {
+
+ }
+ return productData;
+
+ }
+
+ public void deletedialogStockEntry(String id) {
+ try {
+ db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, "Id" + "='" + id + "'", null);
+ } catch (Exception e) {
+ System.out.println("" + e);
+ }
+
+ }
+
+ public void deleteStockEntry(String id) {
+ try {
+ db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_DATA, "Id" + "='" + id + "'", null);
+ } catch (Exception e) {
+ System.out.println("" + e);
+ }
+
+ }
+
+
+
+
+ public ArrayList getBrandMasterData(String store_id) {
+ Cursor cursordata = null;
+ ArrayList Data = new ArrayList();
+
+ try {
+
+ cursordata = db.rawQuery("SELECT * FROM BRAND_MASTER ", null);
+
+ if (cursordata != null) {
+ cursordata.moveToFirst();
+ while (!cursordata.isAfterLast()) {
+ BrandMasterGetterSetter sb = new BrandMasterGetterSetter();
+
+ sb.setBRAND_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_ID")));
+
+ sb.setBRAND(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND")));
+
+ 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")));
+
+ Data.add(sb);
+ cursordata.moveToNext();
+ }
+ cursordata.close();
+
+ }
+
+
+ } catch (Exception ex) {
+
+ }
+ return Data;
+
+ }
+
+
+
+ public ArrayList getSKUMasterData(String store_id) {
+ Cursor cursordata = null;
+ ArrayList Data = new ArrayList();
+
+ try {
+
+ cursordata = db.rawQuery("SELECT * FROM SKU_MASTER ", null);
+
+ if (cursordata != null) {
+ cursordata.moveToFirst();
+ while (!cursordata.isAfterLast()) {
+ SkuMasterGetterSetter sb = new SkuMasterGetterSetter();
+
+ sb.setSKU_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("SKU_ID")));
+
+ sb.setSKU(cursordata.getString(cursordata.getColumnIndexOrThrow("SKU")));
+
+ 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")));
+
+ Data.add(sb);
+ cursordata.moveToNext();
+ }
+ cursordata.close();
+
+ }
+
+
+ } catch (Exception ex) {
+
+ }
+ return Data;
+
+ }
+
+ public void InsertAdditionalData(AddittionalGetterSetter data) {
+ ContentValues values = new ContentValues();
+
+ try {
+
+
+ values.put(CommonString.KEY_STORE_ID, data.getStore_id());
+ values.put(CommonString.KEY_BRAND, data.getBrand());
+ values.put(CommonString.KEY_BRAND_ID, data.getBrand_id());
+ values.put(CommonString.KEY_IMAGE, data.getImage());
+ values.put(CommonString.KEY_SKU_ID, data.getSku_id());
+ values.put(CommonString.KEY_SKUNAME, data.getSku());
+
+ db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_DATA, null, values);
+
+
+ } catch (Exception ex) {
+ Log.d("Database Exception ", ex.getMessage());
+ }
+
+ }
+
+
+ public ArrayList getAdditionalStock(String store_id) {
+ Cursor cursordata = null;
+ ArrayList productData = new ArrayList();
+
+ try {
+
+ cursordata = db.rawQuery("SELECT * FROM ADDITIONAL_STOCK_DATA WHERE STORE_ID = '"+store_id + "'", null);
+
+
+ if (cursordata != null) {
+ cursordata.moveToFirst();
+ while (!cursordata.isAfterLast()) {
+ AddittionalGetterSetter sb = new AddittionalGetterSetter();
+
+
+ sb.setKey_id(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_ID)));
+
+
+ sb.setStore_id(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_STORE_ID)));
+
+ sb.setBrand_id(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_BRAND_ID)));
+
+ sb.setBrand(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_BRAND)));
+
+
+ sb.setImage(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_IMAGE)));
+
+ sb.setSku_id(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_SKU_ID)));
+
+ sb.setSku(cursordata.getString(cursordata
+ .getColumnIndexOrThrow(CommonString.KEY_SKUNAME)));
+
+ productData.add(sb);
+ cursordata.moveToNext();
+ }
+ cursordata.close();
+
+ }
+
+
+ } catch (Exception ex) {
+
+ }
+ return productData;
+
+ }
+
+
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AdditionalDialogGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AdditionalDialogGetterSetter.java
new file mode 100644
index 0000000..a411572
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AdditionalDialogGetterSetter.java
@@ -0,0 +1,234 @@
+package cpm.com.gskmtorange.GetterSetter;
+
+public class AdditionalDialogGetterSetter {
+ public String Display_id,display,brand_id,brand, trg_quantity, image1, image2, category_id,
+ image3, BEFORE_QTY, camera1, camera2, camera3, AFTER_QTY, store_id, stock_count, question_id, question, answer, type,
+ KEY_ID, unique_id,image_url, sku_id,quantity, process_id, sku_name, stock_flag;
+
+ public String getStock_flag() {
+ return stock_flag;
+ }
+
+ public void setStock_flag(String stock_flag) {
+ this.stock_flag = stock_flag;
+ }
+
+ public String getSku_name() {
+ return sku_name;
+ }
+
+ public void setSku_name(String sku_name) {
+ this.sku_name = sku_name;
+ }
+
+ public String getProcess_id() {
+ return process_id;
+ }
+
+ public void setProcess_id(String process_id) {
+ this.process_id = process_id;
+ }
+
+ public String getSku_id() {
+ return sku_id;
+ }
+
+ public void setSku_id(String sku_id) {
+ this.sku_id = sku_id;
+ }
+
+ public String getQuantity() {
+ return quantity;
+ }
+
+ public void setQuantity(String quantity) {
+ this.quantity = quantity;
+ }
+
+ public String getImage_url() {
+ return image_url;
+ }
+
+ public void setImage_url(String image_url) {
+ this.image_url = image_url;
+ }
+
+ public String getUnique_id() {
+ return unique_id;
+ }
+
+ public void setUnique_id(String unique_id) {
+ this.unique_id = unique_id;
+ }
+
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String kEY_ID) {
+ KEY_ID = kEY_ID;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getCategory_id() {
+ return category_id;
+ }
+
+ public void setCategory_id(String category_id) {
+ this.category_id = category_id;
+ }
+
+ public String getQuestion_id() {
+ return question_id;
+ }
+
+ public void setQuestion_id(String question_id) {
+ this.question_id = question_id;
+ }
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+
+ public String getStock_count() {
+ return stock_count;
+ }
+
+ public void setStock_count(String stock_count) {
+ this.stock_count = stock_count;
+ }
+
+ public String getStore_id() {
+ return store_id;
+ }
+
+ public void setStore_id(String store_id) {
+ this.store_id = store_id;
+ }
+
+ public String getCamera1() {
+ return camera1;
+ }
+
+ public void setCamera1(String camera1) {
+ this.camera1 = camera1;
+ }
+
+ public String getCamera2() {
+ return camera2;
+ }
+
+ public void setCamera2(String camera2) {
+ this.camera2 = camera2;
+ }
+
+ public String getCamera3() {
+ return camera3;
+ }
+
+ public void setCamera3(String camera3) {
+ this.camera3 = camera3;
+ }
+
+ public String getDisplay_id() {
+ return Display_id;
+ }
+
+ public void setDisplay_id(String display_id) {
+ Display_id = display_id;
+ }
+
+ public String getDisplay() {
+ return display;
+ }
+
+ public void setDisplay(String display) {
+ this.display = display;
+ }
+
+ public String getBrand_id() {
+ return brand_id;
+ }
+
+ public void setBrand_id(String brand_id) {
+ this.brand_id = brand_id;
+ }
+
+ public String getBrand() {
+ return brand;
+ }
+
+ public void setBrand(String brand) {
+ this.brand = brand;
+ }
+
+ public String getTrg_quantity() {
+ return trg_quantity;
+ }
+
+ public void setTrg_quantity(String trg_quantity) {
+ this.trg_quantity = trg_quantity;
+ }
+
+ public String getImage1() {
+ return image1;
+ }
+
+ public void setImage1(String image1) {
+ this.image1 = image1;
+ }
+
+ public String getImage2() {
+ return image2;
+ }
+
+ public void setImage2(String image2) {
+ this.image2 = image2;
+ }
+
+ public String getImage3() {
+ return image3;
+ }
+
+ public void setImage3(String image3) {
+ this.image3 = image3;
+ }
+
+ public String getBEFORE_QTY() {
+ return BEFORE_QTY;
+ }
+
+ public void setBEFORE_QTY(String bEFORE_QTY) {
+ BEFORE_QTY = bEFORE_QTY;
+ }
+
+ public String getAFTER_QTY() {
+ return AFTER_QTY;
+ }
+
+ public void setAFTER_QTY(String aFTER_QTY) {
+ AFTER_QTY = aFTER_QTY;
+ }
+
+
+
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AddittionalGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AddittionalGetterSetter.java
new file mode 100644
index 0000000..e5bea5d
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AddittionalGetterSetter.java
@@ -0,0 +1,69 @@
+package cpm.com.gskmtorange.GetterSetter;
+
+/**
+ * Created by ashishc on 09-01-2017.
+ */
+
+public class AddittionalGetterSetter {
+
+ public String getBrand() {
+ return Brand;
+ }
+
+ public void setBrand(String brand) {
+ Brand = brand;
+ }
+
+ public String getBrand_id() {
+ return Brand_id;
+ }
+
+ public void setBrand_id(String brand_id) {
+ Brand_id = brand_id;
+ }
+
+ public String getSku() {
+ return Sku;
+ }
+
+ public void setSku(String sku) {
+ Sku = sku;
+ }
+
+ public String getSku_id() {
+ return Sku_id;
+ }
+
+ public void setSku_id(String sku_id) {
+ Sku_id = sku_id;
+ }
+
+ public String getStore_id() {
+ return Store_id;
+ }
+
+ public void setStore_id(String store_id) {
+ Store_id = store_id;
+ }
+
+ public String getImage() {
+ return Image;
+ }
+
+ public void setImage(String image) {
+ Image = image;
+ }
+
+ String Brand,Brand_id,Sku,Sku_id,Store_id,Image;
+
+ public String getKey_id() {
+ return key_id;
+ }
+
+ public void setKey_id(String key_id) {
+ this.key_id = key_id;
+ }
+
+ String key_id;
+
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
index 7a64712..58ded0b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
@@ -36,6 +36,7 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GeoTag.GeoTagStoreList;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.dailyentry.AdditionalVisibility;
import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity;
import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity;
import cpm.com.gskmtorange.dailyentry.StoreListActivity;
@@ -167,7 +168,7 @@ public class MainActivity extends AppCompatActivity
}
else if (id == R.id.nav_geotag) {
-
+ db.open();
storelist = db.getStoreData(date);
@@ -186,6 +187,14 @@ public class MainActivity extends AppCompatActivity
} else if (id == R.id.nav_exit) {
+
+ Intent startDownload = new Intent(this,AdditionalVisibility.class);
+ startActivity(startDownload);
+
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+
+
+
} else if (id == R.id.nav_services) {
Intent startDownload = new Intent(this,T2PComplianceActivity.class);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
index aadbee4..53ba9d0 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
@@ -50,10 +50,18 @@ public class CommonString {
public static final String KEY_IMAGE = "IMAGE";
public static final String KEY_ID = "Id";
public static final String KEY_MERCHANDISER_ID = "MERCHANDISER_ID";
-
-
-
+ public static final String KEY_BRAND = "BRAND";
+ public static final String KEY_BRAND_ID = "BRAND_ID";
+ public static final String KEY_DISPLAY_ID = "DISPLAY_ID";
+ public static final String KEY_QUANTITY = "QUANTITY";
+ public static final String KEY_SKU_ID = "SKU_ID";
+ public static final String KEY_SKUNAME = "SKUNAME";
+ public static final String UNIQUE_KEY_ID = "UNIQUE_KEY_ID";
+ public static final String KEY_CATEGORY_ID = "CATEGORY_ID";
+ public static final String KEY_PROCESS_ID = "PROCESS_ID";
public static final String KEY_JOURNEY_PLAN = "JOURNEY_PLAN";
+ public static final String TABLE_INSERT_STOCK_DIALOG = "STOCK_DIALOG";
+ public static final String TABLE_INSERT_STOCK_ADDITIONAL_DATA = "ADDITIONAL_STOCK_DATA";
public static final String KEY_P = "P";
public static final String KEY_D = "D";
@@ -270,4 +278,25 @@ public class CommonString {
+ ")";
+
+ public static final String CREATE_TABLE_STOCK_DIALOG = "CREATE TABLE "
+ + TABLE_INSERT_STOCK_DIALOG + " (" + KEY_ID
+ + " INTEGER PRIMARY KEY AUTOINCREMENT," + KEY_STORE_ID + " VARCHAR,"
+ + KEY_BRAND_ID + " VARCHAR," + KEY_BRAND + " VARCHAR,"
+ + KEY_DISPLAY_ID +" VARCHAR,"
+ + KEY_SKU_ID + " VARCHAR," + KEY_QUANTITY + " VARCHAR," + UNIQUE_KEY_ID + " VARCHAR,"
+ + KEY_CATEGORY_ID + " VARCHAR,"
+ + KEY_SKUNAME + " VARCHAR,"
+ + KEY_PROCESS_ID + " VARCHAR)";
+
+
+ public static final String CREATE_TABLE_STOCK_ADDITIONAL_STOCK_DATA = "CREATE TABLE "
+ + TABLE_INSERT_STOCK_ADDITIONAL_DATA + " (" + KEY_ID
+ + " INTEGER PRIMARY KEY AUTOINCREMENT," + KEY_STORE_ID + " VARCHAR,"
+ + KEY_BRAND_ID + " VARCHAR," + KEY_BRAND + " VARCHAR,"
+
+ + KEY_SKU_ID + " VARCHAR," + KEY_IMAGE + " VARCHAR,"
+
+ + KEY_SKUNAME + " VARCHAR,"
+ + KEY_IMAGE + " VARCHAR)";
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
index 3fc58a1..26da627 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
@@ -1,26 +1,473 @@
package cpm.com.gskmtorange.dailyentry;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
+import android.os.Build;
import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.provider.MediaStore;
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.ToggleButton;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
+import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
/**
* Created by ashishc on 05-01-2017.
*/
-public class AdditionalVisibility extends AppCompatActivity{
+public class AdditionalVisibility extends AppCompatActivity implements View.OnClickListener, AdapterView.OnItemSelectedListener {
+ ArrayList list = new ArrayList();
+ ArrayList listdata = new ArrayList();
+ Spinner spinner_brand, spinner_sku;
+ Spinner spinner_brand_list, spinner_sku_list;
+
+ public static ArrayList data = new ArrayList();
+ ToggleButton btntoggle;
+ ImageView btnimage, btnedit;
+ Button btnsku, btnaddlayout;
+ GSKOrangeDB db;
+ ArrayList sku_list;
+ String brand_name="", brand_id ="", SKU_name ="", SKU_ID="",brand_list_name="",brand_list_id="",sku_list_name="",sku_list_id="";
+ public ListView listview;
+ LinearLayout linearlay;
+ ArrayList brandList;
+
+ ArrayList brand_list;
+ ArrayList skuMaster_list;
+
+
+ ArrayList empty_list = new ArrayList<>();
+ String _pathforcheck,_path,str;
+ private SharedPreferences preferences;
+ String store_id,date,intime,img_str;
+ ImageView img_cam,img_clicked;
+ Button btn_add;
+ EditText Edt_txt;
+ MyAdaptorStock adapterData;
+ ListView listviewlay;
+ MyAdaptorAdditionalStock adapteradditional;
+ ////String brand_id,SKU_ID;
protected void onCreate(Bundle savedInstanceState) {
// TODO Auto-generated method stub
super.onCreate(savedInstanceState);
setContentView(R.layout.additionalvisibilitylayout);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+ getSupportActionBar().setHomeButtonEnabled(true);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+
+
+ store_id="1";
+ date = preferences.getString(CommonString.KEY_DATE, null);
+ intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
+
+ db = new GSKOrangeDB(AdditionalVisibility.this);
+ db.open();
+ spinner_brand_list = (Spinner) findViewById(R.id.spinner_Brand1);
+ spinner_sku_list = (Spinner) findViewById(R.id.spinner_SkuMaster);
+
+ btntoggle = (ToggleButton) findViewById(R.id.btntoggle);
+ btnimage = (ImageView) findViewById(R.id.btn_image);
+ btnedit = (ImageView) findViewById(R.id.btn_edit);
+ btnsku = (Button) findViewById(R.id.btn_sku);
+ btnaddlayout = (Button) findViewById(R.id.btadd);
+ listviewlay = (ListView) findViewById(R.id.listviewlv);
+
+
+ ///band List
+ brand_list = db.getBrandMasterData(store_id);
+ BrandMasterGetterSetter brand = new BrandMasterGetterSetter();
+ brand.setBRAND("select");
+ brand_list.add(0, brand);
+ CustomAdapter adapter = new CustomAdapter(AdditionalVisibility.this, R.layout.custom_spinner_item, brand_list);
+
+ spinner_brand_list.setAdapter(adapter);
+
+ ///Display List
+
+ skuMaster_list = db.getSKUMasterData(store_id);
+
+ SkuMasterGetterSetter select = new SkuMasterGetterSetter();
+ select.setSKU("Select");
+ skuMaster_list.add(0,select);
+ CustomSkuMasterAdpter skuadapter = new CustomSkuMasterAdpter(AdditionalVisibility.this, R.layout.custom_spinner_item, skuMaster_list);
+ spinner_sku_list.setAdapter(skuadapter);
+
+ spinner_brand_list.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView> parent, View view, int position, long id) {
+
+ if (position != 0) {
+
+ brand_list_name=brand_list.get(position).getBRAND().get(0);
+ brand_list_id=brand_list.get(position).getBRAND_ID().get(0);
+
+ }
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView> parent) {
+
+ }
+ });
+
+ spinner_sku_list.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView> parent, View view, int position, long id) {
+
+ if (position != 0) {
+
+ sku_list_name=skuMaster_list.get(position).getSKU().get(0);
+ sku_list_id=skuMaster_list.get(position).getSKU_ID().get(0);
+
+ }
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView> parent) {
+
+ }
+ });
+
+
+ btnaddlayout.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+
+
+ AddittionalGetterSetter adGt=new AddittionalGetterSetter();
+
+ adGt.setBrand(brand_list_name);
+ adGt.setBrand_id(brand_list_id);
+ adGt.setImage(img_str);
+ adGt.setSku(sku_list_name);
+ adGt.setSku_id(sku_list_id);
+ adGt.setStore_id(store_id);
+
+ db.InsertAdditionalData(adGt);
+
+ spinner_brand_list.setSelection(0);
+
+ spinner_sku_list.setSelection(0);
+
+ img_str="";
+
+ listdata = db.getAdditionalStock(store_id);
+
+ if(listdata.size()>0)
+ {
+ adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this,listdata);
+ listviewlay.setAdapter(adapteradditional);
+ listviewlay.invalidateViews();
+ }
+ else
+ {
+
+ }
+ }
+ });
+
+
+
+ btntoggle.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+
+
+ }
+ });
+
+ btnimage.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ _pathforcheck = store_id + "Store"
+ + "Image" + date.replace("/","") + getCurrentTime().replace(":","")+".jpg";
+
+ _path = CommonString.FILE_PATH + _pathforcheck;
+
+ intime = getCurrentTime();
+
+ startCameraActivity();
+
+ }
+ });
+
+
+ btnsku.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ showSkuDialog();
+
+ }
+ });
+
+ }
+ public String getCurrentTime() {
+
+ Calendar m_cal = Calendar.getInstance();
+
+ SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
+ String cdate = formatter.format(m_cal.getTime());
+
+ /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+ + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
+
+ return cdate;
+
+ }
+
+ @Override
+ public void onItemSelected(AdapterView> parent, View view, int position, long id) {
+
+
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView> parent) {
+
+ }
+
+
+ public class CustomAdapter extends ArrayAdapter {
+
+ private Activity activity;
+ private ArrayList data;
+ BrandMasterGetterSetter tempValues = null;
+ LayoutInflater inflater;
+
+ /*************
+ * CustomAdapter Constructor
+ *****************/
+ public CustomAdapter(
+ AdditionalVisibility activitySpinner,
+ int textViewResourceId,
+ ArrayList objects
+
+ ) {
+ super(activitySpinner, textViewResourceId, objects);
+
+ /********** Take passed values **********/
+ activity = activitySpinner;
+ data = objects;
+ /*********** Layout inflator to call external xml layout () **********************/
+ inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+ }
+
+ @Override
+ public View getDropDownView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ // This funtion called for each row ( Called data.size() times )
+ public View getCustomView(int position, View convertView, ViewGroup parent) {
+
+ /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
+ View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
+
+ /***** Get each Model object from Arraylist ********/
+ tempValues = null;
+ tempValues = (BrandMasterGetterSetter) data.get(position);
+
+ TextView label = (TextView) row.findViewById(R.id.tv_text);
+
+ if (position == 0) {
+
+ // Default selected Spinner item
+ label.setText("Select");
+ //sub.setText("");
+ } else {
+ // Set values for spinner each row
+ label.setText(tempValues.getBRAND().get(0));
+ }
+
+ return row;
+ }
+ }
+
+ public class CustomSkuAdapter extends ArrayAdapter {
+
+ private Activity activity;
+ private ArrayList data;
+ SkuGetterSetter tempValues = null;
+ LayoutInflater inflater;
+
+ /*************
+ * CustomAdapter Constructor
+ *****************/
+ public CustomSkuAdapter(
+ AdditionalVisibility activitySpinner,
+ int textViewResourceId,
+ ArrayList objects
+
+ ) {
+ super(activitySpinner, textViewResourceId, objects);
+
+ /********** Take passed values **********/
+ activity = activitySpinner;
+ data = objects;
+ /*********** Layout inflator to call external xml layout () **********************/
+ inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+ }
+
+ @Override
+ public View getDropDownView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ // This funtion called for each row ( Called data.size() times )
+ public View getCustomView(int position, View convertView, ViewGroup parent) {
+
+ /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
+ View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
+
+ /***** Get each Model object from Arraylist ********/
+ tempValues = null;
+ tempValues = (SkuGetterSetter) data.get(position);
+
+ TextView label = (TextView) row.findViewById(R.id.tv_text);
+
+ if (position == 0) {
+
+ // Default selected Spinner item
+ label.setText("Select");
+ //sub.setText("");
+ } else {
+ // Set values for spinner each row
+ label.setText(tempValues.getSKU());
+ }
+
+ return row;
+ }
+ }
+
+
+
+
+
+ public class CustomSkuMasterAdpter extends ArrayAdapter {
+
+ private Activity activity;
+ private ArrayList data;
+ SkuMasterGetterSetter tempValues = null;
+ LayoutInflater inflater;
+
+ /*************
+ * CustomAdapter Constructor
+ *****************/
+ public CustomSkuMasterAdpter(
+ AdditionalVisibility activitySpinner,
+ int textViewResourceId,
+ ArrayList objects
+
+ ) {
+ super(activitySpinner, textViewResourceId, objects);
+
+ /********** Take passed values **********/
+ activity = activitySpinner;
+ data = objects;
+ /*********** Layout inflator to call external xml layout () **********************/
+ inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+ }
+
+ @Override
+ public View getDropDownView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ // This funtion called for each row ( Called data.size() times )
+ public View getCustomView(int position, View convertView, ViewGroup parent) {
+
+ /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
+ View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
+
+ /***** Get each Model object from Arraylist ********/
+ tempValues = null;
+ tempValues = (SkuMasterGetterSetter) data.get(position);
+
+ TextView label = (TextView) row.findViewById(R.id.tv_text);
+
+ if (position == 0) {
+
+ // Default selected Spinner item
+ label.setText("Select");
+ //sub.setText("");
+ } else {
+ // Set values for spinner each row
+ label.setText(tempValues.getSKU().get(0));
+ }
+
+ return row;
+ }
}
@@ -33,5 +480,526 @@ public class AdditionalVisibility extends AppCompatActivity{
+ protected void startCameraActivity() {
+
+ try {
+
+ Log.i("MakeMachine", "startCameraActivity()");
+ File file = new File(_path);
+ Uri outputFileUri = Uri.fromFile(file);
+
+ String defaultCameraPackage="";
+ final PackageManager packageManager = getPackageManager();
+ List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
+ for (int n=0;n= Build.VERSION_CODES.KITKAT) {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ } else {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) {
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ }
+ }
+
+ }
+
+ Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+ intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+ intent.setPackage(defaultCameraPackage);
+ startActivityForResult(intent, 0);
+
+
+ } catch (Exception e) {
+
+ e.printStackTrace();
+ }
+ }
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+
+ Log.i("MakeMachine", "resultCode: " + resultCode);
+ switch (resultCode) {
+ case 0:
+ Log.i("MakeMachine", "User cancelled");
+ break;
+
+ case -1:
+
+ if (_pathforcheck != null && !_pathforcheck.equals("")) {
+ if (new File(str + _pathforcheck).exists()) {
+ Bitmap bmp = BitmapFactory.decodeFile(str + _pathforcheck);
+ img_cam.setImageBitmap(bmp);
+ img_clicked.setVisibility(View.GONE);
+ img_cam.setVisibility(View.VISIBLE);
+ img_str = _pathforcheck;
+ _pathforcheck = "";
+ }
+ }
+
+ break;
+ }
+
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+
+
+ public void showSkuDialog() {
+ final ArrayList brandList = db.getBrandT2PData("1", "1", "1");
+ BrandMasterGetterSetter brand = new BrandMasterGetterSetter();
+ brand.setBRAND("select");
+ brandList.add(0, brand);
+ // ArrayList skuMasterGetterSetterArrayList = db.getSkuT2PData("1", "1", "1",)
+ final Dialog dialog = new Dialog(AdditionalVisibility.this);
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
+ dialog.setContentView(R.layout.t2p_sku_dialog_layout);
+ //pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
+ //dialog.setCancelable(false);
+ spinner_brand = (Spinner) dialog.findViewById(R.id.spinner_brand);
+ spinner_sku = (Spinner) dialog.findViewById(R.id.spinner_sku);
+ btn_add = (Button) dialog.findViewById(R.id.btn_add);
+ Edt_txt = (EditText) dialog.findViewById(R.id.et_stock);
+ listview = (ListView)dialog.findViewById(R.id.lv);
+ linearlay = (LinearLayout)dialog.findViewById(R.id.list_layout);
+
+
+
+ list = db.getDialogStock(store_id);
+
+
+ if(list.size()>0)
+ {
+ linearlay.setVisibility(View.VISIBLE);
+ adapterData = new MyAdaptorStock(AdditionalVisibility.this,list);
+ listview.setAdapter(adapterData);
+ listview.invalidateViews();
+ }
+ else{
+
+ }
+
+
+
+ spinner_sku.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView> parent, View view, int position, long id) {
+
+ if (position != 0) {
+
+ SKU_ID = sku_list.get(position).getSKU_ID();
+
+ SKU_name = sku_list.get(position).getSKU();
+
+ }
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView> parent) {
+
+ }
+ });
+
+
+
+
+
+
+ btn_add.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ AdditionalDialogGetterSetter ab = new AdditionalDialogGetterSetter();
+
+
+ ab.setBrand(brand_name);
+ ab.setBrand_id(brand_id);
+
+ //ab.setDisplay_id(data.get(position).getDisplay_id());
+ ab.setStore_id(store_id);
+ // ab.setUnique_id(data.get(position).getUnique_id());
+ ab.setSku_id(SKU_ID);
+ ab.setSku_name(SKU_name);
+ // ab.setProcess_id(process_id);
+ ab.setQuantity(Edt_txt.getText().toString());
+ // ab.setCategory_id(category_id);
+
+ db.InsertStockDialog(ab);
+
+ spinner_brand.setSelection(0);
+ spinner_sku.setSelection(0);
+ Edt_txt.setText("");
+
+ list = db.getDialogStock(store_id);
+
+ linearlay.setVisibility(View.VISIBLE);
+ adapterData = new MyAdaptorStock(AdditionalVisibility.this,list);
+ listview.setAdapter(adapterData);
+ listview.invalidateViews();
+
+
+
+ // dialog.cancel();
+ }
+ });
+
+
+ // Create custom adapter object ( see below CustomAdapter.java )
+ CustomAdapter adapter = new CustomAdapter(AdditionalVisibility.this, R.layout.custom_spinner_item, brandList);
+ // Set adapter to spinner
+ spinner_brand.setAdapter(adapter);
+
+ ArrayList empty_list = new ArrayList<>();
+ SkuGetterSetter select = new SkuGetterSetter();
+ select.setSKU("Select");
+ empty_list.add(select);
+ CustomSkuAdapter skuadapter = new CustomSkuAdapter(AdditionalVisibility.this, R.layout.custom_spinner_item, empty_list);
+ spinner_sku.setAdapter(skuadapter);
+
+ spinner_brand.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView> parent, View view, int position, long id) {
+
+ if (position != 0) {
+
+ brand_id = brandList.get(position).getBRAND_ID().get(0);
+ brand_name = brandList.get(position).getBRAND().get(0);
+
+ sku_list = db.getSkuT2PData("1", "1", "1", brand_id);
+ SkuGetterSetter select = new SkuGetterSetter();
+ select.setSKU("Select");
+ sku_list.add(0, select);
+ // Create custom adapter object ( see below CustomSkuAdapter.java )
+ CustomSkuAdapter skuadapter = new CustomSkuAdapter(AdditionalVisibility.this, R.layout.custom_spinner_item, sku_list);
+ // Set adapter to spinner
+ spinner_sku.setAdapter(skuadapter);
+
+ spinner_sku.setSelection(0);
+
+ }
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView> parent) {
+
+ }
+ });
+
+
+ spinner_sku.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView> parent, View view, int position, long id) {
+
+ if (position != 0) {
+
+ SKU_ID = sku_list.get(position).getSKU_ID();
+
+ SKU_name = sku_list.get(position).getSKU();
+
+ }
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView> parent) {
+
+ }
+ });
+
+
+
+
+ dialog.show();
+
+ }
+
+
+ @Override
+ public void onClick(View arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // Handle action bar item clicks here. The action bar will
+ // automatically handle clicks on the Home/Up button, so long
+ // as you specify a parent activity in AndroidManifest.xml.
+ int id = item.getItemId();
+
+ if (id == android.R.id.home) {
+
+ // NavUtils.navigateUpFromSameTask(this);
+ finish();
+
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
+
+ public class MyAdaptorStock extends BaseAdapter {
+
+ private LayoutInflater mInflater;
+ private Context mcontext;
+ private ArrayList list;
+
+ public MyAdaptorStock(Activity activity, ArrayList list1) {
+
+ mInflater = LayoutInflater.from(getBaseContext());
+ mcontext = activity;
+ list = list1;
+ }
+
+ @Override
+ public int getCount() {
+
+ return list.size();
+ }
+
+ @Override
+ public Object getItem(int position1) {
+
+ return position1;
+ }
+
+ @Override
+ public long getItemId(int position1) {
+
+ return position1;
+ }
+
+ class ViewHolder {
+ TextView brand, qty_bought, display;
+ Button save,delete;
+
+ }
+
+ @Override
+ public View getView(final int position1, View convertView, ViewGroup parent) {
+
+ final ViewHolder holder;
+
+ if (convertView == null) {
+
+ convertView = mInflater
+ .inflate(R.layout.additionaldialoglayout, null);
+ holder = new ViewHolder();
+
+ holder.brand = (TextView) convertView.findViewById(R.id.brand_name);
+
+ holder.display = (TextView) convertView.findViewById(R.id.display_name);
+ holder.qty_bought = (TextView) convertView.findViewById(R.id.qty_bought);
+
+
+
+ holder.delete = (Button) convertView.findViewById(R.id.delete_btn);
+
+ convertView.setTag(holder);
+ } else {
+ holder = (ViewHolder) convertView.getTag();
+ }
+
+ holder.delete.setOnClickListener(new View.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+
+ AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
+ AdditionalVisibility.this);
+
+ // set title
+ alertDialogBuilder.setTitle("Do You Want To Delete?");
+
+ // set dialog message
+ alertDialogBuilder
+ .setMessage("Click Yes To Delete!")
+ .setCancelable(false)
+ .setPositiveButton("Yes",new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog,int id) {
+
+
+ db.deletedialogStockEntry(list.get(position1).getKEY_ID());
+
+ adapterData.notifyDataSetChanged();
+
+ /* list = db.getTOTStockEntryDetail(store_id, category_id, process_id,
+ list.get(position1).getDisplay_id(),list.get(position1).getUnique_id());*/
+
+
+ list = db.getDialogStock(store_id);
+
+ listview.setAdapter(new MyAdaptorStock(AdditionalVisibility.this, list));
+ listview.invalidateViews();
+
+ }
+ })
+ .setNegativeButton("No",new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog,int id) {
+ // if this button is clicked, just close
+ // the dialog box and do nothing
+ dialog.cancel();
+ }
+ });
+
+ // create alert dialog
+ AlertDialog alertDialog = alertDialogBuilder.create();
+
+ // show it
+ alertDialog.show();
+
+ }
+ });
+
+
+
+ holder.brand.setText(list.get(position1).getBrand().toString());
+ holder.display.setText(list.get(position1).getSku_name().toString());
+
+ holder.qty_bought.setText(list.get(position1).getQuantity());
+
+
+ holder.brand.setId(position1);
+ holder.display.setId(position1);
+ holder.qty_bought.setId(position1);
+ holder.delete.setId(position1);
+
+ return convertView;
+ }
+ }
+
+
+ public class MyAdaptorAdditionalStock extends BaseAdapter {
+
+ private LayoutInflater mInflater;
+ private Context mcontext;
+ private ArrayList list;
+
+ public MyAdaptorAdditionalStock(Activity activity, ArrayList list1) {
+
+ mInflater = LayoutInflater.from(getBaseContext());
+ mcontext = activity;
+ list = list1;
+ }
+
+ @Override
+ public int getCount() {
+
+ return list.size();
+ }
+
+ @Override
+ public Object getItem(int position1) {
+
+ return position1;
+ }
+
+ @Override
+ public long getItemId(int position1) {
+
+ return position1;
+ }
+
+ class ViewHolder {
+ TextView brand, qty_bought, display;
+ Button save,delete;
+
+ }
+
+ @Override
+ public View getView(final int position1, View convertView, ViewGroup parent) {
+
+ final ViewHolder holder;
+
+ if (convertView == null) {
+
+ convertView = mInflater
+ .inflate(R.layout.additionallistlayout, null);
+ holder = new ViewHolder();
+
+ holder.brand = (TextView) convertView.findViewById(R.id.brand_name);
+
+ holder.display = (TextView) convertView.findViewById(R.id.display_name);
+ holder.qty_bought = (TextView) convertView.findViewById(R.id.qty_bought);
+
+
+
+ holder.delete = (Button) convertView.findViewById(R.id.delete_btn);
+
+ convertView.setTag(holder);
+ } else {
+ holder = (ViewHolder) convertView.getTag();
+ }
+
+ holder.delete.setOnClickListener(new View.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+
+ AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
+ AdditionalVisibility.this);
+
+ // set title
+ alertDialogBuilder.setTitle("Do You Want To Delete?");
+
+ // set dialog message
+ alertDialogBuilder
+ .setMessage("Click Yes To Delete!")
+ .setCancelable(false)
+ .setPositiveButton("Yes",new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog,int id) {
+
+
+ db.deleteStockEntry(listdata.get(position1).getKey_id());
+
+ adapterData.notifyDataSetChanged();
+
+ listdata = db.getAdditionalStock(store_id);
+
+ listview.setAdapter(new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata));
+ listview.invalidateViews();
+
+ }
+ })
+ .setNegativeButton("No",new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog,int id) {
+ // if this button is clicked, just close
+ // the dialog box and do nothing
+ dialog.cancel();
+ }
+ });
+
+ // create alert dialog
+ AlertDialog alertDialog = alertDialogBuilder.create();
+
+ // show it
+ alertDialog.show();
+
+ }
+ });
+
+ holder.brand.setText(list.get(position1).getBrand().toString());
+ holder.display.setText(list.get(position1).getSku().toString());
+
+
+ holder.brand.setId(position1);
+ holder.display.setId(position1);
+ holder.qty_bought.setId(position1);
+ holder.delete.setId(position1);
+
+ return convertView;
+ }
+ }
+
+
+
+
}
diff --git a/GSKMTOrange/src/main/res/layout/additionaldialoglayout.xml b/GSKMTOrange/src/main/res/layout/additionaldialoglayout.xml
new file mode 100644
index 0000000..d3cad5b
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/additionaldialoglayout.xml
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/additionallistlayout.xml b/GSKMTOrange/src/main/res/layout/additionallistlayout.xml
new file mode 100644
index 0000000..dee8b28
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/additionallistlayout.xml
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml
index cabc217..af8a9a3 100644
--- a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml
+++ b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml
@@ -7,22 +7,9 @@
android:fitsSystemWindows="true"
tools:context="cpm.com.gskmtorange.dailyentry.AdditionalVisibility">
-
-
-
-
-
-
+
-
diff --git a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
index caac420..e463a12 100644
--- a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
+++ b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
@@ -1,92 +1,241 @@
-
+ android:orientation="vertical"
+ android:weightSum="100">
-
+ android:theme="@style/AppTheme.AppBarOverlay">
-
+
+
+
+
+ card_view:cardCornerRadius="20dp"
-
+
+
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:background="@color/grey_background"
+ android:weightSum="100">
-
-
+ android:layout_height="0dp"
+ android:layout_weight="8"
+ android:background="@color/grey_background"
+ android:orientation="horizontal"
+ android:padding="5dp"
+ android:weightSum="2">
-
+
-
+
-
+
-
-
-
-
+ android:layout_height="0dp"
+ android:layout_weight="30"
+ android:background="@color/grey_background"
+ android:orientation="horizontal"
+ android:padding="5dp"
+ android:weightSum="3">
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/custom_spinner_item.xml b/GSKMTOrange/src/main/res/layout/custom_spinner_item.xml
new file mode 100644
index 0000000..12af740
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/custom_spinner_item.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml b/GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml
index 0e1cda1..a34bff3 100644
--- a/GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml
+++ b/GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml
@@ -1,10 +1,9 @@
+ android:orientation="vertical">
+ android:textSize="@dimen/text_size_normal" />
+ android:orientation="horizontal"
+ android:padding="5dp"
+ android:weightSum="3">
+ android:paddingLeft="5dp"
+ android:text="@string/brand" />
-
+ android:layout_weight="2" />
@@ -64,25 +61,24 @@
+ android:orientation="horizontal"
+ android:padding="5dp"
+ android:weightSum="3">
+ android:paddingLeft="5dp"
+ android:text="@string/sku" />
-
+ android:layout_weight="2" />
@@ -90,25 +86,25 @@
+ android:orientation="horizontal"
+ android:padding="5dp"
+ android:weightSum="3">
+ android:paddingLeft="5dp"
+ android:text="@string/stock" />
-
+ android:layout_weight="2"
+ android:inputType="number" />
@@ -116,14 +112,15 @@
+ android:background="@color/grey_background"
+ android:padding="10dp">
+ android:text="@string/add" />
@@ -131,4 +128,34 @@
-
\ No newline at end of file
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/mipmap-mdpi/new_camera.png b/GSKMTOrange/src/main/res/mipmap-mdpi/new_camera.png
new file mode 100644
index 0000000..eb388b8
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-mdpi/new_camera.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-mdpi/new_no_camera.png b/GSKMTOrange/src/main/res/mipmap-mdpi/new_no_camera.png
new file mode 100644
index 0000000..d5e3093
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-mdpi/new_no_camera.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-mdpi/new_star.png b/GSKMTOrange/src/main/res/mipmap-mdpi/new_star.png
new file mode 100644
index 0000000..f63fe8f
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-mdpi/new_star.png differ
diff --git a/GSKMTOrange/src/main/res/values/dimens.xml b/GSKMTOrange/src/main/res/values/dimens.xml
index 46979ce..7f965e1 100644
--- a/GSKMTOrange/src/main/res/values/dimens.xml
+++ b/GSKMTOrange/src/main/res/values/dimens.xml
@@ -7,7 +7,7 @@
16dp
16dp
- 5dp
+ 10dp
20sp
16sp
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index 47f6855..61ceab0 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -34,6 +34,7 @@
Select
Add
+
Please select language
SelectLanguageActivity
@@ -100,4 +101,10 @@
Please Download Data First
+ Is there any Additional Display
+ Display
+ Photo
+ Additional Visibility
+ Non-Work Reason
+