Šolar update.
This commit is contained in:
@@ -28,7 +28,17 @@
|
||||
<button onclick="window.location.replace('/solar/pogodbe');" class="selection-tab-button selected">POGODBE</button>
|
||||
</div>
|
||||
</div>
|
||||
{% with messages = get_flashed_messages() %}
|
||||
{% if messages %}
|
||||
<div class="message-notification">
|
||||
{{ messages[0] }}
|
||||
</div>
|
||||
<div id="contract-container" style="height: 250px;">
|
||||
{% else %}
|
||||
<div id="contract-container">
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
|
||||
{% if contract_school %}
|
||||
<div class="contract-item">
|
||||
<img src="/static/image/contract.png" alt="contract" class="contract-item-icon"/>
|
||||
@@ -71,7 +81,7 @@
|
||||
<label style="width: 80%; text-align: right;" for="ucenci-starsi">Pogodba z učenci / starši</label>
|
||||
<input style="width: 20%;" type="radio" id="ucenci-starsi" name="tip-pogodbe" value="ucenci-starsi" checked>
|
||||
</div>
|
||||
<input style="font-size: 10px;" type="file" id="file-contract" name="filename">
|
||||
<input style="font-size: 10px;" type="file" id="file-contract" name="file[]" multiple="">
|
||||
<button style="float: right;" type="submit">Oddaj pogodbo</button>
|
||||
</form>
|
||||
</div>
|
||||
@@ -84,11 +94,26 @@
|
||||
{% for collaborator in collaborators %}
|
||||
<div class="collaborators-item">
|
||||
<div class="collaborators-item-name">{{collaborator.name}}</div>
|
||||
{% for history_item in cooperation_history %}
|
||||
{% if collaborator.id == history_item.user %}
|
||||
<div>{{history_item.badge_text}}</div>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% if collaborator.id in cooperation_history %}
|
||||
{% if cooperation_history[collaborator.id]["coordinator"]|length > 0 %}
|
||||
<div class="collaborators-item-years"><b>Vodenje:</b> {% for item in cooperation_history[collaborator.id]["coordinator"] %}
|
||||
{% if loop.index != 1 %}, {% endif %}
|
||||
{{item[0]}}
|
||||
{% endfor %}</div>
|
||||
{% endif %}
|
||||
{% if cooperation_history[collaborator.id]["mentor"]|length > 0 %}
|
||||
<div class="collaborators-item-years"><b>Mentorstvo:</b> {% for item in cooperation_history[collaborator.id]["mentor"] %}
|
||||
{% if loop.index != 1 %}, {% endif %}
|
||||
{{item[0]}}
|
||||
{% endfor %}</div>
|
||||
{% endif %}
|
||||
{% if cooperation_history[collaborator.id]["other"]|length > 0 %}
|
||||
<div class="collaborators-item-years"><b>Drugo:</b> {% for item in cooperation_history[collaborator.id]["other"] %}
|
||||
{% if loop.index != 1 %}, {% endif %}
|
||||
{{item[0]}}
|
||||
{% endfor %}</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
@@ -96,13 +121,49 @@
|
||||
<div id="awards-container">
|
||||
<div class="container-title">Sodelovanje v letih</div>
|
||||
<div style="overflow-y: auto; margin: auto; width: 100%; height: 200px;">
|
||||
{% for item in cooperation_history %}
|
||||
<div style="border-bottom: 2px solid #c4c4c4; min-height: 50px;">
|
||||
<img src="/static/image/star.png" alt="star" style="float: left; width: 40px;"/>
|
||||
<div class="collaborators-item-name"
|
||||
style="float: right; width: 250px; margin-bottom: 20px; margin-top: 10px; text-align: left; margin-left: 20px;">{{item.badge_text}}</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% if cooperation_history.keys()|length > 0 %}
|
||||
{% if user_id in cooperation_history %}
|
||||
{% for item in cooperation_history[user_id]['coordinator'] %}
|
||||
<div style="border-bottom: 2px solid #c4c4c4; min-height: 50px; margin-bottom: 10px;">
|
||||
<img src="/static/image/star.png" alt="star" style="float: left; width: 40px;"/>
|
||||
<div class="collaborators-item-name"
|
||||
style="float: right; width: 250px; text-align: left; margin-left: 20px;text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">
|
||||
{{item[1]}}
|
||||
</div>
|
||||
<div class="collaborators-item-name"
|
||||
style="float: right; width: 250px; text-align: left; margin-left: 20px;">
|
||||
{{item[0]}}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% for item in cooperation_history[user_id]['mentor'] %}
|
||||
<div style="border-bottom: 2px solid #c4c4c4; min-height: 50px; margin-bottom: 10px;">
|
||||
<img src="/static/image/star.png" alt="star" style="float: left; width: 40px;"/>
|
||||
<div class="collaborators-item-name"
|
||||
style="float: right; width: 250px; text-align: left; margin-left: 20px;text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">
|
||||
{{item[1]}}
|
||||
</div>
|
||||
<div class="collaborators-item-name"
|
||||
style="float: right; width: 250px; text-align: left; margin-left: 20px;">
|
||||
{{item[0]}}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% for item in cooperation_history[user_id]['other'] %}
|
||||
<div style="border-bottom: 2px solid #c4c4c4; min-height: 50px; margin-bottom: 10px;">
|
||||
<img src="/static/image/star.png" alt="star" style="float: left; width: 40px;"/>
|
||||
<div class="collaborators-item-name"
|
||||
style="float: right; width: 250px; text-align: left; margin-left: 20px;text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">
|
||||
{{item[1]}}
|
||||
</div>
|
||||
<div class="collaborators-item-name"
|
||||
style="float: right; width: 250px; text-align: left; margin-left: 20px;">
|
||||
{{item[0]}}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user