mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-11-04 09:12:11 +01:00 
			
		
		
		
	Simplify future user search
This commit is contained in:
		@@ -1,33 +1,43 @@
 | 
				
			|||||||
{% extends "base.html" %}
 | 
					{% extends "base.html" %}
 | 
				
			||||||
{% load static %}
 | 
					{% comment %}
 | 
				
			||||||
{% load i18n %}
 | 
					SPDX-License-Identifier: GPL-3.0-or-later
 | 
				
			||||||
{% load crispy_forms_tags %}
 | 
					{% endcomment %}
 | 
				
			||||||
 | 
					{% load i18n crispy_forms_tags %}
 | 
				
			||||||
 | 
					{% block contenttitle %}{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block content %}
 | 
					{% block content %}
 | 
				
			||||||
<form method="post">
 | 
					<div class="card bg-light">
 | 
				
			||||||
{% csrf_token %}
 | 
					    <h3 class="card-header text-center">
 | 
				
			||||||
{{form|crispy}}
 | 
					        {{ title }}
 | 
				
			||||||
<button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
 | 
					    </h3>
 | 
				
			||||||
</form>
 | 
					    <div class="card-body">
 | 
				
			||||||
 | 
					        <form method="post">
 | 
				
			||||||
 | 
					            {% csrf_token %}
 | 
				
			||||||
 | 
					            {{ form|crispy }}
 | 
				
			||||||
 | 
					            <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
 | 
				
			||||||
 | 
					        </form>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					</div>
 | 
				
			||||||
{% endblock %}
 | 
					{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block extrajavascript %}
 | 
					{% block extrajavascript %}
 | 
				
			||||||
    <script>
 | 
					<script>
 | 
				
			||||||
        require_memberships_obj = $("#id_require_memberships");
 | 
					    require_memberships_obj = $("#id_require_memberships");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (!require_memberships_obj.is(":checked")) {
 | 
					    if (!require_memberships_obj.is(":checked")) {
 | 
				
			||||||
            $("#div_id_membership_fee_paid").toggle();
 | 
					        $("#div_id_membership_fee_paid").toggle();
 | 
				
			||||||
            $("#div_id_membership_fee_unpaid").toggle();
 | 
					        $("#div_id_membership_fee_unpaid").toggle();
 | 
				
			||||||
            $("#div_id_membership_duration").toggle();
 | 
					        $("#div_id_membership_duration").toggle();
 | 
				
			||||||
            $("#div_id_membership_start").toggle();
 | 
					        $("#div_id_membership_start").toggle();
 | 
				
			||||||
            $("#div_id_membership_end").toggle();
 | 
					        $("#div_id_membership_end").toggle();
 | 
				
			||||||
        }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        require_memberships_obj.change(function () {
 | 
					    require_memberships_obj.change(function () {
 | 
				
			||||||
            $("#div_id_membership_fee_paid").toggle();
 | 
					        $("#div_id_membership_fee_paid").toggle();
 | 
				
			||||||
            $("#div_id_membership_fee_unpaid").toggle();
 | 
					        $("#div_id_membership_fee_unpaid").toggle();
 | 
				
			||||||
            $("#div_id_membership_duration").toggle();
 | 
					        $("#div_id_membership_duration").toggle();
 | 
				
			||||||
            $("#div_id_membership_start").toggle();
 | 
					        $("#div_id_membership_start").toggle();
 | 
				
			||||||
            $("#div_id_membership_end").toggle();
 | 
					        $("#div_id_membership_end").toggle();
 | 
				
			||||||
        });
 | 
					    });
 | 
				
			||||||
    </script>
 | 
					</script>
 | 
				
			||||||
{% endblock %}
 | 
					{% endblock %}
 | 
				
			||||||
@@ -1,53 +1,16 @@
 | 
				
			|||||||
{% extends "base.html" %}
 | 
					{% extends "base_search.html" %}
 | 
				
			||||||
 | 
					{% comment %}
 | 
				
			||||||
 | 
					SPDX-License-Identifier: GPL-3.0-or-later
 | 
				
			||||||
 | 
					{% endcomment %}
 | 
				
			||||||
{% load render_table from django_tables2 %}
 | 
					{% load render_table from django_tables2 %}
 | 
				
			||||||
{% load crispy_forms_tags %}
 | 
					{% load crispy_forms_tags %}
 | 
				
			||||||
{% load i18n %}
 | 
					{% load i18n %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block content %}
 | 
					{% block content %}
 | 
				
			||||||
    <a href="{% url 'registration:signup' %}"><button class="btn btn-primary btn-block">{% trans "New user" %}</button></a>
 | 
					<a class="btn btn-block btn-success mb-3" href="{% url 'registration:signup' %}">
 | 
				
			||||||
    <hr>
 | 
					    {% trans "New user" %}
 | 
				
			||||||
    <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note/section ...">
 | 
					</a>
 | 
				
			||||||
    <hr>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <div id="user_table">
 | 
					{# Search panel #}
 | 
				
			||||||
        {% if table.data %}
 | 
					{{ block.super }}
 | 
				
			||||||
            {% render_table table %}
 | 
					 | 
				
			||||||
        {% else %}
 | 
					 | 
				
			||||||
            <div class="alert alert-warning">
 | 
					 | 
				
			||||||
                {% trans "There is no pending user with this pattern." %}
 | 
					 | 
				
			||||||
            </div>
 | 
					 | 
				
			||||||
        {% endif %}
 | 
					 | 
				
			||||||
    </div>
 | 
					 | 
				
			||||||
{% endblock %}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
{% block extrajavascript %}
 | 
					 | 
				
			||||||
<script type="text/javascript">
 | 
					 | 
				
			||||||
    $(document).ready(function() {
 | 
					 | 
				
			||||||
        let old_pattern = null;
 | 
					 | 
				
			||||||
        let searchbar_obj = $("#searchbar");
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        function reloadTable() {
 | 
					 | 
				
			||||||
            let pattern = searchbar_obj.val();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            if (pattern === old_pattern || pattern === "")
 | 
					 | 
				
			||||||
                return;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            $("#user_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #user_table", init);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            $(".table-row").click(function() {
 | 
					 | 
				
			||||||
                window.document.location = $(this).data("href");
 | 
					 | 
				
			||||||
            });
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        searchbar_obj.keyup(reloadTable);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        function init() {
 | 
					 | 
				
			||||||
            $(".table-row").click(function() {
 | 
					 | 
				
			||||||
                window.document.location = $(this).data("href");
 | 
					 | 
				
			||||||
            });
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        init();
 | 
					 | 
				
			||||||
    });
 | 
					 | 
				
			||||||
</script>
 | 
					 | 
				
			||||||
{% endblock %}
 | 
					{% endblock %}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user