Combined two APIs in one in Catalogue Categories Screen.

app/src/citrix/java/com/vsoft/servicenow/AppConfig.java

@@ -21,7 +21,6 @@ public class AppConfig {
      */
      */
     /*Catalogue Category API */
     /*Catalogue Category API */
     public static final String URL_GET_CATALOGUE = "api/vsng2/app_apis/category";
     public static final String URL_GET_CATALOGUE = "api/vsng2/app_apis/category";
-    public static final String URL_GET_CATALOGUE_ORDER = "api/vsng2/app_apis/catalohhome";
 
 
     /*Catalogue Category Items API */
     /*Catalogue Category Items API */
     public static final String URL_GET_CATALOGUE_ITEM = "api/vsng2/app_apis/catalog_item";
     public static final String URL_GET_CATALOGUE_ITEM = "api/vsng2/app_apis/catalog_item";

app/src/main/java/com/vsoft/servicenow/api/interfaces/CatalogueCategoryApi.java

@@ -17,10 +17,6 @@ public interface CatalogueCategoryApi {
     // Get Catalogue API
     // Get Catalogue API
     @GET(Constants.URL_GET_CATALOGUE)
     @GET(Constants.URL_GET_CATALOGUE)
     Call<ResponseBody> getCatalogue(@Query(Constants.URL_PARAM_SYS_ID) String sysId);
     Call<ResponseBody> getCatalogue(@Query(Constants.URL_PARAM_SYS_ID) String sysId);
-
-    // Get Catalogue Order API
-    @GET(Constants.URL_GET_CATALOGUE_ORDER)
-    Call<ResponseBody> getCatalogueOrder();
  }
  }
 
 
 
 

app/src/main/java/com/vsoft/servicenow/db/models/Catalogue.java

@@ -20,6 +20,9 @@ public class Catalogue {
     @SerializedName("homepage_image")
     @SerializedName("homepage_image")
     @Expose
     @Expose
     private String icon;
     private String icon;
+    @SerializedName("order")
+    @Expose
+    private long order;
 
 
     /**
     /**
      *
      *
@@ -93,17 +96,36 @@ public class Catalogue {
         this.icon = icon;
         this.icon = icon;
     }
     }
 
 
+    /**
+     *
+     * @param order
+     *     The order
+     */
+    public void setOrder(long order) {
+        this.order = order;
+    }
+
+    /**
+     *
+     * @return
+     *     The order
+     */
+    public long getOrder() {
+        return order;
+    }
+
     public static class Json {
     public static class Json {
         public static final String URL_PARAM_CATALOGUE_SYSPRM_QUERY_VALUE = "sc_catalog";
         public static final String URL_PARAM_CATALOGUE_SYSPRM_QUERY_VALUE = "sc_catalog";
     }
     }
 
 
     @Override
     @Override
     public String toString() {
     public String toString() {
-        return "Catalogue{" +
-                "title='" + title + '\'' +
-                ", description='" + description + '\'' +
-                ", sysId='" + sysId + '\'' +
-                ", icon='" + icon + '\'' +
-                '}';
+        return "Catalogue{"
+                + "title='" + title + '\''
+                + ", description='" + description + '\''
+                + ", sysId='" + sysId + '\''
+                + ", icon='" + icon + '\''
+                + ", order=" + order
+                + '}';
     }
     }
 }
 }

app/src/main/java/com/vsoft/servicenow/utils/Constants.java

@@ -132,7 +132,6 @@ public class Constants {
 
 
     /*Catalogue Category API */
     /*Catalogue Category API */
     public static final String URL_GET_CATALOGUE = DOMAIN + AppConfig.URL_GET_CATALOGUE;
     public static final String URL_GET_CATALOGUE = DOMAIN + AppConfig.URL_GET_CATALOGUE;
-    public static final String URL_GET_CATALOGUE_ORDER = DOMAIN + AppConfig.URL_GET_CATALOGUE_ORDER;
 
 
     /*Catalogue Category Items API */
     /*Catalogue Category Items API */
     public static final String URL_GET_CATALOGUE_ITEM = DOMAIN + AppConfig.URL_GET_CATALOGUE_ITEM;
     public static final String URL_GET_CATALOGUE_ITEM = DOMAIN + AppConfig.URL_GET_CATALOGUE_ITEM;

app/src/uofl/java/com/vsoft/servicenow/AppConfig.java

@@ -20,8 +20,7 @@ public class AppConfig {
      * Web services urls
      * Web services urls
      */
      */
     /*Catalogue Category API */
     /*Catalogue Category API */
-    public static final String URL_GET_CATALOGUE = "api/uno33/uofl_mobile/category";
-    public static final String URL_GET_CATALOGUE_ORDER = "api/uno33/uofl_mobile/catalohhome";
+    public static final String URL_GET_CATALOGUE = "api/uno33/uofl_mobile/catalogue_screen";
 
 
     /*Catalogue Category Items API */
     /*Catalogue Category Items API */
     public static final String URL_GET_CATALOGUE_ITEM = "api/uno33/uofl_mobile/catalog_item";
     public static final String URL_GET_CATALOGUE_ITEM = "api/uno33/uofl_mobile/catalog_item";