Merge branch 'release/2.0.0-alpha04'

BeckmanComms.Api.DataTransferObjects/BeckmanComms.Api.DataTransferObjects.csproj

@@ -13,6 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="System.ComponentModel" Version="4.3.0" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
   </ItemGroup>
 

BeckmanComms.Api.DataTransferObjects/BeckmanComms.Api.DataTransferObjects.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>BeckmanComms.Api.DataTransferObjects</id>
-    <version>2.0.0-alpha03</version>
+    <version>2.0.0-alpha04</version>
     <title>Beckman API Data Transfer Objects</title>
     <authors>areynold</authors>
     <owners>Beckman Institute; University of Illinois</owners>
@@ -11,6 +11,10 @@
     <description>Model classes for use with the Beckman Institute web API.</description>
     <summary>Model classes for use with the Beckman Institute web API.</summary>
     <releaseNotes>
+      2.0.0-alpha04:
+      * Add DTOs for Event and Calendar API v2.
+      * Update copyright.
+
       2.0.0-alpha03:
       * Use decimal instead of double for DishDto prices.
 
@@ -41,18 +45,21 @@
       0.0.1:
       * Package initial v1, v2 data transfer objects.
     </releaseNotes>
-    <copyright>Copyright 2017, University of Illinois Board of Trustees</copyright>
+    <copyright>Copyright 2018, University of Illinois Board of Trustees</copyright>
     <language>en-US</language>
     <tags>mvc, dto, api, beckman, uiuc, illinois</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.6">
         <dependency id="System.Xml.XmlSerializer" version="4.3.0" />
+        <dependency id="System.ComponentModel" version="4.3.0" />
       </group>
       <group targetFramework=".NETFramework4.5">
         <dependency id="System.Xml.XmlSerializer" version="4.3.0" />
+        <dependency id="System.ComponentModel" version="4.3.0" />
       </group>
       <group targetFramework=".NETStandard1.4">
         <dependency id="System.Xml.XmlSerializer" version="4.3.0" />
+        <dependency id="System.ComponentModel" version="4.3.0" />
       </group>
     </dependencies>
   </metadata>

BeckmanComms.Api.DataTransferObjects/V2/Events/BeckmanCalendars.cs

+using System.ComponentModel;
+
+namespace BeckmanComms.Api.DataTransferObjects.V2.Events
+{
+    /// <summary>
+    /// Names and calendar IDs of Beckman Institute event calendars.
+    /// </summary>
+    public enum BeckmanCalendars
+    {
+        /// <summary>
+        /// Main Beckman Institute calendar.
+        /// </summary>
+        [Description("The main Beckman Institute event calendar.")]
+        BeckmanInstitute = 4595,
+
+        /// <summary>
+        /// CNL calendar.
+        /// </summary>
+        [Description("Calendar for the Cognitive Neuroimaging Laboratory (CNL) at the Beckman Institute.")]
+        CnlEvents = 4521,
+
+        /// <summary>
+        /// ILLI calendar.
+        /// </summary>
+        [Description("Calendar for the Illinois Language and Literacy Initiative (ILLI) at the Beckman Institute.")]
+        IlliEvents = 5511,
+
+        /// <summary>
+        /// LBC calendar.
+        /// </summary>
+        [Description("Calendar for the Lifelong Brain and Cognition Laboratory (LBC) at the Beckman Institute.")]
+        LbcLab = 4669,
+
+        /// <summary>
+        /// MSL calendar.
+        /// </summary>
+        [Description("Calendar for the Memory Systems Lab (MSL) at the Beckman Institute.")]
+        MslEvents = 4470
+    }
+}
\ No newline at end of file

BeckmanComms.Api.DataTransferObjects/V2/Events/CalendarDto.cs

+namespace BeckmanComms.Api.DataTransferObjects.V2.Events
+{
+    /// <summary>
+    /// Information describing a webtools calendar.
+    /// </summary>
+    public class CalendarDto
+    {
+        /// <summary>
+        /// Calendar Name.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Webtools calendar ID.
+        /// </summary>
+        public int CalendarId { get; set; }
+
+        /// <summary>
+        /// Human-readable description of calendar's purpose.
+        /// </summary>
+        public string Description { get; set; }
+    }
+}
\ No newline at end of file

BeckmanComms.Api.DataTransferObjects/V2/Events/EventDto.cs

+using System;
+
+namespace BeckmanComms.Api.DataTransferObjects.V2.Events
+{
+    /// <summary>
+    /// Data Transfer Object representing a Beckman Institute event.
+    /// </summary>
+    public class EventDto
+    {
+        /// <summary>
+        /// Event's unique identifier.
+        /// </summary>
+        public int EventId { get; set; }
+
+        /// <summary>
+        /// ID for calendar containing event.
+        /// </summary>
+        public string CalendarId { get; set; }
+
+        /// <summary>
+        /// Event title.
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// Event description.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Starting date and time of event.
+        /// </summary>
+        public DateTime StartDate { get; set; }
+
+        /// <summary>
+        /// Ending date and time of event.
+        /// </summary>
+        public DateTime EndDate { get; set; }
+
+        /// <summary>
+        /// Event location.
+        /// </summary>
+        public string Location { get; set; }
+
+        /// <summary>
+        /// Name of event's primary contact.
+        /// </summary>
+        public string ContactName { get; set; }
+
+        /// <summary>
+        /// Event contact's email address.
+        /// </summary>
+        public string ContactEmail { get; set; }
+
+        /// <summary>
+        /// Event contact's phone number.
+        /// </summary>
+        public string ContactPhone { get; set; }
+
+        /// <summary>
+        /// Event sponsor.
+        /// </summary>
+        public string Sponsor { get; set; }
+
+        /// <summary>
+        /// Type of event.
+        /// </summary>
+        public string EventType { get; set; }
+
+        /// <summary>
+        /// Whether event is recurring.
+        /// </summary>
+        public bool Recurring { get; set; }
+    }
+}
\ No newline at end of file