diff --git a/.idea/modules.xml b/.idea/modules.xml
index ad566b9..a329b11 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,8 @@
+
+
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 ae2e93b..cdd79c9 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
@@ -408,4 +408,14 @@ public class CommonString {
//Gagan Code End
+ public static final String TABLE_INSERT_STOCK_ADDITIONAL_DATA = "ADDITIONAL_STOCK_DATA";
+ 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_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 d98904f..478eac8 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
@@ -85,11 +85,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
ArrayList empty_list = new ArrayList<>();
- String _pathforcheck, _path, str,msg;
+ String _pathforcheck, _path, str, msg;
private SharedPreferences preferences;
String store_id, date, intime, img_str, togglevalue = "1";
ImageView img_cam, img_clicked;
- Button btn_add;
+ Button btn_add, btn_close;
EditText Edt_txt;
MyAdaptorStock adapterData;
ListView listviewlay;
@@ -197,9 +197,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
listdata = db.getAdditionalStock(store_id);
- for(int k=0;k dialog) {
+ boolean validateData(AddittionalGetterSetter data, ArrayList dialog) {
boolean flag = true;
String brandid = data.getBrand_id();
@@ -1087,8 +1093,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
if (toggleid.equalsIgnoreCase("0")) {
flag = true;
- }
- else {
+ } else {
if (brandid.equalsIgnoreCase("") || skuid.equalsIgnoreCase("")) {
@@ -1101,17 +1106,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
errormsg = "Please Take a image";
- }
- else if (dialog.size()==0) {
+ } else if (dialog.size() == 0) {
errormsg = "Please fill sku data";
flag = false;
- }
-
-
- else {
+ } else {
flag = true;
}
@@ -1125,31 +1126,22 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
boolean validateDialogData(AdditionalDialogGetterSetter data) {
boolean flag = true;
- String brandid=data.getBrand_id();
- String displayid=data.getSku_id();
- String QTy=data.getQuantity();
+ String brandid = data.getBrand_id();
+ String displayid = data.getSku_id();
+ String QTy = data.getQuantity();
- if(brandid.equalsIgnoreCase("")||brandid==null)
- {
+ if (brandid.equalsIgnoreCase("") || brandid == null) {
flag = false;
- msg="Please Select Dropdown";
- }
- else if(displayid==null||displayid.equalsIgnoreCase(""))
- {
+ msg = "Please Select Dropdown";
+ } else if (displayid == null || displayid.equalsIgnoreCase("")) {
flag = false;
- msg="Please Select Dropdown";
- }
-
-
- else if(QTy.equalsIgnoreCase("") || QTy==null)
- {
+ msg = "Please Select Dropdown";
+ } else if (QTy.equalsIgnoreCase("") || QTy == null) {
flag = false;
- msg="Please enter Quantity";
- }
- else
- {
+ msg = "Please enter Quantity";
+ } else {
flag = true;
}
diff --git a/GSKMTOrange/src/main/res/layout/additionalvisibilitydialoglayout.xml b/GSKMTOrange/src/main/res/layout/additionalvisibilitydialoglayout.xml
new file mode 100644
index 0000000..3024cc8
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/additionalvisibilitydialoglayout.xml
@@ -0,0 +1,180 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+