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 a1b3e0a..8131407 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -90,7 +90,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(TableBean.getDisplayChecklistMaster()); db.execSQL(TableBean.getMappingDisplayChecklist()); - + db.execSQL(TableBean.getNonWorkingReason()); } @@ -295,7 +295,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(); @@ -667,7 +667,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } return list; } - + //Gagan Start Method public void InsertCategory(CategoryMasterGetterSetter data) { @@ -1240,7 +1240,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public long InsertCoverageData(CoverageBean data) { + public long InsertCoverageData(CoverageBean data) { //db.delete(CommonString1.TABLE_COVERAGE_DATA, "STORE_ID" + "='" + data.getStoreId() + "'", null); @@ -1342,7 +1342,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } catch (Exception ex) { Log.d("Exception ", " in Insert MSL_Availability " + ex.toString()); } - + + } + public void InsertMAPPING_ADDITIONAL_PROMOTION(MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter data) { db.delete("MAPPING_ADDITIONAL_PROMOTION", null, null); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index dd24000..93c6d49 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -8,23 +8,22 @@ import android.graphics.Bitmap; import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.design.widget.Snackbar; -import android.view.LayoutInflater; -import android.view.View; import android.support.design.widget.NavigationView; +import android.support.design.widget.Snackbar; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.view.LayoutInflater; import android.view.MenuItem; +import android.view.View; import android.webkit.WebView; import android.webkit.WebViewClient; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -36,10 +35,9 @@ 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.T2PComplianceActivity; -import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity; import cpm.com.gskmtorange.dailyentry.StoreListActivity; import cpm.com.gskmtorange.download.DownloadActivity; +import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity; public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener { @@ -188,9 +186,9 @@ public class MainActivity extends AppCompatActivity } else if (id == R.id.nav_services) { - Intent startDownload = new Intent(this,T2PComplianceActivity.class); + /*Intent startDownload = new Intent(this,T2PComplianceActivity.class); startActivity(startDownload); - +*/ overridePendingTransition(R.anim.activity_in, R.anim.activity_out); } else if (id == R.id.nav_setting) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index 7c69a6b..6ca4520 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -1,6 +1,7 @@ package cpm.com.gskmtorange.dailyentry; import android.app.AlertDialog; +import android.content.ActivityNotFoundException; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; @@ -46,6 +47,9 @@ import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity; public class StoreimageActivity extends AppCompatActivity implements View.OnClickListener, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener { + String gallery_package = ""; + Uri outputFileUri; + ImageView img_cam, img_clicked; Button btn_save; @@ -231,7 +235,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic Log.i("MakeMachine", "startCameraActivity()"); File file = new File(_path); - Uri outputFileUri = Uri.fromFile(file); + outputFileUri = Uri.fromFile(file); String defaultCameraPackage = ""; final PackageManager packageManager = getPackageManager(); @@ -241,6 +245,11 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); Log.e("TAG", "package name : " + list.get(n).packageName); + //temp value in case camera is gallery app above jellybean + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + gallery_package = list.get(n).packageName; + } + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { defaultCameraPackage = list.get(n).packageName; @@ -255,11 +264,23 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic } } + //com.android.gallery3d + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); intent.setPackage(defaultCameraPackage); startActivityForResult(intent, 0); - } catch (Exception e) { + } + catch (ActivityNotFoundException e) { + e.printStackTrace(); + + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(gallery_package); + startActivityForResult(intent, 0); + + } + catch (Exception e) { e.printStackTrace(); } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 2faee48..5652d8c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -2,47 +2,81 @@ package cpm.com.gskmtorange.dailyentry; import android.app.Activity; import android.app.Dialog; +import android.content.ActivityNotFoundException; import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.graphics.Color; import android.graphics.drawable.ColorDrawable; +import android.net.Uri; +import android.os.Build; import android.os.Bundle; +import android.preference.PreferenceManager; +import android.provider.MediaStore; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; +import android.util.Log; import android.view.LayoutInflater; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.Window; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; +import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.ProgressBar; import android.widget.Spinner; import android.widget.TextView; import android.widget.ToggleButton; +import com.google.android.gms.appindexing.AppIndex; +import com.google.android.gms.common.api.GoogleApiClient; + +import java.io.File; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.List; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; -import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter; public class T2PComplianceActivity extends AppCompatActivity { + String gallery_package = ""; + Uri outputFileUri; + GSKOrangeDB db; ArrayList t2PGetterSetters; T2PAdapter t2PAdapter; RecyclerView rec_t2p; + String categoryName, categoryId, storeId; + + private SharedPreferences preferences; + String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + + String path = "", str = CommonString.FILE_PATH, _pathforcheck = "", img = ""; + int child_position = -1; + /** + * ATTENTION: This was auto-generated to implement the App Indexing API. + * See https://g.co/AppIndexing/AndroidStudio for more information. + */ + private GoogleApiClient client; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -50,35 +84,68 @@ public class T2PComplianceActivity extends AppCompatActivity { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + db = new GSKOrangeDB(T2PComplianceActivity.this); db.open(); + //preference data + preferences = PreferenceManager.getDefaultSharedPreferences(this); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); + visit_date = preferences.getString(CommonString.KEY_DATE, null); + date = preferences.getString(CommonString.KEY_DATE, null); + username = preferences.getString(CommonString.KEY_USERNAME, null); + intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, ""); + keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, ""); + class_id = preferences.getString(CommonString.KEY_CLASS_ID, ""); + storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, ""); + + rec_t2p = (RecyclerView) findViewById(R.id.rec_t2p); 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) + Snackbar.make(view, "Data Saved", Snackbar.LENGTH_LONG) .setAction("Action", null).show(); + finish(); } }); + + t2PGetterSetters = db.getT2PDefaultData(store_id); + + if (t2PGetterSetters.size() > 0) { + + for (int i = 0; i < t2PGetterSetters.size(); i++) { + + ArrayList gapsChecklist = db.getGapsDefaultData(t2PGetterSetters.get(i).getDisplay_id()); + + t2PGetterSetters.get(i).setGapsChecklist(gapsChecklist); + + } + + + rec_t2p.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + t2PAdapter = new T2PAdapter(t2PGetterSetters); + rec_t2p.setAdapter(t2PAdapter); + + } + + // ATTENTION: This was auto-generated to implement the App Indexing API. + // See https://g.co/AppIndexing/AndroidStudio for more information. + client = new GoogleApiClient.Builder(this).addApi(AppIndex.API).build(); } @Override protected void onResume() { super.onResume(); - t2PGetterSetters = db.getT2PDefaultData("1"); - if (t2PGetterSetters.size() > 0) { - rec_t2p.setLayoutManager(new LinearLayoutManager(getApplicationContext())); - t2PAdapter = new T2PAdapter(t2PGetterSetters); - rec_t2p.setAdapter(t2PAdapter); - - } } + public class T2PAdapter extends RecyclerView.Adapter { private ArrayList list; @@ -95,7 +162,7 @@ public class T2PComplianceActivity extends AppCompatActivity { } @Override - public void onBindViewHolder(final ViewHolder holder, int position) { + public void onBindViewHolder(final ViewHolder holder, final int position) { final T2PGetterSetter mItem = list.get(position); holder.tv_brand.setText(mItem.getBrand()); @@ -105,20 +172,59 @@ public class T2PComplianceActivity extends AppCompatActivity { @Override public void onClick(View v) { - ArrayList gapsChecklist = showGapsDialog(mItem.getDisplay_id()); - if (gapsChecklist.size() > 0) { + showGapsDialog(mItem.getGapsChecklist()); + } + }); + + holder.toggle_btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + if (((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")) { + mItem.setPresent(true); + } else { + mItem.setPresent(false); } + + t2PAdapter.notifyDataSetChanged(); + } + }); + + holder.img_cam.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + child_position = position; + path = str + _pathforcheck; + + startCameraActivity(); } }); holder.btn_sku.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - showSkuDialog(); + showSkuDialog(mItem.getSkulist()); } }); + if (!img.equalsIgnoreCase("")) { + if (position == child_position) { + mItem.setImage(img); + img = ""; + } + } + + if (mItem.getImage().equals("")) { + holder.img_cam.setBackgroundResource(R.drawable.cam_deactive); + } else { + holder.img_cam.setBackgroundResource(R.drawable.cam_active); + } + + holder.toggle_btn.setChecked(mItem.isPresent()); + + } @Override @@ -132,6 +238,7 @@ public class T2PComplianceActivity extends AppCompatActivity { public final TextView tv_brand, tv_display; public final ImageView img_cam, img_remark; public final Button btn_gaps, btn_sku, btn_ref_img; + public final ToggleButton toggle_btn; public ViewHolder(View view) { @@ -147,18 +254,19 @@ public class T2PComplianceActivity extends AppCompatActivity { btn_sku = (Button) mView.findViewById(R.id.btn_sku); btn_ref_img = (Button) mView.findViewById(R.id.btn_ref_image); parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout); + toggle_btn = (ToggleButton) mView.findViewById(R.id.toggle_btn); } } } - public ArrayList showGapsDialog(String display_id) { - ArrayList gapsChecklist = db.getGapsDefaultData(display_id); + public void showGapsDialog(ArrayList gapsChecklist) { + //ArrayList gapsChecklist = db.getGapsDefaultData(display_id); final Dialog dialog = new Dialog(T2PComplianceActivity.this); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); - dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); + dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); dialog.setContentView(R.layout.gaps_dialog_layout); //pb = (ProgressBar) dialog.findViewById(R.id.progressBar1); RecyclerView rec_gap_checklist = (RecyclerView) dialog.findViewById(R.id.rec_gap_checklist); @@ -172,36 +280,95 @@ public class T2PComplianceActivity extends AppCompatActivity { public void onClick(View v) { dialog.cancel(); + } }); dialog.setCancelable(false); dialog.show(); - return gapsChecklist; } - public void showSkuDialog() { + public void showSkuDialog(final ArrayList skuAddedList) { - final ArrayList brandList = db.getBrandT2PData("1", "1", "1"); + final SkuGetterSetter[] sku_selected = new SkuGetterSetter[1]; + final BrandMasterGetterSetter[] brand_selected = new BrandMasterGetterSetter[1]; + + final ArrayList brandList = db.getBrandT2PData(storeType_id, class_id, keyAccount_id); BrandMasterGetterSetter brand = new BrandMasterGetterSetter(); brand.setBRAND("select"); - brandList.add(0,brand); + brandList.add(0, brand); // ArrayList skuMasterGetterSetterArrayList = db.getSkuT2PData("1", "1", "1",) final Dialog dialog = new Dialog(T2PComplianceActivity.this); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); - dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); + dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); dialog.setContentView(R.layout.t2p_sku_dialog_layout); //pb = (ProgressBar) dialog.findViewById(R.id.progressBar1); //dialog.setCancelable(false); - Spinner spinner_brand = (Spinner) dialog.findViewById(R.id.spinner_brand); + final Spinner spinner_brand = (Spinner) dialog.findViewById(R.id.spinner_brand); final Spinner spinner_sku = (Spinner) dialog.findViewById(R.id.spinner_sku); Button btn_add = (Button) dialog.findViewById(R.id.btn_add); + Button btn_cancel = (Button) dialog.findViewById(R.id.btn_cancel); + final EditText et_stock = (EditText) dialog.findViewById(R.id.et_stock); + final RecyclerView rec_sku = (RecyclerView) dialog.findViewById(R.id.rec_sku); + + final ArrayList sku_list = new ArrayList<>(); + + if(skuAddedList.size()>0){ + + rec_sku.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + SkuAddedAdapter skuAdapter = new SkuAddedAdapter(skuAddedList); + rec_sku.setAdapter(skuAdapter); + + } + btn_add.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + if(brand_selected[0] ==null || sku_selected[0]==null || et_stock.getText().toString().equals("")){ + + Snackbar.make(v, getResources().getString(R.string.enter_the_values),Snackbar.LENGTH_SHORT).show(); + } + else{ + SkuGetterSetter sku = new SkuGetterSetter(); + sku.setBRAND_ID(brand_selected[0].getBRAND_ID().get(0)); + sku.setBRAND(brand_selected[0].getBRAND().get(0)); + sku.setSKU(sku_selected[0].getSKU()); + sku.setSKU_ID(sku_selected[0].getSKU_ID()); + sku.setSTOCK(et_stock.getText().toString()); + + skuAddedList.add(sku); + + rec_sku.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + SkuAddedAdapter skuAdapter = new SkuAddedAdapter(skuAddedList); + rec_sku.setAdapter(skuAdapter); + + et_stock.setText(""); + spinner_brand.setSelection(0); + + SkuGetterSetter select = new SkuGetterSetter(); + select.setSKU("Select"); + sku_list.clear(); + sku_list.add(select); + CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, sku_list); + spinner_sku.setAdapter(skuadapter); + + spinner_sku.setSelection(0); + + + brand_selected[0] = null; + sku_selected[0] = null; + + } + + } + }); + + btn_cancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { dialog.cancel(); } }); @@ -211,11 +378,11 @@ public class T2PComplianceActivity extends AppCompatActivity { // Set adapter to spinner spinner_brand.setAdapter(adapter); - ArrayList empty_list = new ArrayList<>(); + SkuGetterSetter select = new SkuGetterSetter(); select.setSKU("Select"); - empty_list.add(select); - CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, empty_list); + sku_list.add(select); + CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, sku_list); spinner_sku.setAdapter(skuadapter); @@ -223,14 +390,23 @@ public class T2PComplianceActivity extends AppCompatActivity { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { - if(position!=0){ + if (position != 0) { + + sku_list.clear(); + + brand_selected[0] = brandList.get(position); String brand_id = brandList.get(position).getBRAND_ID().get(0); - ArrayList sku_list = db.getSkuT2PData("1", "1", "1", brand_id); + ArrayList temp_list = db.getSkuT2PData(storeType_id, class_id, keyAccount_id, brand_id); + + for (int k=0;k parent, View view, int position, long id) { + + if(position!=0){ + + sku_selected[0] = sku_list.get(position); + } + + } + + @Override + public void onNothingSelected(AdapterView parent) { + + } + }); + + dialog.setCancelable(false); dialog.show(); } @@ -275,10 +470,14 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.tb_present.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - + if (((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")) { + mItem.setPresent(true); + } } }); + holder.tb_present.setChecked(mItem.isPresent()); + } @Override @@ -432,4 +631,159 @@ public class T2PComplianceActivity extends AppCompatActivity { } } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + if (id == android.R.id.home) { + finish(); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + + public String getCurrentTime() { + Calendar m_cal = Calendar.getInstance(); + SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss"); + String cdate = formatter.format(m_cal.getTime()); + /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":" + + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/ + + return cdate; + } + + private void startCameraActivity() { + try { + + Log.i("Stock & Facing ", "startCameraActivity()"); + File file = new File(path); + outputFileUri = Uri.fromFile(file); + + String defaultCameraPackage = ""; + final PackageManager packageManager = getPackageManager(); + List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); + for (int n = 0; n < list.size(); n++) { + if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { + /*Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); + Log.e("TAG", "package name : " + list.get(n).packageName);*/ + + //temp value in case camera is gallery app above jellybean + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + gallery_package = list.get(n).packageName; + } + + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + defaultCameraPackage = list.get(n).packageName; + break; + } + } else { + if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + defaultCameraPackage = list.get(n).packageName; + break; + } + } + } + } + + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(defaultCameraPackage); + startActivityForResult(intent, 1); + //startActivityForResult(intent, position); + + } catch (ActivityNotFoundException e) { + e.printStackTrace(); + + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(gallery_package); + startActivityForResult(intent, 0); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + Log.e("Stock & Facing", "resultCode: " + resultCode); + switch (resultCode) { + case 0: + Log.e("Stock & Facing", "User cancelled"); + + break; + case -1: + if (_pathforcheck != null && !_pathforcheck.equals("")) { + if (new File(str + _pathforcheck).exists()) { + img = _pathforcheck; + t2PAdapter.notifyDataSetChanged(); + _pathforcheck = ""; + } + } + break; + } + + super.onActivityResult(requestCode, resultCode, data); + } + + public class SkuAddedAdapter extends RecyclerView.Adapter { + + private ArrayList list; + + public SkuAddedAdapter(ArrayList skuList) { + list = skuList; + } + + @Override + public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.sku_added_item_layout, parent, false); + return new ViewHolder(view); + } + + @Override + public void onBindViewHolder(final ViewHolder holder, final int position) { + + final SkuGetterSetter mItem = list.get(position); + holder.tv_brand.setText(mItem.getBRAND()); + holder.tv_sku.setText(mItem.getSKU().trim()); + holder.tv_stock.setText(mItem.getSTOCK()); + + } + + @Override + public int getItemCount() { + return list.size(); + } + + public class ViewHolder extends RecyclerView.ViewHolder { + public final View mView; + public final LinearLayout parentLayout; + public final TextView tv_brand, tv_sku, tv_stock; + + public ViewHolder(View view) { + super(view); + + mView = view; + + tv_brand = (TextView) mView.findViewById(R.id.tv_brand); + tv_sku = (TextView) mView.findViewById(R.id.tv_sku); + tv_stock = (TextView) mView.findViewById(R.id.tv_stock); + parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout); + + } + + } + } + } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java index aafea3a..aad1dfd 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java @@ -3,8 +3,6 @@ package cpm.com.gskmtorange.gsk_dailyentry; import android.content.Context; import android.content.Intent; 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.GridLayoutManager; import android.support.v7.widget.RecyclerView; @@ -23,6 +21,7 @@ import java.util.Collections; import java.util.List; import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity; import cpm.com.gskmtorange.xmlGetterSetter.DailyDataMenuGetterSetter; public class DailyDataMenuActivity extends AppCompatActivity { @@ -157,6 +156,13 @@ public class DailyDataMenuActivity extends AppCompatActivity { intent.putExtra("categoryName", dailyData.getCategory_name()); intent.putExtra("categoryId", categoryId); startActivity(intent); + } else if(dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))){ + Intent intent = new Intent(DailyDataMenuActivity.this, T2PComplianceActivity.class); + intent.putExtra("categoryName", dailyData.getCategory_name()); + intent.putExtra("categoryId", categoryId); + startActivity(intent); + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); + } } }); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SkuGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SkuGetterSetter.java index fb4cc4d..5bee077 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SkuGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SkuGetterSetter.java @@ -1,13 +1,11 @@ package cpm.com.gskmtorange.xmlGetterSetter; -import java.util.ArrayList; - /** * Created by yadavendras on 28-12-2016. */ public class SkuGetterSetter { - String SKU_ID, SKU, BRAND_ID, MRP, SKU_SEQUENCE; + String SKU_ID, SKU, BRAND_ID, BRAND, MRP, SKU_SEQUENCE,STOCK; public String getSKU_ID() { return SKU_ID; @@ -48,4 +46,20 @@ public class SkuGetterSetter { public void setSKU_SEQUENCE(String SKU_SEQUENCE) { this.SKU_SEQUENCE = SKU_SEQUENCE; } + + public String getBRAND() { + return BRAND; + } + + public void setBRAND(String BRAND) { + this.BRAND = BRAND; + } + + public String getSTOCK() { + return STOCK; + } + + public void setSTOCK(String STOCK) { + this.STOCK = STOCK; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java index 56d6639..f79aec6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java @@ -1,5 +1,7 @@ package cpm.com.gskmtorange.xmlGetterSetter; +import java.util.ArrayList; + /** * Created by yadavendras on 02-01-2017. */ @@ -9,6 +11,9 @@ public class T2PGetterSetter { String brand_id, display_id, brand, display, image, remark; boolean isPresent; + ArrayList gapsChecklist = new ArrayList<>(); + ArrayList skulist = new ArrayList<>(); + public String getBrand_id() { return brand_id; } @@ -64,4 +69,20 @@ public class T2PGetterSetter { public void setPresent(boolean present) { isPresent = present; } + + public ArrayList getGapsChecklist() { + return gapsChecklist; + } + + public void setGapsChecklist(ArrayList gapsChecklist) { + this.gapsChecklist = gapsChecklist; + } + + public ArrayList getSkulist() { + return skulist; + } + + public void setSkulist(ArrayList skulist) { + this.skulist = skulist; + } } diff --git a/GSKMTOrange/src/main/res/drawable/hfd.png b/GSKMTOrange/src/main/res/drawable/hfd.png new file mode 100644 index 0000000..8278277 Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/hfd.png differ diff --git a/GSKMTOrange/src/main/res/drawable/hfd_done.png b/GSKMTOrange/src/main/res/drawable/hfd_done.png new file mode 100644 index 0000000..073f978 Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/hfd_done.png differ diff --git a/GSKMTOrange/src/main/res/drawable/ohc.png b/GSKMTOrange/src/main/res/drawable/ohc.png new file mode 100644 index 0000000..9ccf323 Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/ohc.png differ diff --git a/GSKMTOrange/src/main/res/drawable/ohc_done.png b/GSKMTOrange/src/main/res/drawable/ohc_done.png new file mode 100644 index 0000000..9654568 Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/ohc_done.png differ diff --git a/GSKMTOrange/src/main/res/drawable/pdr.png b/GSKMTOrange/src/main/res/drawable/pdr.png new file mode 100644 index 0000000..9190d2d Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/pdr.png differ diff --git a/GSKMTOrange/src/main/res/drawable/pdr_done.png b/GSKMTOrange/src/main/res/drawable/pdr_done.png new file mode 100644 index 0000000..4b99cf5 Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/pdr_done.png differ diff --git a/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml b/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml index 0d12fc0..ee096fd 100644 --- a/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml +++ b/GSKMTOrange/src/main/res/layout/gap_checklist_item.xml @@ -46,6 +46,8 @@ android:id="@+id/btn_is_present" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textOn="Yes" + android:textOff="No" android:layout_centerInParent="true"/> diff --git a/GSKMTOrange/src/main/res/layout/sku_added_item_layout.xml b/GSKMTOrange/src/main/res/layout/sku_added_item_layout.xml new file mode 100644 index 0000000..c3a8b87 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/sku_added_item_layout.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml index de8d4c0..0f9883d 100644 --- a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml +++ b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml @@ -91,8 +91,8 @@ android:id="@+id/toggle_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/custom_margin" - android:text="@string/brand" + android:textOn="Yes" + android:textOff="No" android:layout_centerInParent="true"/> diff --git a/GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml b/GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml index 1cdbc7f..96582e3 100644 --- a/GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml +++ b/GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml @@ -120,15 +120,37 @@ android:padding="10dp" android:background="@color/grey_background"> -