webapps/portal-oddajanje-solar
16
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

model changes, user institution history, style changes, forgot passowrd functionality, etc.

Browse Source
This commit is contained in:
msinkec
2021-09-02 14:40:54 +02:00
parent 7da73f7d6a
commit 788f3bc3eb
25 changed files with 551 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
templates/solar-admin.html
View File

@@ -5,8 +5,8 @@
<title>Admin panel - Šolar</title>
<style>
.tableFixHead {
overflow-y: auto;
height: 306px;
overflow-y: scroll;
max-height: 306px;
}
.tableFixHead thead th {
position: sticky;
@@ -24,6 +24,9 @@
th {
background: #eee;
}
h2 {
color: blue;
}
</style>
</head>
<body>
@@ -45,13 +48,13 @@
<input type="password" id="password" name="password"><br>
<input type="submit" value="Dodaj">
</form>
<!--<h3>Odstrani uporabnika</h3>
<h3>Odstrani uporabnika</h3>
<form action="/solar/deluser" method="post">
<label for="user_id">ID uporabnika:</label><br>
<input type="text" id="user_id" name="user_id"><br>
<input type="submit" value="Odstrani">
</form>-->
<h3>Seznam vseh aktivnih uporabnikov</h3>
</form>
<h3>Aktivni uporabniki</h3>
<div class="tableFixHead">
<table>
<thead>
@@ -60,6 +63,7 @@
<th>Ime in priimek</th>
<th>Email</th>
<th>ID institucije</th>
<th>Vloga v instituciji</th>
</tr>
</thead>
<tbody>
@@ -69,6 +73,7 @@
<td>{{item[0].name}}</td>
<td>{{item[0].email}}</td>
<td>{{item[1].institution}}</td>
<td>{{item[1].role}}</td>
{% endfor %}
</table>
</div>
@@ -80,11 +85,18 @@
<input type="text" id="institution_id" name="institution_id"><br>
<label for="role">Vloga v instituciji:</label>
<select name="role" id="role">
<option value="moderator">Moderator</option>
<option value="user">Uporabnik</option>
<option value="coordinator">Koordinator/-ka</option>
<option value="mentor">Mentor/-ica</option>
<option value="other">Druga vloga</option>
</select>
<input type="submit" value="Dodeli">
</form>
<h3>Odstrani uporabnika iz institucije</h3>
<form action="/solar/deluserfrominstitution" method="post">
<label for="user_id">ID uporabnika:</label>
<input type="text" id="user_id" name="user_id"><br>
<input type="submit" value="Odstrani">
</form>
<div> </div>
<h2>Institucije</h2>
<h3>Dodaj institucijo</h3>
@@ -92,7 +104,19 @@
<label for="name">Naziv:</label>
<input type="text" id="name" name="name"><br>
<label for="region">Regija:</label>
<input type="text" id="region" name="region"><br>
<select name="region" id="region">
<option value="CE">Celje</option>
<option value="GO">Nova Gorica</option>
<option value="KK">Krško</option>
<option value="KP">Koper</option>
<option value="KR">Kranj</option>
<option value="LJ">Ljubljana</option>
<option value="MB">Maribor</option>
<option value="MS">Murska Sobota</option>
<option value="NM">Novo mesto</option>
<option value="PO">Postojna</option>
<option value="SG">Slovenj Gradec</option>
</select>
<input type="submit" value="Dodaj">
</form>
<h3>Seznam vseh instituticij</h3>
@@ -115,7 +139,7 @@
{% endfor %}
</table>
</div>
<h3>Seznam uporabnikov, ki niso aktivirani</h3>
<h3>Čakajoči uporabniki</h3>
<div class="tableFixHead">
<table>
<thead>
@@ -123,14 +147,18 @@
<th>ID</th>
<th>Ime in priimek</th>
<th>Email</th>
<th>Institucija</th>
<th>Vloga v instituciji</th>
</tr>
</thead>
<tbody>
{% for item in inactive_users %}
<tr>
<td>{{item.id}}</td>
<td>{{item.name}}</td>
<td>{{item.email}}</td>
<td>{{item[0].id}}</td>
<td>{{item[0].name}}</td>
<td>{{item[0].email}}</td>
<td>{{item[1].institution}}</td>
<td>{{item[1].role}}</td>
</tr>
{% endfor %}
</table>
@@ -141,4 +169,30 @@
<input type="text" id="id" name="id"><br>
<input type="submit" value="Aktiviraj">
</form>
<h2>Zgodovina sodelovanja</h2>
<div class="tableFixHead">
<table>
<thead>
<tr>
<th>ID</th>
<th>ID uporabnika</th>
<th>ID institucije</th>
<th>Vloga</th>
<th>Šolsko leto</th>
<th>Besedilo značke</th>
</tr>
</thead>
<tbody>
{% for item in user_cooperation_history %}
<tr>
<td>{{item.id}}</td>
<td>{{item.user}}</td>
<td>{{item.institution}}</td>
<td>{{item.role}}</td>
<td>{{item.school_year}}</td>
<td>{{item.badge_text}}</td>
</tr>
{% endfor %}
</table>
</div>
</body>