From 80c8ae97e2a22e486c44ed6ea8962d923b9d5e42 Mon Sep 17 00:00:00 2001
From: Steve Barker <sbarker@illinois.edu>
Date: Mon, 2 Aug 2021 09:09:37 -0500
Subject: [PATCH] Updated dish dto with Id. Added new holidays calendar to the
beckman calendar.
---
.../BeckmanComms.Api.DataTransferObjects.csproj | 14 +++++++++-----
.../V2/Cafe/DishDto.cs | 4 ++++
.../V2/Events/BeckmanCalendars.cs | 6 ++++++
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/BeckmanComms.Api.DataTransferObjects/BeckmanComms.Api.DataTransferObjects.csproj b/BeckmanComms.Api.DataTransferObjects/BeckmanComms.Api.DataTransferObjects.csproj
index f1d837f..382dd2d 100644
--- a/BeckmanComms.Api.DataTransferObjects/BeckmanComms.Api.DataTransferObjects.csproj
+++ b/BeckmanComms.Api.DataTransferObjects/BeckmanComms.Api.DataTransferObjects.csproj
@@ -2,8 +2,8 @@
<PropertyGroup>
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
- <Version>2.3.0</Version>
- <Authors>areynold</Authors>
+ <Version>2.5.0</Version>
+ <Authors>areynold, sbarker</Authors>
<Company>Beckman Institute for Advanced Science & Technology; University of Illinois at Urbana-Champaign</Company>
<Copyright>Copyright 2018, University of Illinois Board of Trustees</Copyright>
<Description>Model classes for use with the Beckman Institute Communications web API.</Description>
@@ -11,7 +11,11 @@
<RepositoryUrl>https://gitlab.engr.illinois.edu/beckmancomms/beckmancomms-api-datatransferobjects.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>mvc, dto, api, beckman, uiuc, illinois</PackageTags>
- <PackageReleaseNotes>2.3:
+ <PackageReleaseNotes>2.5
+ * Added holiday calendard to the Beckman Calendars list.
+2.4
+ * Added Id to the cafe menu item objects.
+2.3:
* Added primary group to person entry.
2.2:
* Added group parent abbreviation to group types objects.
@@ -85,11 +89,11 @@
* Package initial v1, v2 data transfer objects.
</PackageReleaseNotes>
<NeutralLanguage>en-US</NeutralLanguage>
- <AssemblyVersion>2.3.0.0</AssemblyVersion>
+ <AssemblyVersion>2.5.0.0</AssemblyVersion>
<PackageLicenseUrl>https://gitlab.engr.illinois.edu/beckmancomms/beckmancomms-api-datatransferobjects/blob/master/License.md</PackageLicenseUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <FileVersion>2.3.0.0</FileVersion>
+ <FileVersion>2.5.0.0</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.4|AnyCPU'">
diff --git a/BeckmanComms.Api.DataTransferObjects/V2/Cafe/DishDto.cs b/BeckmanComms.Api.DataTransferObjects/V2/Cafe/DishDto.cs
index 5cbb648..2a471d6 100644
--- a/BeckmanComms.Api.DataTransferObjects/V2/Cafe/DishDto.cs
+++ b/BeckmanComms.Api.DataTransferObjects/V2/Cafe/DishDto.cs
@@ -7,6 +7,10 @@ namespace BeckmanComms.Api.DataTransferObjects.V2.Cafe
/// </summary>
public class DishDto
{
+ /// <summary>
+ /// The name of the dish.
+ /// </summary>
+ public int Id { get; set; }
/// <summary>
/// The name of the dish.
/// </summary>
diff --git a/BeckmanComms.Api.DataTransferObjects/V2/Events/BeckmanCalendars.cs b/BeckmanComms.Api.DataTransferObjects/V2/Events/BeckmanCalendars.cs
index 1a63d83..ee17ee3 100644
--- a/BeckmanComms.Api.DataTransferObjects/V2/Events/BeckmanCalendars.cs
+++ b/BeckmanComms.Api.DataTransferObjects/V2/Events/BeckmanCalendars.cs
@@ -13,6 +13,12 @@ namespace BeckmanComms.Api.DataTransferObjects.V2.Events
[Description("The main Beckman Institute event calendar.")]
BeckmanInstitute = 4595,
+ /// <summary>
+ /// University holiday calendar
+ /// </summary>
+ [Description("The uofi holiday calendar.")]
+ Holidays = 468,
+
/// <summary>
/// CNL calendar.
/// </summary>
--
GitLab