Skip to content

Commit d6beb93

Browse files
feat: don’t download empty CVS Sessions file
1 parent 2ccc434 commit d6beb93

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
# PhpStorm/IntelliJ folder
88
.idea*
9+
.run/*
910

1011
# Mac OS X crap
1112
.DS_Store

phpmyfaq/admin/assets/src/sessions.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,24 @@ export const handleSessions = () => {
2121
const exportSessions = document.getElementById('exportSessions');
2222
const csrf = document.getElementById('csrf');
2323

24+
if (firstHour && lastHour) {
25+
firstHour.addEventListener('change', async () => {
26+
if (firstHour.value !== '' && lastHour.value !== '') {
27+
exportSessions.disabled = false;
28+
} else {
29+
exportSessions.disabled = true;
30+
}
31+
});
32+
lastHour.addEventListener('change', async () => {
33+
if (lastHour.value !== '' && firstHour.value !== '') {
34+
exportSessions.disabled = false;
35+
} else {
36+
exportSessions.disabled = true;
37+
}
38+
});
39+
}
40+
exportSessions.disabled = true;
41+
2442
if (exportSessions) {
2543
exportSessions.addEventListener('click', async (event) => {
2644
event.preventDefault();

phpmyfaq/admin/statistics.sessions.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
'dateToday' => date('Y-m-d'),
108108
'msgExportSessionsFrom' => Translation::get('msgExportSessionsFrom'),
109109
'msgExportSessionsTo' => Translation::get('msgExportSessionsTo'),
110+
'datePickerMinDate' => date('Y-m-d', $stats->firstDate),
110111
];
111112

112113
echo $template->render($templateVars);

phpmyfaq/assets/templates/admin/statistics/sessions.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@
115115
<input type="hidden" id="csrf" value="{{ csrfTokenExport }}"/>
116116
<label for="firstHour" class="col-1 col-form-label">{{ msgExportSessionsFrom }}</label>
117117
<div class="col-5">
118-
<input type="date" class="form-control" id="firstHour"/>
118+
<input type="date" class="form-control" min="{{ datePickerMinDate }}" max="{{ dateToday }}" id="firstHour"/>
119119
</div>
120120
<label for="lastHour" class="col-1 col-form-label">{{ msgExportSessionsTo }}</label>
121121
<div class="col-5">
122-
<input type="date" class="form-control" id="lastHour" max="{{ dateToday }}"/>
122+
<input type="date" class="form-control" id="lastHour" min="{{ datePickerMinDate }}" max="{{ dateToday }}"/>
123123
</div>
124124
<div class="mt-3 d-flex justify-content-end">
125125
<button class="btn btn-primary" type="submit" id="exportSessions">

0 commit comments

Comments
 (0)