Skip to content
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

SS-698 set default time zone to stockholm time #263

Merged
merged 13 commits into from
Dec 10, 2024
Merged

SS-698 set default time zone to stockholm time #263

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5a9cf7f
SS-1206 wrote site-dir path validation and unit tests
anondo1969 Nov 27, 2024
3ae51f4
SS-1206 wrote comment for future e2e tests
anondo1969 Nov 27, 2024
53858ce
Merge branch 'develop' of https://github.com/ScilifelabDataCentre/ser…
anondo1969 Nov 28, 2024
b608510
SS-1206 moved the path validation method
anondo1969 Nov 28, 2024
d3715a2
SS-1206 fixing unit tests
anondo1969 Nov 28, 2024
0d3eaba
SS-698 set timezone to stockholm time
anondo1969 Nov 29, 2024
1408cf4
Merge branch 'develop' into SS-698-set-default-time-zone-to-stockholm…
anondo1969 Nov 29, 2024
49a799a
SS-698 using exiting tooltip js implementation
anondo1969 Nov 29, 2024
ddd30df
Merge branch 'SS-698-set-default-time-zone-to-stockholm-time' of http…
anondo1969 Nov 29, 2024
1d39d79
SS-698 reverting IP to localhost
anondo1969 Nov 29, 2024
d789700
SS-698 -set default timezone to stockholm time
anondo1969 Dec 9, 2024
b49260b
SS-698 fixed invalid syntax
anondo1969 Dec 9, 2024
95214c1
Merge branch 'develop' into SS-698-set-default-time-zone-to-stockholm…
anondo1969 Dec 10, 2024
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
1 change: 1 addition & 0 deletions projects/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,7 @@ def get(self, request, project_slug):
"title": category.name,
"instances": instances_per_category_list,
"apps": apps_per_category,
"timezone": "Europe/Stockholm Timezone",
}
)

Expand Down
1 change: 0 additions & 1 deletion studio/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@
# https://docs.djangoproject.com/en/3.2/topics/i18n/

LANGUAGE_CODE = "en-us"

USE_I18N = True

# Timezone settings
Expand Down
7 changes: 5 additions & 2 deletions templates/projects/partials/app_instances_table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{% load static %}

<table id=""
class="table table-hover my-0 no-footer table-bordered" role="grid">
<thead>
Expand Down Expand Up @@ -40,7 +39,11 @@
{% else %}
<td class="sorting_1">{{ instance.name }}</td>
{% endif %}
<td class="d-none d-xxl-table-cell">{{ instance.created_on | date:"d/n/y H:i" }}</td>
<td class="d-none d-xxl-table-cell">{{ instance.created_on | date:"d/n/y H:i" }}
<span
class="bi bi-clock" data-bs-toggle="tooltip" data-bs-placement="right" data-bs-original-title="{{ objs.timezone }}">
</span>
</td>
Comment on lines +42 to +46
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image Screenshot 2024-12-09 at 13 42 29

All in all, lgtm, but wanted to show this as an alternative

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Nikita. This looks nice, clear, and compact. Shall I implement this one?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, if you like it and have time:)

Otherwise, the current one it also good.

<td>
<span class="badge bg-secondary" id="status-{{ instance.app.slug }}-{{ instance.pk }}">
{{ instance.app_status.status }}
Expand Down
Loading