renalware-core 2.0.164 → 2.1.1

data/db/views/hd_mdm_patients_v03.sql

@@ -0,0 +1,70 @@
+SELECT
+    p.id,
+    p.secure_id,
+    (upper(p.family_name::text) || ', '::text) || p.given_name::text AS patient_name,
+    p.nhs_number,
+    p.local_patient_id AS hospital_numbers,
+    p.sex,
+    p.born_on,
+    rprof.esrf_on,
+    latest_op.performed_on AS last_operation_date,
+    date_part('year'::text, age(p.born_on::timestamp with time zone))::integer AS age,
+    mx.modality_name,
+    case when pw.id > 0 then true else false end as on_worryboard,
+    at.name AS access,
+    (select bmi from clinic_visits cv2 where cv2.patient_id = P.id and bmi > 0 order by date desc limit 1) as bmi,
+    ap.started_on AS access_date,
+    aplantype.name AS access_plan,
+    aplan.created_at::date AS plan_date,
+    txrsd.name AS tx_status,
+    unit.name AS hospital_unit,
+    unit.unit_code AS dialysing_at,
+    (named_nurses.family_name::text || ', '::text) || named_nurses.given_name::text AS named_nurse,
+    (((hdp.document -> 'transport'::text) ->> 'has_transport'::text) || ': '::text) || ((hdp.document -> 'transport'::text) ->> 'type'::text) AS transport,
+    (sched.days_text || ' '::text) || upper(diurnal.code::text) AS schedule,
+    (pa."values" -> 'HGB'::text) ->> 'result'::text AS hgb,
+    ((pa."values" -> 'HGB'::text) ->> 'observed_at'::text)::date AS hgb_date,
+    (pa."values" -> 'PHOS'::text) ->> 'result'::text AS phos,
+    ((pa."values" -> 'PHOS'::text) ->> 'observed_at'::text)::date AS phos_date,
+    (pa."values" -> 'POT'::text) ->> 'result'::text AS pot,
+    ((pa."values" -> 'POT'::text) ->> 'observed_at'::text)::date AS pot_date,
+    (pa."values" -> 'PTHI'::text) ->> 'result'::text AS pthi,
+    ((pa."values" -> 'PTHI'::text) ->> 'observed_at'::text)::date AS pthi_date,
+    (pa."values" -> 'URR'::text) ->> 'result'::text AS urr,
+    ((pa."values" -> 'URR'::text) ->> 'observed_at'::text)::date AS urr_date
+   FROM patients p
+     JOIN patient_current_modalities mx ON mx.patient_id = p.id AND mx.modality_code::text = 'hd'::text
+     LEFT JOIN hd_profiles hdp ON hdp.patient_id = p.id AND hdp.deactivated_at IS NULL
+     LEFT JOIN hospital_units unit ON unit.id = hdp.hospital_unit_id
+     LEFT JOIN users named_nurses ON named_nurses.id = p.named_nurse_id
+     left join patient_worries pw on pw.patient_id  = p.id
+     LEFT JOIN hd_schedule_definitions sched ON sched.id = hdp.schedule_definition_id
+     LEFT JOIN hd_diurnal_period_codes diurnal ON diurnal.id = sched.diurnal_period_id
+     LEFT JOIN pathology_current_observation_sets pa ON pa.patient_id = p.id
+     LEFT JOIN ( SELECT DISTINCT ON (access_profiles.patient_id) access_profiles.id,
+            access_profiles.patient_id,
+            access_profiles.formed_on,
+            access_profiles.started_on,
+            access_profiles.terminated_on,
+            access_profiles.type_id,
+            access_profiles.side,
+            access_profiles.notes,
+            access_profiles.created_by_id,
+            access_profiles.updated_by_id,
+            access_profiles.created_at,
+            access_profiles.updated_at,
+            access_profiles.decided_by_id
+           FROM access_profiles
+          WHERE access_profiles.terminated_on IS NULL
+          ORDER BY access_profiles.patient_id, access_profiles.created_at DESC) ap ON ap.patient_id = p.id
+     LEFT JOIN access_types at ON at.id = ap.type_id
+     LEFT JOIN access_plans aplan ON aplan.patient_id = p.id AND aplan.terminated_at IS NULL
+     LEFT JOIN access_plan_types aplantype ON aplantype.id = aplan.plan_type_id
+     LEFT JOIN transplant_registrations txr ON txr.patient_id = p.id
+     LEFT JOIN transplant_registration_statuses txrs ON txrs.registration_id = txr.id AND txrs.terminated_on IS NULL
+     LEFT JOIN transplant_registration_status_descriptions txrsd ON txrsd.id = txrs.description_id
+     LEFT JOIN renal_profiles rprof ON rprof.patient_id = p.id
+     LEFT JOIN ( SELECT DISTINCT ON (transplant_recipient_operations.patient_id) transplant_recipient_operations.patient_id,
+            transplant_recipient_operations.performed_on
+           FROM transplant_recipient_operations
+          ORDER BY transplant_recipient_operations.patient_id, transplant_recipient_operations.performed_on DESC) latest_op ON latest_op.patient_id = p.id;

data/db/views/reporting_anaemia_audit_v02.sql

@@ -0,0 +1,39 @@
+select
+  modality_desc       modality,
+  count(e1.patient_id)  patient_count,
+  round(avg(hgb),2)    avg_hgb,
+  round(count(hgb_gt_eq_10) / greatest(count(hgb), 1.0) * 100.0, 2) pct_hgb_gt_eq_10,
+  round(count(hgb_gt_eq_11) / greatest(count(hgb), 1.0) * 100.0, 2) pct_hgb_gt_eq_11,
+  round(count(hgb_gt_eq_13) / greatest(count(hgb), 1.0) * 100.0, 2) pct_hgb_gt_eq_13,
+  round(avg(fer),2) avg_fer,
+  round(count(fer_gt_eq_150) / greatest(count(fer), 1.0) * 100.0, 2) pct_fer_gt_eq_150,
+  coalesce(sum(immunosuppressants.ct), 0)::integer as count_epo,
+  coalesce(sum(mircer.ct), 0)::integer as count_mircer,
+  coalesce(sum(neo.ct), 0)::integer as count_neo,
+  coalesce(sum(ara.ct), 0)::integer as count_ara
+  from (
+    select
+    p.id patient_id,
+    md.name modality_desc,
+    md.code modality_code
+    from patients p
+    inner join modality_modalities m on m.patient_id = p.id
+    inner join modality_descriptions md on m.description_id = md.id
+    where m.ended_on is null or m.ended_on > current_timestamp
+  ) e1
+  full join (select mcp.patient_id, count(distinct mcp.drug_id) as ct from medication_current_prescriptions mcp where drug_type_code = 'immunosuppressant' group by mcp.patient_id) as immunosuppressants
+  on e1.patient_id = immunosuppressants.patient_id
+  full join (select mcp.patient_id, count(distinct mcp.drug_id) as ct from medication_current_prescriptions mcp where drug_name like 'Mircer%' group by mcp.patient_id) as mircer
+  on e1.patient_id = mircer.patient_id
+  full join (select mcp.patient_id, count(distinct mcp.drug_id) as ct from medication_current_prescriptions mcp where drug_name like 'Neo%' group by mcp.patient_id) as neo
+  on e1.patient_id = neo.patient_id
+  full join (select mcp.patient_id, count(distinct mcp.drug_id) as ct from medication_current_prescriptions mcp where drug_name like 'Ara%' group by mcp.patient_id) as ara
+  on e1.patient_id = ara.patient_id
+  left join lateral (select result::decimal hgb from pathology_current_observations where description_code = 'HGB' and patient_id = e1.patient_id) e2 ON true
+  left join lateral (select result::decimal fer from pathology_current_observations where description_code = 'FER' and patient_id = e1.patient_id) e3 ON true
+  left join lateral (select hgb hgb_gt_eq_10 where hgb >= 10) e4 ON true
+  left join lateral (select hgb hgb_gt_eq_11 where hgb >= 11) e5 ON true
+  left join lateral (select hgb hgb_gt_eq_13 where hgb >= 13) e6 ON true
+  left join lateral (select fer fer_gt_eq_150 where fer >= 150) e7 ON true
+  where modality_code in ('hd','pd','transplant', 'low_clearance', 'nephrology')
+  group by modality_desc;

data/db/views/reporting_bone_audit_v02.sql

@@ -0,0 +1,31 @@
+-- Note that in the example of
+-- greatest(count(cca_2_1_to_2_4), 1) we default to a 1 if count is 0 which you think
+-- would ff
+select
+  modality_desc       modality,
+  count(patient_id)   patient_count,
+  round(avg(cca),2)   avg_cca,
+  round(count(cca_2_1_to_2_4) / greatest(count(cca), 1.0) * 100.0, 2) pct_cca_2_1_to_2_4,
+  round(count(pth_gt_300) / greatest(count(pth), 1.0) * 100.0, 2)         pct_pth_gt_300,
+  round(count(pth_gt_800) / greatest(count(pth), 1.0) * 100.0, 2)         pct_pth_gt_800_pct,
+  round(avg(phos),2)  avg_phos,
+  max(phos)           max_phos,
+  round(count(phos_lt_1_8)   / greatest(count(phos), 1.0) * 100.0, 2) pct_phos_lt_1_8
+  from (
+    select
+    p.id patient_id,
+    md.name modality_desc,
+    md.code modality_code
+    from patients p
+    inner join modality_modalities m on m.patient_id = p.id
+    inner join modality_descriptions md on m.description_id = md.id
+  ) e1
+  left join lateral (select result::decimal pth  from pathology_current_observations where description_code = 'PTHI'  and patient_id = e1.patient_id) e2 ON true
+  left join lateral (select result::decimal phos from pathology_current_observations where description_code = 'PHOS' and patient_id = e1.patient_id) e3 ON true
+  left join lateral (select result::decimal cca  from pathology_current_observations where description_code = 'CCA'  and patient_id = e1.patient_id) e4 ON true
+  left join lateral (select phos phos_lt_1_8 where phos < 1.8) e5 ON true
+  left join lateral (select pth pth_gt_800 where pth > 800) e6 ON true
+  left join lateral (select pth pth_gt_300 where pth > 300) e7 ON true
+  left join lateral (select cca cca_2_1_to_2_4 where cca between 2.1 and 2.4) e8 ON true
+  where modality_code in ('hd','pd','transplant', 'low_clearance')
+  group by modality_desc

data/db/views/reporting_daily_letters_v03.sql

@@ -0,0 +1,4 @@
+select
+  (select count(*) from letter_letters where created_at::date = now()::date) as letters_created_today,
+  (select count(*) from letter_letters where completed_at::date = now()::date) as letters_printed_today,
+  (select count(*) from letter_letters where type = 'Renalware::Letters::Letter::Draft' and created_at < (current_date - interval '14 days')) as draft_letters_older_than_14_days;

data/lib/collection_presenter.rb

@@ -49,7 +49,7 @@ class CollectionPresenter
     end
   end
 
-  def respond_to?(method)
+  def respond_to?(method, _unused = nil)
     @decorated_collection.respond_to?(method) || @original_collection.respond_to?(method)
   end
 

data/lib/core_extensions/i18n/always_cascade.rb

@@ -21,8 +21,24 @@
 module CoreExtensions
   module I18n
     module AlwaysCascade
+      # Note changing offset from 2 to 1 causes errors in validates_timeliness gem in
+      # #format_error_value where it tries to lookup I18n.t(:date)
+      # It is actually trying to find the key :date in the scope
+      # "validates_timeliness.error_value_formats" but this does not exist so, becuase of the
+      # cascade, it settles on returning the root :date key which is actually a hash, and fails.
+      # Using offset: 2 prevents us from ever picking up the root :date key when using t(:date)
+      # or t(".date_"). It does mean we cannot put any translations under eg :en-GB directly, they
+      # must be under a sub key eg :thead, :btn etc.
+      # offset: 2 means we will be looking back up the tree for e.g. "list.type" if the key is
+      # :type and the partial is called 'list', so we would never find eg the translation
+      # renalware.type; offset: 1 and using skip_root: false seems to do the trick.
+      # See the loop in lib/i18n/backend/cascade.rb in the i18n gem.
+      # Another issue here is that if offset is 1 then any input called eg f.input :date
+      # could resolve to the root :date tranlsation which is a hash of options and not a real
+      # translation, leading to errors. Its not possible rename/reloacte these keys as they
+      # are hard-coded eg in actionview/lib/action_view/helpers/date_helper.rb
       def translate(key, options = {})
-        super(key, options.merge(cascade: { offset: 2, skip_root: false }))
+        super(key, options.merge(cascade: { offset: 2, skip_root: true }))
       end
       alias t translate
     end

data/lib/core_extensions/i18n/handle_blank_value.rb

@@ -3,7 +3,7 @@
 module CoreExtensions
   module I18n
     module HandleBlankValue
-      def localize(object, options = nil)
+      def localize(object, locale: nil, format: nil, **options)
         object.blank? ? "" : super
       end
       alias l localize

data/lib/renalware/engine.rb

@@ -92,8 +92,10 @@ module Renalware
     end
 
     initializer :add_locales do |app|
-      app.config.i18n.load_path += Dir[config.root.join("config/locales/**/*.{rb,yml}")]
-      app.config.i18n.default_locale = "en-GB"
+      app.config.i18n.load_path += Dir[config.root.join("config/locales/**/*.yml")]
+      app.config.i18n.load_path += Dir[config.root.join("app/components/**/*.yml")]
+      app.config.available_locales = [:en] # [:en, :pt]
+      app.config.i18n.default_locale = :"en-GB"
       app.config.i18n.fallbacks = [:en]
     end
 

data/lib/renalware/version_number.rb

@@ -5,6 +5,6 @@ module Renalware
   # to creat that class even though its not used. If we don't do this zeitwerk
   # complains that version.rb does export a constant called Version.
   class VersionNumber
-    VERSION = "2.0.164"
+    VERSION = "2.1.1"
   end
 end

data/lib/tasks/demo_data.rake

@@ -42,7 +42,6 @@ module Renalware
       10.times do
         letter = Letters::Letter::PendingReview.create!(
           patient: patient,
-          issued_on: 1.day.ago,
           pathology_timestamp: 1.day.ago,
           event: clinics_patient.clinic_visits.first,
           clinical: true,

data/spec/factories/events/categories.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :event_category, class: "Renalware::Events::Category" do
+    initialize_with { Renalware::Events::Category.find_or_create_by(name: name) }
+    name { "General" }
+  end
+end

data/spec/factories/events/{events_types.rb → types.rb}

@@ -2,7 +2,15 @@
 
 FactoryBot.define do
   factory :event_type, class: "Renalware::Events::Type" do
-    initialize_with { Renalware::Events::Type.find_or_create_by(name: name) }
+    initialize_with do
+      Renalware::Events::Type.find_or_create_by(
+        name: name,
+        category: category
+      )
+    end
+
+    category factory: :event_category
+    name { "Test" }
 
     factory :access_clinic_event_type do
       name { "Access--Clinic" }

data/spec/factories/letters/letters.rb

@@ -4,7 +4,7 @@ FactoryBot.define do
   factory :letter, class: "Renalware::Letters::Letter" do
     accountable
 
-    issued_on { Time.zone.today }
+    created_at { Time.zone.today }
     description { "This is a custom description" }
     body { "I am pleased to report a marked improvement in her condition." }
 

data/spec/factories/low_clearance/modality_descriptions.rb

@@ -4,7 +4,7 @@ FactoryBot.define do
   factory :low_clearance_modality_description,
           class: "Renalware::LowClearance::ModalityDescription" do
     initialize_with do
-      Renalware::LowClearance::ModalityDescription.find_or_create_by(name: "Low Clearance")
+      Renalware::LowClearance::ModalityDescription.find_or_create_by(name: "Advanced Kidney Care")
     end
   end
 end

data/spec/factories/modalities/modality_descriptions.rb

@@ -30,7 +30,7 @@ FactoryBot.define do
     end
 
     trait :low_clearance do
-      name { "Low Clearance" }
+      name { "Advanced Kidney Care" }
       type { "Renalware::LowClearance::ModalityDescription" }
       code { "low_clearance" }
     end

data/spec/support/date_helpers.rb

@@ -2,10 +2,10 @@
 
 module DateHelpers
   def todays_date
-    I18n.l(Time.zone.today)
+    l(Time.zone.today)
   end
 
   def todays_date_and_time
-    I18n.l(Time.zone)
+    l(Time.zone)
   end
 end

data/spec/support/letters_spec_helper.rb

@@ -42,7 +42,7 @@ module LettersSpecHelper
     end
   end
 
-  def create_aproved_letter_to_patient_with_cc_to_gp_and_one_contact(
+  def create_approved_letter_to_patient_with_cc_to_gp_and_one_contact(
     user: nil,
     body: "test",
     page_count: 1,

data/vendor/assets/stylesheets/foundation/components/_forms.scss

@@ -382,58 +382,60 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
 @include exports("form") {
   @if $include-html-form-classes {
     /* Standard Forms */
-    form { margin: 0 0 $form-spacing; }
+    form.fn-form { margin: 0 0 $form-spacing; }
 
     /* Using forms within rows, we need to set some defaults */
-    form .row { @include form-row-base; }
-
-    /* Label Styles */
-    label { @include form-label;
-      &.right { @include form-label(right, false); }
-      &.inline { @include form-label(inline, false); }
-      /* Styles for required inputs */
-      small {
-        text-transform: $form-label-small-transform;
-        color: scale-color($form-label-font-color, $lightness: 15%);
+    form.fn-form .row { @include form-row-base; }
+
+    .fn-form {
+      /* Label Styles */
+      label { @include form-label;
+        &.right { @include form-label(right, false); }
+        &.inline { @include form-label(inline, false); }
+        /* Styles for required inputs */
+        small {
+          text-transform: $form-label-small-transform;
+          color: scale-color($form-label-font-color, $lightness: 15%);
+        }
       }
-    }
 
-    /* Attach elements to the beginning or end of an input */
-    .prefix,
-    .postfix { @include prefix-postfix-base; }
-
-    /* Adjust padding, alignment and radius if pre/post element is a button */
-    .postfix.button { @include button-size(false, false); @include postfix(false, false, false, true); }
-    .prefix.button { @include button-size(false, false); @include prefix(false, false, true); }
-
-    .prefix.button.radius { @include radius(0); @include side-radius($default-float, $button-radius); }
-    .postfix.button.radius { @include radius(0); @include side-radius($opposite-direction, $button-radius); }
-    .prefix.button.round { @include radius(0); @include side-radius($default-float, $button-round); }
-    .postfix.button.round { @include radius(0); @include side-radius($opposite-direction, $button-round); }
-
-    /* Separate prefix and postfix styles when on span or label so buttons keep their own */
-    span.prefix, label.prefix { @include prefix(); }
-    span.postfix, label.postfix { @include postfix(); }
-
-    /* We use this to get basic styling on all basic form elements */
-    input:not([type]), #{text-inputs(all, 'input')} {
-      -webkit-appearance: none;
-      -moz-appearance: none;
-      border-radius: 0;
-      @include form-element;
-      @if $input-include-glowing-effect == false {
-        -webkit-transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
-        -moz-transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
-        -ms-transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
-        -o-transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
-        transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
-      }
-      &.radius {
-        @include radius($input-border-radius);
+      /* Attach elements to the beginning or end of an input */
+      .prefix,
+      .postfix { @include prefix-postfix-base; }
+
+      /* Adjust padding, alignment and radius if pre/post element is a button */
+      .postfix.button { @include button-size(false, false); @include postfix(false, false, false, true); }
+      .prefix.button { @include button-size(false, false); @include prefix(false, false, true); }
+
+      .prefix.button.radius { @include radius(0); @include side-radius($default-float, $button-radius); }
+      .postfix.button.radius { @include radius(0); @include side-radius($opposite-direction, $button-radius); }
+      .prefix.button.round { @include radius(0); @include side-radius($default-float, $button-round); }
+      .postfix.button.round { @include radius(0); @include side-radius($opposite-direction, $button-round); }
+
+      /* Separate prefix and postfix styles when on span or label so buttons keep their own */
+      span.prefix, label.prefix { @include prefix(); }
+      span.postfix, label.postfix { @include postfix(); }
+
+      /* We use this to get basic styling on all basic form elements */
+      input:not([type]), #{text-inputs(all, 'input')} {
+        -webkit-appearance: none;
+        -moz-appearance: none;
+        border-radius: 0;
+        @include form-element;
+        @if $input-include-glowing-effect == false {
+          -webkit-transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
+          -moz-transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
+          -ms-transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
+          -o-transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
+          transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
+        }
+        &.radius {
+          @include radius($input-border-radius);
+        }
       }
     }
 
-    form {
+    form.fn-form {
       .row {
         .prefix-radius.row.collapse {
           input,
@@ -466,136 +468,139 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
       }
     }
 
-    input[type="submit"] {
-      -webkit-appearance: none;
-      -moz-appearance: none;
-      border-radius: 0;
-    }
-
-    /* Respect enforced amount of rows for textarea */
-    textarea[rows] {
-      height: auto;
-    }
-
-    /* Not allow resize out of parent */
-    textarea {
-      max-width: 100%;
-    }
-
-    // style placeholder text cross browser
-    ::-webkit-input-placeholder {
-      color: $input-placeholder-font-color;
-    }
-
-    :-moz-placeholder { /* Firefox 18- */
-       color: $input-placeholder-font-color;
-    }
-
-    ::-moz-placeholder {  /* Firefox 19+ */
-       color: $input-placeholder-font-color;
-    }
-
-    :-ms-input-placeholder {
-       color: $input-placeholder-font-color;
-    }
+    .fn-form {
 
+      input[type="submit"] {
+        -webkit-appearance: none;
+        -moz-appearance: none;
+        border-radius: 0;
+      }
 
-    /* Add height value for select elements to match text input height */
-    select {
-      @include form-select;
-      height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));
-      &[multiple] {
+      /* Respect enforced amount of rows for textarea */
+      textarea[rows] {
         height: auto;
       }
-    }
-
-    /* Adjust margin for form elements below */
-    input[type="file"],
-    input[type="checkbox"],
-    input[type="radio"],
-    select {
-      margin: 0 0 $form-spacing 0;
-    }
 
-    input[type="checkbox"] + label,
-    input[type="radio"] + label {
-      display: inline-block;
-      margin-#{$default-float}: $form-spacing * .5;
-      margin-#{$opposite-direction}: $form-spacing;
-      margin-bottom: 0;
-      vertical-align: baseline;
-    }
+      /* Not allow resize out of parent */
+      textarea {
+        max-width: 100%;
+      }
 
-    /* Normalize file input width */
-    input[type="file"] {
-      width:100%;
-    }
+      // style placeholder text cross browser
+      ::-webkit-input-placeholder {
+        color: $input-placeholder-font-color;
+      }
 
-    /* HTML5 Number spinners settings */
-    input[type=number] {
-      @include html5number(moz, $input-number-spinners)
-    }
-    input[type="number"]::-webkit-inner-spin-button,
-    input[type="number"]::-webkit-outer-spin-button {
-      @include html5number(webkit, $input-number-spinners);
-    }
+      :-moz-placeholder { /* Firefox 18- */
+        color: $input-placeholder-font-color;
+      }
 
-    /* We add basic fieldset styling */
-    fieldset {
-      @include fieldset;
-    }
+      ::-moz-placeholder {  /* Firefox 19+ */
+        color: $input-placeholder-font-color;
+      }
 
-    /* Error Handling */
+      :-ms-input-placeholder {
+        color: $input-placeholder-font-color;
+      }
 
 
-    span.error, small.error {
-      @include form-error-message;
-    }
+      /* Add height value for select elements to match text input height */
+      select {
+        @include form-select;
+        height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));
+        &[multiple] {
+          height: auto;
+        }
+      }
 
-    .error {
-      input,
-      textarea,
+      /* Adjust margin for form elements below */
+      input[type="file"],
+      input[type="checkbox"],
+      input[type="radio"],
       select {
+        margin: 0 0 $form-spacing 0;
+      }
+
+      input[type="checkbox"] + label,
+      input[type="radio"] + label {
+        display: inline-block;
+        margin-#{$default-float}: $form-spacing * .5;
+        margin-#{$opposite-direction}: $form-spacing;
         margin-bottom: 0;
+        vertical-align: baseline;
       }
 
-      input[type="checkbox"],
-      input[type="radio"] {
-        margin-bottom: $form-spacing
+      /* Normalize file input width */
+      input[type="file"] {
+        width:100%;
+      }
+
+      /* HTML5 Number spinners settings */
+      input[type=number] {
+        @include html5number(moz, $input-number-spinners)
+      }
+      input[type="number"]::-webkit-inner-spin-button,
+      input[type="number"]::-webkit-outer-spin-button {
+        @include html5number(webkit, $input-number-spinners);
       }
 
-      label,
-      label.error {
-        @include form-label-error-color;
+      /* We add basic fieldset styling */
+      fieldset {
+        @include fieldset;
       }
 
-      small.error {
+      /* Error Handling */
+
+
+      span.error, small.error {
         @include form-error-message;
       }
 
-      > label {
-        > small {
-          background: transparent;
-          color: scale-color($form-label-font-color, $lightness: 15%);
-          display: inline;
-          font-size: 60%;
-          font-style: normal;
-          margin: 0;
-          padding: 0;
-          text-transform: $form-label-small-transform;
+      .error {
+        input,
+        textarea,
+        select {
+          margin-bottom: 0;
+        }
+
+        input[type="checkbox"],
+        input[type="radio"] {
+          margin-bottom: $form-spacing
+        }
+
+        label,
+        label.error {
+          @include form-label-error-color;
         }
-      }
 
-      span.error-message {
-        display: block;
+        small.error {
+          @include form-error-message;
+        }
+
+        > label {
+          > small {
+            background: transparent;
+            color: scale-color($form-label-font-color, $lightness: 15%);
+            display: inline;
+            font-size: 60%;
+            font-style: normal;
+            margin: 0;
+            padding: 0;
+            text-transform: $form-label-small-transform;
+          }
+        }
+
+        span.error-message {
+          display: block;
+        }
       }
-    }
 
-    input.error,
-    textarea.error,
-    select.error {
-      margin-bottom: 0;
+      input.error,
+      textarea.error,
+      select.error {
+        margin-bottom: 0;
+      }
+      label.error { @include form-label-error-color; }
     }
-    label.error { @include form-label-error-color; }
   }
 }