Merge pull request #1087 from ae-utbm/remove-laundry

remove laundry

core/management/commands/populate.py

@@ -123,11 +123,6 @@ class Command(BaseCommand):
             name="PdF",
             address="6 Boulevard Anatole France, 90000 Belfort",
         )
-        Club.objects.create(
-            id=settings.SITH_LAUNDERETTE_CLUB_ID,
-            name="Laverie",
-            address="6 Boulevard Anatole France, 90000 Belfort",
-        )
 
         self.reset_index("club")
         for bar_id, bar_name in settings.SITH_COUNTER_BARS:
@@ -291,13 +286,7 @@ class Command(BaseCommand):
             page=services_page,
             title="Services",
             author=skia,
-            content="""
-|   |   |   |
-| :---: | :---: | :---: |
-| [Eboutic](/eboutic) | [Laverie](/launderette) | Matmat |
-| SAS | Weekmail | Forum|
-
-""",
+            content="- [Eboutic](/eboutic)\n- Matmat\n- SAS\n- Weekmail\n- Forum",
         )
 
         index_page = Page(name="Index")
@@ -306,23 +295,10 @@ class Command(BaseCommand):
             page=index_page,
             title="Wiki index",
             author=root,
-            content="""
-Welcome to the wiki page!
-""",
+            content="Welcome to the wiki page!",
         )
 
-        laundry_page = Page(name="launderette")
-        laundry_page.save(force_lock=True)
-        PageRev.objects.create(
-            page=laundry_page,
-            title="Laverie",
-            author=root,
-            content="Fonctionnement de la laverie",
-        )
-
-        groups.public.viewable_page.set(
-            [syntax_page, services_page, index_page, laundry_page]
-        )
+        groups.public.viewable_page.set([syntax_page, services_page, index_page])
 
         self._create_subscription(root)
         self._create_subscription(skia)
@@ -868,7 +844,7 @@ Welcome to the wiki page!
         counter_admin.permissions.add(
             *list(
                 perms.filter(
-                    Q(content_type__app_label__in=["counter", "launderette"])
+                    Q(content_type__app_label__in=["counter"])
                     & ~Q(codename__in=["delete_product", "delete_producttype"])
                 )
             )

core/models.py

@@ -412,14 +412,6 @@ class User(AbstractUser):
     def is_board_member(self) -> bool:
         return self.groups.filter(club_board=settings.SITH_MAIN_CLUB_ID).exists()
 
-    @cached_property
-    def is_launderette_manager(self):
-        from club.models import Club
-
-        return Club.objects.get(
-            id=settings.SITH_LAUNDERETTE_CLUB_ID
-        ).get_membership_for(self)
-
     @cached_property
     def is_banned_alcohol(self) -> bool:
         return self.ban_groups.filter(id=settings.SITH_GROUP_BANNED_ALCOHOL_ID).exists()
@@ -667,10 +659,6 @@ class AnonymousUser(AuthAnonymousUser):
     def is_board_member(self):
         return False
 
-    @property
-    def is_launderette_manager(self):
-        return False
-
     @property
     def is_banned_alcohol(self):
         return False

core/static/core/style.scss

@@ -765,12 +765,6 @@ textarea {
   margin-top: 10px;
 }
 
-/*---------------------------LAUNDERETTE-------------------------------*/
-
-#token_form label {
-  display: inline;
-}
-
 /*--------------------------------FOOTER-------------------------------*/
 
 footer {

core/templates/core/base/navbar.jinja

@@ -24,7 +24,6 @@
       <span class="head">{% trans %}Services{% endtrans %}</span>
       <ul class="content">
         <li><a href="{{ url('matmat:search_clear') }}">{% trans %}Matmatronch{% endtrans %}</a></li>
-        <li><a href="/launderette">{% trans %}Launderette{% endtrans %}</a></li>
         <li><a href="{{ url('core:file_list') }}">{% trans %}Files{% endtrans %}</a></li>
         <li><a href="{{ url('pedagogy:guide') }}">{% trans %}Pedagogy{% endtrans %}</a></li>
       </ul>

core/templates/core/macros.jinja

@@ -86,19 +86,6 @@
   {% trans %}Account number: {% endtrans %}{{ user.customer.account_id }}<br/>
 {%- endmacro %}
 
-{% macro show_slots(user) %}
-  {% if user.slots.filter(start_date__gte=timezone.now()).exists() %}
-    <h5>{% trans %}Slot{% endtrans %}</h5>
-    <ul>
-      {% for i in user.slots.filter(start_date__gte=timezone.now().replace(tzinfo=None)).all() %}
-        <li>{{ i.get_type_display() }} - {{i.machine.launderette }}, {{ i.start_date|date("l j") }} :
-          {{ i.start_date|time(DATETIME_FORMAT) }} |
-          <a href="{{ url('launderette:delete_slot', slot_id=i.id) }}">{% trans %}Delete{% endtrans %}</a></li>
-      {% endfor %}
-    </ul>
-  {% endif %}
-{% endmacro %}
-
 {% macro show_tokens(user) %}
   {% if user.tokens.exists() %}
     <h5>{% trans %}Tokens{% endtrans %}</h5>

core/templates/core/user_detail.jinja

@@ -141,12 +141,6 @@
             {{ user_subscription(profile) }}
           </div>
         {% endif %}
-        {% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %}
-          <div>
-            {{ show_tokens(profile) }}
-            {{ show_slots(profile) }}
-          </div>
-        {% endif %}
       {% else %}
         <div>
           {% trans %}Not subscribed{% endtrans %}

core/views/user.py

@@ -572,10 +572,8 @@ class UserToolsView(LoginRequiredMixin, QuickNotifMixin, UserTabsMixin, Template
 
     def get_context_data(self, **kwargs):
         self.object = self.request.user
-        from launderette.models import Launderette
 
         kwargs = super().get_context_data(**kwargs)
-        kwargs["launderettes"] = Launderette.objects.all()
         kwargs["profile"] = self.request.user
         kwargs["object"] = self.request.user
         return kwargs