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

Merge remote-tracking branch 'origin/GeoT' into GeoT

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
This commit is contained in:
ashishandroid
2017-01-11 12:13:08 +05:30
parent 5c3b06496f
commit 35878c7d51
4 changed files with 38 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1 -1
View File
@@ -41,7 +41,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+2 -23
View File
@@ -1453,22 +1453,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
} }
public ArrayList<AdditionalDialogGetterSetter> getDialogStock(String store_id) { public ArrayList<AdditionalDialogGetterSetter> getDialogStock(String keyid) {
Cursor cursordata = null; Cursor cursordata = null;
ArrayList<AdditionalDialogGetterSetter> productData = new ArrayList<AdditionalDialogGetterSetter>(); ArrayList<AdditionalDialogGetterSetter> productData = new ArrayList<AdditionalDialogGetterSetter>();
try { try {
cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE STORE_ID = '"+store_id + "'", null); cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE COMMON_ID = '"+keyid + "'", 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) { if (cursordata != null) {
cursordata.moveToFirst(); cursordata.moveToFirst();
@@ -1484,12 +1475,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setBrand(cursordata.getString(cursordata sb.setBrand(cursordata.getString(cursordata
.getColumnIndexOrThrow(CommonString.KEY_BRAND))); .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 sb.setQuantity(cursordata.getString(cursordata
.getColumnIndexOrThrow(CommonString.KEY_QUANTITY))); .getColumnIndexOrThrow(CommonString.KEY_QUANTITY)));
@@ -1500,12 +1485,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setSku_name(cursordata.getString(cursordata sb.setSku_name(cursordata.getString(cursordata
.getColumnIndexOrThrow(CommonString.KEY_SKUNAME))); .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); productData.add(sb);
cursordata.moveToNext(); cursordata.moveToNext();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+20 -13
View File
@@ -64,7 +64,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
ArrayList<AdditionalDialogGetterSetter> list = new ArrayList<AdditionalDialogGetterSetter>(); ArrayList<AdditionalDialogGetterSetter> list = new ArrayList<AdditionalDialogGetterSetter>();
ArrayList<AddittionalGetterSetter> listdata = new ArrayList<AddittionalGetterSetter>(); ArrayList<AddittionalGetterSetter> listdata = new ArrayList<AddittionalGetterSetter>();
ArrayList<AdditionalDialogGetterSetter> uploadlist = new ArrayList<AdditionalDialogGetterSetter>();
ArrayList<AdditionalDialogGetterSetter> defdata = new ArrayList<AdditionalDialogGetterSetter>(); ArrayList<AdditionalDialogGetterSetter> defdata = new ArrayList<AdditionalDialogGetterSetter>();
Spinner spinner_brand, spinner_sku; Spinner spinner_brand, spinner_sku;
Spinner spinner_brand_list, spinner_sku_list; Spinner spinner_brand_list, spinner_sku_list;
@@ -97,7 +97,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
MyAdaptorAdditionalStock adapteradditional; MyAdaptorAdditionalStock adapteradditional;
AddittionalGetterSetter adGt; AddittionalGetterSetter adGt;
LinearLayout brandlayout, diaplylayout, cameralayout; LinearLayout brandlayout, diaplylayout, cameralayout;
RelativeLayout skulayout; //RelativeLayout skulayout;
////String brand_id,SKU_ID; ////String brand_id,SKU_ID;
protected void onCreate(Bundle savedInstanceState) { 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 = preferences.getString(CommonString.KEY_STORE_ID, null);
// store_id = "1"; store_id = "1";
date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null);
intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, ""); 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); diaplylayout = (LinearLayout) findViewById(R.id.tv_displaylayout);
cameralayout = (LinearLayout) findViewById(R.id.tv_cameralayout); cameralayout = (LinearLayout) findViewById(R.id.tv_cameralayout);
skulayout = (RelativeLayout) findViewById(R.id.tv_skulayout); //skulayout = (RelativeLayout) findViewById(R.id.tv_skulayout);
btntoggle.setChecked(true); btntoggle.setChecked(true);
@@ -197,6 +197,15 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
listdata = db.getAdditionalStock(store_id); listdata = db.getAdditionalStock(store_id);
for(int k=0;k<listdata.size();k++)
{
String KeyID= listdata.get(k).getKey_id();
uploadlist = db.getDialogStock(KeyID);
}
if (listdata.size() > 0) { if (listdata.size() > 0) {
adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata);
listviewlay.setAdapter(adapteradditional); listviewlay.setAdapter(adapteradditional);
@@ -245,14 +254,13 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
defdata.clear(); defdata.clear();
btntoggle.setChecked(true); btntoggle.setChecked(true);
togglevalue = "1"; togglevalue = "1";
brandlayout.setVisibility(View.VISIBLE); brandlayout.setVisibility(View.VISIBLE);
diaplylayout.setVisibility(View.VISIBLE); diaplylayout.setVisibility(View.VISIBLE);
cameralayout.setVisibility(View.VISIBLE); cameralayout.setVisibility(View.VISIBLE);
skulayout.setVisibility(View.VISIBLE); btnsku.setVisibility(View.VISIBLE);
listdata = db.getAdditionalStock(store_id); listdata = db.getAdditionalStock(store_id);
@@ -287,7 +295,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
} }
}); });
btntoggle.setOnClickListener(new View.OnClickListener() { btntoggle.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
@@ -298,15 +305,15 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
brandlayout.setVisibility(View.VISIBLE); brandlayout.setVisibility(View.VISIBLE);
diaplylayout.setVisibility(View.VISIBLE); diaplylayout.setVisibility(View.VISIBLE);
cameralayout.setVisibility(View.VISIBLE); cameralayout.setVisibility(View.VISIBLE);
skulayout.setVisibility(View.VISIBLE); btnsku.setVisibility(View.VISIBLE);
} else { } else {
togglevalue = "0"; togglevalue = "0";
brandlayout.setVisibility(View.GONE); brandlayout.setVisibility(View.INVISIBLE);
diaplylayout.setVisibility(View.GONE); diaplylayout.setVisibility(View.INVISIBLE);
cameralayout.setVisibility(View.GONE); cameralayout.setVisibility(View.INVISIBLE);
skulayout.setVisibility(View.GONE); 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.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.setAdapter(new MyAdaptorStock(AdditionalVisibility.this, defdata));
listview.invalidateViews(); listview.invalidateViews();
GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
+15 -16
View File
@@ -71,7 +71,7 @@
android:id="@+id/tv_brandlayout" android:id="@+id/tv_brandlayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="30" android:layout_weight="40"
android:background="@color/grey_background" android:background="@color/grey_background"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="5dp" android:padding="5dp"
@@ -90,7 +90,7 @@
<Spinner <Spinner
android:id="@+id/spinner_Brand1" android:id="@+id/spinner_Brand1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="50dp"
android:layout_weight="2" /> android:layout_weight="2" />
</LinearLayout> </LinearLayout>
@@ -99,7 +99,7 @@
android:id="@+id/tv_displaylayout" android:id="@+id/tv_displaylayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="30" android:layout_weight="40"
android:background="@color/grey_background" android:background="@color/grey_background"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="5dp" android:padding="5dp"
@@ -117,11 +117,10 @@
<Spinner <Spinner
android:id="@+id/spinner_SkuMaster" android:id="@+id/spinner_SkuMaster"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="50dp"
android:layout_weight="2" android:layout_weight="2"
/> />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -181,7 +180,7 @@
</LinearLayout> </LinearLayout>
<RelativeLayout <!--<RelativeLayout
android:id="@+id/tv_skulayout" android:id="@+id/tv_skulayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
@@ -189,15 +188,9 @@
android:background="@color/grey_background" android:background="@color/grey_background"
android:padding="5dp"> android:padding="5dp">
<Button
android:id="@+id/btn_sku"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:background="@color/colorPrimary"
android:text="@string/sku" />
</RelativeLayout>
</RelativeLayout>-->
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -205,12 +198,18 @@
android:layout_weight="9" android:layout_weight="9"
android:background="@color/grey_background" android:background="@color/grey_background"
android:padding="5dp"> android:padding="5dp">
<Button
android:id="@+id/btn_sku"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:background="@color/colorPrimary"
android:text="@string/sku" />
<Button <Button
android:id="@+id/btadd" android:id="@+id/btadd"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_alignParentRight="true"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:text="@string/add" /> android:text="@string/add" />
</RelativeLayout> </RelativeLayout>