From 755623418857d5fcd01689f4d55e1eb7f21a12f4 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Tue, 27 Aug 2024 21:42:30 +0530 Subject: [PATCH] remove flatpickr and changed hr and minutes --- src/js/admin-general-view.js | 9 +++++---- src/pug/index.pug | 11 ----------- src/pug/templates/admin-general-view.pug | 3 ++- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/js/admin-general-view.js b/src/js/admin-general-view.js index d0b31fe..17d2e88 100644 --- a/src/js/admin-general-view.js +++ b/src/js/admin-general-view.js @@ -40,7 +40,8 @@ module.exports = { z_slider_variant: " ", config: "", selected_date: null, - selected_time: null, + selected_hours: null, + selected_minutes: null, }; }, @@ -148,12 +149,12 @@ module.exports = { }, change_date_time: async function () { - if (!this.selected_date || !this.selected_time) { + if (!this.selected_date || !this.selected_hours || !this.selected_minutes) { return; } - + try { - const datetime = `${this.selected_date} ${this.selected_time}:00`; + const datetime = `${this.selected_date} ${this.selected_hours}:${this.selected_minutes}:00`; const response = await api.put("time", { datetime }); if (response == "ok") { diff --git a/src/pug/index.pug b/src/pug/index.pug index 2e02079..d442269 100644 --- a/src/pug/index.pug +++ b/src/pug/index.pug @@ -6,7 +6,6 @@ html(lang="en") title Onefinity CNC - Web interface - link(rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css") style: include ../static/css/pure-min.css style: include ../static/css/side-menu.css @@ -179,16 +178,6 @@ html(lang="en") #templates: include ../../build/templates.pug iframe#download-target(style="display:none") - script. - document.addEventListener('DOMContentLoaded', function() { - flatpickr(".flatpickr", { - enableTime: true, - noCalendar: true, - dateFormat: "H:i", - time_24hr: true, - }); - }); - script(src="https://cdn.jsdelivr.net/npm/flatpickr") script: include ../static/js/vue.js script: include ../static/js/sockjs.min.js diff --git a/src/pug/templates/admin-general-view.pug b/src/pug/templates/admin-general-view.pug index 8da1d6b..bfff835 100644 --- a/src/pug/templates/admin-general-view.pug +++ b/src/pug/templates/admin-general-view.pug @@ -67,5 +67,6 @@ script#admin-general-view-template(type="text/x-template") h2 Date/Time .pure-form input(id="date" type="date" v-model="selected_date") - input.flatpickr(id="time" type="time" v-model="selected_time") + input(id="hours" type="text" v-model="selected_hours" placeholder="HH" maxlength="2" min="0" max="23") + input(id="minutes" type="text" v-model="selected_minutes" placeholder="MM" maxlength="2" min="0" max="59") button.pure-button.pure-button-primary(@click="change_date_time", style="margin:5px") Update Date/Time