UOFLMA-100: Fix - Multiple choice order is random in variable forms.

app/src/main/java/com/vsoft/uoflservicenow/ui/CatalogueVariableScreen.java

@@ -53,6 +53,7 @@ import com.vsoft.uoflservicenow.api.listeners.post.PostVariableFormApiListener;
 import com.vsoft.uoflservicenow.api.managers.CatalogueVariableApiManager;
 import com.vsoft.uoflservicenow.api.managers.CatalogueVariableApiManager;
 import com.vsoft.uoflservicenow.api.managers.VariableChoiceApiManager;
 import com.vsoft.uoflservicenow.api.managers.VariableChoiceApiManager;
 import com.vsoft.uoflservicenow.db.models.Catalogue;
 import com.vsoft.uoflservicenow.db.models.Catalogue;
+import com.vsoft.uoflservicenow.db.models.CatalogueOrder;
 import com.vsoft.uoflservicenow.db.models.CatalogueVariable;
 import com.vsoft.uoflservicenow.db.models.CatalogueVariable;
 import com.vsoft.uoflservicenow.db.models.CatalogueVariableSet;
 import com.vsoft.uoflservicenow.db.models.CatalogueVariableSet;
 import com.vsoft.uoflservicenow.db.models.Reference;
 import com.vsoft.uoflservicenow.db.models.Reference;
@@ -79,6 +80,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.List;
 
 
 import butterknife.BindView;
 import butterknife.BindView;
@@ -211,6 +214,13 @@ public class CatalogueVariableScreen extends AppCompatActivity {
                         @Override
                         @Override
                         public void onDoneApiCall(List<VariableChoice> variableChoiceList) {
                         public void onDoneApiCall(List<VariableChoice> variableChoiceList) {
                             CatalogueLog.e("Data: variableChoiceList: " + variableChoiceList);
                             CatalogueLog.e("Data: variableChoiceList: " + variableChoiceList);
+                            /*Sort List of CatalogueOrder*/
+                            Collections.sort(variableChoiceList, new Comparator<VariableChoice>() {
+                                @Override
+                                public int compare(VariableChoice lhs, VariableChoice rhs) {
+                                    return (lhs.getOrder() - rhs.getOrder());
+                                }
+                            });
                             catalogueVariable.setVariableChoiceList(variableChoiceList);
                             catalogueVariable.setVariableChoiceList(variableChoiceList);
                         }
                         }
                     });
                     });