Merge pull request #24 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKMTNEWchangesACNonworking

Gskmtne wchanges ac nonworking

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

@@ -690,7 +690,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
             btnimage.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    _pathforcheck1 = store_id + "AdditionalImage1" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+                    _pathforcheck1 = store_id +categoryId+ "AdditionalImage1" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
 
                     _path = CommonString.FILE_PATH + _pathforcheck1;
                     intime = getCurrentTime();
@@ -702,7 +702,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
             btnimage1.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    _pathforcheck2 = store_id + "AdditionalImage2" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+                    _pathforcheck2 = store_id +categoryId+ "AdditionalImage2" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
 
                     _path = CommonString.FILE_PATH + _pathforcheck2;
                     intime = getCurrentTime();
@@ -714,7 +714,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
             btnimage2.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    _pathforcheck3 = store_id + "AdditionalImage3" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+                    _pathforcheck3 = store_id +categoryId+ "AdditionalImage3" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
 
                     _path = CommonString.FILE_PATH + _pathforcheck3;
                     intime = getCurrentTime();

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

@@ -102,12 +102,13 @@ public class NonWorkingReason extends AppCompatActivity implements
     Uri outputFileUri;
     boolean leave_flag = false;
     ArrayList<CoverageBean> coverage = new ArrayList<CoverageBean>();
+    ArrayList<StoreBean> storelist = new ArrayList<StoreBean>();
     ArrayList<StoreBean> jcp;
     private Dialog dialog;
     private TextView percentage, message;
     private ProgressBar pb;
     private FailureGetterSetter failureGetterSetter = null;
-
+    boolean nonflag=true;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // TODO Auto-generated method stub
@@ -141,10 +142,26 @@ public class NonWorkingReason extends AppCompatActivity implements
         database.open();
         str = CommonString.FILE_PATH;
 
+        storelist = database.getStoreData(visit_date);
 
         coverage = database.getCoverageData(visit_date);
 
-        if (coverage.size() > 0) {
+        for(int i=0;i<storelist.size();i++)
+        {
+            if(!storelist.get(i).getCHECKOUT_STATUS().equalsIgnoreCase("N") || !storelist.get(i).getUPLOAD_STATUS().equalsIgnoreCase("N")){
+
+                nonflag=true;
+                break;
+            }
+            else
+            {
+                nonflag=false;
+            }
+
+        }
+
+
+        if (nonflag) {
             reasondata = database.getNonWorkingEntryAllowData();
 
         } else {
@@ -774,7 +791,11 @@ public class NonWorkingReason extends AppCompatActivity implements
             if (result.equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
                 dialog.dismiss();
 
-                showAlert(getString(R.string.data_downloaded_successfully));
+                finish();
+
+                //showAlert(getString(R.string.uploadeddata));
+
+
             } else {
 
                 GSKOrangeDB db = new GSKOrangeDB(NonWorkingReason.this);

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

@@ -336,7 +336,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
                 holder.img_cam.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() +
+                        _pathforcheck = "T2P_Image_" + store_id+ categoryId+ "_" + mItem.getBrand_id() +
                                 mItem.getDisplay_id() + visit_date.replace("/", "") + "_" +
                                 getCurrentTime().replace(":", "") + ".jpg";
                         child_position = position;
@@ -366,7 +366,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
                 holder.img_cam1.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        _pathforcheck1 = "T2P_Image1_" + store_id + "_" + mItem.getBrand_id() +
+                        _pathforcheck1 = "T2P_Image1_" + store_id+categoryId + "_" + mItem.getBrand_id() +
                                 mItem.getDisplay_id() + visit_date.replace("/", "") + "_" +
                                 getCurrentTime().replace(":", "") + ".jpg";
                         child_position1 = position;
@@ -394,7 +394,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
                 holder.img_cam2.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        _pathforcheck2 = "T2P_Image2_" + store_id + "_" + mItem.getBrand_id() +
+                        _pathforcheck2 = "T2P_Image2_" + store_id + categoryId+"_" + mItem.getBrand_id() +
                                 mItem.getDisplay_id() + visit_date.replace("/", "") + "_" +
                                 getCurrentTime().replace(":", "") + ".jpg";
                         child_position2 = position;

GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml

@@ -205,7 +205,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="@mipmap/new_no_camera"
-                        android:inputType="number" />
+                        android:inputType="number"
+                        android:visibility="invisible"/>
                 </RelativeLayout>
 
             </LinearLayout>

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

@@ -254,11 +254,11 @@
 
     <string name="stock_planogram_data_add_shelf_position_already_exists">Raf / Konum zaten var</string>
 
-    <string name="stock_planogram_add_shelf">Add Shelf</string>
-    <string name="stock_planogram_add_sku">Add Sku</string>
-    <string name="stock_planogram_add_sku_to_shelf">Add Sku to Shelf</string>
-    <string name="stock_planogram_planogram_tracker">Planogram Tracker</string>
-    <string name="stock_planogram_position_on_shelf">Position on Shelf</string>
+    <string name="stock_planogram_add_shelf">Raf Ekle</string>
+    <string name="stock_planogram_add_sku">SKU Ekle</string>
+    <string name="stock_planogram_add_sku_to_shelf">Rafa SKU Ekle</string>
+    <string name="stock_planogram_planogram_tracker">Planogram İzleyici</string>
+    <string name="stock_planogram_position_on_shelf">Raftaki Konum</string>
 
 
     <string name="prompt_userid">Username/Kullanıcı Adı/اسم المستخدم</string>