remove date selection from subscription stats view

Ca n'a jamais marché depuis 2017

core/management/commands/populate_more.py

@@ -138,10 +138,22 @@ class Command(BaseCommand):
         )
 
     def create_subscriptions(self, users: list[User]):
+        subscription_types = [
+            "un-semestre",
+            "deux-semestres",
+            "cursus-tronc-commun",
+            "cursus-branche",
+        ]
+
         def prepare_subscription(_user: User, start_date: date) -> Subscription:
             payment_method = random.choice(settings.SITH_SUBSCRIPTION_PAYMENT_METHOD)[0]
-            duration = random.randint(1, 4)
+            subscription_type = random.choice(subscription_types)
-            s = Subscription(member=_user, payment_method=payment_method)
+            s = Subscription(
+                member=_user,
+                payment_method=payment_method,
+                subscription_type=subscription_type,
+            )
+            duration = settings.SITH_SUBSCRIPTIONS[subscription_type]["duration"]
             s.subscription_start = s.compute_start(d=start_date, duration=duration)
             s.subscription_end = s.compute_end(duration)
             return s

counter/static/bundled/counter/counter-click-index.ts

@@ -123,14 +123,14 @@ document.addEventListener("alpine:init", () => {
 
     onRefillingSuccess(event: CustomEvent) {
       if (
-        event.type !== "htmx:after-swap" ||
+        event.type !== "htmx:after:swap" ||
-        event.detail.failed ||
+        event.detail.ctx.response.status !== 200 ||
-        event.detail.elt.querySelector(".errorlist")
+        event.detail.ctx.target.querySelector(".errorlist")
       ) {
         return;
       }
       this.customerBalance += Number.parseFloat(
-        (event.detail.target.querySelector("#id_amount") as HTMLInputElement).value,
+        (event.detail.ctx.target.querySelector("#id_amount") as HTMLInputElement).value,
       );
       document.getElementById("selling-accordion")?.setAttribute("open", "");
       this.codeField?.widget.focus();

counter/static/counter/css/counter-click.scss

@@ -62,8 +62,7 @@
   }
 
   form {
-    margin-top: .5rem;
+    margin: 0;
-    margin-bottom: .5rem;
   }
 }
 

counter/templates/counter/counter_click.jinja

@@ -186,7 +186,7 @@
           {% if refilling_fragment %}
             <div
               class="accordion-content"
-              @htmx:after-swap="onRefillingSuccess"
+              @htmx:after:swap="onRefillingSuccess"
             >
               {{ refilling_fragment }}
             </div>

counter/templates/counter/fragments/create_refill.jinja

@@ -4,6 +4,8 @@
   hx-swap="outerHTML"
 >
   {% csrf_token %}
-  {{  form.as_p() }}
+  <div class="margin-bottom">
-  <input type="submit" value="{% trans %}Go{% endtrans %}"/>
+    {{ form.as_p() }}
+  </div>
+  <input type="submit" class="btn btn-blue" value="{% trans %}Go{% endtrans %}"/>
 </form>

eboutic/templates/eboutic/eboutic_checkout.jinja

@@ -60,7 +60,7 @@
     </p>
     <br>
     {% if settings.SITH_EBOUTIC_CB_ENABLED %}
-      <div @htmx:after-request="fill">
+      <div @htmx:after:request="fill">
         {{ billing_infos_form }}
       </div>
     {% endif %}

matmat/templates/matmat/search_form.jinja

@@ -25,7 +25,7 @@
       {% endfor %}
     </div>
     {% if page_obj.has_other_pages() %}
-      {{ paginate_htmx(page_obj, paginator) }}
+      {{ paginate_htmx(request, page_obj, paginator) }}
     {% endif %}
     <hr>
   {% endif %}

matmat/tests.py

@@ -58,3 +58,13 @@ class TestMatmatronch(TestCase):
         assert list(response.context_data["object_list"]) == []
         assert not response.context_data["form"].is_valid()
         assert "Recherche vide" in response.context_data["form"].non_field_errors()
+
+    def test_search_many_users(self):
+        """Test that the pagination works when a lot of users are returned."""
+
+        baker.make(User, promo=17, _quantity=40, _bulk_create=True)
+        self.client.force_login(subscriber_user.make())
+        response = self.client.get(reverse("matmat:search", query={"promo": 17}))
+        assert response.status_code == 200
+        assert response.context_data["paginator"].count == 43
+        assert response.context_data["paginator"].num_pages == 3

matmat/views.py

@@ -20,7 +20,6 @@
 # Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 #
-
 from django.db.models import F
 from django.views.generic import ListView
 from django.views.generic.edit import FormMixin

subscription/forms.py

@@ -8,22 +8,11 @@ from django.utils.translation import gettext_lazy as _
 
 from core.models import User
 from core.utils import get_last_promo
-from core.views.forms import SelectDate, SelectDateTime
+from core.views.forms import SelectDate
 from core.views.widgets.ajax_select import AutoCompleteSelectUser
 from subscription.models import Subscription
 
 
-class SelectionDateForm(forms.Form):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields["start_date"] = forms.DateTimeField(
-            label=_("Start date"), widget=SelectDateTime, required=True
-        )
-        self.fields["end_date"] = forms.DateTimeField(
-            label=_("End date"), widget=SelectDateTime, required=True
-        )
-
-
 class SubscriptionForm(forms.ModelForm):
     allowed_payment_methods = ["CARD", "CASH", "AE_ACCOUNT"]
 

subscription/templates/subscription/stats.jinja

@@ -11,51 +11,38 @@
 
 {% block content %}
 
-  <p>
-    <form>
-      {{ form.start_date.label }}<br>
-      {{ form.start_date }}<br><br>
-      {{ form.end_date.label }}<br>
-      {{ form.end_date }}<br>
-      <p><input type="submit" value="{% trans %}Go{% endtrans %}" /></p>
-    </form>
-  </p>
-
   <canvas id="statsChart" width="400" height="200"></canvas>
 
-  <p>
+  {% trans %}Total subscriptions{% endtrans %} : {{ subscriptions_total.count() }}<br><br>
-    {% trans %}Total subscriptions{% endtrans %} : {{ subscriptions_total.count() }}<br><br>
+  {% trans %}Subscriptions by type{% endtrans %}<br><br>
-    {% trans %}Subscriptions by type{% endtrans %}<br><br>
+  {% for location in locations %}
-    {% for location in locations %}
+    {{ location[1] }} : <i class="nb">{{ subscriptions_total.filter(location=location[0]).count() }}</i><br>
-      {{ location[1] }} : <i class="nb">{{ subscriptions_total.filter(location=location[0]).count() }}</i><br>
+  {% endfor %}
+
+  <br>
+  <table>
+    <thead>
+      <th>{% trans %}Subscription type{% endtrans %}</th>
+      {% for location in locations %}
+        <th>{{ location[1] }}</th>
+      {% endfor %}
+      <th id="graphLabel">{% trans %}Total{% endtrans %}</th>
+    </thead>
+    {% for type in subscriptions_types %}
+      <tr>
+        <td><i class="types" >{{ subscriptions_types[type]['name'] }}</i></td>
+        {% set subscriptions_total_type = subscriptions_total.filter(subscription_type=type) %}
+        {% for location in locations %}
+          <td>
+            {% set subscriptions_total_type_location = subscriptions_total_type.filter(location=location[0]) %}
+            {% trans %}Total{% endtrans %} : {{ subscriptions_total_type_location.count()}}<br>
+            {% for p_type in payment_types %}
+              {{ p_type[1] }} : <i class="nb">{{ subscriptions_total_type_location.filter(payment_method=p_type[0]).count()}}</i><br>
+            {% endfor %}
+          </td>
+        {% endfor %}
+        <td class="total"><i class="nb">{{subscriptions_total_type.count()}}</i></td>
+      </tr>
     {% endfor %}
-    <p>
+  </table>
-
-      <br>
-
-      <table>
-        <tr>
-          <th>{% trans %}Subscription type{% endtrans %}</th>
-          {% for location in locations %}
-            <th>{{ location[1] }}</th>
-          {% endfor %}
-          <th id="graphLabel">{% trans %}Total{% endtrans %}</th>
-          {% for type in subscriptions_types %}
-            <tr>
-              <td><i class="types" >{{ subscriptions_types[type]['name'] }}</i></td>
-              {% set subscriptions_total_type = subscriptions_total.filter(subscription_type=type) %}
-              {% for location in locations %}
-                <td>
-                  {% set subscriptions_total_type_location = subscriptions_total_type.filter(location=location[0]) %}
-                  {% trans %}Total{% endtrans %} : {{ subscriptions_total_type_location.count()}}<br>
-                  {% for p_type in payment_types %}
-                    {{ p_type[1] }} : <i class="nb">{{ subscriptions_total_type_location.filter(payment_method=p_type[0]).count()}}</i><br>
-                  {% endfor %}
-                </td>
-              {% endfor %}
-              <td class="total"><i class="nb">{{subscriptions_total_type.count()}}</i>
-              </tr>
-          {% endfor %}
-        </table>
-
 {% endblock %}

subscription/views.py

@@ -17,16 +17,14 @@ from django.conf import settings
 from django.contrib.auth.forms import PasswordResetForm
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.core.exceptions import PermissionDenied
-from django.urls import reverse, reverse_lazy
+from django.urls import reverse
 from django.utils.timezone import localdate
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, DetailView, TemplateView
-from django.views.generic.edit import FormView
 
 from core.views import FragmentMixin, UseFragmentsMixin
 from core.views.group import PermissionGroupsUpdateView
 from subscription.forms import (
-    SelectionDateForm,
     SubscriptionExistingUserForm,
     SubscriptionNewUserForm,
 )
@@ -93,34 +91,19 @@ class SubscriptionPermissionView(PermissionGroupsUpdateView):
     extra_context = {"object_name": _("the groups that can create subscriptions")}
 
 
-class SubscriptionsStatsView(FormView):
+class SubscriptionsStatsView(TemplateView):
     template_name = "subscription/stats.jinja"
-    form_class = SelectionDateForm
-    success_url = reverse_lazy("subscriptions:stats")
 
     def dispatch(self, request, *arg, **kwargs):
-        self.start_date = localdate()
-        self.end_date = self.start_date
         if request.user.is_root or request.user.is_board_member:
             return super().dispatch(request, *arg, **kwargs)
         raise PermissionDenied
 
-    def post(self, request, *args, **kwargs):
-        self.form = self.get_form()
-        self.start_date = self.form["start_date"]
-        self.end_date = self.form["end_date"]
-        return super().post(request, *args, **kwargs)
-
-    def get_initial(self):
-        return {
-            "start_date": self.start_date.strftime("%Y-%m-%d %H:%M:%S"),
-            "end_date": self.end_date.strftime("%Y-%m-%d %H:%M:%S"),
-        }
-
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
+        today = localdate()
         kwargs["subscriptions_total"] = Subscription.objects.filter(
-            subscription_end__gte=self.end_date, subscription_start__lte=self.start_date
+            subscription_end__gte=today, subscription_start__lte=today
         )
         kwargs["subscriptions_types"] = settings.SITH_SUBSCRIPTIONS
         kwargs["payment_types"] = settings.SITH_SUBSCRIPTION_PAYMENT_METHOD