diff --git a/.idea/misc.xml b/.idea/misc.xml
index b8dc4d6..b15ecee 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -41,7 +41,7 @@
-
+
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 4279a76..08f705b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -1453,22 +1453,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
- public ArrayList getDialogStock(String store_id) {
+ public ArrayList getDialogStock(String keyid) {
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);*/
+ cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE COMMON_ID = '"+keyid + "'", null);
if (cursordata != null) {
cursordata.moveToFirst();
@@ -1484,12 +1475,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
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)));
@@ -1500,12 +1485,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
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();
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 3d697c5..d98904f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
@@ -64,7 +64,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
ArrayList list = new ArrayList();
ArrayList listdata = new ArrayList();
-
+ ArrayList uploadlist = new ArrayList();
ArrayList defdata = new ArrayList();
Spinner spinner_brand, spinner_sku;
Spinner spinner_brand_list, spinner_sku_list;
@@ -97,7 +97,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
MyAdaptorAdditionalStock adapteradditional;
AddittionalGetterSetter adGt;
LinearLayout brandlayout, diaplylayout, cameralayout;
- RelativeLayout skulayout;
+ //RelativeLayout skulayout;
////String brand_id,SKU_ID;
protected void onCreate(Bundle savedInstanceState) {
@@ -114,7 +114,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
- // store_id = "1";
+ store_id = "1";
date = preferences.getString(CommonString.KEY_DATE, null);
intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
@@ -133,7 +133,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
diaplylayout = (LinearLayout) findViewById(R.id.tv_displaylayout);
cameralayout = (LinearLayout) findViewById(R.id.tv_cameralayout);
- skulayout = (RelativeLayout) findViewById(R.id.tv_skulayout);
+ //skulayout = (RelativeLayout) findViewById(R.id.tv_skulayout);
btntoggle.setChecked(true);
@@ -197,6 +197,15 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
listdata = db.getAdditionalStock(store_id);
+ for(int k=0;k 0) {
adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata);
listviewlay.setAdapter(adapteradditional);
@@ -245,14 +254,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
defdata.clear();
-
btntoggle.setChecked(true);
togglevalue = "1";
brandlayout.setVisibility(View.VISIBLE);
diaplylayout.setVisibility(View.VISIBLE);
cameralayout.setVisibility(View.VISIBLE);
- skulayout.setVisibility(View.VISIBLE);
+ btnsku.setVisibility(View.VISIBLE);
listdata = db.getAdditionalStock(store_id);
@@ -287,7 +295,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
}
});
-
btntoggle.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -298,15 +305,15 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
brandlayout.setVisibility(View.VISIBLE);
diaplylayout.setVisibility(View.VISIBLE);
cameralayout.setVisibility(View.VISIBLE);
- skulayout.setVisibility(View.VISIBLE);
+ btnsku.setVisibility(View.VISIBLE);
} else {
togglevalue = "0";
- brandlayout.setVisibility(View.GONE);
- diaplylayout.setVisibility(View.GONE);
- cameralayout.setVisibility(View.GONE);
- skulayout.setVisibility(View.GONE);
+ brandlayout.setVisibility(View.INVISIBLE);
+ diaplylayout.setVisibility(View.INVISIBLE);
+ cameralayout.setVisibility(View.INVISIBLE);
+ btnsku.setVisibility(View.INVISIBLE);
}
}
});
@@ -904,7 +911,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
list.get(position1).getDisplay_id(),list.get(position1).getUnique_id());*/
- // list = db.getDialogStock(store_id);
+ //list = db.getDialogStock(store_id);
listview.setAdapter(new MyAdaptorStock(AdditionalVisibility.this, defdata));
listview.invalidateViews();
diff --git a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
index 216b5cb..be17555 100644
--- a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
+++ b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
@@ -71,7 +71,7 @@
android:id="@+id/tv_brandlayout"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_weight="30"
+ android:layout_weight="40"
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
@@ -90,7 +90,7 @@
@@ -99,7 +99,7 @@
android:id="@+id/tv_displaylayout"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_weight="30"
+ android:layout_weight="40"
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
@@ -117,11 +117,10 @@
-
-
-
-
+
+ -->
-
+