Merge remote-tracking branch 'origin/GeoT' into GeoT
# Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml # GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
This commit is contained in:
ashishandroid
Generated
+1
-1
@@ -41,7 +41,7 @@
|
||||
<ConfirmationsSetting value="0" id="Add" />
|
||||
<ConfirmationsSetting value="0" id="Remove" />
|
||||
</component>
|
||||
<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">
|
||||
<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">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
||||
@@ -111,11 +111,15 @@
|
||||
|
||||
<activity
|
||||
android:name=".dailyentry.NonWorkingReason"
|
||||
android:label="@string/title_activity_t2_pcompliance"
|
||||
android:label="@string/title_activity_Non_Work"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AppTheme.NoActionBar"></activity>
|
||||
|
||||
|
||||
<activity
|
||||
android:name=".dailyentry.AdditionalVisibility"
|
||||
android:label="@string/title_activity_Additional_visibility"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AppTheme.NoActionBar"></activity>
|
||||
|
||||
|
||||
</application>
|
||||
|
||||
@@ -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<AdditionalDialogGetterSetter> getDialogStock(String store_id) {
|
||||
Cursor cursordata = null;
|
||||
ArrayList<AdditionalDialogGetterSetter> productData = new ArrayList<AdditionalDialogGetterSetter>();
|
||||
|
||||
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<BrandMasterGetterSetter> getBrandMasterData(String store_id) {
|
||||
Cursor cursordata = null;
|
||||
ArrayList<BrandMasterGetterSetter> Data = new ArrayList<BrandMasterGetterSetter>();
|
||||
|
||||
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<SkuMasterGetterSetter> getSKUMasterData(String store_id) {
|
||||
Cursor cursordata = null;
|
||||
ArrayList<SkuMasterGetterSetter> Data = new ArrayList<SkuMasterGetterSetter>();
|
||||
|
||||
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<AddittionalGetterSetter> getAdditionalStock(String store_id) {
|
||||
Cursor cursordata = null;
|
||||
ArrayList<AddittionalGetterSetter> productData = new ArrayList<AddittionalGetterSetter>();
|
||||
|
||||
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;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+234
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
+69
@@ -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;
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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)";
|
||||
}
|
||||
|
||||
+969
-1
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,129 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:weightSum="100">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="184dp"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp"
|
||||
android:weightSum="100">
|
||||
|
||||
|
||||
<LinearLayout
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="2dp"
|
||||
android:layout_weight="10"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginTop="10dp"
|
||||
android:weightSum="25">
|
||||
|
||||
<TextView
|
||||
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
android:layout_weight="10"
|
||||
android:text="Brand Name"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/brand_name"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="15"
|
||||
android:inputType="text">
|
||||
|
||||
</TextView>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="2dp"
|
||||
android:layout_weight="10"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="25">
|
||||
|
||||
<TextView
|
||||
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
android:layout_weight="10"
|
||||
android:text="SKU Name"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/display_name"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
android:layout_weight="15">
|
||||
|
||||
</TextView>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/third"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="2dp"
|
||||
android:layout_weight="10"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="25">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/facing"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
android:layout_weight="10"
|
||||
android:text="Quantity"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/qty_bought"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="15"
|
||||
android:inputType="number">
|
||||
|
||||
</TextView>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<!-- </LinearLayout> -->
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="10"
|
||||
android:weightSum="25">
|
||||
|
||||
|
||||
<Button
|
||||
android:id="@+id/delete_btn"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="10"
|
||||
android:background="@color/grey_background"
|
||||
android:layout_marginLeft="30dp"
|
||||
android:text="Delete" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,129 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:weightSum="100">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="184dp"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp"
|
||||
android:weightSum="100">
|
||||
|
||||
|
||||
<LinearLayout
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="2dp"
|
||||
android:layout_weight="10"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginTop="10dp"
|
||||
android:weightSum="25">
|
||||
|
||||
<TextView
|
||||
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
android:layout_weight="10"
|
||||
android:text="Brand Name"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/brand_name"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="15"
|
||||
android:inputType="text">
|
||||
|
||||
</TextView>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="2dp"
|
||||
android:layout_weight="10"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="25">
|
||||
|
||||
<TextView
|
||||
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
android:layout_weight="10"
|
||||
android:text="SKU Name"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/display_name"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
android:layout_weight="15">
|
||||
|
||||
</TextView>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/third"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="2dp"
|
||||
android:layout_weight="10"
|
||||
android:orientation="horizontal"
|
||||
android:visibility="gone"
|
||||
android:weightSum="25">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/facing"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
android:layout_weight="10"
|
||||
android:text="Quantity"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/qty_bought"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="15"
|
||||
android:inputType="number">
|
||||
|
||||
</TextView>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<!-- </LinearLayout> -->
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="10"
|
||||
android:weightSum="25">
|
||||
|
||||
<Button
|
||||
android:id="@+id/delete_btn"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="10"
|
||||
android:background="@color/grey_background"
|
||||
android:layout_marginLeft="30dp"
|
||||
android:text="Delete" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
@@ -7,22 +7,9 @@
|
||||
android:fitsSystemWindows="true"
|
||||
tools:context="cpm.com.gskmtorange.dailyentry.AdditionalVisibility">
|
||||
|
||||
<android.support.design.widget.AppBarLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:theme="@style/AppTheme.AppBarOverlay">
|
||||
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:background="?attr/colorPrimary"
|
||||
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
||||
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
|
||||
<include layout="@layout/contentadditionalvisibility" />
|
||||
|
||||
|
||||
<android.support.design.widget.FloatingActionButton
|
||||
android:id="@+id/fab"
|
||||
android:layout_width="wrap_content"
|
||||
@@ -31,8 +18,8 @@
|
||||
android:layout_margin="@dimen/fab_margin"
|
||||
app:srcCompat="@android:drawable/ic_menu_save"
|
||||
app:backgroundTint="@color/colorPrimary"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
|
||||
|
||||
|
||||
</android.support.design.widget.CoordinatorLayout>
|
||||
|
||||
@@ -1,92 +1,241 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:card_view="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/grey_background"
|
||||
android:paddingBottom="@dimen/custom_margin"
|
||||
android:paddingLeft="@dimen/custom_margin"
|
||||
android:paddingRight="@dimen/custom_margin"
|
||||
android:paddingTop="@dimen/custom_margin"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||
>
|
||||
android:orientation="vertical"
|
||||
android:weightSum="100">
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/rec_store_data"
|
||||
<android.support.design.widget.AppBarLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone" />
|
||||
android:theme="@style/AppTheme.AppBarOverlay">
|
||||
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:background="?attr/colorPrimary"
|
||||
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
||||
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
|
||||
<android.support.v7.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="60"
|
||||
android:background="@color/grey_background"
|
||||
card_view:cardCornerRadius="20dp"
|
||||
|
||||
>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/no_data_lay"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/grey_background"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:weightSum="8">
|
||||
android:background="@color/grey_background"
|
||||
android:weightSum="100">
|
||||
|
||||
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_weight="1"
|
||||
card_view:cardBackgroundColor="@color/white"
|
||||
card_view:cardCornerRadius="5dp">
|
||||
android:layout_weight="8"
|
||||
android:background="@color/grey_background"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp"
|
||||
android:weightSum="2">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:id="@+id/tv_"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:text="No data available"
|
||||
android:textSize="25sp"
|
||||
android:textStyle="bold" />
|
||||
</android.support.v7.widget.CardView>
|
||||
android:layout_weight="1.5"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingLeft="5dp"
|
||||
android:text="@string/AdditionalDisplay" />
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_centerInParent="true"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_weight="4"
|
||||
android:background="@drawable/sad_cloud"
|
||||
android:id="@+id/imageView3" />
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_weight="1"
|
||||
card_view:cardBackgroundColor="@color/white"
|
||||
card_view:cardCornerRadius="5dp">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:text="Please download data"
|
||||
android:textSize="25sp"
|
||||
android:textStyle="bold" />
|
||||
</android.support.v7.widget.CardView>
|
||||
<ToggleButton
|
||||
android:id="@+id/btntoggle"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight=".5" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="30"
|
||||
android:background="@color/grey_background"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp"
|
||||
android:weightSum="3">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_brand"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingLeft="5dp"
|
||||
android:text="@string/brand"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/spinner_Brand1"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="2" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="30"
|
||||
android:background="@color/grey_background"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp"
|
||||
android:weightSum="3">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingLeft="5dp"
|
||||
android:text="@string/Display"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/spinner_SkuMaster"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="2"
|
||||
/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="15"
|
||||
android:background="@color/grey_background"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp"
|
||||
android:weightSum="3">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:background="@color/grey_background">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
android:gravity="center_vertical"
|
||||
android:paddingLeft="5dp"
|
||||
android:text="@string/Photo"
|
||||
android:textStyle="bold" />
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:background="@color/grey_background">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/btn_image"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
android:background="@mipmap/new_camera" />
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:background="@color/grey_background">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/btn_edit"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:background="@mipmap/new_no_camera"
|
||||
android:inputType="number" />
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="8"
|
||||
android:background="@color/grey_background"
|
||||
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
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="9"
|
||||
android:background="@color/grey_background"
|
||||
android:padding="5dp">
|
||||
|
||||
<Button
|
||||
android:id="@+id/btadd"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:background="@color/colorPrimary"
|
||||
android:text="@string/add" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
</android.support.v7.widget.CardView>
|
||||
|
||||
<android.support.v7.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_weight="40"
|
||||
android:padding="10dp"
|
||||
card_view:cardBackgroundColor="@color/colorOrange"
|
||||
card_view:cardCornerRadius="20dp"
|
||||
>
|
||||
|
||||
|
||||
|
||||
<ListView
|
||||
android:id="@+id/listviewlv"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:cacheColorHint="#00000000"
|
||||
|
||||
android:choiceMode="singleChoice"
|
||||
android:divider="#ff9933"
|
||||
android:dividerHeight="2dp"
|
||||
android:fastScrollEnabled="true"
|
||||
android:smoothScrollbar="true"></ListView>
|
||||
|
||||
|
||||
</android.support.v7.widget.CardView>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
xmlns:card_view="http://schemas.android.com/apk/res-auto"
|
||||
android:orientation="horizontal"
|
||||
>
|
||||
|
||||
<android.support.v7.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
card_view:cardBackgroundColor="@color/white"
|
||||
card_view:cardCornerRadius="10dp"
|
||||
>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/parent_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Checklist"
|
||||
android:textColor="@color/black"
|
||||
android:textStyle="bold"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingTop="2dp"
|
||||
android:paddingBottom="@dimen/custom_margin"
|
||||
android:textSize="@dimen/text_size_xsmall"
|
||||
android:paddingLeft="@dimen/custom_margin"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</android.support.v7.widget.CardView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:card_view="http://schemas.android.com/apk/res-auto"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="300dp"
|
||||
android:layout_height="match_parent"
|
||||
>
|
||||
android:orientation="vertical">
|
||||
|
||||
<android.support.v7.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
@@ -27,20 +26,19 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_marginTop="15dp"
|
||||
android:paddingBottom="20dp"
|
||||
android:paddingLeft="5dp"
|
||||
android:text="@string/sku"
|
||||
android:textSize="@dimen/text_size_normal"
|
||||
android:paddingBottom="20dp"
|
||||
android:textColor="@color/white"
|
||||
/>
|
||||
android:textSize="@dimen/text_size_normal" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="2"
|
||||
android:background="@color/grey_background"
|
||||
android:padding="5dp">
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp"
|
||||
android:weightSum="3">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_brand"
|
||||
@@ -48,15 +46,14 @@
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/brand"
|
||||
android:paddingLeft="5dp"/>
|
||||
android:paddingLeft="5dp"
|
||||
android:text="@string/brand" />
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/spinner_brand"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
android:layout_weight="2" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
@@ -64,25 +61,24 @@
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="2"
|
||||
android:background="@color/grey_background"
|
||||
android:padding="5dp">
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp"
|
||||
android:weightSum="3">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/sku"
|
||||
android:paddingLeft="5dp"/>
|
||||
android:paddingLeft="5dp"
|
||||
android:text="@string/sku" />
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/spinner_sku"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
android:layout_weight="2" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
@@ -90,25 +86,25 @@
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="2"
|
||||
android:background="@color/grey_background"
|
||||
android:padding="5dp">
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp"
|
||||
android:weightSum="3">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/stock"
|
||||
android:paddingLeft="5dp"/>
|
||||
android:paddingLeft="5dp"
|
||||
android:text="@string/stock" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/et_stock"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
android:layout_weight="2"
|
||||
android:inputType="number" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
@@ -116,14 +112,15 @@
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="10dp"
|
||||
android:background="@color/grey_background">
|
||||
android:background="@color/grey_background"
|
||||
android:padding="10dp">
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_add"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:text="@string/add"/>
|
||||
android:text="@string/add" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -131,4 +128,34 @@
|
||||
|
||||
</android.support.v7.widget.CardView>
|
||||
|
||||
<android.support.v7.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="10dp"
|
||||
android:padding="10dp"
|
||||
card_view:cardBackgroundColor="@color/colorOrange"
|
||||
card_view:cardCornerRadius="20dp"
|
||||
|
||||
>
|
||||
<LinearLayout
|
||||
android:id="@+id/list_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="95"
|
||||
android:visibility="gone"
|
||||
>
|
||||
|
||||
<ListView
|
||||
android:id="@+id/lv"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:cacheColorHint="#00000000"
|
||||
|
||||
android:choiceMode="singleChoice"
|
||||
android:divider="#ff9933"
|
||||
android:dividerHeight="2dp"
|
||||
android:fastScrollEnabled="true"
|
||||
android:smoothScrollbar="true"></ListView>
|
||||
</LinearLayout>
|
||||
</android.support.v7.widget.CardView>
|
||||
</LinearLayout>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.9 KiB |
@@ -7,7 +7,7 @@
|
||||
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||
<dimen name="fab_margin">16dp</dimen>
|
||||
|
||||
<dimen name="custom_margin">5dp</dimen>
|
||||
<dimen name="custom_margin">10dp</dimen>
|
||||
|
||||
<dimen name="text_size_normal">20sp</dimen>
|
||||
<dimen name="text_size_small">16sp</dimen>
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
<string name="select">Select</string>
|
||||
<string name="add">Add</string>
|
||||
|
||||
|
||||
<string name="select_language">Please select language</string>
|
||||
<string name="title_activity_select_language">SelectLanguageActivity</string>
|
||||
|
||||
@@ -100,4 +101,10 @@
|
||||
|
||||
<string name="title_store_list_download_data">Please Download Data First</string>
|
||||
|
||||
<string name="AdditionalDisplay">Is there any Additional Display</string>
|
||||
<string name="Display">Display</string>
|
||||
<string name="Photo">Photo</string>
|
||||
<string name="title_activity_Additional_visibility">Additional Visibility</string>
|
||||
<string name="title_activity_Non_Work">Non-Work Reason</string>
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user