Closing handling #33

Author: EleonoraPetzold

Controllers/EventController.cs

@@ -141,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.WaitingList,model.WaitingListLimitation, 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.Closed, model.LogInPassword, model.EmailBCC, model.EmailCC, model.EmailReply, ms, null);
 
                         newEvent = SaveFile(file, newEvent, eManager);
                         eManager.UpdateEvent(newEvent);
@@ -179,7 +179,10 @@ public ActionResult Save(EventModel model, HttpPostedFileBase file)
                         e.StartDate = model.StartDate;
                         e.Deadline = model.Deadline;
                         e.ParticipantsLimitation = model.ParticipantsLimitation;
+                        e.WaitingList = model.WaitingList;
+                        e.WaitingListLimitation = model.WaitingListLimitation;
                         e.EditAllowed = model.EditAllowed;
+                        e.Closed = model.Closed;
                         e.LogInPassword = model.LogInPassword;
                         e.LogInPassword = model.LogInPassword;
                         e.EmailCC = model.EmailCC;
@@ -191,7 +194,7 @@ public ActionResult Save(EventModel model, HttpPostedFileBase file)
                         eManager.UpdateEvent(e);
                     }
 
-                    return View("EventManager");
+                    return RedirectToAction("EventManager");
                 }
             }
             else

Controllers/EventRegistrationController.cs

@@ -89,10 +89,7 @@ private List<EventRegistrationModel> GetAvailableEvents(string ref_id = null)
                             model.NumberOfRegistration = erManager.GetAllRegistrationsNotDeletedByEvent(e.Id).Count;
                             model.NrOfRegistrationWaitingList = erManager.GetAllWaitingListRegsByEvent(e.Id).Count;
 
-                            if((model.NrOfRegistrationWaitingList >= e.WaitingListLimitation) && (model.NrOfRegistrationWaitingList>= e.ParticipantsLimitation) )
-                            {
-                                model.Closed = true;
-                            }
+                            model.Closed = e.Closed;
 
                             //check if user already registered (if logged in)
                             if (user != null)
@@ -583,7 +580,6 @@ public ActionResult Save()
                 else
                     CreateNewEventRegistration(e, data, user, email, notificationType, ref_id);
 
-
                 return Json(new { result = "redirect", url = Url.Action("EventRegistration", "EventRegistration", new { area = "EMM", ref_id = ref_id }) }, JsonRequestBehavior.AllowGet);
             }
         }
@@ -597,16 +593,34 @@ private void CreateNewEventRegistration(Event e, XDocument data, User user, stri
         {
             bool waitingList = false;
             using (var erManager = new EventRegistrationManager())
+            using(var eventManager = new EventManager())
             { 
-
                 //check Participants Limitation
                 if (e.ParticipantsLimitation != 0)
                 {
                     int countRegs = erManager.GetNumerOfRegistrationsByEvent(e.Id);
+                    int countWaitingList = erManager.GetAllWaitingListRegsByEvent(e.Id).Count + 1;
+
                     if (countRegs >= e.ParticipantsLimitation)
                     {
-                        notificationType = "succesfully_registered_waiting_list";
-                        waitingList = true;
+                        if(e.WaitingList && !e.Closed)
+                        {
+                            if(countWaitingList == e.WaitingListLimitation)
+                            {
+                                e.Closed = true;
+                                eventManager.UpdateEvent(e);
+                            }
+                            
+                            notificationType = "succesfully_registered_waiting_list";
+                            waitingList = true;
+                            
+                        }
+                        else
+                        {
+                            e.Closed = true;
+                            eventManager.UpdateEvent(e);
+                            notificationType = "succesfully_registered";
+                        }
                     }
                     else
                     {
@@ -618,10 +632,10 @@ private void CreateNewEventRegistration(Event e, XDocument data, User user, stri
                     notificationType = "succesfully_registered";
                 }
 
-            // Save registration and send notification
-            erManager.CreateEventRegistration(XmlMetadataWriter.ToXmlDocument(data), e, user, false, ref_id, waitingList);
+                // Save registration and send notification
+                erManager.CreateEventRegistration(XmlMetadataWriter.ToXmlDocument(data), e, user, false, ref_id, waitingList);
 
-            SendEmailNotification(notificationType, email, ref_id, data, e, user);
+                SendEmailNotification(notificationType, email, ref_id, data, e, user);
         }
     }
 

Controllers/EventRegistrationResultController.cs

@@ -167,8 +167,6 @@ public ActionResult MoveFromWaitingList(long id, long eventId)
 
             }
 
-
-
             return RedirectToAction("OnSelectTreeViewItem", new { id = eventId });
         }
 

Entities/BExIS.Emm.Entities/Events/Event.cs

@@ -35,6 +35,8 @@ public class Event : BusinessEntity
 
         public virtual bool EditAllowed { get; set; }
 
+        public virtual bool Closed { get; set; }
+
         public virtual string LogInPassword { get; set; }
 
         public virtual string EmailBCC { get; set; }

Models/EventModel.cs

@@ -50,6 +50,7 @@ public class EventModel
         [DisplayName("Allow edit")]
         public bool EditAllowed { get; set; }
 
+        public bool Closed { get; set; }
         public bool EditMode { get; set; }
 
         [DisplayName("Event password")]
@@ -103,6 +104,9 @@ public EventModel(Event eEvent)
             StartDate = eEvent.StartDate;
             Deadline = eEvent.Deadline;
             ParticipantsLimitation = eEvent.ParticipantsLimitation;
+            WaitingList = eEvent.WaitingList;
+            WaitingListLimitation = eEvent.WaitingListLimitation;
+            Closed = eEvent.Closed;
 
             //if (eEvent.ParticipantsLimitation == 0)
             //    ParticipantsLimitation = "no limitation";

Orm/BExIS.Emm.Orm.NH/Mappings/Default/Event/Event.hbm.xml

@@ -95,6 +95,10 @@
     <property name="EditAllowed" type="Boolean">
       <column name="EditAllowed" />
     </property>
+    
+    <property name="Closed" type="Boolean">
+      <column name="Closed" />
+    </property>
 
     <property name="LogInPassword" type="string">
       <column name="LogInPassword" />

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 waitingList, int waitingListLimitation, 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, bool closed, string logInPassword, string emailBCC, string emailCC, string emailReply, MetadataStructure metadataStructure, string javaScriptPath)
         {
             E.Event newEvent = new E.Event();
             newEvent.Name = name;
@@ -87,6 +87,7 @@ public E.Event CreateEvent(string name, string eventDate, string importantInform
             newEvent.WaitingList = waitingList;
             newEvent.WaitingListLimitation = waitingListLimitation;
             newEvent.EditAllowed = editAllowed;
+            newEvent.Closed = closed;
             newEvent.LogInPassword = logInPassword;
             newEvent.EmailBCC = emailBCC;
             newEvent.EmailCC = emailCC;

Views/Event/EditEvent.cshtml

@@ -194,6 +194,10 @@
             <small>@Html.ValidationMessage("EmailReply")</small>
         </td>
     </tr>
+    <tr>
+        <td>@Html.LabelFor(m => m.Closed)</td>
+        <td>@Html.CheckBoxFor(m => m.Closed, new { @class = "js-switch" })</td>
+    </tr>
 
 </table>