category_id_added

.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>

.idea/gradle.xml

@@ -16,6 +16,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -46,7 +46,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules.xml

@@ -2,12 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/AndroidProject-GSKORANGEV2.iml" filepath="$PROJECT_DIR$/.idea/modules/AndroidProject-GSKORANGEV2.iml" group="GSKORANGEV2" />
-      <module fileurl="file://$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" filepath="$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" />
-      <module fileurl="file://$PROJECT_DIR$/GSKORANGEV2.iml" filepath="$PROJECT_DIR$/GSKORANGEV2.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/GSKORANGEV2-GSKMTOrange.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/GSKORANGEV2-GSKMTOrange.iml" group="GSKORANGEV2/GSKMTOrange" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/library/GSKORANGEV2-library.iml" filepath="$PROJECT_DIR$/.idea/modules/library/GSKORANGEV2-library.iml" group="GSKORANGEV2/library" />
-      <module fileurl="file://$PROJECT_DIR$/library/library.iml" filepath="$PROJECT_DIR$/library/library.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKORANGEV2.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKORANGEV2.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/GSKORANGEV2.GSKMTOrange.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/GSKORANGEV2.GSKMTOrange.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/library/GSKORANGEV2.library.iml" filepath="$PROJECT_DIR$/.idea/modules/library/GSKORANGEV2.library.iml" />
     </modules>
   </component>
 </project>

GSKMTOrange/build.gradle

@@ -27,9 +27,9 @@ android {
         versionCode 31
         versionName "4.3"*/
 
-       /* //For UAE
-        versionCode 26
-        versionName "3.8"*/
+        //For UAE
+        versionCode 25
+        versionName "3.7"
 
 
         //For Turkey
@@ -39,8 +39,8 @@ android {
         //For KSA
        /* versionCode 28
         versionName "4.0"*/
-        versionCode 27
-        versionName "3.8"
+     /*   versionCode 27
+        versionName "3.8"*/
 
         //For SA
        /* versionCode 28

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

@@ -95,7 +95,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
  */
 
 public class GSKOrangeDB extends SQLiteOpenHelper {
-    public static final String DATABASE_NAME = "GSK_ORANGE_DB66";
+    public static final String DATABASE_NAME = "GSK_ORANGE_DB67";
     public static final int DATABASE_VERSION = 15;
     TableBean tableBean;
     private SQLiteDatabase db;

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

@@ -202,14 +202,16 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
         mPasswordView.setText("cpm123");*/
 
         //UAE
-      /*  museridView.setText("testuae");
-        mPasswordView.setText("cpm123");*/
+        museridView.setText("testuae");
+        mPasswordView.setText("cpm123");
 
         //KSA
-        museridView.setText("Esmail.d");
-        mPasswordView.setText("cpm@123");
+      /*  museridView.setText("Esmail.d");
+        mPasswordView.setText("cpm@123");*/
        /* museridView.setText("testksa");
         mPasswordView.setText("cpm123");*/
+      /*  museridView.setText("Ahmed.saied");
+        mPasswordView.setText("cpm@123");*/
 
 
         //turkey
@@ -742,8 +744,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
 
                         //uploadPreviousImages();
                     }
-                }
-                else {
+                } else {
                     //for other than SA
                     if (preferences.getString(CommonString.KEY_VERSION, "").equals(
                             Integer.toString(versionCode))) {
@@ -1263,7 +1264,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
 
         String jsonPreferences = preferences.getString(CommonString.KEY_LOOGIN_PREF, "");
 
-        Type type = new TypeToken<LoginGetterSetter>() {}.getType();
+        Type type = new TypeToken<LoginGetterSetter>() {
+        }.getType();
         login_data = gson.fromJson(jsonPreferences, type);
 
         language = login_data.getCULTURE_NAME();

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java

@@ -306,6 +306,10 @@ public class CategoryListActivity extends AppCompatActivity {
                         categoryList.get(i).setCategory_img(R.mipmap.analgesics_tick);
                     }else if (category_id.equals("8")) {
                         categoryList.get(i).setCategory_img(R.mipmap.first_aid_tick);
+                    }else if (category_id.equals("9")) {
+                        categoryList.get(i).setCategory_img(R.mipmap.pain_relief_tick);
+                    } else if (category_id.equals("10")) {
+                        categoryList.get(i).setCategory_img(R.mipmap.respiratory_health_tick);
                     }
                 } else {
                     if (category_id.equals("1")) {
@@ -324,6 +328,10 @@ public class CategoryListActivity extends AppCompatActivity {
                         categoryList.get(i).setCategory_img(R.mipmap.analgesics);
                     }else if (category_id.equals("8")) {
                         categoryList.get(i).setCategory_img(R.mipmap.first_aid);
+                    }else if (category_id.equals("9")) {
+                        categoryList.get(i).setCategory_img(R.mipmap.pain_relief);
+                    } else if (category_id.equals("10")) {
+                        categoryList.get(i).setCategory_img(R.mipmap.respiratory_health);
                     }
                 }
             }

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

@@ -30,8 +30,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                >
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/categoryName"

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

@@ -94,7 +94,7 @@
                         android:layout_weight="4"
                         android:gravity="center"
                         android:padding="5dp"
-                        android:text="@string/category_performance_t2p"
+                        android:text="@string/title_posm"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="#000" />
 

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

@@ -94,7 +94,7 @@
                         android:layout_weight="4"
                         android:gravity="center"
                         android:padding="5dp"
-                        android:text="@string/category_performance_t2p"
+                        android:text="@string/title_posm"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="#000" />