@@ -241,103 +240,7 @@
-
@@ -358,7 +261,7 @@
var form = document.forms["form-oddaja"];
{% if not institution %}
- btnSubmit.disabled = true;
+ btnSubmit.disabled = true;
{% endif %}
function isEmptyOrSpaces(str){
@@ -412,7 +315,7 @@
acceptedFiles: ".txt, .csv, .pdf, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .jpg, .jpeg, .png, .mkv",
maxFiles: 20,
previewsContainer: "#dropzone-previews",
- dictDefaultMessage: `Kliknite ali odložite datoteke sem.`,
+ dictDefaultMessage: "Kliknite ali odložite datoteke sem.",
dictFallbackMessage: "Vaš brskalnik ne podpira izbiranje datotek z odlaganjem (\"drag & drop\").",
dictInvalidFileType: "Datoteka je napačnega formata.",
dictFileTooBig: "Datoteke je prevelika {{filesize}}. Največja dovoljena velikost: {{maxFilesize}}MiB.",
@@ -468,59 +371,24 @@
btnSubmitFinal.addEventListener("click", function(e) {
// Hand off data to dropzone
dz.processQueue();
-
- // Clear fields and hide popup agian
- /*btnSubmit.disabled = false;
- dataConfirmNotification.style.display = "none";
- btnSubmit.textContent = "Oddaj";
- form.reset();
- scrollboxTriggered = false;*/
});
- /*btnSubmitCancel.addEventListener("click", function(e) {
- btnSubmit.disabled = false;
- scrollboxTriggered = false;
- elemTermsPopup.style.display = "none";
- });*/
-
-/*
- // Enable final submit button only if user scrolls to the end of the terms.
- function checkScrollboxTrigger(event) {
- var element = event.target;
- if (!scrollboxTriggered
- && element.scrollHeight - element.scrollTop <= element.clientHeight + 50
- ) {
- scrollboxTriggered = true;
- btnSubmitFinal.disabled = false;
- }
- }
-
- termsScrollbox.addEventListener('scroll', function(event) {
- checkScrollboxTrigger(event);
- });
-
- termsScrollbox.addEventListener("mouseenter", function(event) {
- checkScrollboxTrigger(event);
- });*/
-
- // Listen to the sendingmultiple event. In this case, it's the sendingmultiple event instead
+// Listen to the sendingmultiple event. In this case, it's the sendingmultiple event instead
// of the sending event because uploadMultiple is set to true.
- /*this.on("sendingmultiple", function() {
+ this.on("sendingmultiple", function() {
// Gets triggered when the form is actually being sent.
// Hide the success button or the complete form.
});
-
this.on("successmultiple", function(files, response) {
// Gets triggered when the files have successfully been sent.
// Redirect user or notify of success.
- alert("Odgovor strežnika: " + response);
- location.reload();
});
-
this.on("errormultiple", function(files, response) {
// Gets triggered when there was an error sending the files.
// Maybe show form again, and notify user of error
- });*/
+ });
+
+
this.on("sending", function(file, xhr, formData) {
formData.append("program",form["program"].value);
formData.append("predmet",form["predmet"].value);
@@ -530,7 +398,6 @@
formData.append("vrsta-custom",form["vrsta-custom"].value);
formData.append("solsko-leto",form["solsko-leto"].value);
formData.append("jezikovni-popravki",form["jezikovni-popravki"].value);
-
});
diff --git a/templates/solar-pogodbe.html b/templates/solar-pogodbe.html
index 36701af..10b919a 100644
--- a/templates/solar-pogodbe.html
+++ b/templates/solar-pogodbe.html
@@ -3,9 +3,170 @@
+
+
+
+
+
+
+
+
+
+
+ {% if show_upload_form %}
+
+ {% endif %}
+
+
+
+
+
+ Oddaj pogodbo
+
+
+ {% if contract_school %}
+
+
+ Oddane pogodbe
+
+
+
+ {% endif %}
+ {% for item in contracts_students %}
+
+
+
+ 
+
+
+ {% endfor %}
+
+
+
+
+
+
+ 
+
+
+
+
+ Sodelujoči
+
+
+
+ {% for collaborator in collaborators %}
+
+
+
+
+
+ {% endfor %}
+ {{collaborator.name}}
+ {% if collaborator.id in cooperation_history %}
+ {% if cooperation_history[collaborator.id]["coordinator"]|length > 0 %}
+ Vodenje: {% for item in cooperation_history[collaborator.id]["coordinator"] %}
+ {% if loop.index != 1 %}, {% endif %}
+ {{item[0]}}
+ {% endfor %}
+ {% endif %}
+ {% if cooperation_history[collaborator.id]["mentor"]|length > 0 %}
+ Mentorstvo: {% for item in cooperation_history[collaborator.id]["mentor"] %}
+ {% if loop.index != 1 %}, {% endif %}
+ {{item[0]}}
+ {% endfor %}
+ {% endif %}
+ {% if cooperation_history[collaborator.id]["other"]|length > 0 %}
+ Drugo: {% for item in cooperation_history[collaborator.id]["other"] %}
+ {% if loop.index != 1 %}, {% endif %}
+ {{item[0]}}
+ {% endfor %}
+ {% endif %}
+ {% endif %}
+ + + + + + + + +