diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 9a6bced..a22a564 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -100,14 +100,12 @@ android:screenOrientation="portrait" android:theme="@style/AppTheme.NoActionBar" android:windowSoftInputMode="adjustPan" /> - - + android:screenOrientation="portrait" + android:theme="@style/AppTheme.NoActionBar" /> + \ No newline at end of file diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java new file mode 100644 index 0000000..58288b0 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java @@ -0,0 +1,108 @@ +package cpm.com.gskmtorange.gsk_dailyentry; + +import android.app.Dialog; +import android.content.Intent; +import android.graphics.drawable.ColorDrawable; +import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.Toolbar; +import android.text.Editable; +import android.text.TextWatcher; +import android.view.View; +import android.view.Window; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import cpm.com.gskmtorange.R; + +public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { + Button btn_addShelf, btn_addSKU; + RecyclerView recyclerView; + String brand, brand_id, company_id, sub_category, sub_category_id; + String addShelfPosition = ""; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_stock_facing__planogram_tracker); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + btn_addShelf = (Button) findViewById(R.id.btn_addShelf); + btn_addSKU = (Button) findViewById(R.id.btn_addSKU); + recyclerView = (RecyclerView) findViewById(R.id.recyclerView_stockFacingPlanogramTracker); + + Intent intent = getIntent(); + brand = intent.getStringExtra("brand"); + brand_id = intent.getStringExtra("brand_id"); + company_id = intent.getStringExtra("company_id"); + sub_category = intent.getStringExtra("sub_category"); + sub_category_id = intent.getStringExtra("sub_category_id"); + + /*FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); + } + });*/ + + btn_addSKU.setEnabled(false); + + btn_addShelf.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(final View view1) { + final Dialog dialog = new Dialog(StockFacing_PlanogramTrackerActivity.this); + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); + dialog.setContentView(R.layout.dialog_stock_facing_planogram_tracker); + + final EditText ed_shelf_position = (EditText) dialog.findViewById(R.id.ed_shelf_position); + Button addShelf = (Button) dialog.findViewById(R.id.dialog_btn_addShelf); + Button cancel = (Button) dialog.findViewById(R.id.dialog_btn_cancel); + + cancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + dialog.dismiss(); + } + }); + + addShelf.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + addShelfPosition = ed_shelf_position.getText().toString().trim(); + + if (!addShelfPosition.equals("")) { + dialog.dismiss(); + + btn_addSKU.setEnabled(true); + } else { + /*Snackbar.make(view1, getResources().getString(R.string.empty_field), Snackbar.LENGTH_LONG) + .setAction("Action", null).show();*/ + Toast.makeText(StockFacing_PlanogramTrackerActivity.this, + getResources().getString(R.string.empty_field), Toast.LENGTH_SHORT).show(); + } + } + }); + + dialog.show(); + } + }); + + String s = addShelfPosition; + + btn_addSKU.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Toast.makeText(StockFacing_PlanogramTrackerActivity.this, "Add SKU", Toast.LENGTH_SHORT).show(); + } + }); + } + +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index d8e6383..184432b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -947,6 +947,21 @@ public class Stock_FacingActivity extends AppCompatActivity { //Camera allow disable img_camera1.setBackgroundResource(R.mipmap.camera_grey); img_camera2.setBackgroundResource(R.mipmap.camera_grey); + + img_camera1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(Stock_FacingActivity.this, StockFacing_PlanogramTrackerActivity.class); + + intent.putExtra("brand", headerTitle.getBrand()); + intent.putExtra("brand_id", headerTitle.getBrand_id()); + intent.putExtra("company_id", headerTitle.getCompany_id()); + intent.putExtra("sub_category", headerTitle.getSub_category()); + intent.putExtra("sub_category_id", headerTitle.getSub_category_id()); + + startActivity(intent); + } + }); } if (headerTitle.getCompany_id().equals("1")) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Stock_Facing_PlanogramTrackerGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Stock_Facing_PlanogramTrackerGetterSetter.java new file mode 100644 index 0000000..8422f9f --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Stock_Facing_PlanogramTrackerGetterSetter.java @@ -0,0 +1,138 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +/** + * Created by gagang on 23-12-2016. + */ + +public class Stock_Facing_PlanogramTrackerGetterSetter { + String category_id, sub_category_id, sub_category, brand_id, brand, + sku_id, sku, mrp, sku_sequence, stock, facing, mbq, company_id, image1, image2, sos_target; + + public String getSub_category_id() { + return sub_category_id; + } + + public void setSub_category_id(String sub_category_id) { + this.sub_category_id = sub_category_id; + } + + public String getSub_category() { + return sub_category; + } + + public void setSub_category(String sub_category) { + this.sub_category = sub_category; + } + + 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 getSku_id() { + return sku_id; + } + + public void setSku_id(String sku_id) { + this.sku_id = sku_id; + } + + public String getSku() { + return sku; + } + + public void setSku(String sku) { + this.sku = sku; + } + + public String getMrp() { + return mrp; + } + + public void setMrp(String mrp) { + this.mrp = mrp; + } + + public String getSku_sequence() { + return sku_sequence; + } + + public void setSku_sequence(String sku_sequence) { + this.sku_sequence = sku_sequence; + } + + public String getStock() { + return stock; + } + + public void setStock(String stock) { + this.stock = stock; + } + + public String getFacing() { + return facing; + } + + public void setFacing(String facing) { + this.facing = facing; + } + + public String getMbq() { + return mbq; + } + + public void setMbq(String mbq) { + this.mbq = mbq; + } + + public String getCompany_id() { + return company_id; + } + + public void setCompany_id(String company_id) { + this.company_id = company_id; + } + + 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 getCategory_id() { + return category_id; + } + + public void setCategory_id(String category_id) { + this.category_id = category_id; + } + + public String getSos_target() { + return sos_target; + } + + public void setSos_target(String sos_target) { + this.sos_target = sos_target; + } +} diff --git a/GSKMTOrange/src/main/res/drawable/bg_boarder_orange.xml b/GSKMTOrange/src/main/res/drawable/bg_boarder_orange.xml new file mode 100644 index 0000000..5944613 --- /dev/null +++ b/GSKMTOrange/src/main/res/drawable/bg_boarder_orange.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/drawable/bg_boarder_orange_transparent.xml b/GSKMTOrange/src/main/res/drawable/bg_boarder_orange_transparent.xml new file mode 100644 index 0000000..6ee88bc --- /dev/null +++ b/GSKMTOrange/src/main/res/drawable/bg_boarder_orange_transparent.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_stock_facing__planogram_tracker.xml b/GSKMTOrange/src/main/res/layout/activity_stock_facing__planogram_tracker.xml new file mode 100644 index 0000000..714bcdf --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/activity_stock_facing__planogram_tracker.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml b/GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml new file mode 100644 index 0000000..3428b76 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml @@ -0,0 +1,57 @@ + + + + + + + +