Merge remote-tracking branch 'origin/feature/4799' into develop

SnapMD · Dec 16, 2015 · 7c39cf7 · 7c39cf7
2 parents 2b0e551 + ba4327c
commit 7c39cf7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/SnapMD.ConnectedCare.ApiModels/Scheduling/AvailabilityBlockClinician.cs b/SnapMD.ConnectedCare.ApiModels/Scheduling/AvailabilityBlockClinician.cs
@@ -0,0 +1,10 @@
+namespace SnapMD.ConnectedCare.ApiModels.Scheduling
+{
+    public class AvailabilityBlockClinician
+    {
+        public int AvailabilityBlockId { get; set; }
+        public int ClinicianId { get; set; }
+        public bool Locked { get; set; }
+        public bool Private { get; set; }
+    }
+}
diff --git a/SnapMD.ConnectedCare.ApiModels/Scheduling/AvailabilityBlockRequest.cs b/SnapMD.ConnectedCare.ApiModels/Scheduling/AvailabilityBlockRequest.cs
@@ -15,6 +15,8 @@ public class AvailabilityBlockRequest
 
         public int? AvailabilityBlockRuleId { get; set; }
 
+        public short OptimizationTypeCodeId { get; set; }
+
         public DateTime? EndTime { get; set; }
 
         public bool IsAllDay { get; set; }

diff --git a/SnapMD.ConnectedCare.ApiModels/Scheduling/AvailabilityBlockResponse.cs b/SnapMD.ConnectedCare.ApiModels/Scheduling/AvailabilityBlockResponse.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace SnapMD.ConnectedCare.ApiModels.Scheduling
 {
@@ -15,5 +16,7 @@ public class AvailabilityBlockResponse : AvailabilityBlockRequest
         public DateTime? ModifiedDate { get; set; }
 
         public AvailabilityBlockRuleResponse Rule { get; set; }
+
+        public IEnumerable<AvailabilityBlockClinician> AvailabilityBlockClinicians { get; set; } 
     }
 }
diff --git a/SnapMD.ConnectedCare.ApiModels/SnapMD.ConnectedCare.ApiModels.csproj b/SnapMD.ConnectedCare.ApiModels/SnapMD.ConnectedCare.ApiModels.csproj
@@ -93,6 +93,7 @@
     <Compile Include="ScheduleConsultationDetailByUsername.cs" />
     <Compile Include="ScheduledConsultation.cs" />
     <Compile Include="ScheduledConsultationResult.cs" />
+    <Compile Include="Scheduling\AvailabilityBlockClinician.cs" />
     <Compile Include="Scheduling\AvailabilityBlockRequest.cs" />
     <Compile Include="Scheduling\AvailabilityBlockResponse.cs" />
     <Compile Include="Scheduling\AvailabilityBlockRuleRequest.cs" />