Merge pull request #426 from marmelab/float_type

[RFR] Introduce float type

examples/blog/config.js

@@ -77,7 +77,8 @@
             .fields([
                 nga.field('id').label('id'), // The default displayed name is the camelCase field name. label() overrides id
                 nga.field('title'), // the default list field type is "string", and displays as a string
-                nga.field('published_at', 'date'), // Date field type allows date formatting
+                nga.field('published_at', 'date'),  // Date field type allows date formatting
+                nga.field('average_note', 'float'), // Float type also displays decimal digits
                 nga.field('views', 'number'),
                 nga.field('tags', 'reference_many') // a Reference is a particular type of field that references another entity
                     .targetEntity(tag) // the tag entity is defined later in this file
@@ -125,6 +126,8 @@
                 nga.field('pictures', 'json'),
                 nga.field('views', 'number')
                     .cssClasses('col-sm-4'),
+                nga.field('average_note', 'float')
+                    .cssClasses('col-sm-4'),
                 nga.field('comments', 'referenced_list') // display list of related comments
                     .targetEntity(comment)
                     .targetReferenceField('post_id')

src/javascripts/ng-admin/Crud/column/maColumn.js

@@ -26,7 +26,7 @@ define(function (require) {
                 entity: '&',
                 datastore: '&'
             },
-            link: function(scope, element, attr) {
+            link: function(scope, element) {
                 scope.datastore = scope.datastore();
                 scope.field = scope.field();
                 scope.entry = scope.entry();

src/javascripts/ng-admin/Crud/config/factories.js

@@ -6,6 +6,7 @@ function factories(fvp) {
     fvp.registerFieldView('datetime', require('../fieldView/DateFieldView'));
     fvp.registerFieldView('email', require('../fieldView/EmailFieldView'));
     fvp.registerFieldView('file', require('../fieldView/FileFieldView'));
+    fvp.registerFieldView('float', require('../fieldView/FloatFieldView'));
     fvp.registerFieldView('json', require('../fieldView/JsonFieldView'));
     fvp.registerFieldView('number', require('../fieldView/NumberFieldView'));
     fvp.registerFieldView('password', require('../fieldView/PasswordFieldView'));

src/javascripts/ng-admin/Crud/field/maInputField.js

@@ -12,6 +12,7 @@ define(function (require) {
         return {
             scope: {
                 'type': '@',
+                'step': '@?',
                 'field': '&',
                 'value': '='
             },
@@ -27,7 +28,7 @@ define(function (require) {
                 }
             },
             template:
-'<input type="{{ type || text }}" ng-model="value" id="{{ name }}" name="{{ name }}" class="form-control"' +
+'<input type="{{ type || text }}" ng-attr-step="{{ step }}" ng-model="value" id="{{ name }}" name="{{ name }}" class="form-control"' +
     'ng-required="v.required" ng-minlength="v.minlength" ng-maxlength="v.maxlength" />'
         };
     }

src/javascripts/ng-admin/Crud/fieldView/FieldViewConfiguration.js

@@ -9,7 +9,7 @@ define(function () {
 
     FieldViewConfiguration.prototype.registerFieldView = function(type, FieldView) {
         this.fieldViews[type] = FieldView;
-    }
+    };
 
     FieldViewConfiguration.prototype.$get = function () {
         return this.fieldViews;

src/javascripts/ng-admin/Crud/fieldView/FloatFieldView.js

@@ -0,0 +1,14 @@
+module.exports = {
+    getReadWidget: function() {
+        return '<ma-number-column field="::field" value="::entry.values[field.name()]"></ma-number-column>';
+    },
+    getLinkWidget: function() {
+        return '<a ng-click="gotoDetail()">' + this.getReadWidget() + '</a>';
+    },
+    getFilterWidget: function() {
+        return '<ma-input-field type="number" step="any" field="::field" value="values[field.name()]"></ma-input-field>';
+    },
+    getWriteWidget: function() {
+        return '<ma-input-field type="number" step="any" field="::field" value="entry.values[field.name()]"></ma-input-field>';
+    }
+};

src/javascripts/test/unit/Crud/fieldView/FloatFieldView.js

@@ -0,0 +1,32 @@
+var assert = require('chai').assert;
+var FloatFieldView = require('../../../../ng-admin/Crud/fieldView/FloatFieldView');
+
+describe('FloatFieldView', function() {
+    describe('getReadWidget', function() {
+        it('should return number column directive', function() {
+            var widget = FloatFieldView.getReadWidget();
+            assert.include(widget, '<ma-number-column');
+        });
+    });
+
+    describe('getLinkWidget', function() {
+        it('should return number column directive', function() {
+            var widget = FloatFieldView.getLinkWidget();
+            assert.include(widget, '<ma-number-column');
+        });
+    });
+
+    describe('getFilterWidget', function() {
+        it('should set step attribute to "any"', function() {
+            var widget = FloatFieldView.getFilterWidget();
+            assert.include(widget, 'step="any"');
+        });
+    });
+
+    describe('getWriteWidget', function() {
+        it('should set step attribute to "any"', function() {
+            var widget = FloatFieldView.getFilterWidget();
+            assert.include(widget, 'step="any"');
+        });
+    });
+});