Skip to content

🎨 [Frontend] UX: Usage in the last 24h #8034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 3, 2025
Merged

🎨 [Frontend] UX: Usage in the last 24h #8034

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8ab4211
last 24h
odeimaiz Jul 2, 2025
1b22d10
minor
odeimaiz Jul 2, 2025
b7f4893
minor
odeimaiz Jul 2, 2025
cd2d78f
minor
odeimaiz Jul 2, 2025
afc4ecf
Merge branch 'master' into enh/last-24h
odeimaiz Jul 2, 2025
86869e1
Merge branch 'enh/last-24h' of github.com:odeimaiz/osparc-simcore int…
odeimaiz Jul 2, 2025
86c1eea
Today
odeimaiz Jul 2, 2025
952e333
rename
odeimaiz Jul 2, 2025
9d7682c
Merge branch 'master' into enh/last-24h
odeimaiz Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions services/static-webserver/client/source/class/osparc/desktop/credits/CreditsSummary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ qx.Class.define("osparc.desktop.credits.CreditsSummary", {
WIDTH: 350,
TIME_RANGES: [{
key: 1,
label: "Today"
label: "Last 24h"
}, {
key: 7,
label: "Last week"
Expand Down Expand Up @@ -116,8 +116,8 @@ qx.Class.define("osparc.desktop.credits.CreditsSummary", {
const trItem = new qx.ui.form.ListItem(tr.label, null, tr.key);
control.add(trItem);
});
// default one week
const found = control.getSelectables().find(trItem => trItem.getModel() === 7);
// default last 24h
const found = control.getSelectables().find(trItem => trItem.getModel() === 1);
if (found) {
control.setSelection([found]);
}
Expand Down
29 changes: 25 additions & 4 deletions services/static-webserver/client/source/class/osparc/desktop/credits/DateFilters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,30 @@ qx.Class.define("osparc.desktop.credits.DateFilters", {
members: {
_buildLayout() {
this._removeAll();
const defaultFrom = new Date()
defaultFrom.setMonth(defaultFrom.getMonth() - 1)
// Range defaults to previous month

const defaultFrom = new Date();
// Range defaults
// from last 24h...
defaultFrom.setDate(defaultFrom.getDate() - 1);
// .. to now
const defaultTo = new Date();

this.__from = this.__addDateInput("From", defaultFrom);
this.__until = this.__addDateInput("Until");
this.__until = this.__addDateInput("Until", defaultTo);

const lastDayBtn = new qx.ui.form.Button("Last 24h").set({
allowStretchY: false,
alignY: "bottom"
});
lastDayBtn.addListener("execute", () => {
const today = new Date();
const last24h = new Date(today);
last24h.setDate(today.getDate() - 1);
this.__from.setValue(last24h);
this.__until.setValue(today);
});
this._add(lastDayBtn);

const lastWeekBtn = new qx.ui.form.Button("Last week").set({
allowStretchY: false,
alignY: "bottom"
Expand All @@ -38,6 +57,7 @@ qx.Class.define("osparc.desktop.credits.DateFilters", {
this.__until.setValue(today);
});
this._add(lastWeekBtn);

const lastMonthBtn = new qx.ui.form.Button("Last month").set({
allowStretchY: false,
alignY: "bottom"
Expand All @@ -50,6 +70,7 @@ qx.Class.define("osparc.desktop.credits.DateFilters", {
this.__until.setValue(today);
});
this._add(lastMonthBtn);

const lastYearBtn = new qx.ui.form.Button("Last year").set({
allowStretchY: false,
alignY: "bottom"
Expand Down
Loading