renalware-core 2.0.98 → 2.0.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50394d43ef8016c2cbd18308d3c6fa69953265c39d8c7a032e1a03271b81140c
-  data.tar.gz: 25b57f293c038f5052643a141dffa18183a41ee2ab8669cd843e0b01925ace5c
+  metadata.gz: 688cbe6a0810acd8980722dbde29b68a21116d2e695a01bb0f71da9bef6c03c2
+  data.tar.gz: ca04c46a641c5214422e23f5b78e4872bccb5447691e5f02a1f76a049da16923
 SHA512:
-  metadata.gz: a32361f670baf0c9f1d94dcdbd733e6a7fcd63cd473aab07afe36aeda11112f4a2cc918206eee7d801b6a83a77887cb0178a485635262c8a2d8a83f1c5be03c0
-  data.tar.gz: fd7c8aae6a967f8f1e2f34479c6a5d2b345eb771e7d9820e73ca903d0e21f7202e5e52ee48889c897b4c58c4ffd12fb3116ab02e079aa8493e001c42aced0703
+  metadata.gz: 7585d9b098511c978d0b3f5b5f3b7ab7bcc89dc648e01943d7391694f69672afc07bf00451e9a65ab4f2caa622d2e7809aa8ade755d32428a208891c4332f223
+  data.tar.gz: 1c30a614fb4d0d85fc50a566ce141fd4aaf684ad6fed4080b32fd207e7bc2334e2f3c432d73899435826be964a67dc08078db6318846ab852ed1872751811f10

data/app/controllers/renalware/concerns/devise_controller_methods.rb

@@ -20,6 +20,7 @@ module Renalware
         configure_account_update_parameters
       end
 
+      # rubocop:disable Metrics/MethodLength
       def configure_sign_up_parameters
         devise_parameter_sanitizer.permit(
           :sign_up,
@@ -30,10 +31,12 @@ module Renalware
             :email,
             :password,
             :password_confirmation,
+            :asked_for_write_access,
             :remember_me
           ]
         )
       end
+      # rubocop:enable Metrics/MethodLength
 
       def configure_sign_in_parameters
         devise_parameter_sanitizer.permit(:sign_in, keys: [:username, :password, :remember_me])

data/app/views/renalware/admin/users/edit.html.slim

@@ -18,6 +18,11 @@
         = check_box_tag "user[unexpire]", true, false, class: "inline"
         = label_tag :user_unexpire, "Reactivate account"
 
+    span
+      | Requested write access:  
+      = yes_no(@user.asked_for_write_access)
+
+    br
     br
     - Renalware::Role.all.each_with_index do |role, index|
       - element_id = "user_role_ids_#{index}"
@@ -30,6 +35,7 @@
       = label_tag element_id, role.name.humanize
     br
     br
+
     = f.input :telephone,
               input_html: { class: "input small" },
               wrapper: :horizontal_small

data/app/views/renalware/admin/users/index.html.slim

@@ -16,6 +16,7 @@
                                      "User")
       th.col-width-small= sort_link(user_search, :username, "Login")
       th= sort_link(user_search, :email, "Email")
+      th.col-width-small Requested write access
       th.col-width-medium Role
       th.col-width-tiny= sort_link(user_search, :approved, "Approved")
       th.col-width-date= sort_link(user_search, :expired_at, "Expired On")
@@ -34,14 +35,19 @@
           td= user.to_s
           td= user.username
           td= user.email
+          td
+            - if user.asked_for_write_access?
+              i.far.fa-check-square
+            - else
+              i.muted.far.fa-square
           td
             - user.roles.each do |role|
               span.tag(class=role.name)= role.name.humanize
-          td.approved
+          td
             - if user.approved?
               i.far.fa-check-square
             - else
-              i.unapproved.far.fa-square
+              i.muted.unapproved.far.fa-square
           td.expired= l(user.expired_at&.to_date)
           td.show-for-large-up= l(user.current_sign_in_at)
           td.show-for-large-up= l(user.last_sign_in_at)

data/app/views/renalware/devise/registrations/new.html.slim

@@ -19,6 +19,18 @@
               as: :password,
               input_html: { autocomplete: "off" },
               wrapper: :horizontal_small
+
+
+    .panel
+      b
+        | Check this box if you feel you should have full access to the database.
+        br
+        | Leaving the box unchecked means you will have read-only access.
+      br
+      br
+
+      = f.input :asked_for_write_access, label: "Write access required"
+
     = f.submit "Sign up", class: "button save"
 
   = render "devise/shared/links"

data/db/migrate/20190823105642_add_asked_for_write_access_to_users.rb

@@ -0,0 +1,7 @@
+class AddAskedForWriteAccessToUsers < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column :users, :asked_for_write_access, :boolean, default: false, null: false
+    end
+  end
+end

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.98"
+  VERSION = "2.0.99"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.98
+  version: 2.0.99
 platform: ruby
 authors:
 - Airslie
@@ -3541,6 +3541,7 @@ files:
 - db/migrate/20190822180201_create_consultants.rb
 - db/migrate/20190823044107_add_outcome_columns_to_clinic_appointments.rb
 - db/migrate/20190823051014_add_hidden_colum_to_event_types.rb
+- db/migrate/20190823105642_add_asked_for_write_access_to_users.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb