renalware-core 2.0.5 → 2.0.7

data/app/views/renalware/letters/contacts/_person_form.html.slim

@@ -1,29 +1,52 @@
 = f.simple_fields_for :person do |ff|
-  = field_set_tag "Person" do
-    = ff.input :title
-    = ff.input :given_name
-    = ff.input :family_name
+  / article
+  /   header
+  /     h2 Person
+  .row
+    .columns.small-2
+      = ff.input :title
+    .columns.small-5
+      = ff.input :given_name
+    .columns.small-5
+      = ff.input :family_name
 
-  = field_set_tag "Address" do
-    - ff.object.build_address
-    = ff.simple_fields_for :address do |fa|
-      = fa.input :name,
-                  placeholder: "If different than above (optional)"
-      = fa.input :organisation_name,
-                 placeholder: "e.g. practice or hospital name (optional)"
-      = fa.input :street_1
-      = fa.input :street_2
-      = fa.input :street_3
-      = fa.input :town
-      = fa.input :county
-      = fa.input :postcode
-      = fa.association :country
-      = fa.input :telephone
-      = fa.input :email
+  /= field_set_tag "Address" do
+  - ff.object.build_address
+  = ff.simple_fields_for :address do |fa|
+    / = fa.input :name,
+    /             placeholder: "If different than above (optional)"
+    = fa.input :organisation_name,
+               placeholder: "e.g. practice or hospital name (optional)"
+    .row
+      .columns.small-6
+        = fa.input :street_1
+      .columns.small-6
+        = fa.input :street_2
+      .columns.small-6
+        = fa.input :street_3
+      .columns.small-6
+        = fa.input :town
+      .columns.small-6
+        = fa.input :county
+      .columns.small-6
+        = fa.input :postcode
+      .columns.small-6
+        = fa.association :country
+      .columns.small-6
+        = fa.input :telephone
+      .columns.small-6
+        = fa.input :email
+      .columns.small-6
+        // Disable `for` attribute, so it works when multiple contact form on the page
+        = f.input :default_cc, label_html: { for: nil }
+
+    .row
+      .columns.small-6
+        = f.input :description_id, collection: contact_descriptions
+      .columns.small-6
+        = f.input :other_description
+    .row
+      .columns.small-12
+        = f.input :notes, as: :text, input_html: { rows: 2 }
 
-= f.input :description_id, collection: contact_descriptions
-= f.input :other_description
-= f.input :notes, as: :text, input_html: { rows: 2 }
 
-// Disable `for` attribute, so it works when multiple contact form on the page
-= f.input :default_cc, label_html: { for: nil }

data/app/views/renalware/letters/formatted_letters/_letter.html.slim

@@ -240,11 +240,23 @@ scss:
         list-style-position: outside;
         margin: 0;
         padding: 0;
+
+        li {
+          margin-bottom: .2rem;
+        }
       }
 
       h3 {
         font-size: 1em;
-        margin-bottom: 20px;
+        margin: 1rem 0;
+      }
+
+      p.private {
+        margin: 1rem 0;
+      }
+
+      .address {
+        margin-bottom: 6rem;
       }
     }
   }
@@ -314,8 +326,7 @@ scss:
         - letter.electronic_cc_recipients.each do |user|
           li= user.professional_signature
 
-      .private
-        p Private and confidential
+      p.private Private and confidential
 
       - letter.cc_recipients.each do |cc|
         .address.nobreak

data/app/views/renalware/letters/letters/_cc_recipient_form.html.slim

@@ -8,5 +8,5 @@ tr
 
     = check_box_tag("letter[cc_recipients_attributes][][_keep]", "1",
         recipient.present?, id: check_box_id)
-  td= label_tag check_box_id, contact.address
+  td= label_tag check_box_id, [contact.to_s, contact.address].compact.join(" - ")
   td= label_tag check_box_id, contact.description_name

data/app/views/renalware/letters/letters/_form.html.slim

@@ -29,7 +29,7 @@ ruby:
               }
     = hidden_field_tag "description_id"
     = f.input :clinical, as: :hidden
-    = f.input :issued_on, as: :date_picker, wrapper: :horizontal_datepicker
+    = f.input :issued_on, as: :date_picker
     = f.association :author,
         as: :user_picker,
         collection: Renalware::System::UsersPresenter.new.list_for_dropdown( \

data/app/views/renalware/letters/letters/_main_recipient.html.slim

@@ -6,11 +6,10 @@ article
 
     .radio_buttons.row.optional.letter_main_recipient_person_role.field_with_hint
       .columns.small-12
-        .hint
-          - if patient.primary_care_physician.nil? || patient.practice.nil?
-            | No option to send to GP as patient has no Practice and/or GP
-            br
-          =f.object.patient_cc_hint
+        - if patient.primary_care_physician.nil? || patient.practice.nil?
+          .panel
+            | No option to send to GP as patient is missing a practice or GP
+
         = fmr.collection_radio_buttons(:person_role,
                                        f.object.person_roles,
                                        :second,
@@ -23,6 +22,7 @@ article
                              class: "radio_buttons recipient-person-role-picker has_salutation") \
                                     + b.text \
               }
+        .hint=f.object.patient_cc_hint
 
     = fmr.input :id, as: :hidden
 

data/app/views/renalware/letters/letters/contact_added.js.erb

@@ -1,4 +1,6 @@
 $("#letter_main_recipient_attributes_addressee_id")
-  .append('<option value="<%= @contact.id %>"><%= @contact.name_and_description %></option>');
+  .append('<option value="<%= @contact.id %>" data-salutation="<%=@contact.salutation%>" data-class=".has_salutation"><%= @contact.name_and_description %></option>');
+setTimeout(function() { $("#letter_main_recipient_attributes_addressee_id").trigger("change") }, 200);
+
 $("#letter-ccs table tbody")
-  .append('<%= j render(partial: "cc_recipient_form", object: @contact, as: :contact, locals: { letter: @letter }) %>');
+  .append('<%= j render(partial: "cc_recipient_form", object: @contact, as: :contact, locals: { letter: @letter }) %>');

data/app/views/renalware/patients/alerts/_list.html.slim

@@ -1 +1 @@
-= render patient.alerts
+= render partial: "/renalware/patients/alerts/alert", collection: patient.alerts

data/app/views/renalware/problems/problems/edit.html.slim

@@ -4,10 +4,9 @@
 
   = simple_form_for problem,
                     url: patient_problem_path(patient, problem),
-                    html: { autocomplete: "off", class: "problem-form" },
-                    wrapper: :horizontal_form do |f|
+                    html: { autocomplete: "off", class: "problem-form" } do |f|
 
-      = f.input :description
+      = f.input :description, as: :text
       = f.button :button, "Save"
       span= " or "
       = link_to "cancel", patient_problems_path(patient)

data/app/views/renalware/problems/problems/new.html.slim

@@ -2,10 +2,9 @@
 
   = simple_form_for problem,
                     url: patient_problems_path(patient),
-                    html: { autocomplete: "off" },
-                    wrapper: :horizontal_form do |f|
+                    html: { autocomplete: "off" } do |f|
 
-    = f.input :description, wrapper: :horizontal_small
+    = f.input :description, as: :text
 
     = f.button :submit
     span= " or "

data/app/views/renalware/snippets/snippets/_list.html.slim

@@ -3,14 +3,9 @@
 
 .snippets(class=klass)
   .modal-header
-    h1= t("#{i18n_scope}.page_title")
-
-    = render "renalware/shared/modal_close_link" if remote
-
-  - unless remote
-    .columns.small-12
-      = link_to "Create new", new_snippet_path, class: "button create-snippet right"
-
+    - if remote
+      h1= t("#{i18n_scope}.page_title")
+      = render "renalware/shared/modal_close_link"
   ul.tabs
     li(class= "#{'active' if author == :me}")
       = link_to snippets_path, remote: remote do

data/app/views/renalware/snippets/snippets/_row.html.slim

@@ -17,12 +17,13 @@ tr(data={ "snippet-id" => snippet.id, invocation_url: snippet_invocations_path(s
                  "#",
                  title: "Insert this snippet into the letter",
                  class: "insert-snippet button compact alternative"
-  td.css-toggle-container
-    = tooltip_with_block(label: snippet.title) do
-      = snippet.title
-  td.css-toggle-container.body= snippet.body.html_safe
   - unless author == :me
     td.col-width-medium.author= snippet.author
+  td.css-toggle-container.title
+    = tooltip_with_block(label: snippet.title) do
+      = snippet.title
+  td.css-toggle-container.body
+    .body-content= snippet.body.html_safe
   - unless remote
     td.last_used_on
       = "#{snippet.last_used_on? ? l(snippet.last_used_on) : 'Never'} (#{snippet.times_used})"

data/app/views/renalware/snippets/snippets/_table.html.slim

@@ -1,26 +1,27 @@
 - delete_confirmation_msg = I18n.t("prompts.confirm_delete_with_model", model: "snippet")
 
-table.snippets
-  thead
-    tr
-      th.col-width-toggle
-      th.col-width-medium
-        = sort_link([:renalware, search], :title)
-      th(style="max-width: 100%")
-        = sort_link([:renalware, search], :body)
-      - unless author == :me
-        th.col-width-medium.author
-          = sort_link([:renalware, search], :author_family_name, t(".author"))
-      - unless remote
-        th.col-width-medium.last_used_on
-          = sort_link([:renalware, search], :last_used_on, t(".last_used_on"))
-        th.col-width-date-time.updated_at
-          = sort_link([:renalware, search], :updated_at, t(".updated_at"))
+.scrollable
+  table.snippets
+    thead
+      tr
         th.col-width-medium
-  tbody
-    = render partial: "row",
-             collection: snippets,
-             as: :snippet,
-             locals: { author: author,
-                       delete_confirmation_msg: delete_confirmation_msg,
-                       remote: remote }
+        - unless author == :me
+          th.col-width-medium.author
+            = sort_link([:renalware, search], :author_family_name, t(".author"))
+        th.col-width-medium
+          = sort_link([:renalware, search], :title)
+        th(style="max-width: 100%")
+          = sort_link([:renalware, search], :body)
+        - unless remote
+          th.col-width-medium.last_used_on
+            = sort_link([:renalware, search], :last_used_on, t(".last_used_on"))
+          th.col-width-date-time.updated_at
+            = sort_link([:renalware, search], :updated_at, t(".updated_at"))
+          th.col-width-medium
+    tbody
+      = render partial: "row",
+               collection: snippets,
+               as: :snippet,
+               locals: { author: author,
+                         delete_confirmation_msg: delete_confirmation_msg,
+                         remote: remote }

data/app/views/renalware/snippets/snippets/edit.html.slim

@@ -1,5 +1,4 @@
-.row
-
-  h1= t(".title")
+= within_admin_layout(title: "Edit",
+                      breadcrumbs: breadcrumb_for("Snippets", snippets_path)) do
 
   = render "form", snippet: snippet, submit_to_url: snippet_path(snippet)

data/app/views/renalware/snippets/snippets/index.html.slim

@@ -1,4 +1,5 @@
-- content_for(:page_title){ t(".page_title") }
+= content_for(:actions) do
+  = link_to "Create new", new_snippet_path, class: "button create-snippet right"
 
-.row.collapse
+= within_admin_layout(title: "Snippets") do
   = render "list", snippets: snippets, search: search, author: author, remote: false

data/app/views/renalware/snippets/snippets/new.html.slim

@@ -1,6 +1,3 @@
-- content_for(:page_title){ t(".title") }
-
-.row
-  h1= t(".title")
-
+= within_admin_layout(title: "New",
+                      breadcrumbs: breadcrumb_for("Snippets", snippets_path)) do
   = render "form", snippet: snippet, submit_to_url: snippets_path

data/lib/renalware/version.rb

@@ -1,3 +1,3 @@
 module Renalware
-  VERSION = "2.0.5".freeze
+  VERSION = "2.0.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.7
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails