renalware-core 2.0.16 → 2.0.17

data/app/values/renalware/duration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   class Duration
     attr_reader :seconds

data/app/values/renalware/gender.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   class Gender
     include ActiveModel::Model

data/app/values/renalware/time_of_day.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   class TimeOfDay < SimpleDelegator
   end

data/app/views/renalware/admissions/consults/_table.html.slim

@@ -65,7 +65,7 @@
           td= consult.location
           td.noprint= l(consult.started_on)
           td.noprint= l(consult.ended_on)
-          td.show-for-large-up= consult.patient_current_modality
+          td.show-for-large-up.col-width-medium-with-ellipsis= consult.patient_current_modality
           td.show-for-large-up= consult.patient_sex
           td.show-for-large-up= l(consult.patient.born_on)
           td.show-for-large-up.noprint= consult.patient_age

data/app/views/renalware/hd/ongoing_sessions/_table.html.slim

@@ -11,8 +11,8 @@ table.report
       th.col-width-date= sort_link([:renalware, query], :performed_on, "Date")
       th.col-width-time= sort_link([:renalware, query], :start_time, "Start Time")
       th.col-width-time= sort_link([:renalware, query], :end_time, "End Time")
-      td= sort_link([:renalware, query], :signed_on_by_family_name, "Signed On By")
-      td= sort_link([:renalware, query], :signed_off_by_family_name, "Signed Off By")
+      td= sort_link([:renalware, query], :signed_on_by_family_name, "Put On By")
+      td= sort_link([:renalware, query], :signed_off_by_family_name, "Taken Off By")
 
   tbody
     = render partial: "session", collection: sessions

data/app/views/renalware/hd/sessions/_thead.html.slim

@@ -37,5 +37,3 @@ thead
     th= t(".post")
     th= t(".post")
     th= t(".post")
-    / th.col-width-medium= t(".sign_on")
-    / th.col-width-medium= t(".sign_off")

data/app/views/renalware/navigation/_admin.html.slim

@@ -0,0 +1,12 @@
+li.has-dropdown
+  = link_to "Admin", "#"
+  ul.dropdown
+    li= link_to "Users", admin_users_path
+    li= link_to "Hospital Units", hospitals_units_path
+    li= link_to "HD Cannulation Types", hd_cannulation_types_path
+    li= link_to "HD Dialysers", hd_dialysers_path
+    li= link_to "Request Form Print History", pathology_requests_requests_path
+    li= link_to "Pathology Requesting Configuration", pathology_requests_rules_path
+    - unless Rails.env.production?
+      li
+        = link_to "Email Templates", system_email_templates_path

data/app/views/renalware/navigation/_menu.html.slim

@@ -9,7 +9,9 @@ section.top-bar-section
     = render "renalware/navigation/patients_admin"
     = render "renalware/navigation/directory"
     - if current_user_is_admin?
-      = render "renalware/navigation/renalware_admin"
+      = render "renalware/navigation/admin"
+    - if current_user_is_super_admin?
+      = render "renalware/navigation/super_admin"
     li.divider
     = render "renalware/navigation/sign_out"
     li.divider

data/app/views/renalware/navigation/_super_admin.html.slim

@@ -0,0 +1,11 @@
+li.has-dropdown
+  = link_to "Super Admin", "#"
+  ul.dropdown
+    li= link_to "Event Types", events_types_path
+    li= link_to "Drugs", drugs_drugs_path
+    li= link_to "Modalities", modalities_descriptions_path
+    li= link_to "PD Bags", pd_bag_types_path
+    li= link_to "Primary Care Physicians", patients_primary_care_physicians_path
+    li= link_to "Cache", admin_cache_path
+    li= link_to "File Imports", admin_feeds_files_path
+    li= link_to "User Feedback", system_user_feedback_index_path

data/app/views/renalware/system/user_feedback/edit.html.slim

@@ -0,0 +1,19 @@
+= within_admin_layout( \
+  title: "Edit",
+  breadcrumbs: breadcrumb_for("User Feedback", system_user_feedback_index_path) \
+) do
+
+  dl.dl-horizontal
+    dt From
+    dd= feedback.author
+    dt Email
+    dd= mail_to(feedback.author.email)
+    dt Created at
+    dd= l(feedback.created_at)
+    dt Message
+    dd= feedback.comment
+
+  = simple_form_for(feedback, as: :feedback) do |f|
+    = f.input :admin_notes, input_html: { rows: 5 }
+    = f.input :acknowledged, as: :boolean, boolean_style: :inline
+    = f.submit "Save", class: :button

data/app/views/renalware/system/user_feedback/index.html.slim

@@ -0,0 +1,18 @@
+= within_admin_layout(title: "User Feedback") do
+  table.feedback
+    thead
+      th.col-width-tiny
+      th.col-width-date-time= sort_link(search, :created_at, "Date")
+      th.col-width-large= sort_link(search, :author_family_name, "Author")
+      th.col-width-mediumish-with-ellipsis Comment
+      th.col-width-mediumish-with-ellipsis= sort_link(search, :acknowledged, "Acknowledged")
+    tbody
+      - feedback_msgs.each do |feedback|
+        tr
+          td= link_to("Edit", edit_system_user_feedback_path(feedback))
+          td= l(feedback.created_at)
+          td= feedback.author
+          td.col-width-mediumish-with-ellipsis= feedback.comment
+          td.col-width-tiny= yes_no(feedback.acknowledged)
+
+  = paginate feedback_msgs

data/app/views/renalware/transplants/wait_lists/show.html.slim

@@ -23,8 +23,8 @@
         th= sort_link([:renalware, q], :patient_family_name, "Patient")
         th Hosp No
         th= sort_link([:renalware, q], :patient_born_on, "Age")
-        th= sort_link([:renalware, q], :patient_sex, "Sex")
-        th Modal
+        th Sex
+        th= sort_link([:renalware, q], :patient_current_modality_description_name, "Modality")
         th= sort_link([:renalware, q], :hd_site, "HD Site")
         th Status
         th UKT Status
@@ -32,7 +32,7 @@
         th.col-width-date= sort_link([:renalware, q], :entered_on, "Entry Date")
         th DOL
         th Bld Grp
-        th.col-width-date= sort_link([:renalware, q], :crf_highest_value, "CRF high")
+        th.col-width-tiny= sort_link([:renalware, q], :crf_highest_value, "CRF high")
         th.col-width-date CRF high date
         th= sort_link([:renalware, q], :crf_latest_value, "CRF latest")
         th.col-width-date CRF latest date

data/config/initializers/ahoy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ahoy::Store < Ahoy::DatabaseStore
   def visit_model
     Renalware::System::Visit

data/config/initializers/backtrace_silencers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 SHOULDA_NOISE      = %w(shoulda).freeze
 FACTORY_GIRL_NOISE = %w(factory_bot).freeze
 RENALWARE_NOISE = SHOULDA_NOISE + FACTORY_GIRL_NOISE

data/config/initializers/client_side_validations.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # ClientSideValidations Initializer
 
 # Disabled validators

data/config/initializers/core_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "core_extensions/i18n/handle_blank_value"
 require "core_extensions/i18n/always_cascade"
 require "core_extensions/dumb_delegator"

data/config/initializers/delayed_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Delayed::Worker.logger = Logger.new(Rails.root.join("log", "delayed_job.log"))
 Delayed::Worker.destroy_failed_jobs = false
 Delayed::Worker.max_attempts = 10

data/config/initializers/devise.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|

data/config/initializers/devise_security_extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Devise.setup do |config|
   # ==> Security Extension
   # Configure security extension for devise

data/config/initializers/inflections.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

data/config/initializers/kaminari.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Kaminari.configure do |config|
   # config.default_per_page = 25
   # config.max_per_page = nil

data/config/initializers/mailer_previews.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Enable mailer previews in Staging
 #
 if Rails.env.staging?

data/config/initializers/mime_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

data/config/initializers/null_object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   NullObject = Naught.build do |config|
     config.black_hole

data/config/initializers/paper_trail.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 PaperTrail.config.track_associations = false

data/config/initializers/postgresql_database_tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Tasks
     class PostgreSQLDatabaseTasks

data/config/initializers/ransack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Ransack.configure do |config|
   # Change default search parameter key name.
   # Default key name is :q

data/config/initializers/renalware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware"
 
 # New subscription registry - previous implementation does not work across threads

data/config/initializers/simple_form.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Use this setup block to configure all options available in SimpleForm.
 SimpleForm.setup do |config|
   # Wrappers are used by the form builder to generate a

data/config/initializers/simple_form_clock_picker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 SimpleForm.setup do |config|
   config.wrappers :horizontal_clockpicker,
                   tag: :div,

data/config/initializers/simple_form_datepicker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 SimpleForm.setup do |config|
   config.wrappers :horizontal_datepicker,
                   tag: :div,

data/config/initializers/simple_form_foundation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Use this setup block to configure all options available in SimpleForm.
 SimpleForm.setup do |config|
   # Don't forget to edit this file to adapt it to your needs (specially

data/config/initializers/validates_timeliness.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ValidatesTimeliness.setup do |config|
   # Extend ORM/ODMs for full support (:active_record, :mongoid).
   # config.extend_orms = [ :active_record ]

data/config/initializers/wicked_pdf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WickedPDF Global Configuration
 #
 # Use this to set up shared configuration options for your entire application.

data/config/initializers/wrap_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which

data/config/locales/renalware/hd/session.en.yml

@@ -5,8 +5,8 @@ en:
         performed_on: Session Date
         hospital_unit: Hospital Unit
         hospital_centre: Hospital Centre
-        signed_on_by: Signed On By
-        signed_off_by: Signed Off By
+        signed_on_by: Put On By
+        signed_off_by: Taken Off By
         start_time: Session Start Time
         end_time: Session End Time
         hd_type: HD Type

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Renalware::Engine.routes.draw do
   match "/404", to: "system/errors#not_found", via: :all
   match "/500", to: "system/errors#internal_server_error", via: :all
@@ -19,8 +21,8 @@ Renalware::Engine.routes.draw do
   get "/session_timed_out" => "session_timeout#has_user_timed_out", as: "session_timed_out"
 
   super_admin_constraint = lambda do |request|
-    current_user = request.env["warden"].user
-    current_user&.respond_to?(:has_role?) && current_user&.has_role?(:super_admin)
+    current_user = request.env["warden"].user || NullObject.instance
+    current_user.has_role?(:super_admin)
   end
 
   constraints super_admin_constraint do
@@ -264,7 +266,7 @@ Renalware::Engine.routes.draw do
 
   namespace :system do
     resources :email_templates, only: :index
-    resources :user_feedback, only: [:new, :create]
+    resources :user_feedback, except: :destroy, controller: "user_feedback"
   end
 
   namespace :transplants do

data/config/spring.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Spring.application_root = "./spec/dummy"
 
 %w(

data/db/migrate/20180326155400_add_admin_notes_to_system_user_feedback.rb

@@ -0,0 +1,6 @@
+class AddAdminNotesToSystemUserFeedback < ActiveRecord::Migration[5.1]
+  def change
+    add_column :system_user_feedback, :admin_notes, :text
+    add_column :system_user_feedback, :acknowledged, :boolean
+  end
+end

data/db/seeds.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "csv"
 require_relative "./seeds/seeds_helper.rb"
 

data/db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   log "Adding Access Catheter Insertion Techniques" do
 

data/db/seeds/default/accesses/access_plan_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   log "Adding Access Plan Types" do
 

data/db/seeds/default/accesses/access_sites.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   log "Adding Access Sites" do
 

data/db/seeds/default/accesses/access_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   log "Adding Access Types" do
 

data/db/seeds/default/accesses/access_types_procedures.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   log "Adding Access Types & Procedures" do
 

data/db/seeds/default/accesses/seeds.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "./access_sites"
 require_relative "./access_types_procedures"
 require_relative "./access_plan_types"

data/db/seeds/default/clinics/clinics.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   log "Adding Clinics" do
 

data/db/seeds/default/clinics/seeds.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative "./clinics"

data/db/seeds/default/deaths/death_causes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   log "Adding Renal Reg Cause of Death codes" do
 

data/db/seeds/default/deaths/seeds.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative "./death_causes"