diff --git a/plugins/mezuro/public/javascripts/validations.js b/plugins/mezuro/public/javascripts/validations.js index ff57495..adeee43 100644 --- a/plugins/mezuro/public/javascripts/validations.js +++ b/plugins/mezuro/public/javascripts/validations.js @@ -2,6 +2,7 @@ jQuery(function (){ jQuery('#range_submit').live("click", validate_new_range_configuration); jQuery('#metric_configuration_submit').live("click", validate_metric_configuration); jQuery('#repository_submit').live("click", validate_new_repository); + jQuery('#reading_submit').live("click", validate_new_reading); }); function validate_code(code){ @@ -19,6 +20,17 @@ function allRequiredFieldsAreFilled() { return true; } +function validate_new_reading() { + var name = jQuery('#reading_label').val(); + var grade = jQuery('#reading_grade').val(); + var color = jQuery('#reading_color').val(); + if (is_null(name) || is_null(grade) || is_null(color)){ + alert("Please fill all fields marked with (*)."); + return false; + } + return true; +} + function validate_new_repository() { if (allRequiredFieldsAreFilled()) { return addressAndTypeMatch(); diff --git a/plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb b/plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb index 7946c56..4cbd39d 100644 --- a/plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb @@ -1,11 +1,10 @@ <%= hidden_field_tag :id, @reading_group_content.id %> -<%= required labelled_form_field _('label:'), f.text_field(:label) %> +<%= required labelled_form_field _('Label:'), f.text_field(:label) %> -<%= required labelled_form_field _('grade:'), -f.text_field(:grade) %> +<%= required labelled_form_field _('Grade:'), f.text_field(:grade) %> -<%= required labelled_form_field _('color:'), +<%= required labelled_form_field _('Color:'), colorpicker_field(:reading, :color) %>Click in the field to change Color
<%= f.submit "Save" %>
diff --git a/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb b/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb index e5f5771..7c6dea1 100644 --- a/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb @@ -1,5 +1,7 @@ + +