newcode

GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

@@ -590,9 +590,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
             values.put("CHECKOUT_STATUS", status);
             values1.put(CommonString.KEY_COVERAGE_STATUS, status);
-
+            db.update(CommonString.TABLE_COVERAGE_DATA, values1, CommonString.KEY_STORE_ID + "='" + id + "'", null);
             db.update(CommonString.KEY_JOURNEY_PLAN, values, CommonString.KEY_STORE_ID + "='" + id + "'", null);
-            //db.update(CommonString.TABLE_COVERAGE_DATA, values1, CommonString.KEY_STORE_ID + "='" + id + "'", null);
+
 
         } catch (Exception ex) {
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java

@@ -124,7 +124,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
     ArrayList<GeotaggingBeans> geotaglist = new ArrayList<GeotaggingBeans>();
 
     ArrayList<GeotaggingBeans> geotaglistImage = new ArrayList<GeotaggingBeans>();
-
+    Boolean markerflag=true;
     private TextView percentage, message;
     private FailureGetterSetter failureGetterSetter = null;
     /**
@@ -251,7 +251,8 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
         fabcarmabtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
+
+               /* List<ApplicationInfo> 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.d("TAG", "Installed Applications  : " + list.get(n).loadLabel(packageManager).toString());
@@ -261,9 +262,9 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
                             break;
                         }
                     }
-                }
+                }*/
 
-                _pathforcheck = storeid + getResources().getString(R.string.store) + getResources().getString(R.string.image) + getCurrentTime().replace(":", "") + ".jpg";
+                _pathforcheck = storeid +"GeoTag" + visitData.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
 
                 _path = CommonString.FILE_PATH + _pathforcheck;
 
@@ -333,8 +334,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
     @Override
     public void onConnected(Bundle bundle) {
 
-        mLastLocation = LocationServices.FusedLocationApi
+        mLastLocation = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient);
-                .getLastLocation(mGoogleApiClient);
 
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
                 || ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
@@ -344,11 +344,17 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
 
                 mMap.setMyLocationEnabled(true);
 
+                if(markerflag=true)
+                {
                     // Add a marker of latest location and move the camera
                     LatLng latLng = new LatLng(latitude, longitude);
                     mMap.addMarker(new MarkerOptions().position(latLng));
                     mMap.moveCamera(CameraUpdateFactory.newLatLng(latLng));
                     mMap.animateCamera(CameraUpdateFactory.zoomTo(15));
+
+
+                }
+
             }
         }
 
@@ -526,6 +532,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
 
                         img_str = _pathforcheck;
                         _pathforcheck = "";
+                        markerflag=false;
 
                     }
                 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java

@@ -132,6 +132,13 @@ public class MainActivity extends AppCompatActivity
         updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
         toolbar.setTitle(getString(R.string.main_menu_activity_name));
 
+        db.open();
+
+        coverageList = db.getCoverageData(date);
+
+        storelist = db.getStoreData(date);
+
+
     }
 
     @Override
@@ -227,8 +234,6 @@ public class MainActivity extends AppCompatActivity
                     if (coverageList.size() == 0) {
                         Snackbar.make(webView, R.string.no_data_for_upload, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
 
-                        Intent i = new Intent(getBaseContext(), UploadActivity.class);
-                        startActivity(i);
                     } else {
                         if (isStoreCheckedIn() && isValid()) {
 
@@ -253,8 +258,7 @@ public class MainActivity extends AppCompatActivity
             }
         } else if (id == R.id.nav_geotag) {
 
-            db.open();
+
-            storelist = db.getStoreData(date);
 
 
             if (storelist.size() > 0) {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java

@@ -676,8 +676,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
             btnimage.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    _pathforcheck = store_id + getResources().getString(R.string.store)
+                    _pathforcheck = store_id + "AdditionalVisibility" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
-                            + getResources().getString(R.string.image) + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
 
                     _path = CommonString.FILE_PATH + _pathforcheck;
                     intime = getCurrentTime();

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java

@@ -293,7 +293,8 @@ public class CheckoutActivity extends AppCompatActivity {
 
                 finish();
 
-            } else if (!result.equals("")) {
+            }
+            else if (!result.equals("")) {
 				/*AlertMessage message = new AlertMessage(
 						CheckOutStoreActivity.this, CommonString1.ERROR + result, "success", null);
 				message.showMessage();*/

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java

@@ -310,7 +310,8 @@ public class NonWorkingReason extends AppCompatActivity implements
     public void onClick(View v) {
         // TODO Auto-generated method stub
         if (v.getId() == R.id.imgcam) {
-            _pathforcheck = store_id + "NonWorking" + _UserId + ".jpg";
+
+            _pathforcheck = store_id +"NonWorking" + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
 
             _path = CommonString.FILE_PATH + _pathforcheck;
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java

@@ -49,7 +49,7 @@ import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity;
  */
 
 public class StoreListActivity extends AppCompatActivity {
-    ArrayList<CoverageBean> coverage;
+    ArrayList<CoverageBean> coverage = new ArrayList<CoverageBean>();
     ArrayList<StoreBean> storelist = new ArrayList<StoreBean>();
     //ListView list;
     private SharedPreferences preferences;
@@ -200,10 +200,11 @@ public class StoreListActivity extends AppCompatActivity {
             viewHolder.txt.setText(current.getSTORE_NAME());
             viewHolder.address.setText(current.getADDRESS());
 
-            if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_VALID)) {
+           /* if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_VALID)) {
                 viewHolder.chkbtn.setVisibility(View.VISIBLE);
                 viewHolder.imageview.setVisibility(View.INVISIBLE);
-            } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_U)) {
+            } else*/
+            if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_U)) {
                 viewHolder.imageview.setVisibility(View.VISIBLE);
                 viewHolder.imageview.setBackgroundResource(R.mipmap.tick);
                 viewHolder.chkbtn.setVisibility(View.INVISIBLE);
@@ -228,20 +229,62 @@ public class StoreListActivity extends AppCompatActivity {
                 viewHolder.imageview.setVisibility(View.VISIBLE);
                 viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
                 viewHolder.chkbtn.setVisibility(View.INVISIBLE);
-            } else if (checkleavestatus(storeid)) {
+            }/* else if (checkleavestatus(storeid)) {
                 viewHolder.imageview.setVisibility(View.VISIBLE);
                 viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
                 viewHolder.chkbtn.setVisibility(View.INVISIBLE);
-            } else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_INVALID)) {
+            }*/
+            /*else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_INVALID)) {
 
-                if (coverage.size() > 0) {
+            }*/
+            else if (coverage.size() > 0) {
+                String statusleave="";
 
-                    int i;
+                    for (int i = 0; i < coverage.size(); i++) {
 
-                    for (i = 0; i < coverage.size(); i++) {
+                       if (storeid.equals(coverage.get(i).getStoreId())) {
+                         statusleave=coverage.get(i).getStatus();
 
 
-                        if (coverage.get(i).getInTime() != null) {
+                           if(statusleave.equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)){
+
+                               viewHolder.imageview.setVisibility(View.VISIBLE);
+                               viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
+                               viewHolder.chkbtn.setVisibility(View.INVISIBLE);
+
+
+                           }
+
+                           else if(coverage.get(i).getStatus().equalsIgnoreCase(CommonString.KEY_VALID))
+                           {
+                               viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
+                               viewHolder.chkbtn.setVisibility(View.VISIBLE);
+                               viewHolder.imageview.setVisibility(View.INVISIBLE);
+
+                           }
+                           else  if(coverage.get(i).getStatus().equalsIgnoreCase(CommonString.KEY_INVALID)){
+
+                               viewHolder.imageview.setVisibility(View.INVISIBLE);
+                               viewHolder.chkbtn.setVisibility(View.INVISIBLE);
+                               viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.green));
+                           }
+
+
+                           else {
+
+                               viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
+                               viewHolder.imageview.setVisibility(View.INVISIBLE);
+                               viewHolder.chkbtn.setVisibility(View.INVISIBLE);
+                           }
+
+                            break;
+
+
+
+
+                       }
+
+                       /* if (coverage.get(i).getInTime() != null) {
 
                             if (coverage.get(i).getOutTime() == null) {
 
@@ -256,11 +299,11 @@ public class StoreListActivity extends AppCompatActivity {
                                 break;
                             }
 
-                        }
+                        }*/
 
                     }
-                }
+
-            } else {
+        }else {
 
                 viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
                 viewHolder.imageview.setVisibility(View.INVISIBLE);
@@ -290,7 +333,9 @@ public class StoreListActivity extends AppCompatActivity {
                         Snackbar.make(v, R.string.title_store_list_activity_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show();
                     } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) {
                         Snackbar.make(v, R.string.title_store_list_activity_already_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show();
-                    } else if (checkleavestatus(store_id)) {
+                    }
+
+                    else if (checkleavestatus(store_id)) {
 
                         Snackbar.make(v, R.string.title_store_list_activity_already_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show();
 
@@ -298,20 +343,7 @@ public class StoreListActivity extends AppCompatActivity {
                     } else {
 
                         // PUT IN PREFERENCES
-                        editor = preferences.edit();
-                        editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID());
-                        editor.putString(CommonString.KEY_STORE_NAME, current.getSTORE_NAME());
-                        editor.putString(CommonString.KEY_VISIT_DATE, current.getVISIT_DATE());
-                        editor.putString(CommonString.KEY_CAMERA_ALLOW, current.getCAMERA_ALLOW());
-                        editor.putString(CommonString.KEY_CHECKOUT_STATUS, current.getCHECKOUT_STATUS());
-                        editor.putString(CommonString.KEY_CLASS_ID, current.getCLASS_ID());
-                        editor.putString(CommonString.KEY_EMP_ID, current.getEMP_ID());
-                        editor.putString(CommonString.KEY_GEO_TAG, current.getGEO_TAG());
-                        editor.putString(CommonString.KEY_KEYACCOUNT_ID, current.getKEYACCOUNT_ID());
-                        editor.putString(CommonString.KEY_STORETYPE_ID, current.getSTORETYPE_ID());
-                        editor.putString(CommonString.KEY_UPLOAD_STATUS, current.getUPLOAD_STATUS());
 
-                        editor.commit();
 
                         // showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS());
 
@@ -336,7 +368,7 @@ public class StoreListActivity extends AppCompatActivity {
                             }
 
                             if (enteryflag) {
-                                showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS());
+                                showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS(),current.getGEO_TAG(),current);
                             }
                         } else {
                             Snackbar.make(v, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
@@ -439,7 +471,7 @@ public class StoreListActivity extends AppCompatActivity {
     }
 
 
-    void showMyDialog(final String storeCd, final String storeName, final String status, final String visitDate, final String checkout_status) {
+    void showMyDialog(final String storeCd, final String storeName, final String status, final String visitDate, final String checkout_status,final String GeotagStatus,final StoreBean current) {
         dialog = new Dialog(this);
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(R.layout.dialogbox);
@@ -452,6 +484,25 @@ public class StoreListActivity extends AppCompatActivity {
             public void onCheckedChanged(RadioGroup group, int checkedId) {
                 // find which radio button is selected
                 if (checkedId == R.id.yes) {
+
+                    if(!GeotagStatus.equalsIgnoreCase("N")){
+
+                        editor = preferences.edit();
+                        editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID());
+                        editor.putString(CommonString.KEY_STORE_NAME, current.getSTORE_NAME());
+                        editor.putString(CommonString.KEY_VISIT_DATE, current.getVISIT_DATE());
+                        editor.putString(CommonString.KEY_CAMERA_ALLOW, current.getCAMERA_ALLOW());
+                        editor.putString(CommonString.KEY_CHECKOUT_STATUS, current.getCHECKOUT_STATUS());
+                        editor.putString(CommonString.KEY_CLASS_ID, current.getCLASS_ID());
+                        editor.putString(CommonString.KEY_EMP_ID, current.getEMP_ID());
+                        editor.putString(CommonString.KEY_GEO_TAG, current.getGEO_TAG());
+                        editor.putString(CommonString.KEY_KEYACCOUNT_ID, current.getKEYACCOUNT_ID());
+                        editor.putString(CommonString.KEY_STORETYPE_ID, current.getSTORETYPE_ID());
+                        editor.putString(CommonString.KEY_UPLOAD_STATUS, current.getUPLOAD_STATUS());
+
+                        editor.commit();
+
+
                     boolean flag = true;
                     if (coverage.size() > 0) {
                         for (int i = 0; i < coverage.size(); i++) {
@@ -462,6 +513,7 @@ public class StoreListActivity extends AppCompatActivity {
                         }
                     }
                     if (flag == true) {
+
                          Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class);
                         startActivity(in);
                         overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
@@ -473,7 +525,31 @@ public class StoreListActivity extends AppCompatActivity {
                         dialog.cancel();
                     }
 
-                } else if (checkedId == R.id.no) {
+                }
+                else{
+                        dialog.cancel();
+                        AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this);
+                        builder.setTitle(getResources().getString(R.string.dialog_title));
+                        builder.setMessage(R.string.first_geotag_the_store).setCancelable(false)
+                                .setPositiveButton(getResources().getString(R.string.ok),
+                                        new DialogInterface.OnClickListener() {
+                                            public void onClick(DialogInterface dialog1,
+                                                                int id) {
+
+                                                dialog1.cancel();
+
+                                            }
+                                        });
+
+
+                        AlertDialog alert = builder.create();
+
+                        alert.show();
+
+                    }
+
+
+                }else if (checkedId == R.id.no) {
 
                     dialog.cancel();
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java

@@ -157,8 +157,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
 
             case R.id.img_cam_selfie:
 
-                _pathforcheck = store_id + getResources().getString(R.string.store)
+                _pathforcheck = store_id +"SI" + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
-                        + getResources().getString(R.string.image) + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
 
                 _path = CommonString.FILE_PATH + _pathforcheck;
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java

@@ -164,6 +164,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
             t2PGetterSetters = db.getT2PDefaultData(store_id);
         } else {
             for (int i = 0; i < t2PGetterSetters.size(); i++) {
+
                 ArrayList<GapsChecklistGetterSetter> gapsList = db.getGapsData(t2PGetterSetters.get(i).getKey_id());
                 ArrayList<SkuGetterSetter> skuList = db.getT2PSKUData(t2PGetterSetters.get(i).getKey_id());
 
@@ -175,14 +176,6 @@ public class T2PComplianceActivity extends AppCompatActivity {
 
         if (t2PGetterSetters.size() > 0) {
 
-           /* for (int i = 0; i < t2PGetterSetters.size(); i++) {
-
-                ArrayList<GapsChecklistGetterSetter> 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);
@@ -717,7 +710,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
                     break;
                 } else if (t2PGetterSetters.get(i).getSkulist().size() == 0) {
                     flag = false;
-                    error_msg = getResources().getString(R.string.fill_sku_data);
+                    error_msg = getResources().getString(R.string.title_activity_fill_sku);
                     break;
                 }
             }

GSKMTOrange/src/main/res/values-tr/string.xml

@@ -228,7 +228,11 @@
     <string name="title_activity_checkout">Çıkış yapmak</string>
     <string name="Areyou_sure_take_backup">Verilerinizin yedeğini almak istediğinizden emin misiniz</string>
     <string name="data_exported_successfully">Veritabanı Başarıyla Gönderildi</string>
+    <string name="first_geotag_the_store">İlk depoyu coğrafi etiketle göster</string>
 
+    <string name="fill_gaps_data">Lütfen GAP verilerini doldurun</string>
+
+    <string name="enter_the_values">Değerleri girin</string>
 </resources>
 
 

GSKMTOrange/src/main/res/values/strings.xml

@@ -261,6 +261,6 @@
     <string name="promo_data_uploading">Promo Data Uploading</string>
     <string name="Areyou_sure_take_backup"> Are you sure you want to take the backup of your data</string>
 
-
+    <string name="first_geotag_the_store">First geotag the store</string>
 
 </resources>