-
- Portal ŠOLAR
-
+
+
-
- 
-
- Nazaj na prijavo
-
- Pozabljeno geslo - ŠOLAR
-
- {% with messages = get_flashed_messages() %}
- {% if messages %}
-
+
- {{ messages[0] }}
-
- {% endif %}
- {% endwith %}
-
-
+
+
+
diff --git a/templates/solar-login.html b/templates/solar-login.html
index 8e7cff6..8c4f44e 100644
--- a/templates/solar-login.html
+++ b/templates/solar-login.html
@@ -3,63 +3,57 @@
+
-
+
+
+
+ Pozabljeno geslo - ŠOLAR
+
+
+ {% with messages = get_flashed_messages() %}
+ {% if messages %}
+
-
+ 
+
+ {% endif %}
+ {% endwith %}
+ {{ messages[0] }}
+
-
-
- Portal za oddajanje besedil
-
-
- {{ dropzone.style('position: absolute;
- top: -0.5px;
- width: 388px;
- height: 732px;
- left: 385px;
- background: linear-gradient(198.62deg, rgba(255, 255, 255, 0.49) -1.62%, rgba(255, 255, 255, 0.73) -1.61%, rgba(255, 255, 255, 0.41) 79.34%);
- box-shadow: 20px 4px 40px rgba(0, 0, 0, 0.25);
- border: 0px;
- backdrop-filter: blur(20px);
- border-radius: 0px 20px 20px 0px;') }}
-
+
+
+
+
- Odjavi se
- {% if is_institution_coordinator %}
-
Upravljaj z institucijo - {% endif %} - {% if is_admin %} -
Administracijski meni - {% endif %} -
Pomoč - -
-
-
-
- Portal za oddajanje besedil
-Korpus Šolar
- -Zbiranje besedil za korpus Šolar poteka po naslednjem postopku, ki prinaša tudi točke za napredovanje.
-
- Prijava
- -
- {% with messages = get_flashed_messages() %}
- {% if messages %}
- 
- Registracija
+
- {{ messages[0] }}
-
- {% endif %}
- {% endwith %}
-
- Pozabljeno geslo
-
- RegistracijaŠe nimate uporabniškega računa? Registrirajte se!
-
+
diff --git a/templates/solar-oddaja.html b/templates/solar-oddaja.html
index 8397119..e0448fa 100644
--- a/templates/solar-oddaja.html
+++ b/templates/solar-oddaja.html
@@ -3,31 +3,246 @@
+
-
+
-
+ 
+
Portal za oddajanje besedil
+ +Korpus ŠOLAR
+ +Zbiranje besedil za korpus Šolar poteka po naslednjem postopku, ki prinaša tudi točke za napredovanje.
+
+ Prijava
+
+
+
+ {% with messages = get_flashed_messages() %}
+ {% if messages %}
+
+ 
+
+ {% endif %}
+ {% endwith %}
+
+
+ {{ messages[0] }}
+
+ Registracija
+Še nimate uporabniškega računa? Registrirajte se!
+ +Upravljaj z institucijo - {% endif %} - {% if is_admin %} -
Administracijski meni - {% endif %} -
Pomoč - -
+
+ 
+
+
+
+ Portal ŠOLAR
-
+
+
-
+
+
+
+
-
@@ -142,13 +351,11 @@
var btnSubmit = document.getElementById("button-submit");
var btnSubmitFinal = document.getElementById("button-submit-final");
var btnSubmitCancel = document.getElementById("button-submit-cancel");
- var btnZgodovina = document.getElementById("button-zgodovina");
- var btnPogodbe = document.getElementById("button-pogodbe");
var elemTermsPopup = document.getElementById("popup-terms");
var termsScrollbox = document.getElementById("popup-terms-text");
var dataConfirmNotification = document.getElementById("data-confirm-notification");
- var scrollboxTriggered = false;
- var form = document.forms["my-dropzone"];
+ var errorMessage = document.getElementById("error-message");
+ var form = document.forms["form-oddaja"];
{% if not institution %}
btnSubmit.disabled = true;
@@ -158,8 +365,42 @@
return str == null || str.match(/^ *$/) !== null;
}
+ function showError(str) {
+ errorMessage.querySelector("p").textContent = str;
+ errorMessage.style.display = "block";
+ window.scroll({
+ top: 0,
+ behavior: 'smooth'
+ });
+ }
+
const reEmail = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+
+ //onready
+ selectPredmet.addEventListener("change", function(e) {
+ var predmetCustomBox = document.getElementById("predmet-custom-box").closest('.row');
+ if (selectPredmet.value.startsWith("drug")) {
+ predmetCustomBox.style.maxHeight = "150px";
+ } else {
+ predmetCustomBox.style.maxHeight = "0px";
+ }
+ });
+
+ selectVrsta.addEventListener("change", function(e) {
+ var vrstaCustomBox = document.getElementById("vrsta-custom-box").closest('.row');
+ if (selectVrsta.value == "delo-v-razredu") {
+ vrstaCustomBox.style.maxHeight = "150px";
+ } else {
+ vrstaCustomBox.style.maxHeight = "0px";
+ }
+ });
+ var event = new CustomEvent("change");
+ selectPredmet.dispatchEvent(event);
+ selectVrsta.dispatchEvent(event);
+
+
+
Dropzone.options.myDropzone = { // The camelized version of the ID of the form element
url: "../upload",
autoProcessQueue: false,
@@ -168,8 +409,9 @@
paramName: "file", // The name that will be used to transfer the file
maxFilesize: 1000, // MB
timeout: 5000000, // milliseconds
- acceptedFiles: ".txt, .csv, .pdf, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .jpg, .jpeg, .png",
+ 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.`,
dictFallbackMessage: "Vaš brskalnik ne podpira izbiranje datotek z odlaganjem (\"drag & drop\").",
dictInvalidFileType: "Datoteka je napačnega formata.",
@@ -184,24 +426,8 @@
// The setting up of the dropzone
init: function() {
var dz = this;
-
- selectPredmet.addEventListener("change", function(e) {
- var predmetCustomBox = document.getElementById("predmet-custom-box");
- if (selectPredmet.value.startsWith("drug")) {
- predmetCustomBox.style.display = "inherit";
- } else {
- predmetCustomBox.style.display = "none";
- }
- });
-
- selectVrsta.addEventListener("change", function(e) {
- var vrstaCustomBox = document.getElementById("vrsta-custom-box");
- if (selectVrsta.value == "delo-v-razredu") {
- vrstaCustomBox.style.display = "inherit";
- } else {
- vrstaCustomBox.style.display = "none";
- }
- });
+ dataConfirmNotification.style.display = "none";
+ errorMessage.style.display = "none";
btnSubmit.addEventListener("click", function(e) {
// Make sure that the form isn't actually being sent.
@@ -219,18 +445,13 @@
var jezikovniPopravki = form["jezikovni-popravki"].value;
if (predmet.startsWith("drug") && isEmptyOrSpaces(predmetCustom)) {
- alert("Polje za predmet ne more biti prazno!");
+ showError("Polje za predmet ne more biti prazno!");
} else if (vrsta === "delo-v-razredu" && isEmptyOrSpaces(vrstaCustom)) {
- alert("Polje za vrsto besedila ne more biti prazno!");
+ showError("Polje za vrsto besedila ne more biti prazno!");
} else if (dataConfirmNotification.style.display == "none") {
dataConfirmNotification.style.display = "inherit";
- btnSubmit.textContent = "Potrdi";
+ btnSubmit.style.display = "none";
} else {
- // Then make terms popup visible
- //btnSubmit.disabled = true;
- //btnSubmitFinal.disabled = true;
- //elemTermsPopup.style.display = "inline";
- //scrollboxtriggered = false;
// Hand off data to dropzone
dz.processQueue();
@@ -249,32 +470,20 @@
dz.processQueue();
// Clear fields and hide popup agian
- btnSubmit.disabled = false;
- elemTermsPopup.style.display = "none";
+ /*btnSubmit.disabled = false;
dataConfirmNotification.style.display = "none";
btnSubmit.textContent = "Oddaj";
form.reset();
- scrollboxTriggered = false;
+ scrollboxTriggered = false;*/
});
- btnSubmitCancel.addEventListener("click", function(e) {
+ /*btnSubmitCancel.addEventListener("click", function(e) {
btnSubmit.disabled = false;
scrollboxTriggered = false;
elemTermsPopup.style.display = "none";
- });
-
- btnZgodovina.addEventListener("click", function(e) {
- e.preventDefault();
- e.stopPropagation();
- window.location.replace("../zgodovina");
- });
-
- btnPogodbe.addEventListener("click", function(e) {
- e.preventDefault();
- e.stopPropagation();
- window.location.replace("../pogodbe");
- });
+ });*/
+/*
// Enable final submit button only if user scrolls to the end of the terms.
function checkScrollboxTrigger(event) {
var element = event.target;
@@ -292,11 +501,11 @@
termsScrollbox.addEventListener("mouseenter", function(event) {
checkScrollboxTrigger(event);
- });
+ });*/
// 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.
});
@@ -311,9 +520,33 @@
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);
+ formData.append("predmet-custom",form["predmet-custom"].value);
+ formData.append("letnik",form["letnik"].value);
+ formData.append("vrsta",form["vrsta"].value);
+ formData.append("vrsta-custom",form["vrsta-custom"].value);
+ formData.append("solsko-leto",form["solsko-leto"].value);
+ formData.append("jezikovni-popravki",form["jezikovni-popravki"].value);
+
});
+
+ },
+ uploadprogress: function(file, progress, bytesSent) {
+ if (file.previewElement) {
+ console.log(progress);
+ var progressElement = file.previewElement.querySelector("[data-dz-uploadprogress]");
+ progressElement.style.width = progress + "%";
+ //progressElement.querySelector(".progress-text").textContent = progress + "%";
+ }
}
+
+
+
+
}
diff --git a/templates/solar-register.html b/templates/solar-register.html
index 9cad54a..26e0fc5 100644
--- a/templates/solar-register.html
+++ b/templates/solar-register.html
@@ -3,67 +3,78 @@
+
+
+
+
+
+
+
+
+
+
+
+ {% if not institution %}
+
+
+
+
+ {% elif not institution_contract %}
+
+ Niste član nobene institucije!
+
+
+
+ {% endif %}
+
+ Pogodba s šolo še ni naložena!
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+ Portal za oddajanje besedil
-
+
+
+
+
+
+
+
+
+
Upravljaj z institucijo
+
+
diff --git a/templates/solar-zgodovina.html b/templates/solar-zgodovina.html
index d98183b..92e6bec 100644
--- a/templates/solar-zgodovina.html
+++ b/templates/solar-zgodovina.html
@@ -3,10 +3,106 @@
+
+
+
+ Portal za oddajanje besedil
+ +Korpus ŠOLAR
+ +Zbiranje besedil za korpus Šolar poteka po naslednjem postopku, ki prinaša tudi točke za napredovanje.
+
+ Registracija
+
+
-
+ {% with messages = get_flashed_messages() %}
+ {% if messages %}
+
+
+
+
+ {% endif %}
+ {% endwith %}
+
+
+ {{ messages[0] }}
+
+
+
+
+
+
+
+
+
+
+
Odjavi se
{% if is_institution_coordinator %}
+
+
+
+
+
+ {% for item in upload_history %}
+
+
+ Zgodovina naloženih datotek
+
+
+ {% endfor %}
+
+
+
+
+
+
+
+
+
+
+ Dodano {{ item.timestamp.strftime('%d. %m. %Y') }}
+ {{ uploader_names[loop.index - 1] }}
+ Št. datotek: {{ item.upload_file_hashes|length }}
+
+
+ {% set began = False %}
+ {% if institution_names[loop.index - 1] %}
+ {% if began %}, {% endif %} {{ institution_names[loop.index - 1] }}
+ {% set began = True %}
+ {% endif %}
+ {% if item.program %}
+ {% if began %}, {% endif %} {{ item.program }}
+ {% set began = True %}
+ {% endif %}
+ {% if item.subject %}
+ {% if began %}, {% endif %} {{ item.subject }}
+ {% set began = True %}
+ {% endif %}
+ {% if item.subject_custom %}
+ {% if began %}, {% endif %} {{ item.subject_custom }}
+ {% set began = True %}
+ {% endif %}
+ {% if item.grade %}
+ {% if began %}, {% endif %} {{ item.grade }}
+ {% set began = True %}
+ {% endif %}
+ {% if item.text_type %}
+ {% if began %}, {% endif %} {{ item.text_type }}
+ {% set began = True %}
+ {% endif %}
+ {% if item.text_type_custom %}
+ {% if began %}, {% endif %} {{ item.text_type_custom }}
+ {% set began = True %}
+ {% endif %}
+ {% if item.school_year %}
+ {% if began %}, {% endif %} {{ item.school_year }}
+ {% set began = True %}
+ {% endif %}
+ {% if item.grammar_corrections %}
+ {% if began %}, {% endif %} {{ item.grammar_corrections }}
+ {% set began = True %}
+ {% endif %}
+
+
+ Upravljaj z institucijo