Merge branch 'ignore_doctor' of https://github.com/grahamegrieve/Clin…

…icArrivals into ignore_doctor
grahamegrieve · Apr 2, 2020 · 2556a01 · 2556a01
2 parents 220364c + b4f4f0e
commit 2556a01
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/ClinicArrivals.Models/DoctorRoomLabelMapping.cs b/ClinicArrivals.Models/DoctorRoomLabelMapping.cs
@@ -7,7 +7,8 @@
 
 namespace ClinicArrivals.Models
 {
-    // actually this does more than room label mappings, but the name is kept the same so as not to lost settings
+    // actually this does more than room label mappings, but the name is kept the same so as not to lose settings
+
     [AddINotifyPropertyChangedInterface]
     public class DoctorRoomLabelMapping
     {

diff --git a/Test.Models/MessageEngineTester.cs b/Test.Models/MessageEngineTester.cs
@@ -145,7 +145,8 @@ public void testScreeningMsgNoVideo()
             // inspect outputs:
             Assert.AreEqual(1, OutputMsgs.Count);
             Assert.AreEqual("+61411012345", OutputMsgs[0].phone);
-            Assert.AreEqual("Patient Test Patient #2 has an appointment with Dr Adam Ant at 01:00 PM on 1-Jan. When you arrive at the clinic, stay in your car (or outside the clinic) and reply \"arrived\" to this message. If you have any potential symptoms of Covid-19, or exposure to a known case, you MUST advise the Doctor and staff by telephone i advance of your appointment", OutputMsgs[0].message);
+            Assert.AreEqual("Patient Test Patient #2 has an appointment with Dr Adam Ant at 01:00 PM on 1-Jan. When you arrive at the clinic, stay in your car (or outside the clinic) and reply \"arrived\" to this message. If you have any potential symptoms of Covid-19, or exposure to a known case, you MUST advise the Doctor and staff by telephone in advance of your appointment", OutputMsgs[0].message);
+
             Assert.AreEqual(1, StorageOps.Count);
             Assert.AreEqual("1002", StorageOps[0].Appointment.AppointmentFhirID);
             Assert.IsTrue(StorageOps[0].Appointment.ExternalData.ScreeningMessageSent);
@@ -634,7 +635,8 @@ private void loadTestTemplates(TemplateProcessor tp)
             tp.Templates = new System.Collections.ObjectModel.ObservableCollection<MessageTemplate>();
             tp.Templates.Add(new MessageTemplate(MessageTemplate.MSG_REGISTRATION, "Patient {{Patient.name}} has an appointment with {{Practitioner.name}} at {{Appointment.start.time}} on {{Appointment.start.date}}. 3 hours prior to the appointment, you will be sent a COVID-19 screening check to decide whether you should do a video consultation rather than seeing the doctor in person"));
             tp.Templates.Add(new MessageTemplate(MessageTemplate.MSG_SCREENING, "Please consult the web page http://www.rcpa.org.au/xxx to determine whether you are eligible to meet with the doctor by phone/video. If you are, respond to this message with YES otherwise respond with NO"));
-            tp.Templates.Add(new MessageTemplate(MessageTemplate.MSG_SCREENING_NOVIDEO, "Patient {{Patient.name}} has an appointment with {{Practitioner.name}} at {{Appointment.start.time}} on {{Appointment.start.date}}. When you arrive at the clinic, stay in your car (or outside the clinic) and reply \"arrived\" to this message. If you have any potential symptoms of Covid-19, or exposure to a known case, you MUST advise the Doctor and staff by telephone i advance of your appointment"));
+            tp.Templates.Add(new MessageTemplate(MessageTemplate.MSG_SCREENING_NOVIDEO, "Patient {{Patient.name}} has an appointment with {{Practitioner.name}} at {{Appointment.start.time}} on {{Appointment.start.date}}. When you arrive at the clinic, stay in your car (or outside the clinic) and reply \"arrived\" to this message. If you have any potential symptoms of Covid-19, or exposure to a known case, you MUST advise the Doctor and staff by telephone in advance of your appointment"));
+
             tp.Templates.Add(new MessageTemplate(MessageTemplate.MSG_SCREENING_YES, "Thank you. Do not come to the doctor's clinic. You will get an SMS message containing the URL for your video meeting a few minutes before your appointment. You can join from any computer or smartphone"));
             tp.Templates.Add(new MessageTemplate(MessageTemplate.MSG_SCREENING_NO, "Thank you. When you arrive at the clinic, stay in your car (or outside) and reply \"arrived\" to this message"));
             tp.Templates.Add(new MessageTemplate(MessageTemplate.MSG_VIDEO_INVITE, "Please start your video call at {{url}}. When you have started it, reply to this message with the word \"joined\""));

diff --git a/documentation/UserGuide.md b/documentation/UserGuide.md
@@ -55,7 +55,8 @@ However the PMS systems do not track which room the doctor is in. So this inform
 
 In addition, on a per doctor basis, you can specify that:
 
-* a doctor does not participate in messaging at all - this is typically used for special slots like nurse prep visits that are in person, and paired with other appointments so there's no poing messaging about them
+* a doctor does not participate in messaging at all - this is typically used for special slots like nurse prep visits that are in person, and paired with other appointments so there's no point messaging about them
+
 * A doctor does not participate in video at all - all appointments are physical  - this is typically used for special slots like nurse visits that must be in person. If a doctor is not using video, then a different welcoming message is sent out (CantConsiderTeleHealth)
 
 ## Performing Initial Configuration