Skip to content

SUP-45754 : Agenda view : Display hour and minute when it's necessary #68

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

Open
boulch wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SUP-45754 : Agenda view : Display hour and minute when it's necessary #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ Changelog
1.4.7 (unreleased)
------------------

- SUP-45754 : Agenda view : Display hour and minute when it's necessary
[boulch]

- Fix effective news date
[thomlamb]

Expand Down
8 changes: 6 additions & 2 deletions src/imio/smartweb/core/webcomponents/src/components/Events/EventCard/EventCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ import { Translate } from "react-translated";
const ContactCard = ({ item, showCategoriesOrTopics, contextAuthenticatedUser }) => {
moment.locale("be");
const title = item.title && item.title;
const start = moment.utc(item.start).format("DD-MM-YYYY");
const end = moment.utc(item.end).format("DD-MM-YYYY");
const start = moment.utc(item.start).format(
moment.utc(item.start).format("HH:mm") === "00:00" ? "DD-MM-YYYY" : "DD-MM-YYYY HH:mm"
);
const end = moment.utc(item.end).format(
moment.utc(item.end).format("HH:mm") === "00:00" ? "DD-MM-YYYY" : "DD-MM-YYYY HH:mm"
);
return (
<>
{contextAuthenticatedUser === "False" ? (
Expand Down