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 a5ee049..121acff 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -56,6 +56,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NoCameraLastVisitGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingSubReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.POGGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter; @@ -78,7 +79,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean; */ public class GSKOrangeDB extends SQLiteOpenHelper { - public static final String DATABASE_NAME = "GSK_ORANGE_DB32"; + public static final String DATABASE_NAME = "GSK_ORANGE_DB34"; public static final int DATABASE_VERSION = 15; TableBean tableBean; private SQLiteDatabase db; @@ -176,6 +177,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(TableBean.getTable_CONFIGURATION_COUNTRY_WISE()); db.execSQL(TableBean.getTable_NO_CAMERA_LAST_VISIT_DATA()); db.execSQL(TableBean.getTable_GEO_FENCING()); + db.execSQL(TableBean.getTable_NON_WORKING_SUB_REASON());//--Added 26.09.2018 //15-03-2017 db.execSQL(CommonString.CREATE_TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING); @@ -854,6 +856,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } sb.setCheckOut_Image(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CHECKOUT_IMAGE))); sb.setFlag_from(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STORE_FLAG))); + sb.setSub_reasonId(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SUB_REASON_ID))); list.add(sb); @@ -1479,6 +1482,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { ContentValues values = new ContentValues(); try { + + String sub_reason_id = data.getSub_reasonId(); + + if(sub_reason_id.equals("")){ + sub_reason_id = "0"; + } + values.put(CommonString.KEY_STORE_ID, data.getStoreId()); values.put(CommonString.KEY_USER_ID, data.getUserId()); values.put(CommonString.KEY_IN_TIME, data.getInTime()); @@ -1492,6 +1502,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put(CommonString.KEY_IMAGE, data.getImage()); values.put(CommonString.KEY_COVERAGE_REMARK, data.getRemark()); values.put(CommonString.KEY_REASON_ID, data.getReasonid()); + values.put(CommonString.KEY_SUB_REASON_ID, sub_reason_id); values.put(CommonString.KEY_REASON, data.getReason()); values.put(CommonString.KEY_GEO_TAG, data.getGEO_TAG()); values.put(CommonString.KEY_CHECKOUT_IMAGE, data.getCheckOut_Image()); @@ -1832,7 +1843,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { //Non Working data public void insertNonWorkingData(NonWorkingReasonGetterSetter data) { - db.delete("NON_WORKING_REASON", null, null); + db.delete("NON_WORKING_REASON_NEW", null, null); ContentValues values = new ContentValues(); try { @@ -1843,8 +1854,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("REASON", data.getREASON().get(i)); values.put("ENTRY_ALLOW", data.getENTRY_ALLOW().get(i)); values.put("IMAGE_ALLOW", data.getIMAGE_ALLOW().get(i)); + values.put("REMARK_REQUIRED", data.getREMARK_REQUIRED().get(i)); + values.put("REMARK_TYPE", data.getREMARK_TYPE().get(i)); + values.put("REMARK_LABEL", data.getREMARK_LABEL().get(i)); + values.put("REMARK_MANDATORY", data.getREMARK_MANDATORY().get(i)); - db.insert("NON_WORKING_REASON", null, values); + db.insert("NON_WORKING_REASON_NEW", null, values); } @@ -1860,7 +1875,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { ArrayList list = new ArrayList(); Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM NON_WORKING_REASON", null); + dbcursor = db.rawQuery("SELECT * FROM NON_WORKING_REASON_NEW", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -1875,6 +1890,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setIMAGE_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE_ALLOW"))); + sb.setREMARK_REQUIRED(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_REQUIRED"))); + sb.setREMARK_TYPE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_TYPE"))); + sb.setREMARK_LABEL(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_LABEL"))); + sb.setREMARK_MANDATORY(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_MANDATORY"))); list.add(sb); dbcursor.moveToNext(); @@ -4739,7 +4758,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { ArrayList list = new ArrayList(); Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM NON_WORKING_REASON WHERE ENTRY_ALLOW=1", null); + dbcursor = db.rawQuery("SELECT * FROM NON_WORKING_REASON_NEW WHERE ENTRY_ALLOW=1", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -4754,6 +4773,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setIMAGE_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE_ALLOW"))); + sb.setREMARK_REQUIRED(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_REQUIRED"))); + sb.setREMARK_TYPE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_TYPE"))); + sb.setREMARK_LABEL(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_LABEL"))); + sb.setREMARK_MANDATORY(dbcursor.getString(dbcursor.getColumnIndexOrThrow("REMARK_MANDATORY"))); list.add(sb); dbcursor.moveToNext(); @@ -5384,7 +5407,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { cd.setRow_no(Integer.parseInt(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_ROW_NO)))); cd.setColumn_no(Integer.parseInt(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_COLUMN_NO)))); cd.setFacing(Integer.parseInt(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_FACING)))); - cd.setVertical(dbcursor.getInt(dbcursor.getColumnIndexOrThrow(CommonString.KEY_ISVERTICAL))==1); + cd.setVertical(dbcursor.getInt(dbcursor.getColumnIndexOrThrow(CommonString.KEY_ISVERTICAL)) == 1); list.add(cd); dbcursor.moveToNext(); @@ -5430,7 +5453,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - dbcursor = db.rawQuery("SELECT ROW_NO, MAX(COLUMN_NO) as COLUMN_NO FROM "+ table_name + " WHERE " + + dbcursor = db.rawQuery("SELECT ROW_NO, MAX(COLUMN_NO) as COLUMN_NO FROM " + table_name + " WHERE " + "STORE_ID = '" + store_id + "' AND CATEGORY_ID = '" + category_id + "' AND SUB_CATEGORY_ID = '" + sub_category_id + "' GROUP BY ROW_NO", null); @@ -5464,7 +5487,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - dbcursor = db.rawQuery("SELECT NC.SKU_GROUP_ID, SM.SKUGROUP_NAME, NC.FACING, NC.IS_VERTICAL FROM "+ table_name +" NC " + + dbcursor = db.rawQuery("SELECT NC.SKU_GROUP_ID, SM.SKUGROUP_NAME, NC.FACING, NC.IS_VERTICAL FROM " + table_name + " NC " + "INNER JOIN SKUGROUP_MASTER SM ON NC.SKU_GROUP_ID = SM.SKUGROUP_ID " + "WHERE NC.STORE_ID = '" + store_id + "' AND NC.CATEGORY_ID = '" + category_id + "' AND NC.SUB_CATEGORY_ID = '" + sub_category_id + "' AND ROW_NO = '" + row + "' AND COLUMN_NO = '" + column + "'", null); @@ -6441,6 +6464,63 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } + return list; + } + + //NON_WORKING_SUB_REASON data + + public void insertNonWorkingSubreasonData(NonWorkingSubReasonGetterSetter data) { + db.delete("NON_WORKING_SUB_REASON", null, null); + ContentValues values = new ContentValues(); + + try { + + for (int i = 0; i < data.getREASON_ID().size(); i++) { + + values.put("REASON_ID", Integer.parseInt(data.getREASON_ID().get(i))); + values.put("SUB_REASON_ID", data.getSUB_REASON_ID().get(i)); + values.put("SUB_REASON", data.getSUB_REASON().get(i)); + + db.insert("NON_WORKING_SUB_REASON", null, values); + + } + + } catch (Exception ex) { + Log.d("Database Exception ", ex.toString()); + } + + } + + // get NonWorking Sub reason data + public ArrayList getNonWorkingSubReasonData(String reason_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + try { + dbcursor = db.rawQuery("SELECT * FROM NON_WORKING_SUB_REASON WHERE REASON_ID ='"+ reason_id +"'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + NonWorkingSubReasonGetterSetter sb = new NonWorkingSubReasonGetterSetter(); + + sb.setSUB_REASON_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_REASON_ID"))); + + sb.setSUB_REASON(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_REASON"))); + + list.add(sb); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + + } catch (Exception e) { + + return list; + } + + return list; } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java index d41fba4..6ae8e10 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -50,6 +50,7 @@ public class CommonString { public static final String KEY_LONGITUDE = "LONGITUDE"; public static final String KEY_COVERAGE_STATUS = "Coverage"; public static final String KEY_REASON_ID = "REASON_ID"; + public static final String KEY_SUB_REASON_ID = "SUB_REASON_ID"; public static final String KEY_REASON = "REASON"; public static final String KEY_COVERAGE_REMARK = "REMARK"; public static final String KEY_CHECKOUT_IMAGE = "Checkout_Image"; @@ -165,6 +166,7 @@ public class CommonString { //public static final String METHOD_UPLOAD_COVERAGE = "UPLOAD_COVERAGENEW"; public static final String METHOD_UPLOAD_COVERAGE = "UPLOAD_COVERAGENEW1"; + public static final String METHOD_UPLOAD_COVERAGE_NEW = "UPLOAD_COVERAGENEW2"; public static final String METHOD_UPLOAD_COVERAGE_STATUS = "UploadCoverage_Status"; @@ -173,6 +175,9 @@ public class CommonString { public static final String SOAP_ACTION_UPLOAD_STORE_COVERAGE = "http://tempuri.org/" + METHOD_UPLOAD_COVERAGE; + public static final String SOAP_ACTION_UPLOAD_STORE_COVERAGE_NEW = "http://tempuri.org/" + + METHOD_UPLOAD_COVERAGE_NEW; + public static final String METHOD_UPLOAD_IMAGE = "GetImageWithFolderName"; public static final String SOAP_ACTION_UPLOAD_IMAGE = "http://tempuri.org/" + METHOD_UPLOAD_IMAGE; @@ -193,7 +198,7 @@ public class CommonString { public static final String CREATE_TABLE_COVERAGE_DATA = "CREATE TABLE IF NOT EXISTS " + TABLE_COVERAGE_DATA + " (" + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ," - + KEY_STORE_ID + " VARCHAR,USER_ID VARCHAR, " + + KEY_STORE_ID + " INTEGER,USER_ID VARCHAR, " + KEY_IN_TIME + " VARCHAR," + KEY_OUT_TIME + " VARCHAR," + KEY_VISIT_DATE + " VARCHAR," @@ -203,7 +208,8 @@ public class CommonString { + KEY_COVERAGE_STATUS + " VARCHAR," + KEY_IMAGE + " VARCHAR," + KEY_GEO_TAG + " VARCHAR," - + KEY_REASON_ID + " VARCHAR," + + KEY_REASON_ID + " INTEGER," + + KEY_SUB_REASON_ID + " INTEGER," + KEY_COVERAGE_REMARK + " VARCHAR," + KEY_CHECKOUT_IMAGE + " VARCHAR," + KEY_STORE_FLAG + " VARCHAR," diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java index d25c76e..0ea985c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -65,6 +65,7 @@ import cpm.com.gskmtorange.constant.CommonFunctions; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingSubReasonGetterSetter; import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler; @@ -72,12 +73,13 @@ public class NonWorkingReason extends AppCompatActivity implements OnItemSelectedListener, OnClickListener { ArrayList reasondata = new ArrayList(); - private Spinner reasonspinner; + ArrayList sub_reasondata = new ArrayList<>(); + private Spinner reasonspinner, subreason_spinner; private GSKOrangeDB database; - String reasonname, reasonid, entry_allow, image, entry, reason_reamrk, intime, image_allow; + String reasonname, reasonid, entry_allow, image, entry, reason_reamrk, intime, image_allow, remark_allow, remark_type, sub_reason_id=""; Button save; boolean ResultFlag = true; - private ArrayAdapter reason_adapter; + private ArrayAdapter reason_adapter, sub_reason_adapter; protected String _path, str,strflag; protected String _pathforcheck = ""; private ArrayList storedata = new ArrayList(); @@ -104,18 +106,23 @@ public class NonWorkingReason extends AppCompatActivity implements private FailureGetterSetter failureGetterSetter = null; boolean nonflag=true; String store_flag_str; + + TextView tv_remark; + @Override protected void onCreate(Bundle savedInstanceState) { // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.nonworkingmainlayout); - reasonspinner = (Spinner) findViewById(R.id.spinner2); + reasonspinner = (Spinner) findViewById(R.id.spinner_reason); camera = (ImageButton) findViewById(R.id.imgcam); save = (Button) findViewById(R.id.save); text = (EditText) findViewById(R.id.reasontxt); + tv_remark = (TextView) findViewById(R.id.tv_remark); reason_lay = (RelativeLayout) findViewById(R.id.layout_reason); rel_cam = (RelativeLayout) findViewById(R.id.relimgcam); + subreason_spinner = (Spinner) findViewById(R.id.spinner_sub_reason); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); @@ -154,7 +161,6 @@ public class NonWorkingReason extends AppCompatActivity implements { nonflag=false; } - } if (nonflag) { @@ -165,7 +171,6 @@ public class NonWorkingReason extends AppCompatActivity implements } - intime = CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()); camera.setOnClickListener(this); @@ -203,13 +208,15 @@ public class NonWorkingReason extends AppCompatActivity implements // TODO Auto-generated method stub switch (arg0.getId()) { - case R.id.spinner2: + case R.id.spinner_reason: if (position != 0) { reasonname = reasondata.get(position - 1).getREASON().get(0); reasonid = reasondata.get(position - 1).getREASON_ID().get(0); entry_allow = reasondata.get(position - 1).getENTRY_ALLOW().get(0); image_allow = reasondata.get(position - 1).getIMAGE_ALLOW().get(0); + remark_allow = reasondata.get(position - 1).getREMARK_REQUIRED().get(0); + remark_type = reasondata.get(position - 1).getREMARK_TYPE().get(0); if (image_allow.equalsIgnoreCase("1")) { rel_cam.setVisibility(View.VISIBLE); @@ -218,15 +225,55 @@ public class NonWorkingReason extends AppCompatActivity implements rel_cam.setVisibility(View.GONE); image = "false"; } - reason_reamrk = "true"; - if (reason_reamrk.equalsIgnoreCase("true")) { + //reason_reamrk = "true"; + if (remark_allow.equalsIgnoreCase("1")) { reason_lay.setVisibility(View.VISIBLE); + if(remark_type.equalsIgnoreCase("Text")){ + text.setVisibility(View.VISIBLE); + subreason_spinner.setVisibility(View.GONE); + } + else { + text.setVisibility(View.GONE); + subreason_spinner.setVisibility(View.VISIBLE); + + sub_reasondata = database.getNonWorkingSubReasonData(reasonid); + + sub_reason_adapter = new ArrayAdapter(this, + android.R.layout.simple_spinner_item); + + String select_str = getResources().getString(R.string.select_promo) + " " +reasondata.get(position - 1).getREMARK_LABEL().get(0); + + sub_reason_adapter.add(select_str); + + for (int i = 0; i < sub_reasondata.size(); i++) { + sub_reason_adapter.add(sub_reasondata.get(i).getSUB_REASON().get(0)); + } + + subreason_spinner.setAdapter(sub_reason_adapter); + + sub_reason_adapter + .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + + subreason_spinner.setOnItemSelectedListener(this); + } + tv_remark.setText(reasondata.get(position - 1).getREMARK_LABEL().get(0)); } else { reason_lay.setVisibility(View.GONE); } } else { reasonname = ""; reasonid = ""; + reason_lay.setVisibility(View.GONE); + } + break; + + case R.id.spinner_sub_reason: + + if (position != 0) { + sub_reason_id = sub_reasondata.get(position-1).getSUB_REASON_ID().get(0); + } + else { + sub_reason_id = ""; } break; } @@ -347,11 +394,11 @@ public class NonWorkingReason extends AppCompatActivity implements public boolean textAllowed() { boolean result = true; + if(remark_type!=null && remark_type.equalsIgnoreCase("Text")){ + if (text.getText().toString().trim().equals("")) { - if (text.getText().toString().trim().equals("")) { - - result = false; - + result = false; + } } return result; @@ -374,7 +421,25 @@ public class NonWorkingReason extends AppCompatActivity implements if (imageAllowed()) { - if (textAllowed()) { + boolean valid_flag = true; + if(remark_allow.equalsIgnoreCase("1")){ + + if (textAllowed()) { + + if(!validateSubReasonData()){ + valid_flag = false; + Toast.makeText(getApplicationContext(), R.string.title_activity_select_dropdown, + Toast.LENGTH_SHORT).show(); + } + + } else { + valid_flag = false; + Toast.makeText(getApplicationContext(), R.string.pleaseenterRemarks, + Toast.LENGTH_SHORT).show(); + } + } + + if(valid_flag){ AlertDialog.Builder builder = new AlertDialog.Builder( NonWorkingReason.this); @@ -411,6 +476,7 @@ public class NonWorkingReason extends AppCompatActivity implements cdata.setLatitude("0.0"); cdata.setLongitude("0.0"); cdata.setImage(image1); + cdata.setSub_reasonId(sub_reason_id); cdata.setRemark(text.getText().toString().replaceAll("[&^<>{}'$]", " ")); cdata.setStatus(CommonString.STORE_STATUS_LEAVE); @@ -444,6 +510,7 @@ public class NonWorkingReason extends AppCompatActivity implements cdata.setLatitude("0.0"); cdata.setLongitude("0.0"); cdata.setImage(image1); + cdata.setSub_reasonId(sub_reason_id); cdata.setRemark(text .getText() @@ -480,7 +547,7 @@ public class NonWorkingReason extends AppCompatActivity implements new NonWorkingReason.GeoTagUpload(NonWorkingReason.this).execute(); - // finish(); + // finish(); } }) .setNegativeButton(R.string.closed, @@ -495,10 +562,8 @@ public class NonWorkingReason extends AppCompatActivity implements alert = builder.create(); alert.show(); - } else { - Toast.makeText(getApplicationContext(), R.string.pleaseenterRemarks, - Toast.LENGTH_SHORT).show(); } + } else { Toast.makeText(getApplicationContext(), R.string.title_activity_take_image, Toast.LENGTH_SHORT).show(); @@ -517,9 +582,21 @@ public class NonWorkingReason extends AppCompatActivity implements if (reasonid != null && !reasonid.equalsIgnoreCase("")) { result = true; } + return result; + } + + public boolean validateSubReasonData() { + boolean result = false; + if(remark_type!=null && remark_type.equalsIgnoreCase("List")){ + if (sub_reason_id != null && !sub_reason_id.equalsIgnoreCase("")) { + result = true; + } + } + else { + result = true; + } return result; - } private static String arabicToenglish(String number) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java index de49567..dbadfdf 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -895,7 +895,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli }else{ - String msg = getString(R.string.you_need_to_be_in_the_store) + " " +distance + " meters"; + String msg = getString(R.string.you_need_to_be_in_the_store) + "\n " + getString(R.string.distance_from_the_store)+ " - " + distance + " "+getString(R.string.meters); dialog.cancel(); AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this); builder.setTitle(getResources().getString(R.string.dialog_title)); 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 2fed547..55cb338 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -12,6 +12,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.Matrix; +import android.graphics.RectF; import android.location.Location; import android.location.LocationManager; import android.net.Uri; @@ -50,7 +52,10 @@ import org.xml.sax.XMLReader; import org.xmlpull.v1.XmlPullParserException; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.InterruptedIOException; import java.io.StringReader; import java.net.MalformedURLException; @@ -239,7 +244,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic GooglePlayServicesUtil.getErrorDialog(resultCode, this, PLAY_SERVICES_RESOLUTION_REQUEST).show(); } else { - Toast.makeText(getApplicationContext(),getResources().getString(R.string.notsuppoted) + Toast.makeText(getApplicationContext(), getResources().getString(R.string.notsuppoted) , Toast.LENGTH_LONG) .show(); finish(); @@ -327,7 +332,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic } // ATTENTION: This was auto-generated to implement the App Indexing API. // See https://g.co/AppIndexing/AndroidStudio for more information. - // AppIndex.AppIndexApi.start(client, getIndexApiAction()); + // AppIndex.AppIndexApi.start(client, getIndexApiAction()); } @@ -335,7 +340,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic protected void onStop() { super.onStop();// ATTENTION: This was auto-generated to implement the App Indexing API. // See https://g.co/AppIndexing/AndroidStudio for more information. - // AppIndex.AppIndexApi.end(client, getIndexApiAction()); + // AppIndex.AppIndexApi.end(client, getIndexApiAction()); /* if (mGoogleApiClient.isConnected()) { mGoogleApiClient.disconnect(); }*/ @@ -359,6 +364,96 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); } + + public File saveBitmapToFileSmaller(File file) { + File file2 = file; + try { + int inWidth = 0; + int inHeight = 0; + + InputStream in = new FileInputStream(file2); + // decode image size (decode metadata only, not the whole image) + BitmapFactory.Options options = new BitmapFactory.Options(); + options.inJustDecodeBounds = true; + BitmapFactory.decodeStream(in, null, options); + in.close(); + in = null; + + // save width and height + inWidth = options.outWidth; + inHeight = options.outHeight; + + // decode full image pre-resized + in = new FileInputStream(file2); + options = new BitmapFactory.Options(); + // calc rough re-size (this is no exact resize) + options.inSampleSize = Math.max(inWidth / 1632, inHeight / 1224); + // decode full image + Bitmap roughBitmap = BitmapFactory.decodeStream(in, null, options); + + // calc exact destination size + Matrix m = new Matrix(); + RectF inRect = new RectF(0, 0, roughBitmap.getWidth(), roughBitmap.getHeight()); + RectF outRect = new RectF(0, 0, 1632, 1224); + m.setRectToRect(inRect, outRect, Matrix.ScaleToFit.CENTER); + float[] values = new float[9]; + m.getValues(values); + // resize bitmap + Bitmap resizedBitmap = Bitmap.createScaledBitmap(roughBitmap, (int) (roughBitmap.getWidth() * values[0]), (int) (roughBitmap.getHeight() * values[4]), true); + // save image + FileOutputStream out = new FileOutputStream(file2); + resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 88, out); + + } catch (Exception e) { + Log.e("Image", e.toString(), e); + return file; + } + return file2; + } + + public File saveBitmapToFile(File file) { + try { + + // BitmapFactory options to downsize the image + BitmapFactory.Options o = new BitmapFactory.Options(); + o.inJustDecodeBounds = true; + o.inSampleSize = 6; + // factor of downsizing the image + + FileInputStream inputStream = new FileInputStream(file); + //Bitmap selectedBitmap = null; + BitmapFactory.decodeStream(inputStream, null, o); + inputStream.close(); + + // The new size we want to scale to + final int REQUIRED_SIZE = 75; + + // Find the correct scale value. It should be the power of 2. + int scale = 1; + while (o.outWidth / scale / 2 >= REQUIRED_SIZE && + o.outHeight / scale / 2 >= REQUIRED_SIZE) { + scale *= 2; + } + + BitmapFactory.Options o2 = new BitmapFactory.Options(); + o2.inSampleSize = scale; + inputStream = new FileInputStream(file); + + Bitmap selectedBitmap = BitmapFactory.decodeStream(inputStream, null, o2); + inputStream.close(); + + // here i override the original image file + //file.createNewFile(); + FileOutputStream outputStream = new FileOutputStream(file); + + selectedBitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream); + + return file; + } catch (Exception e) { + return null; + } + } + @Override public void onClick(View v) { @@ -392,11 +487,10 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic String status; - if(store_flag_str.equals(CommonString.FROM_JCP)){ - status =CommonString.KEY_INVALID; - } - else { - status =CommonString.KEY_VALID; + if (store_flag_str.equals(CommonString.FROM_JCP)) { + status = CommonString.KEY_INVALID; + } else { + status = CommonString.KEY_VALID; } CoverageBean cdata = new CoverageBean(); @@ -406,9 +500,10 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic cdata.setInTime(intime); cdata.setReason(""); cdata.setReasonid("0"); - cdata.setLatitude(lat+""); - cdata.setLongitude(lon+""); + cdata.setLatitude(lat + ""); + cdata.setLongitude(lon + ""); cdata.setImage(img_str); + cdata.setSub_reasonId("0"); cdata.setRemark(""); cdata.setStatus(status); @@ -419,10 +514,9 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic database.InsertCoverageData(cdata); String table; - if(store_flag_str.equals(CommonString.FROM_JCP)){ + if (store_flag_str.equals(CommonString.FROM_JCP)) { table = CommonString.KEY_JOURNEY_PLAN; - } - else { + } else { table = CommonString.KEY_ADHOC_JOURNEY_PLAN; } @@ -538,6 +632,12 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic if (_pathforcheck != null && !_pathforcheck.equals("")) { if (new File(str + _pathforcheck).exists()) { + //temp check-------- + /*File file = new File(str + _pathforcheck); + saveBitmapToFileSmaller(file);*/ + //saveBitmapToFile(file); + //------------------- + try { Bitmap bmp = BitmapFactory.decodeFile(str + _pathforcheck); @@ -574,7 +674,6 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic } - @Override protected void onResume() { super.onResume(); @@ -582,7 +681,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic toolbar.setTitle(R.string.title_activity_store_image); // Resuming the periodic location updates - if (mGoogleApiClient.isConnected() ) { + if (mGoogleApiClient.isConnected()) { startLocationUpdates(); } @@ -799,14 +898,13 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic if (result.equalsIgnoreCase(CommonString.KEY_SUCCESS)) { dialog.dismiss(); - if(store_flag_str.equals(CommonString.FROM_JCP)){ + if (store_flag_str.equals(CommonString.FROM_JCP)) { Intent in = new Intent(StoreimageActivity.this, StoreWisePerformanceActivity.class); startActivity(in); finish(); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); - } - else { - finish(); + } else { + finish(); overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index 67600cc..d719a90 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -63,6 +63,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSet import cpm.com.gskmtorange.xmlGetterSetter.NoCameraLastVisitGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingSubReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter; @@ -107,6 +108,7 @@ public class DownloadActivity extends AppCompatActivity { ConfigurationContrywiseGetterSetter configurationContrywiseGetterSetter; NoCameraLastVisitGetterSetter noCameraLastVisitGetterSetter; GeoFencingGetterSetter geoFencingGetterSetter; + NonWorkingSubReasonGetterSetter nonWorkingSubReasonGetterSetter; private Dialog dialog; private ProgressBar pb; @@ -627,7 +629,8 @@ public class DownloadActivity extends AppCompatActivity { // NON_WORKING_REASON request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); request.addProperty("UserName", userId); - request.addProperty("Type", "NON_WORKING_REASON"); + //request.addProperty("Type", "NON_WORKING_REASON"); + request.addProperty("Type", "NON_WORKING_REASON_NEW"); request.addProperty("cultureid", culture_id); envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); @@ -658,6 +661,40 @@ public class DownloadActivity extends AppCompatActivity { } publishProgress(data); + // NON_WORKING_SUB_REASON + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); + request.addProperty("UserName", userId); + request.addProperty("Type", "NON_WORKING_SUB_REASON"); + request.addProperty("cultureid", culture_id); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); + + result = envelope.getResponse(); + + if (result.toString() != null) { + xpp.setInput(new StringReader(result.toString())); + xpp.next(); + eventType = xpp.getEventType(); + nonWorkingSubReasonGetterSetter = XMLHandlers.nonWorkingSubReasonXMLHandler(xpp, eventType); + if (nonWorkingSubReasonGetterSetter.getREASON_ID().size() > 0) { + String reasontable = nonWorkingSubReasonGetterSetter.getTable_NON_WORKING_SUB_REASON(); + if (reasontable != null) { + resultHttp = CommonString.KEY_SUCCESS; + TableBean.setTable_NON_WORKING_SUB_REASON(reasontable); + } + } else { + return "NON_WORKING_SUB_REASON"; + } + data.value = 70; + data.name = "NON_WORKING_SUB_REASON " + getResources().getString(R.string.download_data); + } + publishProgress(data); + // MAPPING_PROMOTION request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); @@ -1474,6 +1511,9 @@ public class DownloadActivity extends AppCompatActivity { db.insertNonWorkingData(nonWorkingReasonGetterSetter); + //NON_WORKING_SUB_REASON added - 26.09.2018 + db.insertNonWorkingSubreasonData(nonWorkingSubReasonGetterSetter); + db.InsertSTORE_PERFORMANCE(store_performance_masterGetterSetter); db.InsertMAPPING_PLANOGRAM(mapping_planogram_masterGetterSetter); db.InsertADDITIONAL_DISPLAY(additional_display_getter_setter); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index 3d32d72..259d7e5 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -327,6 +327,12 @@ public class UploadActivity extends AppCompatActivity { adhoc = "0"; } + + String sub_reason_id = coverageList.get(i).getSub_reasonId(); + if(sub_reason_id.equals("")){ + sub_reason_id = "0"; + } + String onXML = "[DATA]" + "[USER_DATA]" + "[STORE_CD]" + coverageList.get(i).getStoreId() + "[/STORE_CD]" @@ -344,10 +350,11 @@ public class UploadActivity extends AppCompatActivity { + "[CAMERA_ALLOWED]" + camera_allow + "[/CAMERA_ALLOWED]" + "[CHECKOUT_IMAGE]" + coverageList.get(i).getCheckOut_Image() + "[/CHECKOUT_IMAGE]" + "[ADHOC]" + adhoc + "[/ADHOC]" + + "[SUBREASONID]" + sub_reason_id + "[/SUBREASONID]" + "[/USER_DATA]" + "[/DATA]"; - SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE); + SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE_NEW); request.addProperty("onXML", onXML); SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); @@ -355,7 +362,7 @@ public class UploadActivity extends AppCompatActivity { envelope.setOutputSoapObject(request); HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); - androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope); + androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE_NEW, envelope); result = envelope.getResponse(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java index 3b00cb9..997697b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java @@ -361,7 +361,7 @@ public class UploadImageWithRetrofit { Bitmap resizedBitmap = Bitmap.createScaledBitmap(roughBitmap, (int) (roughBitmap.getWidth() * values[0]), (int) (roughBitmap.getHeight() * values[4]), true); // save image FileOutputStream out = new FileOutputStream(file2); - resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 90, out); + resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 100, out); } catch (Exception e) { Log.e("Image", e.toString(), e); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NonWorkingReasonGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NonWorkingReasonGetterSetter.java index 78383dc..07ab029 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NonWorkingReasonGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NonWorkingReasonGetterSetter.java @@ -14,6 +14,11 @@ public class NonWorkingReasonGetterSetter { ArrayList REASON = new ArrayList<>(); ArrayList ENTRY_ALLOW = new ArrayList<>(); ArrayList IMAGE_ALLOW = new ArrayList<>(); + ArrayList REMARK_REQUIRED = new ArrayList<>(); + ArrayList REMARK_TYPE = new ArrayList<>(); + ArrayList REMARK_LABEL = new ArrayList<>(); + ArrayList REMARK_MANDATORY = new ArrayList<>(); + public String getTable_NON_WORKING_REASON() { return table_NON_WORKING_REASON; @@ -54,4 +59,36 @@ public class NonWorkingReasonGetterSetter { public void setIMAGE_ALLOW(String IMAGE_ALLOW) { this.IMAGE_ALLOW.add(IMAGE_ALLOW); } + + public ArrayList getREMARK_REQUIRED() { + return REMARK_REQUIRED; + } + + public void setREMARK_REQUIRED(String REMARK_REQUIRED) { + this.REMARK_REQUIRED.add(REMARK_REQUIRED); + } + + public ArrayList getREMARK_TYPE() { + return REMARK_TYPE; + } + + public void setREMARK_TYPE(String REMARK_TYPE) { + this.REMARK_TYPE.add(REMARK_TYPE); + } + + public ArrayList getREMARK_LABEL() { + return REMARK_LABEL; + } + + public void setREMARK_LABEL(String REMARK_LABEL) { + this.REMARK_LABEL.add(REMARK_LABEL); + } + + public ArrayList getREMARK_MANDATORY() { + return REMARK_MANDATORY; + } + + public void setREMARK_MANDATORY(String REMARK_MANDATORY) { + this.REMARK_MANDATORY.add(REMARK_MANDATORY); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NonWorkingSubReasonGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NonWorkingSubReasonGetterSetter.java new file mode 100644 index 0000000..0a476a5 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NonWorkingSubReasonGetterSetter.java @@ -0,0 +1,45 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +import java.util.ArrayList; + +public class NonWorkingSubReasonGetterSetter { + + String table_NON_WORKING_SUB_REASON; + + ArrayList SUB_REASON_ID = new ArrayList<>(); + ArrayList SUB_REASON = new ArrayList<>(); + ArrayList REASON_ID = new ArrayList<>(); + + + public String getTable_NON_WORKING_SUB_REASON() { + return table_NON_WORKING_SUB_REASON; + } + + public void setTable_NON_WORKING_SUB_REASON(String table_NON_WORKING_SUB_REASON) { + this.table_NON_WORKING_SUB_REASON = table_NON_WORKING_SUB_REASON; + } + + public ArrayList getSUB_REASON_ID() { + return SUB_REASON_ID; + } + + public void setSUB_REASON_ID(String SUB_REASON_ID) { + this.SUB_REASON_ID.add(SUB_REASON_ID); + } + + public ArrayList getSUB_REASON() { + return SUB_REASON; + } + + public void setSUB_REASON(String SUB_REASON) { + this.SUB_REASON.add(SUB_REASON); + } + + public ArrayList getREASON_ID() { + return REASON_ID; + } + + public void setREASON_ID(String REASON_ID) { + this.REASON_ID.add(REASON_ID); + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java index 6f4a4fb..e72fe0e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java @@ -38,7 +38,15 @@ public class TableBean { public static String Table_CONFIGURATION_COUNTRY_WISE; public static String Table_NO_CAMERA_LAST_VISIT_DATA; public static String Table_GEO_FENCING; + public static String Table_NON_WORKING_SUB_REASON; + public static String getTable_NON_WORKING_SUB_REASON() { + return Table_NON_WORKING_SUB_REASON; + } + + public static void setTable_NON_WORKING_SUB_REASON(String table_NON_WORKING_SUB_REASON) { + Table_NON_WORKING_SUB_REASON = table_NON_WORKING_SUB_REASON; + } public static String getAdditionalDisplay() { return ADDITIONAL_DISPLAY; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java index b1ea447..e21f6b4 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -31,6 +31,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NoCameraLastVisitGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingSubReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter; @@ -574,6 +575,19 @@ public class XMLHandlers { if (xpp.getName().equals("IMAGE_ALLOW")) { reason.setIMAGE_ALLOW(xpp.nextText()); } + + if (xpp.getName().equals("REMARK_REQUIRED")) { + reason.setREMARK_REQUIRED(xpp.nextText()); + } + if (xpp.getName().equals("REMARK_TYPE")) { + reason.setREMARK_TYPE(xpp.nextText()); + } + if (xpp.getName().equals("REMARK_LABEL")) { + reason.setREMARK_LABEL(xpp.nextText()); + } + if (xpp.getName().equals("REMARK_MANDATORY")) { + reason.setREMARK_MANDATORY(xpp.nextText()); + } } xpp.next(); } @@ -1300,4 +1314,37 @@ public class XMLHandlers { } return st; } + + // NON_WORKING_SUB_REASON XML HANDLER + public static NonWorkingSubReasonGetterSetter nonWorkingSubReasonXMLHandler(XmlPullParser xpp, + int eventType) { + NonWorkingSubReasonGetterSetter reason = new NonWorkingSubReasonGetterSetter(); + + try { + while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) { + if (xpp.getEventType() == XmlPullParser.START_TAG) { + if (xpp.getName().equals("META_DATA")) { + reason.setTable_NON_WORKING_SUB_REASON(xpp.nextText()); + } + if (xpp.getName().equals("REASON_ID")) { + reason.setREASON_ID(xpp.nextText()); + } + if (xpp.getName().equals("SUB_REASON_ID")) { + reason.setSUB_REASON_ID(xpp.nextText()); + } + if (xpp.getName().equals("SUB_REASON")) { + reason.setSUB_REASON(xpp.nextText()); + } + } + xpp.next(); + } + } catch (XmlPullParserException e) { + + e.printStackTrace(); + } catch (IOException e) { + + e.printStackTrace(); + } + return reason; + } } diff --git a/GSKMTOrange/src/main/res/layout/nonworking.xml b/GSKMTOrange/src/main/res/layout/nonworking.xml index 978ee11..456a12e 100644 --- a/GSKMTOrange/src/main/res/layout/nonworking.xml +++ b/GSKMTOrange/src/main/res/layout/nonworking.xml @@ -47,7 +47,7 @@ android:textStyle="bold" /> + android:layout_below="@id/tv_remark" + android:ems="20" + /> + + + diff --git a/GSKMTOrange/src/main/res/values-ar/string.xml b/GSKMTOrange/src/main/res/values-ar/string.xml index c71158d..3f975f1 100644 --- a/GSKMTOrange/src/main/res/values-ar/string.xml +++ b/GSKMTOrange/src/main/res/values-ar/string.xml @@ -276,4 +276,7 @@ غير مخططة أدخل الرد + يجب ان تكون داخل المحل حتى تتمكن من فتح/اغلاق الزيارة + المسافة عن المحل + diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 41fcae9..1a608b5 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -313,6 +313,10 @@ Ad hoc cevap giriniz + + Giriş/Çıkış yapmak için mağazada olmalısınız + Mağazadan uzaklık + diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index b1ca684..ba31db3 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -369,7 +369,8 @@ Type response - You need to be in the store to Checkin/Checkout\n Distance from Store - + You need to be in the store to Checkin/Checkout Distance from Store - + meters