akanealw/bale
1
0
Fork 0
mirror of https://github.com/natankeddem/bale.git synced 2026-04-23 06:50:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

optimize date and time displays

Browse Source
This commit is contained in:
Natan Keddem
2023-11-19 17:05:58 -05:00
parent f3ef97a342
commit ffbc9b71c0
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bale/interfaces/sshdl.py
View File

@@ -240,7 +240,7 @@ class SshFileFind(SshFileBrowse):
"headerName": "Modified",
"field": "modified_timestamp",
"filter": "agTextColumnFilter",
"maxWidth": 200,
"maxWidth": 125,
":cellRenderer": """(data) => {
var date = new Date(data.value * 1000).toLocaleString(undefined, {dateStyle: 'short', timeStyle: 'short', hour12: false});;
return date;

21
bale/tabs/automation.py
View File

@@ -161,8 +161,16 @@ class Automation(Tab):
"maxWidth": 150,
},
{"headerName": "Command", "field": "command", "filter": "agTextColumnFilter"},
{"headerName": "Next Date", "field": "next_run_date", "filter": "agDateColumnFilter", "maxWidth": 100},
{"headerName": "Next Time", "field": "next_run_time", "maxWidth": 100},
{
"headerName": "Next Run",
"field": "next_run",
"filter": "agTextColumnFilter",
"maxWidth": 125,
":cellRenderer": """(data) => {
var date = new Date(data.value * 1000).toLocaleString(undefined, {dateStyle: 'short', timeStyle: 'short', hour12: false});;
return date;
}""",
},
{
"headerName": "Status",
"field": "status",
@@ -227,11 +235,9 @@ class Automation(Tab):
self._automations.clear()
for job in self.scheduler.scheduler.get_jobs():
if job.next_run_time is not None:
next_run_date = job.next_run_time.strftime("%Y/%m/%d")
next_run_time = job.next_run_time.strftime("%H:%M")
next_run = job.next_run_time.timestamp()
else:
next_run_date = "NA"
next_run_time = "NA"
next_run = "NA"
if "data" in job.kwargs:
jd = json.loads(job.kwargs["data"])
if self.host == jd["host"]:
@@ -239,8 +245,7 @@ class Automation(Tab):
{
"name": job.id.split("@")[0],
"command": jd["command"],
"next_run_date": next_run_date,
"next_run_time": next_run_time,
"next_run": next_run,
"status": "",
}
)

2
bale/tabs/history.py
View File

@@ -52,7 +52,7 @@ class History(Tab):
"headerName": "Timestamp",
"field": "timestamp",
"filter": "agTextColumnFilter",
"maxWidth": 200,
"maxWidth": 125,
":cellRenderer": """(data) => {
var date = new Date(data.value * 1000).toLocaleString(undefined, {dateStyle: 'short', timeStyle: 'short', hour12: false});;
return date;

2
bale/tabs/manage.py
View File

@@ -82,7 +82,7 @@ class Manage(Tab):
"headerName": "Created",
"field": "creation",
"filter": "agTextColumnFilter",
"maxWidth": 200,
"maxWidth": 125,
":cellRenderer": """(data) => {
var date = new Date(data.value * 1000).toLocaleString(undefined, {dateStyle: 'short', timeStyle: 'short', hour12: false});;
return date;