From ac66bf487154cb5b1fa5997f1b23904cb38a0982 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 29 Nov 2012 10:40:19 +1100 Subject: [PATCH] Add client-side validation to order cycle form --- app/assets/javascripts/admin/util.js.erb | 2 +- app/assets/stylesheets/admin/openfoodweb.css.scss | 4 ++++ app/views/admin/order_cycles/new.html.haml | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admin/util.js.erb b/app/assets/javascripts/admin/util.js.erb index 5287c5d034..c689ab8307 100644 --- a/app/assets/javascripts/admin/util.js.erb +++ b/app/assets/javascripts/admin/util.js.erb @@ -11,4 +11,4 @@ $(document).ready(function() { buttonImageOnly: true, stepMinute: 15 }); -}); \ No newline at end of file +}); diff --git a/app/assets/stylesheets/admin/openfoodweb.css.scss b/app/assets/stylesheets/admin/openfoodweb.css.scss index 633b768371..dafc21a80a 100644 --- a/app/assets/stylesheets/admin/openfoodweb.css.scss +++ b/app/assets/stylesheets/admin/openfoodweb.css.scss @@ -18,3 +18,7 @@ float: right; margin-bottom: 1em; } + +.ng .ng-invalid.ng-dirty { + background-color: #fa787e; +} diff --git a/app/views/admin/order_cycles/new.html.haml b/app/views/admin/order_cycles/new.html.haml index 4e3a5e2ef1..b5b8282156 100644 --- a/app/views/admin/order_cycles/new.html.haml +++ b/app/views/admin/order_cycles/new.html.haml @@ -1,8 +1,8 @@ %h1 New Order Cycle -= form_for [main_app, :admin, @order_cycle], :url => '', :html => {'ng-app' => 'order_cycle', 'ng-controller' => 'AdminOrderCycleCtrl', 'ng-submit' => 'submit()'} do |f| += form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng', 'ng-app' => 'order_cycle', 'ng-controller' => 'AdminOrderCycleCtrl', 'ng-submit' => 'submit()'} do |f| = f.label :name - = f.text_field :name, 'ng-model' => 'order_cycle.name' + = f.text_field :name, 'ng-model' => 'order_cycle.name', 'required' => true %br/ = f.label :orders_open_at, 'Orders open' @@ -16,7 +16,7 @@ %h2 Coordinator = f.label :coordinator_id, 'Coordinator' - = f.collection_select :coordinator_id, Enterprise.all, :id, :name, {}, {'ng-model' => 'order_cycle.coordinator_id'} + = f.collection_select :coordinator_id, Enterprise.all, :id, :name, {}, {'ng-model' => 'order_cycle.coordinator_id', 'required' => true} %h2 Outgoing %p TODO