renalware-core 2.0.164 → 2.0.165

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de3ed99a5d8710a68b891a50ee0a575b1d3b141c169eb3788b05aee36b5a6db2
-  data.tar.gz: dfb9b199413bccd4f215afe49dc7fe6e9f3a9ff6b1c15ba2dff18ad7a7f3aec7
+  metadata.gz: 700d5b2079008a4d7003114ffc54c354e66ccc522b264cf8be06f7affef1b608
+  data.tar.gz: 9bbb9f90eda8d067104d6bbb88d3abd47a9c31c7cd31c4913f4fe400f4d13405
 SHA512:
-  metadata.gz: d88f8b264a43ae6d9907fba7492fdef6a7980d852ce765f7449964aaaceab5545eae2ccbe705aab9379513522dbe09396161959a72621f089ab0689f4173ca5f
-  data.tar.gz: c5450e7a0a13c2ae617c300fc65c9c509e0d9da36ba2479a8064c6653436298b16eee9d08fd57da31648193699f1500cbe3c782fc8ce2f386febbf750f568a1a
+  metadata.gz: 34ccd19919e8e560fd814a94faaa1529ba058780b8c08afca122f737668a738ddd7865af63f8fb93446a3f18c85dfec56aaccb59429a12354c39b3f44b9779a6
+  data.tar.gz: 03a28eee3622a1b1e856a4d36549e85bdff271cc74f1e1f0db492dfbba1f07a8fa67fd7206919b7406fac404456cb65aa36d9da17c887e3eb886578aa737232e

data/app/assets/stylesheets/renalware/partials/_tables.scss

@@ -409,6 +409,12 @@ table {
   }
 }
 
+tr.deleted {
+  td {
+    background-color: lighten($nhs-red, 53);
+  }
+}
+
 table.report {
   table-layout: auto;
 

data/app/components/renalware/system/admin_menu_component.html.slim

@@ -24,6 +24,7 @@ ul.side-nav.side-nav--admin
   = super_admin_menu_item "Print batches", renalware.letters_batches_path, %r{letters/batches}
   = super_admin_menu_item "OBX", renalware.pathology_observation_descriptions_path, %r{admin/pathology_observation_descriptions}
   = super_admin_menu_item "Pathology Code Groups", renalware.pathology_code_groups_path, %r{pathology/code_groups}
+  = super_admin_menu_item "Virology Vaccination Types", renalware.virology_vaccination_types_path, %r{virology/vaccination_types}
   = admin_menu_item "Mailshots", renalware.letters_mailshots_path, %r{letters/mailshots}
   = super_admin_menu_item "Playground", renalware.admin_playground_path, %r{admin/playground}
   = developer_menu_item "HL7 Test", renalware.new_feeds_hl7_test_message_path, %r{admin/123}

data/app/controllers/renalware/virology/vaccination_types_controller.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/virology"
+
+module Renalware
+  module Virology
+    class VaccinationTypesController < BaseController
+      def index
+        types = VaccinationType.with_deleted.ordered
+        authorize types
+        render locals: { types: types }
+      end
+
+      def edit
+        type = find_and_authorise_type
+        render locals: { type: type }
+      end
+
+      def update
+        type = find_and_authorise_type
+        if type.update(type_params)
+          redirect_to virology_vaccination_types_path
+        else
+          render :edit, locals: { type: type }
+        end
+      end
+
+      def new
+        type = VaccinationType.new
+        authorize type
+        render locals: { type: type }
+      end
+
+      def create
+        type = VaccinationType.new(type_params)
+        authorize type
+        if type.save
+          redirect_to virology_vaccination_types_path
+        else
+          render :new, locals: { type: type }
+        end
+      end
+
+      def destroy
+        find_and_authorise_type.destroy!
+        redirect_to virology_vaccination_types_path
+      end
+
+      def sort
+        authorize VaccinationType, :sort?
+        ids = params[:virology_vaccination_type]
+        VaccinationType.sort(ids)
+        render json: ids
+      end
+
+      private
+
+      def find_and_authorise_type
+        VaccinationType.find(params[:id]).tap { |type| authorize type }
+      end
+
+      def type_params
+        params
+          .require("virology_vaccination_type")
+          .permit(:name, :code, :position)
+      end
+    end
+  end
+end

data/app/models/renalware/virology/vaccination_type.rb

@@ -5,12 +5,34 @@ require_dependency "renalware/virology"
 module Renalware
   module Virology
     class VaccinationType < ApplicationRecord
-      validates :name, presence: true, uniqueness: true
-      validates :code, presence: true, uniqueness: true
+      include Sortable
+
+      class UniquenessIncludingDeletedValidator < ActiveModel::EachValidator
+        def validate_each(record, attribute, value)
+          return unless record.send(:"#{attribute}_changed?")
+
+          if record.class.with_deleted.exists?(attribute => value)
+            record.errors.add attribute, (options[:message] || "already used")
+          end
+        end
+      end
+      validates :name, presence: true, uniqueness_including_deleted: true
+      validates :code, presence: true, uniqueness_including_deleted: true
+      before_create :underscore_code
 
       acts_as_paranoid
 
-      scope :ordered, -> { order(position: :asc, name: :asc) }
+      scope :ordered, -> { order(deleted_at: :desc, position: :asc, name: :asc) }
+
+      def self.policy_class
+        BasePolicy
+      end
+
+      def underscore_code
+        return if code.blank?
+
+        self.code = code.downcase.tr("  ", " ").tr(" ", "_")
+      end
     end
   end
 end

data/app/views/renalware/virology/vaccination_types/_form.html.slim

@@ -0,0 +1,10 @@
+= simple_form_for type do |f|
+  = f.input :name
+  - if type.new_record?
+    = f.input :code, hint: "Will be converted to lower case with underscores"
+  - else
+    p.px-0.mb-5
+      ' Code:
+      code= type.code
+
+  = f.submit class: :button

data/app/views/renalware/virology/vaccination_types/edit.html.slim

@@ -0,0 +1,3 @@
+= within_new_admin_layout(title: "Edit",
+                          breadcrumbs: breadcrumb_for("Virology Vaccination Types", virology_vaccination_types_path)) do
+  = render "form", type: type

data/app/views/renalware/virology/vaccination_types/index.html.slim

@@ -0,0 +1,42 @@
+= content_for(:actions) do
+  = link_to t("new_record.link_title"),
+            new_virology_vaccination_type_path,
+            class: "button"
+
+= within_new_admin_layout(title: "Virology Vaccination Types") do
+  .rounded-md.bg-blue-100.px-3.py-2.flex.items-start.shadow.mb-5
+    i.fas.fa-info-circle.mr-2.mt-1.text-blue-500
+    ' Deleting a type sets the 'deleted at' date, preventing the type from
+    ' being used prospectively.
+    br
+    ' The type's code cannot be edited once set, just in case it has already been used.
+    br
+    ' Drag and drop the icon to change the sort order.
+
+  table.vaccination_types
+    thead
+      tr
+        th.actions.col-width-small
+        th Name
+        th Code
+        th.text-center Sort order
+        th.col-width-date-time Created at
+        th.col-width-date-time Deleted at
+    tbody.sortables(data-rel=sort_virology_vaccination_types_path)
+      - types.each do |type|
+        = content_tag_for(:tr, type, class: "sortable #{type.deleted? ? 'deleted' : ''}") do
+          td.actions
+            - unless type.deleted?
+              =link_to "Edit", edit_virology_vaccination_type_path(type)
+              =link_to "Delete",
+                        virology_vaccination_type_path(type),
+                        method: :delete,
+                        data: { confirm: "Are you sure you want to delete this type? Doing so will prevent it from being used prospectively."}
+
+          td= type.name
+          td= type.code
+          td.handle
+            - unless type.deleted?
+              i.fas.fa-bars
+          td= l(type.created_at)
+          td= l(type.deleted_at)

data/app/views/renalware/virology/vaccination_types/new.html.slim

@@ -0,0 +1,3 @@
+= within_new_admin_layout(title: "New",
+                          breadcrumbs: breadcrumb_for("Virology Vaccination Types", virology_vaccination_types_path)) do
+  = render "form", type: type

data/config/permissions.yml

@@ -8,6 +8,7 @@ super_admin:
   - Renalware::HD::CannulationType
   - Renalware::System::Download
   - Renalware::Pathology::ObservationDescription
+  - Renalware::Virology::VaccinationType
 admin:
   - Renalware::User
   - Renalware::BagType

data/config/routes/virology.rb

@@ -10,3 +10,9 @@ resources :patients, only: [] do
               defaults: { slug: :vaccinations }
   end
 end
+
+namespace :virology do
+  resources :vaccination_types do
+    post :sort, on: :collection
+  end
+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.0.165"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.164
+  version: 2.0.165
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -1455,6 +1455,7 @@ files:
 - app/controllers/renalware/virology/base_controller.rb
 - app/controllers/renalware/virology/dashboards_controller.rb
 - app/controllers/renalware/virology/profiles_controller.rb
+- app/controllers/renalware/virology/vaccination_types_controller.rb
 - app/controllers/renalware/virology/vaccinations_controller.rb
 - app/documents/document/attribute_initializer.rb
 - app/documents/document/attribute_initializer/active_model.rb
@@ -3330,6 +3331,10 @@ files:
 - app/views/renalware/virology/dashboards/show.html.slim
 - app/views/renalware/virology/profiles/_summary.html.slim
 - app/views/renalware/virology/profiles/edit.html.slim
+- app/views/renalware/virology/vaccination_types/_form.html.slim
+- app/views/renalware/virology/vaccination_types/edit.html.slim
+- app/views/renalware/virology/vaccination_types/index.html.slim
+- app/views/renalware/virology/vaccination_types/new.html.slim
 - app/views/renalware/virology/vaccinations/_alert.html.slim
 - app/views/renalware/virology/vaccinations/_cell.html.slim
 - app/views/renalware/virology/vaccinations/_inputs.html.slim