Skip to content

Commit 8d57d7a

Browse files
committed
Fix for #141 and first phase of date / timezone overhaul
1 parent 568c237 commit 8d57d7a

6 files changed

Lines changed: 12 additions & 27 deletions

File tree

web/static/js/add-activity-modal.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@ document.addEventListener("DOMContentLoaded", () => {
33
const addActivityModal = document.getElementById("addActivityModal");
44
const activityDateInput = document.getElementById("activityDate");
55

6-
// Set default date to today
7-
//const setDefaultDate = () => {
8-
// const today = new Date().toISOString().split("T")[0];
9-
// activityDateInput.value = today;
10-
//};
11-
12-
// Set default date when the modal is shown
13-
//addActivityModal.addEventListener("show.bs.modal", setDefaultDate);
6+
// Set default date/time when the modal is shown
7+
addActivityModal.addEventListener("show.bs.modal", () => {
8+
formHelpers.setDateTimeNow("activityDate");
9+
});
1410

1511
form.addEventListener("submit", (e) => {
1612
e.preventDefault();

web/static/js/add-measurement-modal.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@ document.addEventListener("DOMContentLoaded", () => {
33
const addMeasurementModal = document.getElementById("addMeasurementModal");
44
const measurementDateInput = document.getElementById("measureDate");
55

6-
// Set default date to today
7-
//const setDefaultDate = () => {
8-
// const today = new Date().toISOString().split("T")[0];
9-
// measurementDateInput.value = today;
10-
//};
11-
12-
// Set default date when the modal is shown
13-
//addMeasurementModal.addEventListener("show.bs.modal", setDefaultDate);
6+
// Set default date/time when the modal is shown
7+
addMeasurementModal.addEventListener("show.bs.modal", () => {
8+
formHelpers.setDateTimeNow("measureDate");
9+
});
1410

1511
form.addEventListener("submit", (e) => {
1612
e.preventDefault();

web/static/js/multi-plant-activity-modal.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@ document.addEventListener("DOMContentLoaded", () => {
33
const addMultiPlantActivityModal = document.getElementById("addMultiPlantActivityModal");
44
const activityMultiDateInput = document.getElementById("activityMultiDate");
55

6-
// Set default date to today
7-
//const setMultiDefaultDate = () => {
8-
// const today = new Date().toISOString().split("T")[0];
9-
// activityMultiDateInput.value = today;
10-
//};
11-
12-
// Set default date when the modal is shown
13-
//addMultiPlantActivityModal.addEventListener("show.bs.modal", setMultiDefaultDate);
6+
// Set default date/time when the modal is shown
7+
addMultiPlantActivityModal.addEventListener("show.bs.modal", () => {
8+
formHelpers.setDateTimeNow("activityMultiDate");
9+
});
1410

1511
form.addEventListener("submit", (e) => {
1612
e.preventDefault();

web/templates/modals/add-activity-modal.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ <h5 class="modal-title" id="addActivityModalLabel">{{ .lcl.add_activity }}</h5>
2828
<div class="mb-3">
2929
<label for="activityDate" class="form-label required">{{ .lcl.title_date }}</label>
3030
<input type="datetime-local" step="1" class="form-control" id="activityDate" required>
31-
<script>formHelpers.setDateTimeNow("activityDate");</script>
3231
</div>
3332

3433
<!-- Submit Button -->

web/templates/modals/add-measurement-modal.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ <h5 class="modal-title" id="addMeasurementModalLabel">{{ .lcl.add_measurement }}
2828
<div class="mb-3">
2929
<label for="measureDate" class="form-label required">{{ .lcl.title_date }}</label>
3030
<input type="datetime-local" step="1" class="form-control" id="measureDate" required>
31-
<script>formHelpers.setDateTimeNow("measureDate");</script>
3231
</div>
3332

3433
<!-- Submit Button -->

web/templates/modals/multi-plant-activity-modal.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ <h5 class="modal-title" id="addMultiPlantActivityModalLabel">{{ .lcl.multiple_ac
2929
<div class="mb-3">
3030
<label for="activityMultiDate" class="form-label required">{{ .lcl.title_date }}</label>
3131
<input type="datetime-local" step="1" class="form-control" id="activityMultiDate" required>
32-
<script>formHelpers.setDateTimeNow("activityMultiDate");</script>
3332
</div>
3433

3534
<!-- Plant Selection -->

0 commit comments

Comments
 (0)