renalware-core 2.0.130 → 2.0.131

Sign up to get free protection for your applications and to get access to all the features.
Files changed (112) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +3 -2
  3. data/app/controllers/renalware/admin/users_controller.rb +1 -0
  4. data/app/controllers/renalware/medications/prescriptions_controller.rb +2 -2
  5. data/app/controllers/renalware/patients/patients_controller.rb +1 -1
  6. data/app/jobs/renalware/letters/calculate_page_count_job.rb +5 -0
  7. data/app/models/concerns/renalware/pdf_compilation.rb +2 -2
  8. data/app/models/renalware/events/lists/form.rb +1 -1
  9. data/app/models/renalware/letters/approve_letter.rb +3 -1
  10. data/app/models/renalware/letters/delivery/email_letter_to_practice.rb +6 -14
  11. data/app/models/renalware/letters/lists/form.rb +2 -2
  12. data/app/models/renalware/letters/pdf_renderer.rb +1 -0
  13. data/app/models/renalware/letters/printing/pdf_combining.rb +2 -2
  14. data/app/models/renalware/medications/dose_unit.rb +2 -0
  15. data/app/models/renalware/modalities/description.rb +10 -2
  16. data/app/models/renalware/pd/apd/glucose_calculator.rb +2 -2
  17. data/app/models/renalware/system/update_user.rb +3 -0
  18. data/app/models/renalware/ukrdc/create_encrypted_patient_xml_files.rb +15 -4
  19. data/app/models/renalware/ukrdc/create_patient_xml_file.rb +16 -3
  20. data/app/models/renalware/ukrdc/outgoing/rendering/address.rb +38 -0
  21. data/app/models/renalware/ukrdc/outgoing/rendering/allergy.rb +27 -0
  22. data/app/models/renalware/ukrdc/outgoing/rendering/base.rb +20 -0
  23. data/app/models/renalware/ukrdc/outgoing/rendering/cause_of_death.rb +38 -0
  24. data/app/models/renalware/ukrdc/outgoing/rendering/clinic_visit_observation.rb +24 -0
  25. data/app/models/renalware/ukrdc/outgoing/rendering/clinician.rb +12 -0
  26. data/app/models/renalware/ukrdc/outgoing/rendering/diagnoses.rb +63 -0
  27. data/app/models/renalware/ukrdc/outgoing/rendering/diagnosis.rb +52 -0
  28. data/app/models/renalware/ukrdc/outgoing/rendering/dialysis_session.rb +81 -0
  29. data/app/models/renalware/ukrdc/outgoing/rendering/document.rb +46 -0
  30. data/app/models/renalware/ukrdc/outgoing/rendering/entered_at.rb +26 -0
  31. data/app/models/renalware/ukrdc/outgoing/rendering/entered_by.rb +12 -0
  32. data/app/models/renalware/ukrdc/outgoing/rendering/family_doctor.rb +30 -0
  33. data/app/models/renalware/ukrdc/outgoing/rendering/hd_session_observations.rb +51 -0
  34. data/app/models/renalware/ukrdc/outgoing/rendering/hd_treatment.rb +26 -0
  35. data/app/models/renalware/ukrdc/outgoing/rendering/lab_order.rb +80 -0
  36. data/app/models/renalware/ukrdc/outgoing/rendering/lab_orders.rb +30 -0
  37. data/app/models/renalware/ukrdc/outgoing/rendering/medication.rb +77 -0
  38. data/app/models/renalware/ukrdc/outgoing/rendering/name.rb +29 -0
  39. data/app/models/renalware/ukrdc/outgoing/rendering/observation.rb +70 -0
  40. data/app/models/renalware/ukrdc/outgoing/rendering/observations.rb +58 -0
  41. data/app/models/renalware/ukrdc/outgoing/rendering/patient.rb +167 -0
  42. data/app/models/renalware/ukrdc/outgoing/rendering/patient_number.rb +27 -0
  43. data/app/models/renalware/ukrdc/outgoing/rendering/patient_numbers.rb +53 -0
  44. data/app/models/renalware/ukrdc/outgoing/rendering/pd_treatment.rb +27 -0
  45. data/app/models/renalware/ukrdc/outgoing/rendering/primary_language.rb +35 -0
  46. data/app/models/renalware/ukrdc/outgoing/rendering/procedures.rb +40 -0
  47. data/app/models/renalware/ukrdc/outgoing/rendering/renal_diagnosis.rb +35 -0
  48. data/app/models/renalware/ukrdc/outgoing/rendering/transplant.rb +69 -0
  49. data/app/models/renalware/ukrdc/outgoing/rendering/treatment.rb +78 -0
  50. data/app/models/renalware/ukrdc/outgoing/rendering/user.rb +33 -0
  51. data/app/models/renalware/ukrdc/pathology_observation_requests_query.rb +1 -0
  52. data/app/models/renalware/ukrdc/xml_renderer.rb +54 -75
  53. data/app/models/renalware/user.rb +4 -1
  54. data/app/presenters/renalware/hd/scheduling/diary_presenter.rb +2 -2
  55. data/app/presenters/renalware/system/users_presenter.rb +1 -1
  56. data/app/presenters/renalware/ukrdc/transplant_operation_presenter.rb +4 -0
  57. data/app/views/renalware/admin/users/edit.html.slim +6 -0
  58. data/app/views/renalware/admin/users/index.html.slim +6 -1
  59. data/app/views/renalware/api/ukrdc/patients/_clinic_visit_observation.xml.builder +3 -3
  60. data/app/views/renalware/api/ukrdc/patients/_documents.xml.builder +28 -24
  61. data/app/views/renalware/api/ukrdc/patients/_sending_facility.xml.builder +1 -1
  62. data/app/views/renalware/api/ukrdc/patients/_treatments.xml.builder +0 -27
  63. data/app/views/renalware/api/ukrdc/patients/show.xml.builder +1 -5
  64. data/app/views/renalware/medications/drug_types/prescriptions/_table.html.slim +1 -1
  65. data/app/views/renalware/patients/patients/_form.html.slim +1 -0
  66. data/app/views/renalware/patients/patients/show/_contact_details.html.slim +2 -1
  67. data/config/initializers/core_extensions.rb +1 -0
  68. data/config/initializers/devise.rb +1 -1
  69. data/config/locales/renalware/medications/prescription.yml +2 -0
  70. data/db/migrate/20170526060804_enable_uuid_extension.rb +1 -1
  71. data/db/migrate/20191219145651_add_hidden_to_users.rb +8 -0
  72. data/db/migrate/20200106073329_add_next_of_kin_to_patients.rb +7 -0
  73. data/db/migrate/20200106210851_create_case_insensitive_index_on_patients.rb +22 -0
  74. data/lib/core_extensions/active_record/migration_helpers.rb +7 -0
  75. data/lib/core_extensions/ox/element_additions.rb +18 -0
  76. data/lib/renalware/engine.rb +2 -1
  77. data/lib/renalware/version.rb +1 -1
  78. data/lib/tasks/spec.rake +33 -0
  79. data/spec/factories/accesses/assessments.rb +18 -0
  80. data/spec/factories/accesses/catheter_insertion_techniques.rb +8 -0
  81. data/spec/factories/accesses/plans.rb +1 -1
  82. data/spec/factories/accesses/plans_types.rb +1 -1
  83. data/spec/factories/accesses/procedures.rb +2 -2
  84. data/spec/factories/accesses/profiles.rb +1 -1
  85. data/spec/factories/accesses/sites.rb +1 -1
  86. data/spec/factories/accesses/types.rb +1 -1
  87. data/spec/factories/hd/hd_session_document.rb +8 -8
  88. data/spec/factories/transplants/donations.rb +1 -1
  89. data/spec/factories/transplants/recipient_followups.rb +1 -1
  90. data/spec/factories/transplants/recipient_operations.rb +1 -1
  91. data/spec/factories/transplants/registration_status_descriptions.rb +1 -1
  92. data/spec/factories/transplants/registration_statuses.rb +1 -1
  93. data/spec/factories/transplants/registrations.rb +1 -1
  94. data/spec/factories/transplants/rejection_episodes.rb +1 -1
  95. data/spec/factories/transplants/rejection_treatments.rb +1 -1
  96. data/spec/factories/ukrdc/modality_codes.rb +1 -1
  97. data/spec/support/capybara_helper.rb +6 -0
  98. data/spec/support/letters_spec_helper.rb +2 -2
  99. data/spec/support/pages/accesses/procedure_page.rb +53 -0
  100. data/spec/support/pages/accesses/profile_page.rb +45 -0
  101. data/spec/support/pages/clinical/allergy_page.rb +74 -0
  102. data/spec/support/pages/letters/form.rb +5 -3
  103. data/spec/support/shared_contexts/a_global_rule_set.rb +1 -1
  104. data/spec/support/xml_spec_helper.rb +9 -0
  105. metadata +60 -11
  106. data/app/views/renalware/api/ukrdc/patients/_clinical_relationships.xml.builder +0 -7
  107. data/app/views/renalware/api/ukrdc/patients/_family_histories.xml.builder +0 -7
  108. data/app/views/renalware/api/ukrdc/patients/_program_memberships.xml.builder +0 -7
  109. data/app/views/renalware/api/ukrdc/patients/_surveys.xml.builder +0 -7
  110. data/app/views/renalware/api/ukrdc/patients/observations/_blood_pressure.xml.builder +0 -0
  111. data/app/views/renalware/api/ukrdc/patients/observations/_standing_blood_pressure.xml.builder +0 -0
  112. data/app/views/renalware/api/ukrdc/patients/observations/_weight.xml.builder +0 -0
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- shared_context "a global_rule_set" do
3
+ shared_context "with a global_rule_set" do
4
4
  let!(:clinic) { create(:clinic) }
5
5
  let!(:required_observation_description) { create(:pathology_observation_description) }
6
6
  let!(:request_description) do
@@ -0,0 +1,9 @@
1
+ # frozen_string_literal: true
2
+
3
+ module XmlSpecHelper
4
+ # Use Ox to dump the pre-rendered Ox marshalled XML into its final format
5
+ # and tidy it up to remove vaguaries that can upset tests.
6
+ def format_xml(raw)
7
+ Ox.dump(raw, indent: -1, skip: :skip_return).tr("\n", " ")
8
+ end
9
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: renalware-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.130
4
+ version: 2.0.131
5
5
  platform: ruby
6
6
  authors:
7
7
  - Airslie
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-12-16 00:00:00.000000000 Z
11
+ date: 2020-01-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionview-component
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '1.5'
19
+ version: 1.6.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '1.5'
26
+ version: 1.6.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: active_type
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -542,6 +542,20 @@ dependencies:
542
542
  - - "~>"
543
543
  - !ruby/object:Gem::Version
544
544
  version: '1.9'
545
+ - !ruby/object:Gem::Dependency
546
+ name: ox
547
+ requirement: !ruby/object:Gem::Requirement
548
+ requirements:
549
+ - - "~>"
550
+ - !ruby/object:Gem::Version
551
+ version: '2.11'
552
+ type: :runtime
553
+ prerelease: false
554
+ version_requirements: !ruby/object:Gem::Requirement
555
+ requirements:
556
+ - - "~>"
557
+ - !ruby/object:Gem::Version
558
+ version: '2.11'
545
559
  - !ruby/object:Gem::Dependency
546
560
  name: pandoc-ruby
547
561
  requirement: !ruby/object:Gem::Requirement
@@ -1938,6 +1952,37 @@ files:
1938
1952
  - app/models/renalware/ukrdc/incoming/paths.rb
1939
1953
  - app/models/renalware/ukrdc/incoming/xml_document.rb
1940
1954
  - app/models/renalware/ukrdc/modality_code.rb
1955
+ - app/models/renalware/ukrdc/outgoing/rendering/address.rb
1956
+ - app/models/renalware/ukrdc/outgoing/rendering/allergy.rb
1957
+ - app/models/renalware/ukrdc/outgoing/rendering/base.rb
1958
+ - app/models/renalware/ukrdc/outgoing/rendering/cause_of_death.rb
1959
+ - app/models/renalware/ukrdc/outgoing/rendering/clinic_visit_observation.rb
1960
+ - app/models/renalware/ukrdc/outgoing/rendering/clinician.rb
1961
+ - app/models/renalware/ukrdc/outgoing/rendering/diagnoses.rb
1962
+ - app/models/renalware/ukrdc/outgoing/rendering/diagnosis.rb
1963
+ - app/models/renalware/ukrdc/outgoing/rendering/dialysis_session.rb
1964
+ - app/models/renalware/ukrdc/outgoing/rendering/document.rb
1965
+ - app/models/renalware/ukrdc/outgoing/rendering/entered_at.rb
1966
+ - app/models/renalware/ukrdc/outgoing/rendering/entered_by.rb
1967
+ - app/models/renalware/ukrdc/outgoing/rendering/family_doctor.rb
1968
+ - app/models/renalware/ukrdc/outgoing/rendering/hd_session_observations.rb
1969
+ - app/models/renalware/ukrdc/outgoing/rendering/hd_treatment.rb
1970
+ - app/models/renalware/ukrdc/outgoing/rendering/lab_order.rb
1971
+ - app/models/renalware/ukrdc/outgoing/rendering/lab_orders.rb
1972
+ - app/models/renalware/ukrdc/outgoing/rendering/medication.rb
1973
+ - app/models/renalware/ukrdc/outgoing/rendering/name.rb
1974
+ - app/models/renalware/ukrdc/outgoing/rendering/observation.rb
1975
+ - app/models/renalware/ukrdc/outgoing/rendering/observations.rb
1976
+ - app/models/renalware/ukrdc/outgoing/rendering/patient.rb
1977
+ - app/models/renalware/ukrdc/outgoing/rendering/patient_number.rb
1978
+ - app/models/renalware/ukrdc/outgoing/rendering/patient_numbers.rb
1979
+ - app/models/renalware/ukrdc/outgoing/rendering/pd_treatment.rb
1980
+ - app/models/renalware/ukrdc/outgoing/rendering/primary_language.rb
1981
+ - app/models/renalware/ukrdc/outgoing/rendering/procedures.rb
1982
+ - app/models/renalware/ukrdc/outgoing/rendering/renal_diagnosis.rb
1983
+ - app/models/renalware/ukrdc/outgoing/rendering/transplant.rb
1984
+ - app/models/renalware/ukrdc/outgoing/rendering/treatment.rb
1985
+ - app/models/renalware/ukrdc/outgoing/rendering/user.rb
1941
1986
  - app/models/renalware/ukrdc/pathology_observation_requests_query.rb
1942
1987
  - app/models/renalware/ukrdc/paths.rb
1943
1988
  - app/models/renalware/ukrdc/patients_query.rb
@@ -2245,11 +2290,9 @@ files:
2245
2290
  - app/views/renalware/api/ukrdc/patients/_address.xml.builder
2246
2291
  - app/views/renalware/api/ukrdc/patients/_allergies.xml.builder
2247
2292
  - app/views/renalware/api/ukrdc/patients/_clinic_visit_observation.xml.builder
2248
- - app/views/renalware/api/ukrdc/patients/_clinical_relationships.xml.builder
2249
2293
  - app/views/renalware/api/ukrdc/patients/_diagnoses.xml.builder
2250
2294
  - app/views/renalware/api/ukrdc/patients/_documents.xml.builder
2251
2295
  - app/views/renalware/api/ukrdc/patients/_encounters.xml.builder
2252
- - app/views/renalware/api/ukrdc/patients/_family_histories.xml.builder
2253
2296
  - app/views/renalware/api/ukrdc/patients/_hd_session_observations.xml.builder
2254
2297
  - app/views/renalware/api/ukrdc/patients/_lab_orders.xml.builder
2255
2298
  - app/views/renalware/api/ukrdc/patients/_medications.xml.builder
@@ -2257,17 +2300,12 @@ files:
2257
2300
  - app/views/renalware/api/ukrdc/patients/_observations.xml.builder
2258
2301
  - app/views/renalware/api/ukrdc/patients/_patient.xml.builder
2259
2302
  - app/views/renalware/api/ukrdc/patients/_procedures.xml.builder
2260
- - app/views/renalware/api/ukrdc/patients/_program_memberships.xml.builder
2261
2303
  - app/views/renalware/api/ukrdc/patients/_sending_facility.xml.builder
2262
2304
  - app/views/renalware/api/ukrdc/patients/_social_histories.xml.builder
2263
- - app/views/renalware/api/ukrdc/patients/_surveys.xml.builder
2264
2305
  - app/views/renalware/api/ukrdc/patients/_treatments.xml.builder
2265
2306
  - app/views/renalware/api/ukrdc/patients/diagnoses/_cause_of_death.xml.builder
2266
2307
  - app/views/renalware/api/ukrdc/patients/lab_orders/_lab_order.xml.builder.dead
2267
2308
  - app/views/renalware/api/ukrdc/patients/lab_orders/_result_item.xml.builder.dead
2268
- - app/views/renalware/api/ukrdc/patients/observations/_blood_pressure.xml.builder
2269
- - app/views/renalware/api/ukrdc/patients/observations/_standing_blood_pressure.xml.builder
2270
- - app/views/renalware/api/ukrdc/patients/observations/_weight.xml.builder
2271
2309
  - app/views/renalware/api/ukrdc/patients/procedures/_dialysis_session.xml.builder
2272
2310
  - app/views/renalware/api/ukrdc/patients/procedures/_transplant_operation.xml.builder
2273
2311
  - app/views/renalware/api/ukrdc/patients/show.xml.builder
@@ -3725,6 +3763,9 @@ files:
3725
3763
  - db/migrate/20191209160151_add_patient_question_text_to_survey_responses.rb
3726
3764
  - db/migrate/20191209163151_update_survey_views_to_allow_free_text.rb
3727
3765
  - db/migrate/20191213094611_create_low_clearance_referrers.rb
3766
+ - db/migrate/20191219145651_add_hidden_to_users.rb
3767
+ - db/migrate/20200106073329_add_next_of_kin_to_patients.rb
3768
+ - db/migrate/20200106210851_create_case_insensitive_index_on_patients.rb
3728
3769
  - db/seeds.rb
3729
3770
  - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
3730
3771
  - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -3871,6 +3912,7 @@ files:
3871
3912
  - lib/core_extensions/hash.rb
3872
3913
  - lib/core_extensions/i18n/always_cascade.rb
3873
3914
  - lib/core_extensions/i18n/handle_blank_value.rb
3915
+ - lib/core_extensions/ox/element_additions.rb
3874
3916
  - lib/core_extensions/scenic.rb
3875
3917
  - lib/document/attribute_initializer.rb
3876
3918
  - lib/document/attribute_initializer/active_model.rb
@@ -3914,10 +3956,13 @@ files:
3914
3956
  - lib/tasks/pd.rake
3915
3957
  - lib/tasks/renalware.rake
3916
3958
  - lib/tasks/reporting.rake
3959
+ - lib/tasks/spec.rake
3917
3960
  - lib/tasks/ukrdc.rake
3918
3961
  - lib/templates/slim/scaffold/_form.html.slim
3919
3962
  - lib/test_support/ajax_helpers.rb
3920
3963
  - lib/test_support/text_editor_helpers.rb
3964
+ - spec/factories/accesses/assessments.rb
3965
+ - spec/factories/accesses/catheter_insertion_techniques.rb
3921
3966
  - spec/factories/accesses/patients.rb
3922
3967
  - spec/factories/accesses/plans.rb
3923
3968
  - spec/factories/accesses/plans_types.rb
@@ -4085,7 +4130,10 @@ files:
4085
4130
  - spec/support/matchers/document.rb
4086
4131
  - spec/support/matchers/have_pdf_page_text.rb
4087
4132
  - spec/support/matchers/validate_timeliness_of.rb
4133
+ - spec/support/pages/accesses/procedure_page.rb
4134
+ - spec/support/pages/accesses/profile_page.rb
4088
4135
  - spec/support/pages/admissions/consults_page.rb
4136
+ - spec/support/pages/clinical/allergy_page.rb
4089
4137
  - spec/support/pages/clinical/profile_page.rb
4090
4138
  - spec/support/pages/letters/form.rb
4091
4139
  - spec/support/pages/letters/patient_letters.rb
@@ -4105,6 +4153,7 @@ files:
4105
4153
  - spec/support/travel.rb
4106
4154
  - spec/support/ukrdc_helpers.rb
4107
4155
  - spec/support/webmock.rb
4156
+ - spec/support/xml_spec_helper.rb
4108
4157
  - vendor/assets/javascripts/renalware/double_scroll.js
4109
4158
  - vendor/assets/javascripts/renalware/iframeResizer.contentWindow.js
4110
4159
  - vendor/assets/javascripts/renalware/iframeResizer.js
@@ -1,7 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- # xml = builder
4
-
5
- # xml.ClinicalRelationships do
6
- # xml.comment! "Not supplied in RW 2.0"
7
- # end
@@ -1,7 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- # xml = builder
4
-
5
- # xml.FamilyHistories do
6
- # xml.comment! "Not supplied in RW 2.0"
7
- # end
@@ -1,7 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- # xml = builder
4
-
5
- # xml.ProgramMemberships do
6
- # xml.comment! "Not supplied in RW 2.0"
7
- # end
@@ -1,7 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- # xml = builder
4
-
5
- # xml.Surveys do
6
- # xml.comment! "Not supplied in RW 2.0"
7
- # end