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

fixes

Browse Source
This commit is contained in:
Leon Noe Jovan
2023-01-16 18:52:30 +01:00
parent f627218e41
commit 2868cf3548
26 changed files with 1483 additions and 855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
templates/solar-pogodbe.html
View File

@@ -47,58 +47,44 @@
<h2>Sodelujoči</h2>
</div>
</div>-->
{% set vars = {'prev_schoolyear': ''} %}
{% for item in cooperation_history %}
{% if item[0] != vars.prev_schoolyear %}
<div class="row">
<div class="col-12">
<h2>Šolsko leto {{item[0]}}</h2>
</div>
</div>
{% if vars.update({'prev_schoolyear': item[0]}) %} {% endif %}
{% endif %}
{% for entry in item[1] %}
<div class="row">
<div class="col-6">
<div class="row">
<div class="col-6">
<h2>Sodelujoči</h2>
{% for u in institution_users %}
<div class="team-item">
<div class="team-item-name">{{entry.name}} <span class="team-item-role">{%if entry.role == "mentor" %}Mentor/-ica{%elif entry.role == "coordinator" %}Koordinator/-ica{%elif entry.role == "other" %}Druga vloga{%endif%}</span></div>
<div class="team-item-name">{{u.name}} <span class="team-item-role">{{role_map[u.id]}}</span></div>
</div>
{% endfor %}
<h2 style="margin-top:2rem">Zgodovina sprememb</h2>
{% for item in cooperation_history %}
<div class="team-item">
<div class="team-item-name">
{{item.name}}
<span class="team-item-role" style="margin-left:0">{{item.timestamp.strftime('%d.%m.%Y')}} postane {% if item.role == "coordinator"%}koordinator/-ka{% elif item.role == "mentor" %}mentor/-ica{% elif item.role == "other" %}druga vloga{% endif %}</span>
</div>
</div>
{% endfor %}
</div>
{% endfor %}
{% endfor %}
<div class="row" id="my_dataviz_title">
<div class="col-12">
<h2>Število oddaj na uporabnika</h2>
</div>
</div>
<div class="row">
<div class="col-6">
<div id="my_dataviz">
<div id="my_dataviz_title">
<h2>Število oddaj na uporabnika</h2>
<div id="my_dataviz"></div>
</div>
</div>
</div>
<div id="my_dataviz__region_title">
<h2>Število vseh oddaj po regijah</h2>
<div id="my_dataviz_region">
<div class="row" id="my_dataviz__region_title">
<div class="col-12">
<h2>Število vseh oddaj po regijah</h2>
</div>
</div>
<div class="row">
<div class="col-6">
<div id="my_dataviz_region">
</div>
<div>
<div style="display:inline-block;width:12px;height:12px;background:#006CB7"></div>
<p style="display:inline-block">Osnovne šole</p>
<div style="margin-left:32px;display:inline-block;width:12px;height:12px;background:#B86D00"></div>
<p style="display:inline-block">Sredje šole</p>
</div>
<div>
<div style="display:inline-block;width:12px;height:12px;background:#006CB7"></div>
<p style="display:inline-block">Osnovne šole</p>
<div style="margin-left:32px;display:inline-block;width:12px;height:12px;background:#B86D00"></div>
<p style="display:inline-block">Srednje šole</p>
</div>
</div>
</div>
</div>
@@ -157,10 +143,10 @@
var x = d3.scaleLinear()
.domain([0,d3.max(data, function (d) { return d.value})])
.range([ 0, width]);
svg.append("g")
.attr("transform", "translate(0," + height + ")")
.call(d3.axisBottom(x))
.call(d3.axisBottom(x)/*.ticks(5)*/)
.selectAll("text")
.style("text-anchor", "center");