renalware-core 2.0.0.pre.beta11 → 2.0.0.pre.beta12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +14 -0
- data/app/controllers/renalware/accesses/base_controller.rb +0 -1
- data/app/controllers/renalware/clinical/allergies_controller.rb +0 -1
- data/app/controllers/renalware/clinical/allergy_statuses_controller.rb +0 -1
- data/app/controllers/renalware/clinics/clinic_visits_controller.rb +0 -1
- data/app/controllers/renalware/concerns/devise_controller_methods.rb +26 -14
- data/app/controllers/renalware/concerns/pdf_renderable.rb +0 -1
- data/app/controllers/renalware/deaths_controller.rb +14 -6
- data/app/controllers/renalware/events/swabs_controller.rb +0 -1
- data/app/controllers/renalware/hd/base_controller.rb +0 -1
- data/app/controllers/renalware/hd/cannulation_types_controller.rb +30 -15
- data/app/controllers/renalware/hd/diaries_controller.rb +1 -1
- data/app/controllers/renalware/hd/diary_slots_controller.rb +1 -2
- data/app/controllers/renalware/hd/mdm_patients_controller.rb +0 -1
- data/app/controllers/renalware/hd/ongoing_sessions_controller.rb +3 -4
- data/app/controllers/renalware/hd/patients_controller.rb +0 -1
- data/app/controllers/renalware/hd/protocols_controller.rb +2 -1
- data/app/controllers/renalware/letters/base_controller.rb +0 -1
- data/app/controllers/renalware/mdm_controller.rb +0 -1
- data/app/controllers/renalware/medications/prescriptions_controller.rb +2 -2
- data/app/controllers/renalware/modalities/descriptions_controller.rb +0 -1
- data/app/controllers/renalware/modalities/modalities_controller.rb +0 -1
- data/app/controllers/renalware/modalities/reasons_controller.rb +0 -1
- data/app/controllers/renalware/pathology/base_controller.rb +0 -1
- data/app/controllers/renalware/pathology/requests/requests_controller.rb +9 -3
- data/app/controllers/renalware/patients/alerts_controller.rb +0 -1
- data/app/controllers/renalware/patients/bookmarks_controller.rb +1 -1
- data/app/controllers/renalware/patients/patients_controller.rb +4 -2
- data/app/controllers/renalware/patients/practices_controller.rb +0 -1
- data/app/controllers/renalware/patients/primary_care_physician_controller.rb +0 -1
- data/app/controllers/renalware/pd/assessments_controller.rb +0 -1
- data/app/controllers/renalware/pd/bag_types_controller.rb +0 -1
- data/app/controllers/renalware/pd/base_controller.rb +0 -1
- data/app/controllers/renalware/pd/dashboards_controller.rb +0 -1
- data/app/controllers/renalware/pd/mdm_patients_controller.rb +0 -1
- data/app/controllers/renalware/pd/regimes_controller.rb +1 -1
- data/app/controllers/renalware/pd/training_sessions_controller.rb +0 -1
- data/app/controllers/renalware/problems/problems_controller.rb +0 -1
- data/app/controllers/renalware/renal/base_controller.rb +0 -1
- data/app/controllers/renalware/renal/profiles_controller.rb +4 -3
- data/app/controllers/renalware/renal/registry_preflight_checks_controller.rb +10 -4
- data/app/controllers/renalware/reporting/audit_refreshments_controller.rb +0 -1
- data/app/controllers/renalware/research/studies_controller.rb +0 -1
- data/app/controllers/renalware/snippets/snippet_invocations_controller.rb +0 -1
- data/app/controllers/renalware/snippets/snippets_controller.rb +0 -1
- data/app/controllers/renalware/system/mock_errors_controller.rb +0 -1
- data/app/controllers/renalware/transplants/base_controller.rb +0 -1
- data/app/controllers/renalware/transplants/donor_stages_controller.rb +0 -1
- data/app/controllers/renalware/transplants/mdm_patients_controller.rb +0 -1
- data/app/controllers/renalware/transplants/recipient_dashboards_controller.rb +0 -1
- data/app/controllers/renalware/transplants/recipient_workups_controller.rb +0 -1
- data/app/documents/renalware/age.rb +1 -1
- data/app/documents/renalware/hd/profile_document.rb +1 -1
- data/app/documents/renalware/hd/session_document.rb +0 -1
- data/app/documents/renalware/transplants/recipient_operation_document.rb +0 -1
- data/app/documents/renalware/transplants/recipient_workup_document.rb +0 -1
- data/app/documents/renalware/transplants/registration_document.rb +0 -1
- data/app/documents/renalware/year_dated_confirmation.rb +1 -2
- data/app/drops/renalware/pd/patient_drop.rb +0 -1
- data/app/drops/renalware/renal/patient_drop.rb +0 -1
- data/app/helpers/renalware/article_helper.rb +2 -2
- data/app/helpers/renalware/attribute_name_helper.rb +0 -1
- data/app/helpers/renalware/bag_types_helper.rb +0 -2
- data/app/helpers/renalware/clipboard_helper.rb +0 -1
- data/app/helpers/renalware/definition_list_helper.rb +0 -1
- data/app/helpers/renalware/drugs_helper.rb +0 -2
- data/app/helpers/renalware/flash_helper.rb +0 -2
- data/app/helpers/renalware/layout_helper.rb +1 -1
- data/app/helpers/renalware/mdm_helper.rb +0 -1
- data/app/helpers/renalware/pd_regime_bags_helper.rb +0 -2
- data/app/helpers/renalware/pd_regimes_helper.rb +0 -1
- data/app/helpers/renalware/section_helper.rb +0 -1
- data/app/helpers/renalware/tooltip_helper.rb +0 -1
- data/app/helpers/renalware/transplant_helper.rb +4 -2
- data/app/helpers/renalware/users_helper.rb +0 -1
- data/app/inputs/inline_radio_buttons_input.rb +1 -1
- data/app/mailers/previews/user_mailer_preview.rb +0 -2
- data/app/models/concerns/renalware/patients_ransack_helper.rb +0 -1
- data/app/models/renalware.rb +0 -1
- data/app/models/renalware/clinical/body_composition.rb +0 -1
- data/app/models/renalware/clinical/create_allergy.rb +1 -2
- data/app/models/renalware/clinical/delete_allergy.rb +0 -1
- data/app/models/renalware/clinical/modality_description.rb +0 -1
- data/app/models/renalware/clinics/appointment.rb +0 -1
- data/app/models/renalware/clinics/appointment_query.rb +1 -1
- data/app/models/renalware/clinics/build_visit_from_appointment.rb +0 -1
- data/app/models/renalware/clinics/consultant.rb +0 -1
- data/app/models/renalware/clinics/create_clinic_visit.rb +0 -1
- data/app/models/renalware/clinics/visit_query.rb +1 -1
- data/app/models/renalware/events.rb +0 -1
- data/app/models/renalware/feeds/persist_message.rb +0 -1
- data/app/models/renalware/hd/archive_yesterdays_slots_job.rb +0 -1
- data/app/models/renalware/hd/generate_monthly_statistics_for_patient.rb +1 -2
- data/app/models/renalware/hd/master_diary.rb +0 -1
- data/app/models/renalware/hd/mdm_patients_query.rb +0 -1
- data/app/models/renalware/hd/patient_listener.rb +0 -1
- data/app/models/renalware/hd/patients_with_unmet_preferences_query.rb +0 -2
- data/app/models/renalware/hd/revise_hd_profile.rb +0 -1
- data/app/models/renalware/hd/schedule_definition.rb +4 -0
- data/app/models/renalware/hd/sessions/auditable_patient_sessions_in_period_query.rb +0 -1
- data/app/models/renalware/hd/sessions/auditable_patients_in_period_query.rb +0 -1
- data/app/models/renalware/hd/sessions/auditable_session.rb +0 -1
- data/app/models/renalware/hd/sessions/auditable_session_collection.rb +0 -1
- data/app/models/renalware/hd/sessions/latest_patient_sessions_query.rb +0 -2
- data/app/models/renalware/hd/sessions/protocol_sessions_query.rb +0 -1
- data/app/models/renalware/hd/sessions/save_session.rb +1 -2
- data/app/models/renalware/hd/update_rolling_patient_statistics.rb +0 -1
- data/app/models/renalware/letters/contact.rb +0 -1
- data/app/models/renalware/letters/determine_counterpart_ccs.rb +1 -1
- data/app/models/renalware/letters/event/clinic_visit.rb +1 -1
- data/app/models/renalware/letters/event/unknown.rb +0 -1
- data/app/models/renalware/letters/part/recent_pathology_results.rb +0 -1
- data/app/models/renalware/letters/patient_listener.rb +0 -1
- data/app/models/renalware/medications/revise_prescription.rb +12 -2
- data/app/models/renalware/messaging/internal/send_message.rb +0 -1
- data/app/models/renalware/pathology/consultant.rb +0 -1
- data/app/models/renalware/pathology/create_observations.rb +5 -3
- data/app/models/renalware/pathology/message_listener.rb +4 -0
- data/app/models/renalware/pathology/message_param_parser.rb +0 -1
- data/app/models/renalware/pathology/observation.rb +1 -3
- data/app/models/renalware/pathology/relevant_observation_description.rb +0 -1
- data/app/models/renalware/pathology/requests/global_rule/observation_result.rb +3 -3
- data/app/models/renalware/pathology/requests/global_rule/transplant_date_within_weeks.rb +1 -1
- data/app/models/renalware/pathology/requests/global_rule/transplant_registration_status.rb +1 -1
- data/app/models/renalware/pathology/requests/global_rule_set.rb +1 -1
- data/app/models/renalware/pathology/requests/high_risk_rule_set.rb +0 -1
- data/app/models/renalware/pathology/requests/request_params_factory.rb +2 -2
- data/app/models/renalware/pathology/requests/request_query.rb +1 -1
- data/app/models/renalware/patients.rb +3 -1
- data/app/models/renalware/patients/mdm_patients_query.rb +0 -1
- data/app/models/renalware/patients/message_listener.rb +4 -0
- data/app/models/renalware/patients/practice_search_query.rb +1 -1
- data/app/models/renalware/patients/search_query.rb +0 -1
- data/app/models/renalware/pd.rb +0 -1
- data/app/models/renalware/pd/apd/available_overnight_volume.rb +0 -2
- data/app/models/renalware/pd/apd/calculate_volumes.rb +0 -1
- data/app/models/renalware/pd/apd/non_tidal_regime_calculations.rb +0 -1
- data/app/models/renalware/pd/apd/tidal_regime_calculations.rb +0 -1
- data/app/models/renalware/pd/mdm_patients_query.rb +0 -1
- data/app/models/renalware/pd/organism_code.rb +8 -4
- data/app/models/renalware/pd/regime.rb +0 -1
- data/app/models/renalware/pd/regime_bag.rb +0 -1
- data/app/models/renalware/pd/revise_regime.rb +0 -1
- data/app/models/renalware/renal/registry/preflight_checks/deaths_query.rb +11 -4
- data/app/models/renalware/renal/registry/preflight_checks/patients_query.rb +12 -6
- data/app/models/renalware/reporting/fetch_audit_json.rb +0 -1
- data/app/models/renalware/role.rb +1 -1
- data/app/models/renalware/system/render_liquid_template.rb +0 -1
- data/app/models/renalware/system/update_user.rb +0 -1
- data/app/models/renalware/transplants/donation.rb +3 -2
- data/app/models/renalware/transplants/recipient_followup.rb +9 -5
- data/app/models/renalware/transplants/recipient_operation.rb +0 -1
- data/app/models/renalware/user.rb +1 -1
- data/app/policies/renalware/base_policy.rb +0 -1
- data/app/policies/renalware/clinics/appointment_policy.rb +0 -1
- data/app/policies/renalware/events/event_policy.rb +0 -2
- data/app/policies/renalware/pathology/requests/global_rule_set_policy.rb +0 -1
- data/app/policies/renalware/pathology/requests/request_policy.rb +0 -1
- data/app/policies/renalware/renal/aki_alert_policy.rb +0 -1
- data/app/presenters/renalware/address_presenter.rb +2 -2
- data/app/presenters/renalware/hd/dashboard_presenter.rb +0 -1
- data/app/presenters/renalware/hd/mdm_presenter.rb +0 -1
- data/app/presenters/renalware/hd/patient_presenter.rb +3 -1
- data/app/presenters/renalware/hd/profile_document_presenter.rb +1 -2
- data/app/presenters/renalware/hd/session_access_presenter.rb +0 -1
- data/app/presenters/renalware/hd/session_presenter.rb +3 -3
- data/app/presenters/renalware/letters/contacts_presenter.rb +0 -1
- data/app/presenters/renalware/letters/letter_presenter.rb +0 -1
- data/app/presenters/renalware/medications/prescription_presenter.rb +0 -1
- data/app/presenters/renalware/pathology/observations_for_codes_presenter.rb +0 -1
- data/app/presenters/renalware/pd/delivery_interval_presenter.rb +0 -1
- data/app/presenters/renalware/pd/training_duration_presenter.rb +0 -1
- data/app/presenters/renalware/system/users_presenter.rb +0 -1
- data/app/presenters/renalware/transplants/mdm_presenter.rb +0 -1
- data/app/presenters/renalware/transplants/patient_presenter.rb +0 -1
- data/app/presenters/renalware/transplants/wait_list_registration_presenter.rb +1 -1
- data/app/presenters/renalware/ukrdc/pathology_observation_presenter.rb +2 -2
- data/app/validators/renalware/address_validator.rb +1 -1
- data/app/validators/renalware/letters/author_signature_validator.rb +1 -1
- data/app/validators/renalware/patients/blood_pressure_validator.rb +1 -1
- data/app/views/renalware/admissions/consults/_filters.html.slim +2 -2
- data/app/views/renalware/admissions/consults/_form.html.slim +1 -1
- data/app/views/renalware/api/ukrdc/patients/_lab_orders.xml.builder +1 -1
- data/app/views/renalware/api/ukrdc/patients/_medications.xml.builder +6 -5
- data/app/views/renalware/api/ukrdc/patients/_patient.xml.builder +1 -3
- data/app/views/renalware/api/ukrdc/patients/_sending_facility.xml.builder +0 -1
- data/app/views/renalware/api/ukrdc/patients/encounters/_hd_session.xml.builder +19 -15
- data/app/views/renalware/api/ukrdc/patients/lab_orders/_lab_order.xml.builder +26 -25
- data/app/views/renalware/api/ukrdc/patients/lab_orders/_result_item.xml.builder +1 -1
- data/app/views/renalware/api/ukrdc/patients/show.xml.builder +1 -2
- data/app/views/renalware/clinics/visits/_table_row.html.slim +1 -1
- data/app/views/renalware/dashboard/bookmarks/_bookmark.html.slim +1 -0
- data/app/views/renalware/dashboard/bookmarks/_table.html.slim +1 -0
- data/app/views/renalware/deaths/edit.html.slim +4 -4
- data/app/views/renalware/deaths/index.html.slim +2 -2
- data/app/views/renalware/hd/cannulation_types/_form.html.slim +2 -2
- data/app/views/renalware/hd/cannulation_types/edit.html.slim +1 -1
- data/app/views/renalware/hd/cannulation_types/index.html.slim +1 -1
- data/app/views/renalware/hd/cannulation_types/new.html.slim +1 -1
- data/app/views/renalware/hd/ongoing_sessions/_filters.html.slim +1 -1
- data/app/views/renalware/hd/ongoing_sessions/_table.html.slim +9 -9
- data/app/views/renalware/hd/ongoing_sessions/show.html.slim +2 -2
- data/app/views/renalware/hd/sessions/_show.html.slim +1 -1
- data/app/views/renalware/layouts/_patient.html.slim +0 -1
- data/app/views/renalware/letters/letters/edit.html.slim +1 -1
- data/app/views/renalware/medications/drug_types/prescriptions/_table.html.slim +2 -2
- data/app/views/renalware/messaging/internal/receipts/_receipt.html.slim +1 -1
- data/app/views/renalware/messaging/internal/receipts/_sent_receipt.html.slim +1 -1
- data/app/views/renalware/navigation/_renal.html.slim +0 -1
- data/app/views/renalware/pathology/required_observations/index.html.slim +1 -1
- data/app/views/renalware/patients/alerts/_alert.html.slim +1 -1
- data/app/views/renalware/patients/bookmarks/_new.html.slim +1 -0
- data/app/views/renalware/patients/patients/_form.html.slim +2 -2
- data/app/views/renalware/patients/patients/_patient.html.slim +1 -1
- data/app/views/renalware/patients/patients/_table.html.slim +1 -1
- data/app/views/renalware/patients/patients/new.html.slim +0 -1
- data/app/views/renalware/patients/patients/show/_primary_care_physician.html.slim +0 -1
- data/app/views/renalware/patients/primary_care_physician/edit.html.slim +3 -4
- data/app/views/renalware/patients/worries/_new.html.slim +0 -1
- data/app/views/renalware/patients/worryboard/_table.html.slim +1 -1
- data/app/views/renalware/pd/dashboards/show/_page_actions.html.slim +1 -1
- data/app/views/renalware/pd/exit_site_infections/_details.html.slim +0 -8
- data/app/views/renalware/pd/pet_adequacy_results/new.html.slim +0 -1
- data/app/views/renalware/pd/regimes/_current_regime.html.slim +2 -2
- data/app/views/renalware/pd/regimes/edit.html.slim +1 -1
- data/app/views/renalware/pd/regimes/show.html.slim +1 -1
- data/app/views/renalware/pd/training_sessions/_form.html.slim +1 -1
- data/app/views/renalware/renal/registry_preflight_checks/_table.html.slim +5 -1
- data/app/views/renalware/renal/registry_preflight_checks/deaths.html.slim +1 -1
- data/app/views/renalware/renal/registry_preflight_checks/patients.html.slim +1 -1
- data/app/views/renalware/research/studies/_form.html.slim +0 -1
- data/app/views/renalware/research/studies/show.html.slim +0 -1
- data/app/views/renalware/research/study_participants/_form.html.slim +1 -2
- data/app/views/renalware/shared/_last_update.html.slim +1 -0
- data/app/views/renalware/shared/documents/_attributes_group.html.slim +1 -1
- data/app/views/renalware/shared/documents/_dated_result.html.slim +1 -1
- data/app/views/renalware/snippets/snippets/_row.html.slim +1 -1
- data/app/views/renalware/transplants/donations/edit.html.slim +1 -1
- data/app/views/renalware/transplants/donor_followups/edit.html.slim +0 -1
- data/app/views/renalware/transplants/donor_followups/show.html.slim +0 -1
- data/app/views/renalware/transplants/live_donors/_index.html.slim +0 -1
- data/app/views/renalware/transplants/recipient_operations/_sections_nav.html.slim +1 -1
- data/app/views/renalware/transplants/recipient_workups/_sections_nav.html.slim +1 -1
- data/config/initializers/delayed_job.rb +1 -0
- data/config/initializers/ransack.rb +0 -1
- data/config/initializers/simple_form.rb +4 -2
- data/config/initializers/simple_form_foundation.rb +8 -4
- data/config/locales/renalware/dashboard/dashboard.yml +1 -0
- data/config/locales/renalware/renal/profile.en.yml +4 -1
- data/config/routes.rb +0 -1
- data/db/migrate/20141004150240_create_ethnicities.rb +1 -1
- data/db/migrate/20171113120217_add_uuid_to_hd_sessions.rb +6 -0
- data/db/migrate/20171116103230_move_objects_to_renalware_schema.rb +63 -0
- data/db/migrate/20171118160030_add_tags_to_patient_bookmarks.rb +5 -0
- data/lib/collection_presenter.rb +1 -3
- data/lib/document/attribute_initializer.rb +0 -1
- data/lib/document/base.rb +1 -1
- data/lib/renalware/configuration.rb +1 -1
- data/lib/renalware/engine.rb +21 -1
- data/lib/renalware/version.rb +1 -1
- data/lib/smart_delegator.rb +0 -1
- data/lib/test_support/autocomplete_helpers.rb +3 -3
- data/spec/factories/clinical/body_compositions.rb +1 -1
- data/spec/factories/clinical/dry_weights.rb +1 -1
- data/spec/factories/clinics/appointments.rb +1 -1
- data/spec/factories/clinics/clinic_visits.rb +2 -2
- data/spec/factories/events/events.rb +1 -2
- data/spec/factories/hd/sessions.rb +1 -1
- data/spec/factories/letters/letters.rb +1 -1
- data/spec/factories/medications/prescription.rb +1 -1
- data/spec/factories/messaging/internal/messages.rb +1 -1
- data/spec/factories/modalities/modalities.rb +1 -1
- data/spec/factories/pathology/lab.rb +1 -1
- data/spec/factories/pathology/requests/global_rule_set.rb +1 -1
- data/spec/factories/pathology/requests/patient_rule.rb +1 -1
- data/spec/factories/pathology/requests/request.rb +3 -3
- data/spec/factories/patients/alerts.rb +1 -1
- data/spec/factories/patients/bookmarks.rb +1 -1
- data/spec/factories/pd/infection_organisms.rb +0 -1
- data/spec/factories/pd/pd_regimes.rb +0 -1
- data/spec/factories/pd/peritonitis_episode_type_descriptions.rb +1 -1
- data/spec/factories/pd/pet_adequacies.rb +0 -2
- data/spec/factories/pd/systems.rb +2 -2
- data/spec/factories/research/studies.rb +1 -1
- data/spec/factories/research/study_participants.rb +1 -1
- data/spec/factories/system/users.rb +3 -3
- data/spec/factories/transplants/recipient_operations.rb +3 -3
- data/spec/factories/transplants/registration_statuses.rb +1 -1
- data/spec/support/capybara.rb +23 -0
- data/spec/support/database_cleaner.rb +0 -2
- data/spec/support/factory_bot.rb +45 -0
- data/spec/support/select_date_spec_helper.rb +0 -1
- data/spec/support/travel.rb +0 -2
- metadata +35 -324
@@ -3,29 +3,30 @@
|
|
3
3
|
xml = builder
|
4
4
|
|
5
5
|
xml.LabOrder do
|
6
|
-
xml.ReceivingLocation do
|
7
|
-
|
8
|
-
|
9
|
-
end
|
6
|
+
# xml.ReceivingLocation do
|
7
|
+
# xml.Code ""
|
8
|
+
# xml.Description # request.pathology_lab.name
|
9
|
+
# end
|
10
10
|
xml.PlacerId request.requestor_order_number
|
11
11
|
# xml.FillerId "??ORC:3 Labs Order Id"
|
12
|
-
xml.OrderedBy do
|
13
|
-
|
14
|
-
|
15
|
-
end
|
16
|
-
xml.OrderItem do
|
17
|
-
|
18
|
-
|
12
|
+
# xml.OrderedBy do
|
13
|
+
# xml.Code "unknown"
|
14
|
+
# xml.Description request.requestor_name
|
15
|
+
# end
|
16
|
+
# xml.OrderItem do
|
17
|
+
# xml.comment! "Code TODO: LOIN code for request E.g. MB from 'OBR|1|^PCS|09B0099478^LA|FBC^FULL BLOOD COUNT^MB|..'"
|
18
|
+
# xml.Code
|
19
|
+
# end
|
19
20
|
xml.OrderCategory do
|
20
21
|
xml.Code request.description.code
|
21
22
|
end
|
22
|
-
xml.SpecimenCollectedTime "TODO"
|
23
|
-
xml.SpecimenReceivedTime "TODO"
|
24
|
-
xml.Priority do
|
25
|
-
|
26
|
-
end
|
23
|
+
# xml.SpecimenCollectedTime "TODO"
|
24
|
+
# xml.SpecimenReceivedTime "TODO"
|
25
|
+
# xml.Priority do
|
26
|
+
# xml.Code "TODO: Probably n/a"
|
27
|
+
# end
|
27
28
|
xml.SpecimenSource request.description.bottle_type
|
28
|
-
xml.Duration "OBR:27.3 but no available in the example messages I have"
|
29
|
+
# xml.Duration "OBR:27.3 but no available in the example messages I have"
|
29
30
|
|
30
31
|
xml.ResultItems do
|
31
32
|
render partial: "renalware/api/ukrdc/patients/lab_orders/result_item",
|
@@ -34,13 +35,13 @@ xml.LabOrder do
|
|
34
35
|
locals: { builder: builder, patient: patient }
|
35
36
|
end
|
36
37
|
|
37
|
-
xml.PatientClass do
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
end
|
38
|
+
# xml.PatientClass do
|
39
|
+
# xml.CodingStandard "HL7_0004"
|
40
|
+
# xml.Code "e.g. I for Inpatient"
|
41
|
+
# xml.Description "e.g. Inpatient"
|
42
|
+
# end
|
42
43
|
xml.EnteredOn request.requested_at.iso8601
|
43
|
-
xml.EnteredAt do
|
44
|
-
|
45
|
-
end
|
44
|
+
# xml.EnteredAt do
|
45
|
+
# xml.code "location code here"
|
46
|
+
# end
|
46
47
|
end
|
@@ -5,7 +5,7 @@ observation = Renalware::UKRDC::PathologyObservationPresenter.new(observation)
|
|
5
5
|
xml.ResultItem do
|
6
6
|
xml.EnteredOn observation.updated_at&.iso8601
|
7
7
|
xml.ObservationTime observation.observed_at&.iso8601
|
8
|
-
xml.PrePost observation.pre_post(patient.current_modality_hd?)
|
8
|
+
xml.PrePost observation.pre_post(patient_is_on_hd: patient.current_modality_hd?)
|
9
9
|
xml.ResultValue observation.result
|
10
10
|
xml.ResultValueUnits observation.measurement_unit_name
|
11
11
|
xml.ServiceId do
|
@@ -1,7 +1,6 @@
|
|
1
1
|
# See
|
2
2
|
# https://www.ukrdc.org/2015/09/15/ukrdc-schema/
|
3
3
|
# https://github.com/renalreg/ukrdc
|
4
|
-
#
|
5
4
|
xml.instruct! :xml, version: "1.0", encoding: "UTF-8"
|
6
5
|
|
7
6
|
namespace_and_schema = {
|
@@ -9,7 +8,7 @@ namespace_and_schema = {
|
|
9
8
|
"xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
|
10
9
|
"xsi:schemaLocation" => [
|
11
10
|
"http://www.rixg.org.uk/",
|
12
|
-
|
11
|
+
"https://github.com/renalreg/ukrdc/blob/master/Schema/UKRDC.xsd"
|
13
12
|
].join(" ")
|
14
13
|
}
|
15
14
|
|
@@ -5,7 +5,7 @@ tr(class="#{'dna' if clinic_visit.did_not_attend?}")
|
|
5
5
|
= link_to_clinic_visit_letter(clinic_visit.patient, clinic_visit)
|
6
6
|
td.date-time= l clinic_visit.date
|
7
7
|
td= yes_no(clinic_visit.did_not_attend)
|
8
|
-
td=
|
8
|
+
td= default_patient_link(clinic_visit.patient)
|
9
9
|
td= clinic_visit.patient.nhs_number
|
10
10
|
td= clinic_visit.patient.sex
|
11
11
|
td= clinic_visit.patient.age
|
@@ -1,8 +1,8 @@
|
|
1
1
|
= within_patient_layout(title: "Cause of Death",
|
2
|
-
breadcrumbs: breadcrumb_for("Clinical Profile", patient_clinical_profile_path(
|
2
|
+
breadcrumbs: breadcrumb_for("Clinical Profile", patient_clinical_profile_path(patient))) do
|
3
3
|
|
4
|
-
= simple_form_for
|
5
|
-
url: patient_death_path(
|
4
|
+
= simple_form_for patient,
|
5
|
+
url: patient_death_path(patient),
|
6
6
|
html: { autocomplete: "off" },
|
7
7
|
wrapper: "horizontal_form" do |f|
|
8
8
|
|
@@ -32,4 +32,4 @@
|
|
32
32
|
|
33
33
|
= f.button :submit
|
34
34
|
span= " or "
|
35
|
-
= link_to "cancel", patient_clinical_profile_path(
|
35
|
+
= link_to "cancel", patient_clinical_profile_path(patient)
|
@@ -14,7 +14,7 @@
|
|
14
14
|
th.col-width-medium
|
15
15
|
|
16
16
|
tbody
|
17
|
-
-
|
17
|
+
- patients.each do |patient|
|
18
18
|
tr
|
19
19
|
td= default_patient_link(patient)
|
20
20
|
td= patient.nhs_number
|
@@ -28,4 +28,4 @@
|
|
28
28
|
edit_patient_death_path(patient),
|
29
29
|
title: "Edit death details"
|
30
30
|
|
31
|
-
= paginate
|
31
|
+
= paginate patients
|
@@ -1,10 +1,10 @@
|
|
1
1
|
.row
|
2
2
|
= render "header"
|
3
|
-
= render "renalware/shared/errors", model:
|
3
|
+
= render "renalware/shared/errors", model: cannulation_type
|
4
4
|
|
5
5
|
.row
|
6
6
|
.large-6.columns
|
7
|
-
= simple_form_for
|
7
|
+
= simple_form_for cannulation_type, html: { autocomplete: "off" } do |f|
|
8
8
|
= f.input :name, autofocus: true
|
9
9
|
|
10
10
|
= f.button :submit
|
@@ -1 +1 @@
|
|
1
|
-
= render "form"
|
1
|
+
= render "form", cannulation_type: cannulation_type
|
@@ -1 +1 @@
|
|
1
|
-
= render "form"
|
1
|
+
= render "form", cannulation_type: cannulation_type
|
@@ -2,17 +2,17 @@ table.report
|
|
2
2
|
thead
|
3
3
|
tr
|
4
4
|
th.noprint.col-width-11
|
5
|
-
th.col-width-medium= sort_link([:renalware,
|
5
|
+
th.col-width-medium= sort_link([:renalware, query], :patient_family_name, "Patient")
|
6
6
|
th.col-width-tiny Hosp No
|
7
|
-
th= sort_link([:renalware,
|
8
|
-
th= sort_link([:renalware,
|
7
|
+
th= sort_link([:renalware, query], :patient_born_on, "Age")
|
8
|
+
th= sort_link([:renalware, query], :patient_sex, "Sex")
|
9
9
|
th Current Modality
|
10
|
-
th= sort_link([:renalware,
|
11
|
-
th.col-width-date= sort_link([:renalware,
|
12
|
-
th.col-width-time= sort_link([:renalware,
|
13
|
-
th.col-width-time= sort_link([:renalware,
|
14
|
-
td= sort_link([:renalware,
|
15
|
-
td= sort_link([:renalware,
|
10
|
+
th= sort_link([:renalware, query], :hospital_unit_name, "Unit")
|
11
|
+
th.col-width-date= sort_link([:renalware, query], :performed_on, "Date")
|
12
|
+
th.col-width-time= sort_link([:renalware, query], :start_time, "Start Time")
|
13
|
+
th.col-width-time= sort_link([:renalware, query], :end_time, "End Time")
|
14
|
+
td= sort_link([:renalware, query], :signed_on_by_family_name, "Signed On By")
|
15
|
+
td= sort_link([:renalware, query], :signed_off_by_family_name, "Signed Off By")
|
16
16
|
|
17
17
|
tbody
|
18
18
|
- sessions.each do |session|
|
@@ -1,3 +1,3 @@
|
|
1
1
|
= within_admin_layout(title: "Ongoing HD Sessions") do
|
2
|
-
= render "filters"
|
3
|
-
= render "table",
|
2
|
+
= render "filters", query: query
|
3
|
+
= render "table", query: query, sessions: sessions
|
@@ -38,7 +38,7 @@
|
|
38
38
|
= render "renalware/shared/attributes_group",
|
39
39
|
legend: "Notes/Complications", destination: "complications",
|
40
40
|
models: { session.document.complications => attributes_list,
|
41
|
-
session => [:notes]
|
41
|
+
session => [:notes] }
|
42
42
|
.row
|
43
43
|
.columns.large-12
|
44
44
|
= render "prescription_administrations", session: session
|
@@ -2,7 +2,7 @@
|
|
2
2
|
= link_to "Preview", patient_letters_letter_path(patient, letter), class: "button secondary"
|
3
3
|
|
4
4
|
= within_patient_layout(title: "Edit Letter",
|
5
|
-
breadcrumbs: [
|
5
|
+
breadcrumbs: [breadcrumb_for("Letters", patient_letters_letters_path(patient))]) do
|
6
6
|
|
7
7
|
.document
|
8
8
|
= simple_form_for letter,
|
@@ -17,8 +17,8 @@ table#drug-type-prescriptions
|
|
17
17
|
tbody
|
18
18
|
- prescriptions.each do |prescription|
|
19
19
|
tr
|
20
|
-
td=
|
21
|
-
td= prescription.
|
20
|
+
td= prescription.patient_local_patient_id
|
21
|
+
td= default_patient_link(prescription.patient)
|
22
22
|
td= prescription.patient_age
|
23
23
|
td= prescription.patient_sex
|
24
24
|
td= prescription.patient_current_modality_name
|
@@ -18,7 +18,7 @@ tr(class="#{ "urgent" if message.urgent?}" id=message.html_identifier)
|
|
18
18
|
= content_tag(:tr,
|
19
19
|
id: "#{message.html_preview_identifier}",
|
20
20
|
style: "display: none",
|
21
|
-
class: "#{
|
21
|
+
class: "#{ 'urgent' if message.urgent?}")
|
22
22
|
td(colspan=6)
|
23
23
|
.message-preview
|
24
24
|
.subject= message.subject
|
@@ -16,7 +16,7 @@ tr(class="#{ "urgent" if message.urgent?}" id=message.html_identifier)
|
|
16
16
|
= content_tag(:tr,
|
17
17
|
id: "#{message.html_preview_identifier}",
|
18
18
|
style: "display: none",
|
19
|
-
class: "#{
|
19
|
+
class: "#{ 'urgent' if message.urgent?}")
|
20
20
|
td(colspan=6)
|
21
21
|
.message-preview
|
22
22
|
.subject= message.subject
|
@@ -7,7 +7,7 @@
|
|
7
7
|
label for="clinic_id" Clinic
|
8
8
|
= form_tag(patient_pathology_required_observations_path(patient_id: @patient), method: :get) do
|
9
9
|
= select_tag "request[clinic_id]",
|
10
|
-
options_from_collection_for_select(all_clinics,
|
10
|
+
options_from_collection_for_select(all_clinics, "id", "name", request_html_form_params.clinic_id),
|
11
11
|
onchange: raw("this.form.submit();")
|
12
12
|
.row
|
13
13
|
.large-12.columns
|
@@ -10,6 +10,7 @@
|
|
10
10
|
url: patient_bookmarks_path(patient_id: patient) do |f|
|
11
11
|
h2= t(".title")
|
12
12
|
=f.input :urgent, as: :boolean, boolean_style: :inline
|
13
|
+
=f.input :tags, label: "Tags"
|
13
14
|
=f.input :notes, as: :text, input_html: { autofocus: :autofocus }
|
14
15
|
=f.submit t(".save"), class: :button
|
15
16
|
span= " or "
|
@@ -72,10 +72,10 @@
|
|
72
72
|
= field_set_tag do
|
73
73
|
legend UKRDC Preferences
|
74
74
|
|
75
|
-
= f.input :send_to_renalreg,
|
75
|
+
= f.input :send_to_renalreg, as: :inline_radio_buttons, wrapper: :horizontal_small
|
76
76
|
= f.input :renalreg_decision_on, as: :date_picker, wrapper: :horizontal_datepicker
|
77
77
|
= f.input :renalreg_recorded_by, wrapper: :horizontal_medium
|
78
|
-
= f.input :send_to_rpv,
|
78
|
+
= f.input :send_to_rpv, as: :inline_radio_buttons, wrapper: :horizontal_small
|
79
79
|
= f.input :rpv_decision_on, as: :date_picker, wrapper: :horizontal_datepicker
|
80
80
|
= f.input :rpv_recorded_by, wrapper: :horizontal_medium
|
81
81
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
tr
|
2
2
|
td.full-name= default_patient_link(patient)
|
3
3
|
td= patient.nhs_number
|
4
|
-
- Renalware.config.patient_hospital_identifiers.
|
4
|
+
- Renalware.config.patient_hospital_identifiers.each_value do |value|
|
5
5
|
td= patient.public_send(value)
|
6
6
|
td= patient.sex.code
|
7
7
|
td= patient.born_on
|
@@ -3,7 +3,7 @@ table#patients
|
|
3
3
|
tr
|
4
4
|
th.col-width-medium= attr_name(Renalware::Patient, :name)
|
5
5
|
th.col-width-nhs-no NHS Number
|
6
|
-
- Renalware.config.patient_hospital_identifiers.
|
6
|
+
- Renalware.config.patient_hospital_identifiers.each_key do |key|
|
7
7
|
th.col-width-reference-without-prefix="#{key} No"
|
8
8
|
th.col-width-tiny= attr_name(Renalware::Patient, :sex)
|
9
9
|
th.col-width-date= attr_name(Renalware::Patient, :born_on)
|
@@ -1,13 +1,12 @@
|
|
1
|
-
|
2
1
|
.finda-a-gp
|
3
2
|
|
4
3
|
h4 Search for a GP
|
5
4
|
|
6
5
|
label(for="practice-search") First find the practice
|
7
6
|
select#practice-search(
|
8
|
-
data={"ajax--url" => search_patients_practices_path,
|
9
|
-
|
10
|
-
|
7
|
+
data={ "ajax--url" => search_patients_practices_path,
|
8
|
+
"form-refresh-url" => edit_patient_primary_care_physician_path(patient),
|
9
|
+
"hint" => "Enter first few letters of practice name or its postcode" }
|
11
10
|
autofocus= "true"
|
12
11
|
)
|
13
12
|
|
@@ -4,7 +4,7 @@ table#patients
|
|
4
4
|
th.at-least.col-width-large
|
5
5
|
= sort_link(query,
|
6
6
|
:patient_family_name,
|
7
|
-
[:patient_family_name,
|
7
|
+
[:patient_family_name, "patient_given_name asc"],
|
8
8
|
"Name")
|
9
9
|
th.col-width-nhs-no NHS No.
|
10
10
|
th.col-width-reference-no Hosp No.
|
@@ -34,7 +34,7 @@ ul.f-dropdown#pd-options(data-dropdown-content aria-hidden="true")
|
|
34
34
|
title: t(".add_exit_site_infection"),
|
35
35
|
url: new_patient_pd_exit_site_infection_path(patient)
|
36
36
|
|
37
|
-
= dropdown_btn_item enabled: patient_on_pd
|
37
|
+
= dropdown_btn_item enabled: patient_on_pd && policy(Renalware::PD::PETAdequacyResult).new?,
|
38
38
|
title: t(".add_pet_adequacy"),
|
39
39
|
url: new_patient_pd_pet_adequacy_result_path(patient)
|
40
40
|
|
@@ -14,13 +14,13 @@
|
|
14
14
|
dd= default_for_blank_date(regime.end_date, "Pending")
|
15
15
|
dt Treatment:
|
16
16
|
dd= regime.treatment
|
17
|
-
= render("renalware/pd/regimes/assistance_type", regime: regime)
|
17
|
+
= render("renalware/pd/regimes/assistance_type", regime: regime) if regime.apd?
|
18
18
|
dt Delivery frequency:
|
19
19
|
dd= Renalware::PD::DeliveryIntervalPresenter.new(regime.delivery_interval).to_s
|
20
20
|
dt On additional HD?:
|
21
21
|
dd= yes_no(regime.add_hd)
|
22
22
|
|
23
|
-
= render"renalware/pd/regimes/glucose", regime: regime
|
23
|
+
= render "renalware/pd/regimes/glucose", regime: regime
|
24
24
|
|
25
25
|
- if regime.type == "Renalware::PD::APDRegime"
|
26
26
|
= render "renalware/pd/regimes/current_apd_regime", regime: regime
|