antoine.jourdain
/
sae_2a_anglais
1
0
Fork 0
Code Issues 17 Pull Requests 1 Packages Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/php' into php

Browse Source
php
Patrick BRUGIERE 1 year ago
parent 6ecc99a6e3 8cc18109db
commit 8967d45f7c
8 changed files with 112 additions and 139 deletions
Show Stats Download Patch File Download Diff File

5
Project/php/css/styles.css
Unescape View File

@ -2767,7 +2767,6 @@ textarea.form-control-lg {
.btn { .btn {
--bs-btn-padding-x: 0.75rem; --bs-btn-padding-x: 0.75rem;
--bs-btn-padding-y: 0.375rem; --bs-btn-padding-y: 0.375rem;
--bs-btn-font-family: ;
--bs-btn-font-size: 1rem; --bs-btn-font-size: 1rem;
--bs-btn-font-weight: 400; --bs-btn-font-weight: 400;
--bs-btn-line-height: 1.5; --bs-btn-line-height: 1.5;
@ -2878,7 +2877,7 @@ textarea.form-control-lg {
.btn-success { .btn-success {
--bs-btn-color: #000; --bs-btn-color: #000;
--bs-btn-bg: #67c29c; --bs-btn-bg: #008800;
--bs-btn-border-color: #67c29c; --bs-btn-border-color: #67c29c;
--bs-btn-hover-color: #000; --bs-btn-hover-color: #000;
--bs-btn-hover-bg: #7ecbab; --bs-btn-hover-bg: #7ecbab;
@ -2929,7 +2928,7 @@ textarea.form-control-lg {
.btn-danger { .btn-danger {
--bs-btn-color: #fff; --bs-btn-color: #fff;
--bs-btn-bg: #a16468; --bs-btn-bg: #bb0000;
--bs-btn-border-color: #a16468; --bs-btn-border-color: #a16468;
--bs-btn-hover-color: #fff; --bs-btn-hover-color: #fff;
--bs-btn-hover-bg: #895558; --bs-btn-hover-bg: #895558;

8
Project/php/templates/addGroupForm.twig
Unescape View File

@ -1,6 +1,6 @@
<form action="{{ base }}/admin/{{ userID }}/addGroup" method="POST"> <form action="{{ base }}/admin/{{ userID }}/addGroup" method="POST">
<input name="num" type="text" placeholder="number" required> <input class="input-group-text d-inline" name="num" type="text" placeholder="number" required>
<input name="year" type="text" placeholder="year" required> <input class="input-group-text d-inline" name="year" type="text" placeholder="year" required>
<input name="sector" type="text" placeholder="sector" required> <input class="input-group-text d-inline" name="sector" type="text" placeholder="sector" required>
<input type="submit" value="Add"> <input class="btn btn-success" type="submit" value="Add">
</form> </form>

59
Project/php/templates/groupContainer.twig
Unescape View File

@ -1,58 +1,41 @@
<table> <div class="container mt-5">
{% if groups is defined %} <table class="table table-bordered thead-dark">
{% for row in groups %} <thead>
{% if selectedGroup is defined and selectedGroup == row.id %}
<tr style="background-color:red;">
{% else %}
<tr> <tr>
{% endif %} <th>ID</th>
<td>ID</td> <th>Num</th>
<td>Num</td> <th>Year</th>
<td>Year</td> <th>Sector</th>
<td>Sector</td> <th>Actions</th>
</tr> </tr>
<tr> </thead>
<tbody>
{% if groups is defined %}
{% for row in groups %}
<tr {% if selectedGroup is defined and selectedGroup == row.id %}class="table-danger"{% endif %}>
<td>{{ row.id }}</td> <td>{{ row.id }}</td>
<td>{{ row.num }}</td> <td>{{ row.num }}</td>
<td>{{ row.year }}</td> <td>{{ row.year }}</td>
<td>{{ row.sector }}</td> <td>{{ row.sector }}</td>
<td>
{% if actions is defined %} {% if actions is defined %}
{% if 'showGroupDetails' in actions %} {% if 'showGroupDetails' in actions %}
<td> <a href="{{ base }}/admin/{{ userID }}/showGroupDetails?selectedGroup={{ row.id }}" class="btn btn-primary fs-6">Show</a>
<a href="{{base}}/admin/{{userID}}/showGroupDetails?selectedGroup={{ row.id }}">
<input class="btn-black" type="button" value="Show"/>
</a>
</td>
{% endif %} {% endif %}
{% if 'removeGroup' in actions %} {% if 'removeGroup' in actions %}
<td> <a href="{{ base }}/admin/{{ userID }}/removeGroup?selectedGroup={{ row.id }}" class="btn btn-danger fs-6">Remove</a>
<a href="{{base}}/admin/{{userID}}/removeGroup?selectedGroup={{ row.id }}">
<input class="btn-black" type="button" value="Remove"/>
</a>
</td>
{% endif %} {% endif %}
{% if 'removeVocabFromGroup' in actions %} {% if 'removeVocabFromGroup' in actions %}
<td> <a href="{{ base }}/teacher/{{ userID }}/removeVocabFromGroup?vocabID={{ vocabID }}&selectedGroup={{ row.id }}" class="btn btn-warning fs-6">Remove from group</a>
<a href="{{base}}/teacher/{{userID}}/removeVocabFromGroup?vocabID={{ vocabID }}&selectedGroup={{ row.id }}">
<input class="btn-black" type="button" value="Remove from group"/>
</a>
</td>
{% endif %} {% endif %}
{% if 'addVocabToGroup' in actions %} {% if 'addVocabToGroup' in actions %}
<td> <a href="{{ base }}/teacher/{{ userID }}/addVocabToGroup?vocabID={{ vocabID }}&selectedGroup={{ row.id }}" class="btn btn-success">Add to group</a>
<a href="{{base}}/teacher/{{userID}}/addVocabToGroup?vocabID={{ vocabID }}&selectedGroup={{ row.id }}">
<input class="btn-black" type="button" value="Add to group"/>
</a>
</td>
{% endif %} {% endif %}
{% endif %} {% endif %}
</td>
</tr> </tr>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</tbody>
</table> </table>
</div>

31
Project/php/templates/manageGroupView.html
Unescape View File

@ -11,39 +11,34 @@
<script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script> <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
<!-- Google fonts--> <!-- Google fonts-->
<link href="https://fonts.googleapis.com/css?family=Varela+Round" rel="stylesheet" /> <link href="https://fonts.googleapis.com/css?family=Varela+Round" rel="stylesheet" />
<link <link
href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i"
rel="stylesheet" /> rel="stylesheet" />
<!-- Core theme CSS (includes Bootstrap)--> <!-- Core theme CSS (includes Bootstrap)-->
<link href="{{base}}/css/styles.css" rel="stylesheet" /> <link href="{{base}}/css/styles.css" rel="stylesheet" />
</head> </head>
<style>
section {
border: 2px solid black;
margin: 10px 0;
}
</style>
<body> <body>
{% include 'navBar.twig' %} {% include 'navBar.twig' %}
<div class="content"> <div class="content">
<section class="groupList"> <div class="border my-2 py-2 border-5 border-secondary rounded-3 text-center">
<h2>Group list</h2> <h1>Group list</h1>
{% include 'groupContainer.twig' with {'actions' : ['showGroupDetails', 'removeGroup']} %} {% include 'groupContainer.twig' with {'actions' : ['showGroupDetails', 'removeGroup']} %}
</section> </div>
<section class="users"> <div class="border my-2 py-2 border-5 border-secondary rounded-3 text-center">
<h2>Users of the group</h2> <h1>Users of the group</h1>
{% include 'userContainer.twig' with {'users' : users, 'action' : 'removeUserFromGroup'} %} {% include 'userContainer.twig' with {'users' : users, 'action' : 'removeUserFromGroup'} %}
</section> </div>
<section class="addGroupForm"> <div class="border my-2 py-2 border-5 border-secondary rounded-3 text-center">
<h2>Add group</h2> <h1>Add group</h1>
{% include 'addGroupForm.twig' %} {% include 'addGroupForm.twig' %}
</section> </div>
<section class="unassignedUsers"> <div class="border my-2 py-2 border-5 border-secondary rounded-3 text-center">
<h1>Unassigned users</h1> <h1>Unassigned users</h1>
{% include 'userContainer.twig' with {'users' : unassignedUsers, 'action' : 'addUserToGroup'} %} {% include 'userContainer.twig' with {'users' : unassignedUsers, 'action' : 'addUserToGroup'} %}
</section>
</div> </div>
<script src="{{base}}/js/scripts.js"></script> </div>
</body> </body>
</html> </html>

4
Project/php/templates/manageVocabListView.html
Unescape View File

@ -18,10 +18,6 @@
<link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/> <link rel="icon" type="image/x-icon" href="{{base}}/assets/favicon.ico"/>
</head> </head>
<style> <style>
section {
border: 2px solid black;
margin: 10px 0;
}
</style> </style>
<body> <body>
{% include 'navBar.twig' %} {% include 'navBar.twig' %}

46
Project/php/templates/userContainer.twig
Unescape View File

@ -1,14 +1,21 @@
<table> <div class="container mt-5">
<table class="table table-bordered">
<thead>
<tr> <tr>
<td>ID</td> <th>ID</th>
<td>Nickname</td> <th>Nickname</th>
<td>Name</td> <th>Name</th>
<td>Surname</td> <th>Surname</th>
<td>Mail</td> <th>Mail</th>
<td>Group</td> <th>Group</th>
<td>Role</td> <th>Role</th>
<td>Extra Time</td> <th>Extra Time</th>
{% if action is defined %}
<th>Action</th>
{% endif %}
</tr> </tr>
</thead>
<tbody>
{% if users is defined %} {% if users is defined %}
{% for row in users %} {% for row in users %}
<tr> <tr>
@ -20,27 +27,20 @@
<td>{{ row.group }}</td> <td>{{ row.group }}</td>
<td>{{ row.roles|join(', ') }}</td> <td>{{ row.roles|join(', ') }}</td>
<td>{{ row.extraTime ? 'yes' : 'no' }}</td> <td>{{ row.extraTime ? 'yes' : 'no' }}</td>
{% if action is defined %} {% if action is defined %}
<td>
{% if action == 'removeUserFromGroup' %} {% if action == 'removeUserFromGroup' %}
<td><a href="{{base}}/admin/{{ userID }}/removeUserFromGroup?userToRemove={{row.id}}&selectedGroup={{ selectedGroup }}"> <a href="{{ base }}/admin/{{ userID }}/removeUserFromGroup?userToRemove={{ row.id }}&selectedGroup={{ selectedGroup }}" class="btn btn-danger">Delete from group</a>
<input class="btn-black" type="button" value="Delete from group"/>
</a></td>
{% elseif action == 'addUserToGroup' %} {% elseif action == 'addUserToGroup' %}
<td><a href="{{base}}/admin/{{ userID }}/addUserToGroup?userToAdd={{row.id}}&groupID={{selectedGroup}}"> <a href="{{ base }}/admin/{{ userID }}/addUserToGroup?userToAdd={{ row.id }}&groupID={{ selectedGroup }}" class="btn btn-success">Add to group</a>
<input class="btn-black" type="button" value="Add to group"/>
</a></td>
{% elseif action == 'removeUser' %} {% elseif action == 'removeUser' %}
<td><a href="{{base}}/admin/{{ userID }}/removeUser?userToRemove={{row.id}}"> <a href="{{ base }}/admin/{{ userID }}/removeUser?userToRemove={{ row.id }}" class="btn btn-warning">Delete</a>
<input class="btn-black" type="button" value="Delete"/>
</a></td>
{% endif %} {% endif %}
</td>
{% endif %} {% endif %}
</tr> </tr>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</tbody>
</table> </table>
</div>

10
Project/php/templates/usersView.html
Unescape View File

@ -13,18 +13,18 @@
<div class="content"> <div class="content">
<section> <section>
<table> <table>
<tr> <tr class="d-flex justify-content-center">
<td><a href="{{base}}/admin/{{userID}}/showAllUsers"> <td><a href="{{base}}/admin/{{userID}}/showAllUsers">
<input class="btn-black" type="button" value="Show all users"/> <input class="btn btn-info" type="button" value="Show all users"/>
</a></td> </a></td>
<td><a href="{{base}}/admin/{{userID}}/showAllAdmins"> <td><a href="{{base}}/admin/{{userID}}/showAllAdmins">
<input class="btn-black" type="button" value="Show all admins"/> <input class="btn btn-info" type="button" value="Show all admins"/>
</a></td> </a></td>
<td><a href="{{base}}/admin/{{userID}}/showAllTeachers"> <td><a href="{{base}}/admin/{{userID}}/showAllTeachers">
<input class="btn-black" type="button" value="Show all teachers"/> <input class="btn btn-info" type="button" value="Show all teachers"/>
</a></td> </a></td>
<td><a href="{{base}}/admin/{{userID}}/showAllStudents"> <td><a href="{{base}}/admin/{{userID}}/showAllStudents">
<input class="btn-black" type="button" value="Show all students"/> <input class="btn btn-info" type="button" value="Show all students"/>
</a></td> </a></td>
</tr> </tr>
</table> </table>

4
Project/php/templates/vocabularyContainer.twig
Unescape View File

@ -22,13 +22,13 @@
<td> <td>
{% if 'getContent' in actions %} {% if 'getContent' in actions %}
<a href="{{base}}/teacher/{{userID}}/getContent?vocabID={{row.id}}"> <a href="{{base}}/teacher/{{userID}}/getContent?vocabID={{row.id}}">
<input class="btn-black" type="button" value="show content" /> <input class="btn btn-primary" type="button" value="show content" />
</a> </a>
{% endif %} {% endif %}
{% if 'delById' in actions %} {% if 'delById' in actions %}
<a id="delButton" href="{{base}}/teacher/{{userID}}/delById?vocabID={{ row.id }}"> <a id="delButton" href="{{base}}/teacher/{{userID}}/delById?vocabID={{ row.id }}">
<input class="btn-black" type="button" value="delete from vocabulary" /> <input class="btn btn-primary" type="button" value="delete from vocabulary" />
</a> </a>
{% endif %} {% endif %}

Write Preview
Loading…
Cancel
Save