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

Merge branch 'leon-redesign' of https://gitea.cjvt.si/mihasinkec/portal-oddajanje-solar into leon-redesign

Browse Source
This commit is contained in:
msinkec 2022-02-10 10:25:39 +01:00
commit 9ce19a34a7
5 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app.py
View File

@ -323,6 +323,7 @@ def solar(text):
collaborators=collaborators, collaborators=collaborators,
cooperation_history=cooperation_history, cooperation_history=cooperation_history,
user_id=current_user.id, user_id=current_user.id,
institution_id=current_user_institution.id,
is_admin=is_admin, is_institution_coordinator=current_user_institution_coordinator) is_admin=is_admin, is_institution_coordinator=current_user_institution_coordinator)
elif text.startswith('admin/') or text == 'admin': elif text.startswith('admin/') or text == 'admin':
users = portal.solar.get_all_users_join_institutions() users = portal.solar.get_all_users_join_institutions()

21
templates/solar-admin.html
View File

@ -3,6 +3,10 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Admin panel - Šolar</title> <title>Admin panel - Šolar</title>
<link rel="stylesheet" href="../static/css/header.css" type="text/css">
<link rel="stylesheet" href="../static/css/form.css" type="text/css">
<link rel="stylesheet" href="../static/css/simple-grid.css" type="text/css">
<link rel="stylesheet" href="../static/css/manage-institution.css" type="text/css">
<style> <style>
.tableFixHead { .tableFixHead {
overflow-y: scroll; overflow-y: scroll;
@ -30,7 +34,21 @@
</style> </style>
</head> </head>
<body> <body>
<a href="../oddaja">Nazaj na oddajo</a> <header>
<div class="logo"><a href="../"><img src="../static/image/logo-white.svg"/></a></div>
<div class="menu-items">
<a href="../logout">Odjava</a>
{% if is_institution_coordinator %}
<a href="../manage-institution">Upravljaj z institucijo</a>
{% endif %}
{% if is_admin %}
<a href="../admin">Administracijski meni</a>
{% endif %}
<a href="../oddaja">Oddaja</a>
<a href="https://slovenscina.eu/" target="_blank">Več informacij</a>
</div>
</header>
<div class="container" style="margin-top:8rem;">
{% with messages = get_flashed_messages() %} {% with messages = get_flashed_messages() %}
{% if messages %} {% if messages %}
<div style="background: blue;"> <div style="background: blue;">
@ -389,6 +407,7 @@
<button id="button-submit" type="submit">Posodobi</button> <button id="button-submit" type="submit">Posodobi</button>
</form> </form>
</div>
<script> <script>
var selectPredmet = document.getElementById("predmet"); var selectPredmet = document.getElementById("predmet");
var selectVrsta = document.getElementById("vrsta"); var selectVrsta = document.getElementById("vrsta");

1
templates/solar-manage-institution.html
View File

@ -49,7 +49,6 @@
</div> </div>
</header> </header>
<div class="container" style="margin-top:8rem;"> <div class="container" style="margin-top:8rem;">
<a href="../oddaja">Nazaj na oddajo</a>
{% with messages = get_flashed_messages() %} {% with messages = get_flashed_messages() %}
{% if messages %} {% if messages %}
<div style="background: blue;"> <div style="background: blue;">

2
templates/solar-pogodbe.html
View File

@ -103,7 +103,7 @@
var data; var data;
// Parse the Data // Parse the Data
d3.json("/topuploads-by-user/").then(function(jsondata) { d3.json("/topuploads-institution/{{institution_id}}").then(function(jsondata) {
if(Object.keys(jsondata).length < 1) { if(Object.keys(jsondata).length < 1) {
return; return;
} }

32
templates/solar-zgodovina.html
View File

@ -45,14 +45,14 @@
</div> </div>
</div>--> </div>-->
{% set map_program = { {% set map_program = {
"OS" : "Osnovna šola (OŠ)", "OS" : "Osnovna šola",
"SSG" : "Splošna in strokovna gimnazija (SGG)", "SSG" : "Splošna in strokovna gimnazija",
"MGP" : "Mednarodni gimnazijski programi (MGP)", "MGP" : "Mednarodni gimnazijski programi",
"ZG" : "Zasebne gimnazije (ZG)", "ZG" : "Zasebne gimnazije",
"NPI" : "Nižje poklicno izobraževanje (NPI)", "NPI" : "Nižje poklicno izobraževanje",
"SPI" : "Srednje poklicno izobraževanje (SPI)", "SPI" : "Srednje poklicno izobraževanje",
"SSI" : "Srednje strokovno izobraževanje (SSI)", "SSI" : "Srednje strokovno izobraževanje",
"PTI" : "Poklicno-tehnično izobraževanje (PTI)" "PTI" : "Poklicno-tehnično izobraževanje"
}%} }%}
{% set map_subject = { {% set map_subject = {
"SLO" : "Slovenščina", "SLO" : "Slovenščina",
@ -73,6 +73,19 @@
"N" : "Besedilo ne vsebuje učiteljskih popravkov", "N" : "Besedilo ne vsebuje učiteljskih popravkov",
"DN" : "Besedilo vsebuje učiteljske popravke in ne strinjam se z njihovo vključitvijo v korpus", "DN" : "Besedilo vsebuje učiteljske popravke in ne strinjam se z njihovo vključitvijo v korpus",
}%} }%}
{% set map_regions = {
"CE" : "Celje",
"GO" : "Nova Gorica",
"KK" : "Krško",
"KP" : "Koper",
"KR" : "Kranj",
"LJ" : "Ljubljana",
"MB" : "Maribor",
"MS" : "Murska Sobota",
"NM" : "Novo Mesto",
"PO" : "Postojna",
"SG" : "Slovenj Gradec",
}%}
@ -81,6 +94,9 @@
{% if institution_names[loop.index - 1] %} {% if institution_names[loop.index - 1] %}
{% set item_values = item_values + [institution_names[loop.index - 1]] %} {% set item_values = item_values + [institution_names[loop.index - 1]] %}
{% endif %} {% endif %}
{% if item.region %}
{% set item_values = item_values + [map_regions[item.region]] %}
{% endif %}
{% if item.program %} {% if item.program %}
{% set item_values = item_values + [map_program[item.program]] %} {% set item_values = item_values + [map_program[item.program]] %}
{% endif %} {% endif %}