technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-09 21:02:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/save-amount-shown-per-page' into 'marietje-zuid'

Browse Source 
Store page size on manage and request pages

Closes #51

See merge request technicie/MarietjeDjango!68
This commit is contained in:
Kees van Kempen
2023-10-11 16:09:30 +02:00
parent a9e0614b2c 7a1b0583a6
commit 41f33f5d20
4 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
marietje/marietje/static/marietje/js/base.js
View File

@ -36,4 +36,26 @@ Number.prototype.timestampToHHMMSS = function () {
seconds = '0' + seconds; seconds = '0' + seconds;
} }
return hours + ':' + minutes + ':' + seconds; return hours + ':' + minutes + ':' + seconds;
}; };
function setCookie(name, value, days) {
let expires = "";
value = encodeURI(value);
if (days) {
let date = new Date();
date.setTime(date.getTime() + (days*24*60*60*1000));
expires = "; expires=" + date.toUTCString();
}
document.cookie = name + "=" + (value || "") + expires + "; path=/";
}
function getCookie(name) {
let nameEQ = name + "=";
let ca = document.cookie.split(';');
for(let i=0;i < ca.length;i++) {
let c = ca[i];
while (c.charAt(0)===' ') c = c.substring(1,c.length);
if (c.indexOf(nameEQ) === 0) return decodeURIComponent(c.substring(nameEQ.length,c.length));
}
return null;
}

7
marietje/marietje/templates/marietje/base.html
View File

@ -22,6 +22,10 @@
<!-- Base JavaScript --> <!-- Base JavaScript -->
<script type="text/javascript" src="{% static "marietje/js/base.js" %}"></script> <script type="text/javascript" src="{% static "marietje/js/base.js" %}"></script>
<script>
const CSRF_TOKEN = "{{ csrf_token }}";
</script>
</head> </head>
<body> <body>
<nav class="navbar navbar-expand-lg sticky-top navbar-dark bg-primary"> <nav class="navbar navbar-expand-lg sticky-top navbar-dark bg-primary">
@ -109,9 +113,6 @@
</footer> </footer>
{% endif %} {% endif %}
{% bootstrap_javascript %} {% bootstrap_javascript %}
<script>
const CSRF_TOKEN = "{{ csrf_token }}";
</script>
{% block js %}{% endblock %} {% block js %}{% endblock %}
</body> </body>
</html> </html>

5
marietje/queues/templates/queues/queue.html
View File

@ -425,6 +425,7 @@
this.page_size = 10; this.page_size = 10;
} }
this.page_number = 1; this.page_number = 1;
setCookie("REQUEST_PAGE_SIZE", this.page_size, 14);
this.search(); this.search();
} }
} }
@ -455,6 +456,10 @@
tata.error("", "An unknown error occurred, please try again.") tata.error("", "An unknown error occurred, please try again.")
} }
}); });
const stored_page_size = parseInt(getCookie("REQUEST_PAGE_SIZE"));
if (stored_page_size !== Number.NaN && stored_page_size > 0) {
this.page_size = stored_page_size;
}
}, },
methods: { methods: {
search() { search() {

5
marietje/songs/templates/songs/manage.html
View File

@ -101,6 +101,7 @@
this.page_size = 10; this.page_size = 10;
} }
this.page_number = 1; this.page_number = 1;
setCookie("MANAGE_PAGE_SIZE", this.page_size, 14);
this.refresh(); this.refresh();
} }
} }
@ -131,6 +132,10 @@
tata.error("", "An unknown error occurred, please try again.") tata.error("", "An unknown error occurred, please try again.")
} }
}); });
const stored_page_size = parseInt(getCookie("MANAGE_PAGE_SIZE"));
if (stored_page_size !== Number.NaN && stored_page_size > 0) {
this.page_size = stored_page_size;
}
}, },
methods: { methods: {
search() { search() {