Merge pull request #1055 from frknbasaran/server-1551

[server-1551] added custom sort algorithm for app_version field.

Author: ar2rsawseen

frontend/express/public/javascripts/countly/countly.template.js

@@ -2733,6 +2733,55 @@ var AppRouter = Backbone.Router.extend({
             return ((x < y) ? 1 : ((x > y) ? -1 : 0));
         };
 
+        /**
+        * Compare two versions
+        * @param {String} a, First version
+        * @param {String} b, Second version
+        * @returns {Number} returns -1, 0 or 1 by result of comparing
+        */
+        function compareVersions(a, b) {
+            var aParts = a.split('.');
+            var bParts = b.split('.');
+
+            for (var j = 0; j < aParts.length && j < bParts.length; j++) {
+                var aPartNum = parseInt(aParts[j], 10);
+                var bPartNum = parseInt(bParts[j], 10);
+
+                var cmp = Math.sign(aPartNum - bPartNum);
+
+                if (cmp !== 0) {
+                    return cmp;
+                }
+            }
+
+            if (aParts.length === bParts.length) {
+                return 0;
+            }
+
+            var longestArray = aParts;
+            if (bParts.length > longestArray.length) {
+                longestArray = bParts;
+            }
+
+            var continueIndex = Math.min(aParts.length, bParts.length);
+
+            for (var i = continueIndex; i < longestArray.length; i += 1) {
+                if (parseInt(longestArray[i], 10) > 0) {
+                    return longestArray === bParts ? -1 : +1;
+                }
+            }
+
+            return 0;
+        }
+
+        jQuery.fn.dataTableExt.oSort['app_versions-asc'] = function(x, y) {
+            return compareVersions(x, y);
+        };
+
+        jQuery.fn.dataTableExt.oSort['app_versions-desc'] = function(x, y) {
+            return compareVersions(x, y);
+        };
+
         jQuery.fn.dataTableExt.oSort['format-ago-asc'] = function(x, y) {
             return x - y;
         };

frontend/express/public/javascripts/countly/countly.views.js

@@ -1632,7 +1632,13 @@ window.AppVersionView = countlyView.extend({
             this.dtable = $('.d-table').dataTable($.extend({}, $.fn.dataTable.defaults, {
                 "aaData": appVersionData.chartData,
                 "aoColumns": [
-                    { "mData": "app_versions", "sTitle": jQuery.i18n.map["app-versions.table.app-version"] },
+                    {
+                        "mData": "app_versions",
+                        "sTitle": jQuery.i18n.map["app-versions.table.app-version"],
+                        "mRender": function(d) {
+                            return d;
+                        }
+                    },
                     {
                         "mData": "t",
                         "sType": "formatted-num",