ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a load of test

Browse Source
This commit is contained in:
Ross
2023-11-27 12:08:45 +00:00
parent 95c136d3f3
commit 5cc57587aa
16 changed files with 209 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generic/templates/generic/cid_group_base.html
+19 -14
View File
@@ -3,28 +3,33 @@
{% block navigation %}
{{block.super}}
<br/>
Group: {{group.name}}->
{% if group_type == "cid" %}
<br/>
Group: {{group.name}}->
{% if not group %}
<a href="{% url 'generic:cid_group_detail' cidusergroup.pk %}">Group</a> /
<a href="{% url 'generic:cid_group_update' cidusergroup.pk %}">Edit Users</a> /
<a href="{% url 'generic:cid_group_exams' cidusergroup.pk %}">Edit Exams</a> /
<a href="{% url 'generic:cid_group_delete' cidusergroup.pk %}">Delete</a>
<a href="{% url 'generic:cid_group_detail' cidusergroup.pk %}">Group</a> /
<a href="{% url 'generic:cid_group_update' cidusergroup.pk %}">Edit Users</a> /
<a href="{% url 'generic:cid_group_exams' cidusergroup.pk %}">Edit Exams</a> /
<a href="{% url 'generic:cid_group_delete' cidusergroup.pk %}">Delete</a>
{% else %}
<a href="{% url 'generic:cid_group_detail' group.pk %}">Group</a> /
<a href="{% url 'generic:cid_group_update' group.pk %}">Edit Users</a> /
<a href="{% url 'generic:cid_group_exams' group.pk %}">Edit Exams</a> /
<a href="{% url 'generic:cid_group_delete' group.pk %}">Delete</a>
<a href="{% url 'generic:cid_group_detail' group.pk %}">Group</a> /
<a href="{% url 'generic:cid_group_update' group.pk %}">Edit Users</a> /
<a href="{% url 'generic:cid_group_exams' group.pk %}">Edit Exams</a> /
<a href="{% url 'generic:cid_group_delete' group.pk %}">Delete</a>
{% endif %}
{% else %}
<a href="{% url 'generic:user_group_detail' group.pk %}">Group</a> /
<a href="{% url 'generic:user_group_update' group.pk %}">Edit Users</a> /
<a href="{% url 'generic:user_group_exams' group.pk %}">Edit Exams</a> /
<a href="{% url 'generic:user_group_delete' group.pk %}">Delete</a>
{% if group %}
<br/>
Group: {{group.name}}->
<a href="{% url 'generic:user_group_detail' group.pk %}">Group</a> /
<a href="{% url 'generic:user_group_update' group.pk %}">Edit Users</a> /
<a href="{% url 'generic:user_group_exams' group.pk %}">Edit Exams</a> /
<a href="{% url 'generic:user_group_delete' group.pk %}">Delete</a>
{% endif %}
{% endif %}
{% endblock %}
generic/templates/generic/cidusergroup_form.html
+24 -21
View File
@@ -5,10 +5,10 @@
{% endblock %}
{% block js %}
<!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
{{form.media}}
{{form.media}}
<script type="text/javascript">
</script>
<script type="text/javascript">
</script>
<!-- {{ form.media }} -->
{% endblock %}
@@ -20,28 +20,31 @@
<h2>Add New Group</h2>
Use this form to create a CID user group.
{% endif %}
<form action="" method="post" enctype="multipart/form-data" id="condition-form">
{% csrf_token %}
<form action="" method="post" enctype="multipart/form-data" id="condition-form">
{% csrf_token %}
<table>
{{ form.as_table }}
</table>
<input type="submit" class="submit-button" value="Submit" name="submit">
<table>
{{ form.as_table }}
</table>
<input type="submit" class="submit-button" value="Submit" name="submit">
<p>Users can be added to the group <a href="{% url 'generic:manage_cids' %}">here</a></p>
<h3>Users</h3>
{% if cidusergroup %}
<p>Users can be added to the group <a href="{% url 'generic:manage_cids' %}">here</a></p>
<ul>
{% for user in cidusergroup.ciduser_set.all %}
<li><a href="{% url 'generic:update_cid' user.pk %}">{{user.cid}}</a>: {{user.name}} [{{user.email}} {{user.last_name}}] {{user.userprofile.grade}}</li>
<h3>Users</h3>
{% empty %}
<li>Group currently has no users.</li>
{% endfor %}
</ul>
Count: {{cidusergroup.ciduser_set.count}}
<ul>
{% for user in cidusergroup.ciduser_set.all %}
<li><a href="{% url 'generic:update_cid' user.pk %}">{{user.cid}}</a>: {{user.name}} [{{user.email}} {{user.last_name}}] {{user.userprofile.grade}}</li>
</form>
{% empty %}
<li>Group currently has no users.</li>
{% endfor %}
</ul>
Count: {{cidusergroup.ciduser_set.count}}
{% endif %}
</form>
{% endblock %}
generic/tests/test_trainees.py
+3 -1
View File
@@ -44,6 +44,7 @@ def test_trainee_stuff(client, create_cid_manager, create_users):
print(UserProfile.objects.all().count())
assert UserProfile.objects.all().count() == 5
print(UserProfile.objects.filter(peninsula_trainee=True))
assert UserProfile.objects.filter(peninsula_trainee=True).count() == 4
response = client.get(reverse(f"trainees"))
@@ -59,9 +60,10 @@ def test_trainee_stuff(client, create_cid_manager, create_users):
response = client.get(reverse(f"trainees"))
assert response.status_code == 200
trainee_rows = BeautifulSoup(response.content, "html.parser").find(
trainee_rows = BeautifulSoup(response.content, "html.parser").find_all(
"tr", {"class": "trainee"}
)
print(trainee_rows)
assert (
len(trainee_rows) == UserProfile.objects.filter(peninsula_trainee=True).count()