waiting list feature #33

EleonoraPetzold · EleonoraPetzold · commit 614089c179d0 · 2022-02-16T14:52:11.000+01:00
diff --git a/Controllers/EventController.cs b/Controllers/EventController.cs
@@ -118,6 +118,13 @@ public ActionResult Save(EventModel model, HttpPostedFileBase file)
 
             if (model.ImportantInformation == null)
                 ModelState.AddModelError("ImportantInformation", "Important information is required.");
+            
+            if(model.ParticipantsLimitation == 0 && model.WaitingList == true)
+                ModelState.AddModelError("WaitingList", "You don't need a waiting list if there is no participants limitation.");
+
+            if (model.WaitingListLimitation > 0 && model.WaitingList == false)
+                ModelState.AddModelError("WaitingListLimitation", "You don't need a waiting list limitation if you dont use the waiting list.");
+
 
             //check if schema file is uploaded
             //if (attachments ==null &&model.Id == 0)
@@ -134,7 +141,7 @@ public ActionResult Save(EventModel model, HttpPostedFileBase file)
 
                     if (model.Id == 0)
                     {
-                        Event newEvent = eManager.CreateEvent(model.Name, model.EventDate, model.ImportantInformation, model.MailInformation, model.SelectedEventLanguage, model.StartDate, model.Deadline, model.ParticipantsLimitation, model.EditAllowed, model.LogInPassword, model.EmailBCC, model.EmailCC, model.EmailReply, ms, null);
+                        Event newEvent = eManager.CreateEvent(model.Name, model.EventDate, model.ImportantInformation, model.MailInformation, model.SelectedEventLanguage, model.StartDate, model.Deadline, model.ParticipantsLimitation, model.WaitingList,model.WaitingListLimitation, model.EditAllowed, model.LogInPassword, model.EmailBCC, model.EmailCC, model.EmailReply, ms, null);
 
                         newEvent = SaveFile(file, newEvent, eManager);
                         eManager.UpdateEvent(newEvent);
diff --git a/Controllers/EventRegistrationController.cs b/Controllers/EventRegistrationController.cs
@@ -587,15 +587,18 @@ public ActionResult Save()
         /// <returns></returns>
         private void CreateNewEventRegistration(Event e, XDocument data, User user, string email, string notificationType, string ref_id)
         {
+            bool waitingList = false;
             using (var erManager = new EventRegistrationManager())
             { 
+
                 //check Participants Limitation
                 if (e.ParticipantsLimitation != 0)
                 {
                     int countRegs = erManager.GetNumerOfRegistrationsByEvent(e.Id);
                     if (countRegs >= e.ParticipantsLimitation)
                     {
                         notificationType = "succesfully_registered_waiting_list";
+                        waitingList = true;
                     }
                     else
                     {
@@ -608,7 +611,7 @@ private void CreateNewEventRegistration(Event e, XDocument data, User user, stri
                 }
 
             // Save registration and send notification
-            erManager.CreateEventRegistration(XmlMetadataWriter.ToXmlDocument(data), e, user, false, ref_id);
+            erManager.CreateEventRegistration(XmlMetadataWriter.ToXmlDocument(data), e, user, false, ref_id, waitingList);
 
             SendEmailNotification(notificationType, email, ref_id, data, e, user);
         }
diff --git a/Controllers/EventRegistrationResultController.cs b/Controllers/EventRegistrationResultController.cs
@@ -131,6 +131,7 @@ public ActionResult OnSelectTreeViewItem(long id)
         {
             EventRegistrationResultModel model = new EventRegistrationResultModel();
             model.Results = GetEventResults(id);
+            
             model.EventId = id;
 
             //check rights on event
@@ -177,6 +178,32 @@ private DataTable GetEventResults(long eventId)
             return results;
         }
 
+        private DataTable GetWaitingListResults(long eventId)
+        {
+            DataTable results = new DataTable();
+            results.Columns.Add("Deleted");
+
+            using (EventRegistrationManager erManager = new EventRegistrationManager())
+            {
+                List<EventRegistration> eventRegistrations = erManager.GetAllWaitingListRegsByEvent(eventId);
+
+                if (eventRegistrations.Count != 0)
+                {
+                    XmlNodeReader xmlNodeReader = new XmlNodeReader(eventRegistrations[0].Data);
+                    results = CreateDataTableColums(results, XElement.Load(xmlNodeReader));
+                    xmlNodeReader.Dispose();
+                }
+
+                foreach (EventRegistration er in eventRegistrations)
+                {
+                    XmlNodeReader xmlNodeReader = new XmlNodeReader(er.Data);
+                    results.Rows.Add(AddDataRow(XElement.Load(xmlNodeReader), results, er.Deleted.ToString()));
+                    xmlNodeReader.Dispose();
+                }
+            }
+
+            return results;
+        }
         //private DataTable GetEventRegistration(long eventId, XDocument data)
         //{
         //    DataTable results = new DataTable();
diff --git a/Entities/BExIS.Emm.Entities/Events/Event.cs b/Entities/BExIS.Emm.Entities/Events/Event.cs
@@ -29,6 +29,10 @@ public class Event : BusinessEntity
 
         public virtual int ParticipantsLimitation { get; set; }
 
+        public virtual bool WaitingList { get; set; }
+
+        public virtual int WaitingListLimitation { get; set; }
+
         public virtual bool EditAllowed { get; set; }
 
         public virtual string LogInPassword { get; set; }
diff --git a/Entities/BExIS.Emm.Entities/Events/EventRegistration.cs b/Entities/BExIS.Emm.Entities/Events/EventRegistration.cs
@@ -19,6 +19,9 @@ public class EventRegistration : BusinessEntity
 
         public virtual string Token { get; set; }
 
+        public virtual bool WaitingList { get; set; }
+
+
         #endregion
 
         #region Associations
diff --git a/Models/EventModel.cs b/Models/EventModel.cs
@@ -41,6 +41,12 @@ public class EventModel
         [DisplayName("Participants limitation")]
         public int ParticipantsLimitation { get; set; }
 
+        [DisplayName("Allow waiting list")]
+        public bool WaitingList { get; set;  }
+
+        [DisplayName("Waiting list limitation")]
+        public int WaitingListLimitation { get; set; }
+
         [DisplayName("Allow edit")]
         public bool EditAllowed { get; set; }
 
diff --git a/Models/EventRegistrationModel.cs b/Models/EventRegistrationModel.cs
@@ -12,7 +12,7 @@ namespace BExIS.Modules.EMM.UI.Models
 {
 
     /// <summary>
-    /// The EventRegistrationModel represent all informatio ehich are needed to handel a event registration.
+    /// The EventRegistrationModel represent all information which are needed to handel a event registration.
     /// </summary>
     /// <remarks></remarks>
     public class EventRegistrationModel
@@ -100,6 +100,7 @@ public class EventRegistrationResultModel
         public long EventId { get; set; }
         public XmlDocument Form { get; set; }
         public DataTable Results { get; set; }
+        public DataTable WaitingListResults { get; set; }
         public bool UserHasRights { get; set; }
 
         public EventRegistrationResultModel()
diff --git a/Orm/BExIS.Emm.Orm.NH/Mappings/Default/Event/Event.hbm.xml b/Orm/BExIS.Emm.Orm.NH/Mappings/Default/Event/Event.hbm.xml
@@ -83,6 +83,14 @@
     <property name="ParticipantsLimitation" type="Int32">
       <column name="ParticipantsLimitation" />
     </property>
+    
+      <property name="WaitingList" type="Boolean">
+      <column name="WaitingList" />
+    </property>
+    
+    <property name="WaitingListLimitation" type="Int32">
+      <column name="WaitingListLimitation" />
+    </property>
 
     <property name="EditAllowed" type="Boolean">
       <column name="EditAllowed" />
diff --git a/Orm/BExIS.Emm.Orm.NH/Mappings/Default/Event/EventRegistration.hbm.xml b/Orm/BExIS.Emm.Orm.NH/Mappings/Default/Event/EventRegistration.hbm.xml
@@ -31,6 +31,10 @@
     <property name="Token" type="String">
       <column name="Token" />
     </property>
+    
+     <property name="WaitingList" type="Boolean">
+      <column name="WaitingList" />
+    </property>
 
     <!-- Mapping Entity Associations -->
 
diff --git a/Services/BExIS.Emm.Services/Event/EventManager.cs b/Services/BExIS.Emm.Services/Event/EventManager.cs
@@ -72,7 +72,7 @@ public E.Event GetEventById(long id)
         /// <summary>
         /// Creates an EventRegistration <seealso cref="EventRegistration"/> and persists the entity in the database.
         /// </summary>
-        public E.Event CreateEvent(string name, string eventDate, string importantInformation, string mailInformation, string eventLanguage, DateTime startDate, DateTime deadline, int participantsLimitation, bool editAllowed, string logInPassword, string emailBCC, string emailCC, string emailReply, MetadataStructure metadataStructure, string javaScriptPath)
+        public E.Event CreateEvent(string name, string eventDate, string importantInformation, string mailInformation, string eventLanguage, DateTime startDate, DateTime deadline, int participantsLimitation, bool waitingList, int waitingListLimitation, bool editAllowed, string logInPassword, string emailBCC, string emailCC, string emailReply, MetadataStructure metadataStructure, string javaScriptPath)
         {
             E.Event newEvent = new E.Event();
             newEvent.Name = name;
@@ -84,6 +84,8 @@ public E.Event CreateEvent(string name, string eventDate, string importantInform
             newEvent.StartDate = startDate;
             newEvent.Deadline = deadline;
             newEvent.ParticipantsLimitation = participantsLimitation;
+            newEvent.WaitingList = waitingList;
+            newEvent.WaitingListLimitation = waitingListLimitation;
             newEvent.EditAllowed = editAllowed;
             newEvent.LogInPassword = logInPassword;
             newEvent.EmailBCC = emailBCC;
diff --git a/Services/BExIS.Emm.Services/Event/EventRegistrationManager.cs b/Services/BExIS.Emm.Services/Event/EventRegistrationManager.cs
@@ -58,14 +58,15 @@ protected virtual void Dispose(bool disposing)
         /// <summary>
         /// Creates an EventRegistration <seealso cref="EventRegistration"/> and persists the entity in the database.
         /// </summary>
-        public E.EventRegistration CreateEventRegistration(XmlDocument data, E.Event e, User user, bool deleted, string token)
+        public E.EventRegistration CreateEventRegistration(XmlDocument data, E.Event e, User user, bool deleted, string token, bool waitingList)
         {
             E.EventRegistration eventRegistration = new E.EventRegistration();
             eventRegistration.Data = data;
             eventRegistration.Deleted = deleted;
             eventRegistration.Event = e;
             eventRegistration.Person = user;
             eventRegistration.Token= token;
+            eventRegistration.WaitingList = waitingList;
 
             using (IUnitOfWork uow = this.GetUnitOfWork())
             {
@@ -116,6 +117,12 @@ public E.EventRegistration UpdateEventRegistration(E.EventRegistration eventRegi
             return EventRegistrationRepo.Query(a=>a.Event.Id == id).ToList();
         }
 
+        public List<E.EventRegistration> GetAllWaitingListRegsByEvent(long id)
+        {
+            return EventRegistrationRepo.Query(a => a.Event.Id == id && a.WaitingList == true).ToList();
+        }
+
+
         public List<E.EventRegistration> GetAllRegistrationsNotDeletedByEvent(long id)
         {
             return EventRegistrationRepo.Query(a => a.Event.Id == id && a.Deleted == false).ToList();
diff --git a/Views/Event/EditEvent.cshtml b/Views/Event/EditEvent.cshtml
@@ -111,10 +111,22 @@
         </td>
         <td>
             @(Html.Telerik().IntegerTextBoxFor(m => m.ParticipantsLimitation)
-                                                                                                                                                    .MinValue(0)
-                                                                                                                                                    .MaxValue(Int32.MaxValue)
-                                                                                                                                                    .Value(Model.ParticipantsLimitation)
-                                                                                                                                                    .HtmlAttributes(new { tabindex = "2", style = "border-width: 2px; height: 30px;" })
+                                                                                                                                      .HtmlAttributes(new { tabindex = "2", style = "border-width: 2px; height: 30px;" })
+            )
+        </td>
+    </tr>
+    <tr>
+        <td>@Html.LabelFor(m => m.WaitingList)</td>
+        <td>@Html.CheckBoxFor(m => m.WaitingList, new { @class = "js-switch" })</td>
+    </tr>
+    <tr>
+        <td>
+            <b title="This field is required" style="color:red">*</b>
+            @Html.LabelFor(m => m.WaitingListLimitation)
+        </td>
+        <td>
+            @(Html.Telerik().IntegerTextBoxFor(m => m.WaitingListLimitation)
+                                                                                                                                      .HtmlAttributes(new { tabindex = "2", style = "border-width: 2px; height: 30px;" })
             )
         </td>
     </tr>

Original file line number	Diff line number	Diff line change
`@@ -587,15 +587,18 @@ public ActionResult Save()`
`587`	`587`	`/// <returns></returns>`
`588`	`588`	`private void CreateNewEventRegistration(Event e, XDocument data, User user, string email, string notificationType, string ref_id)`
`589`	`589`	`{`
	`590`	`+ bool waitingList = false;`
`590`	`591`	`using (var erManager = new EventRegistrationManager())`
`591`	`592`	`{`
	`593`	`+`
`592`	`594`	`//check Participants Limitation`
`593`	`595`	`if (e.ParticipantsLimitation != 0)`
`594`	`596`	`{`
`595`	`597`	`int countRegs = erManager.GetNumerOfRegistrationsByEvent(e.Id);`
`596`	`598`	`if (countRegs >= e.ParticipantsLimitation)`
`597`	`599`	`{`
`598`	`600`	`notificationType = "succesfully_registered_waiting_list";`
	`601`	`+ waitingList = true;`
`599`	`602`	`}`
`600`	`603`	`else`
`601`	`604`	`{`
`@@ -608,7 +611,7 @@ private void CreateNewEventRegistration(Event e, XDocument data, User user, stri`
`608`	`611`	`}`
`609`	`612`
`610`	`613`	`// Save registration and send notification`
`611`		`- erManager.CreateEventRegistration(XmlMetadataWriter.ToXmlDocument(data), e, user, false, ref_id);`
	`614`	`+ erManager.CreateEventRegistration(XmlMetadataWriter.ToXmlDocument(data), e, user, false, ref_id, waitingList);`
`612`	`615`
`613`	`616`	`SendEmailNotification(notificationType, email, ref_id, data, e, user);`
`614`	`617`	`}`