Changeset a749c25d5fae9ffc0b991d488d9abc5c0aabb7de in indico

Timestamp:

01/27/12 15:35:32 (4 months ago)

Author:

Alberto Resco Perez <alberto.resco.perez@…>

Children:

4ea669e54b4fc0f87e4bd65500eca6c19a61939e

Parents:

a7be1a17914010579dd11191ba7dca4c5ba2ba21

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (01/27/12 15:35:32)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/02/12 17:45:57)

Message:

[IMP] Restrict num participants meetings/lectures

• Add an Input in the Setup tab of participants.
• When a user goes to event display does not show the apply link.
• Closes #912.

Location:

indico/MaKaC

Files:

• participant.py (modified) (2 diffs)
• services/implementation/conference.py (modified) (3 diffs)
• webinterface/pages/conferences.py (modified) (2 diffs)
• webinterface/tpls/ConferenceParticipantsSetup.tpl (modified) (2 diffs)
• webinterface/tpls/events/include/EventDetails.tpl (modified) (8 diffs)

indico/MaKaC/participant.py

@@ -50 +50 @@
         self._dateNegotiation = None
         self._displayParticipantList = True
+        self._numMaxParticipants = 0
 
     def clone(self, conference, options, eventManager=None):
@@ -136 +137 @@
         self.notifyModification()
 
+    def getNumMaxParticipants(self):
+        try:
+            return self._numMaxParticipants
+        except AttributeError :
+            self._numMaxParticipants = 0
+            return False
+
+    def setNumMaxParticipants(self, value, responsibleUser = None):
+        self._numMaxParticipants = value
+        logData = {
+            "subject": "Num max of participants.",
+            "value": str(value)
+        }
+        self._conference.getLogHandler().logAction(logData, "participants", responsibleUser)
+        self.notifyModification()
+
+    def isFull(self):
+        if self.getNumMaxParticipants() != 0:
+            return len(self.getParticipantList()) >= self.getNumMaxParticipants()
+        return False
 
     def alreadyParticipating(self, participant):

indico/MaKaC/services/implementation/conference.py

@@ -822 +822 @@
         return True
 
+class ConferenceParticipantsSetNumMaxParticipants( ConferenceTextModificationBase ):
+    """
+    Conference num max participants modification
+    """
+    def _handleSet(self):
+        numMaxPart = self._value
+        if (self._value ==""):
+            raise ServiceError("ERR-E2", _("The value of the maximum numbers of participants cannot be empty."))
+        try:
+            numMaxPart = int(self._value)
+        except ValueError:
+            raise ServiceError("ERR-E3", _("The value of the maximum numbers of participants has to be a positive number."))
+
+        self._target.getParticipation().setNumMaxParticipants(int(numMaxPart))
+
+
+    def _handleGet(self):
+        return self._target.getParticipation().getNumMaxParticipants()
+
 class ConferenceApplyParticipant(ConferenceDisplayBase, ConferenceAddEditParticipantBase):
 
@@ -832 +851 @@
             raise NoReportError(_("""This event began on %s, you cannot apply for
                                          participation after the event began."""%self._conf.getStartDate()), title=_("Event started"))
-
-        if not self._conf.getParticipation().isAllowedForApplying() :
+        participation = self._conf.getParticipation()
+
+        if not participation.isAllowedForApplying() :
             raise NoReportError( _("""Participation in this event is restricted to persons invited.
                                            If you insist on taking part in this event, please contact the event manager."""), title=_("Application restricted"))
+        if participation.getNumMaxParticipants() > 0 and len(participation.getParticipantList()) >= participation.getNumMaxParticipants():
+            raise NoReportError( _("""You cannot apply for participation in this event because the maximum numbers of participants has been reached.
+                                           If you insist on taking part in this event, please contact the event manager."""), title=_("Maximum number of participants reached"))
+
         result = {}
         user = self._getUser()
         pending = self._generateParticipant(user)
-        participation = self._conf.getParticipation()
         if participation.alreadyParticipating(pending) != 0:
             raise NoReportError(_("The participant can not be added to the meeting because there is already a participant with the email address '%s'."
@@ -1558 +1581 @@
     "participation.allowForApply": ConferenceParticipantsAllowForApplying,
     "participation.autopAccept": ConferenceParticipantsAutoAccept,
+    "participation.setNumMaxParticipants": ConferenceParticipantsSetNumMaxParticipants,
     "participation.applyParticipant": ConferenceApplyParticipant,
     "participation.addParticipant": ConferenceAddParticipant,

indico/MaKaC/webinterface/pages/conferences.py

@@ -1076 +1076 @@
         if (conf.getType() in ("meeting", "simple_event")
                 and conf.getParticipation().isAllowedForApplying()
-                and conf.getStartDate() > nowutc()):
+                and conf.getStartDate() > nowutc()
+                and not conf.getParticipation().isFull()):
             vars['registrationOpen'] = True
         evaluation = conf.getEvaluation()
@@ -3386 +3387 @@
         vars["allowForApply"] = self._conf.getParticipation().isAllowedForApplying()
         vars["autopAccept"] = self._conf.getParticipation().autoAccept()
+        vars["numMaxParticipants"] = self._conf.getParticipation().getNumMaxParticipants()
         return vars
 

indico/MaKaC/webinterface/tpls/ConferenceParticipantsSetup.tpl

@@ -31 +31 @@
     </td>
 </tr>
+<tr>
+    <td style="padding-right:15px">${ _("Max No. of participants.")}</td>
+    <td class="blacktext">
+        <div id="inPlaceEditNumMaxParticipants"></div>
+    </td>
+</tr>
 </table>
 
@@ -43 +49 @@
     $("#inPlaceEditAutoAccept").append($(new RemoteSwitchButton(${"false" if autoAccept else "true"},
             Html.img({src:imageSrc("enabledSection.png")}), Html.img({src:imageSrc("disabledSection.png")}), "event.participation.autopAccept", "event.participation.autopAccept",{confId:${confId}}).draw().dom));
+    $("#inPlaceEditNumMaxParticipants").append(new InputEditWidget('event.participation.setNumMaxParticipants',
+            {confId:${confId}}, ${ jsonEncode(numMaxParticipants) }, 0, false, null, function(value){return IndicoUtil.isInteger(value);}, '${_("The value set is not a positive number")}', '${_("Please insert a positive number or 0 for unlimited")}',
+            null).draw().dom);
+
    });
 </script>

indico/MaKaC/webinterface/tpls/events/include/EventDetails.tpl

@@ -6 +6 @@
 % if conf.getDescription():
 <tr id="eventDescription">
-    <td class="leftCol">Description</td>
+    <td class="leftCol">${_("Description")}</td>
     <td>${common.renderDescription(conf.getDescription())}</td>
 </tr>
@@ -13 +13 @@
 % if participants:
 <tr id="eventParticipants">
-    <td class="leftCol">Participants</td>
+    <td class="leftCol">${_("Participants")}</td>
     <td id="eventListParticipants">${participants}</td>
 </tr>
@@ -22 +22 @@
     <td class="leftCol">
     % if webcastOnAirURL:
-        Live Webcast
+        ${_("Live Webcast")}
     % elif forthcomingWebcast:
-        Webcast
+        ${_("Webcast")}
     % endif
     </td>
     <td>
     % if webcastOnAirURL:
-         <a href="${webcastOnAirURL}" target="_blank"><strong>View the live webcast</strong></a>
+         <a href="${webcastOnAirURL}" target="_blank"><strong>${_("View the live webcast")}</strong></a>
     % elif forthcomingWebcast:
-         Please note that this event will be available <em>live</em> via the
-         <a href="${forthcomingWebcastURL}" target="_blank"><strong>Webcast Service</strong>.</a>
+         ${_("Please note that this event will be available <em>live</em> via the")}
+         <a href="${forthcomingWebcastURL}" target="_blank"><strong>${_("Webcast Service")}</strong>.</a>
     % endif
     </td>
@@ -40 +40 @@
 % if len(materials) > 0:
 <tr id="materialList">
-    <td class="leftCol">Material</td>
+    <td class="leftCol">${_("Material")}</td>
     <td>
         <div class="materialList clearfix">
@@ -64 +64 @@
 % if len(lectures) > 0:
 <tr id="lectureLinks">
-    <td class="leftCol">Other occasions</td>
+    <td class="leftCol">${_("Other occasions")}</td>
     <td>
     % for lecture in lectures:
@@ -76 +76 @@
 % if registrationOpen:
 <tr>
-    <td class="leftCol">Registration</td>
+    <td class="leftCol">${_("Registration")}</td>
     <td>
-        Want to participate?
-        <span class="fakeLink" id="applyLink">Apply here</span>
+        ${_("Want to participate?")}
+        <span class="fakeLink" id="applyLink">${_("Apply here")}</span>
     </td>
 </tr>
@@ -86 +86 @@
 % if evaluationLink:
 <tr>
-    <td class="leftCol">Evaluation</td>
-    <td><a href="${evaluationLink}">Evaluate this event</a></td>
+    <td class="leftCol">${_("Evaluation")}</td>
+    <td><a href="${evaluationLink}">${_("Evaluate this event")}</a></td>
 </tr>
 % endif
@@ -93 +93 @@
 % if conf.getOrgText():
 <tr>
-    <td class="leftCol">Organised by</td>
+    <td class="leftCol">${_("Organised by")}</td>
     <td>${conf.getOrgText()}</td>
 </tr>