imio.smartweb.core 1.2.44__py3-none-any.whl → 1.2.45__py3-none-any.whl

imio/smartweb/core/webcomponents/src/components/Events/EventCard/EventCard.jsx

@@ -1,25 +1,18 @@
 import React from "react";
 import moment from "moment";
-import Moment from "react-moment";
-const ContactCard = ({ item }) => {
-    const title = item.title && item.title;
-    const category =
-        item.taxonomy_contact_category && item.taxonomy_contact_category[0];
-    const start = moment(item.start && item.start);
+import { Translate } from "react-translated";
 
-    const number = item.number ? item.number : "";
-    const street = item.street ? item.street : "";
-    const complement = item.complement ? item.complement : "";
-    const zipcode = item.zipcode ? item.zipcode : "";
-    const city = item.city ? item.city : "";
-    const country = item.country ? item.country : "";
-    const phones = item.phones ? item.phones : "";
-    const mails = item.mails ? item.mails : "";
-    const topics = item.topics ? item.topics : "";
+const ContactCard = ({ item, showCategoriesOrTopics }) => {
+    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");
     return (
         <div className="r-list-item">
             <div
-                className={item.image_vignette_scale ? "r-item-img" : "r-item-img r-item-img-placeholder"}
+                className={
+                    item.image_vignette_scale ? "r-item-img" : "r-item-img r-item-img-placeholder"
+                }
                 style={{
                     backgroundImage: item.image_vignette_scale
                         ? "url(" + item.image_vignette_scale + ")"
@@ -28,16 +21,36 @@ const ContactCard = ({ item }) => {
             />
 
             <div className="r-item-text">
-                {start &&
+                {start && (
                     <span className="r-item-date">
-                        <Moment format="DD-MM-YYYY">{start}</Moment>
+                        {start === end ? (
+                            start
+                        ) : (
+                            <>
+                                {start} <Translate text="au" /> {end}
+                            </>
+                        )}
                     </span>
-                }
+                )}
                 <span className="r-item-title">{title}</span>
-                {item.category && <span className="r-item-categorie">{item.category.title}</span>}
+                {showCategoriesOrTopics === "topic" ? (
+                    item.topics[0] && (
+                        <span className="r-item-categorie">{item.topics[0].title}</span>
+                    )
+                ) : showCategoriesOrTopics === "category" ? (
+                    item.local_category ? (
+                        <span className="r-item-categorie">{item.local_category.title}</span>
+                    ) : (
+                        item.category && (
+                            <span className="r-item-categorie">{item.category.title}</span>
+                        )
+                    )
+                ) : (
+                    ""
+                )}
             </div>
         </div>
     );
 };
 
-export default ContactCard;
+export default ContactCard;

imio/smartweb/core/webcomponents/src/components/Events/EventList/EventList.jsx

@@ -2,7 +2,7 @@ import EventCard from "../EventCard/EventCard";
 import { Link } from "react-router-dom";
 import React from "react";
 import removeAccents from "remove-accents";
-const ContactList = ({ itemsArray, onChange, onHover, parentCallback }) => {
+const ContactList = ({ itemsArray, onChange, onHover,showCategoriesOrTopics }) => {
     function handleClick(event) {
         onChange(event);
     }
@@ -32,7 +32,7 @@ const ContactList = ({ itemsArray, onChange, onHover, parentCallback }) => {
                                 },
                             }}
                         ></Link>
-                        <EventCard item={item} key={item.created} />
+                        <EventCard item={item} showCategoriesOrTopics={showCategoriesOrTopics} key={item.created} />
                     </li>
                 ))}
             </ul>

imio/smartweb/core/webcomponents/src/components/Events/Events.jsx

@@ -29,6 +29,7 @@ export default function Events(props) {
                     displayMap={props.displayMap}
                     onlyPastEvents={props.onlyPastEvents}
                     language={props.currentLanguage}
+                    showCategoriesOrTopics={props.showCategoriesOrTopics}
                 />
             </Provider>
         </BrowserRouter>
@@ -125,7 +126,7 @@ function EventsView(props) {
     let MapRender;
     if (itemsArray && itemsArray.length > 0) {
         listRender = (
-            <EventList onChange={clickID} itemsArray={itemsArray} onHover={hoverID} />
+            <EventList onChange={clickID} itemsArray={itemsArray} onHover={hoverID} showCategoriesOrTopics={props.showCategoriesOrTopics} />
         );
         MapRender = (
             <Map

imio/smartweb/core/webcomponents/src/components/News/News.jsx

@@ -25,6 +25,7 @@ export default function News(props) {
                         queryUrl={props.queryUrl}
                         proposeUrl={props.proposeUrl}
                         batchSize={props.batchSize}
+                        showCategoriesOrTopics={props.showCategoriesOrTopics}
                     />
                 </Provider>
             </BrowserRouter>
@@ -97,7 +98,7 @@ const NewsView = (props) => {
     // coditional list render
     let listRender;
     if (itemsArray && itemsArray.length > 0) {
-        listRender = <NewsList onChange={clickID} itemsArray={itemsArray} />;
+        listRender = <NewsList onChange={clickID} itemsArray={itemsArray} showCategoriesOrTopics={props.showCategoriesOrTopics} />;
     } else if (!isLoading) {
         listRender = <p><Translate text="Aucune actualité n'a été trouvée" /></p>;
     }

imio/smartweb/core/webcomponents/src/components/News/News.scss

@@ -186,4 +186,11 @@
       }
     }
   }
-}
+}
+
+.r-item-categorie {
+  margin-top: 5px;
+  text-transform: uppercase;
+  color: #747474;
+  font-weight: 400;
+} 

imio/smartweb/core/webcomponents/src/components/News/NewsCard/NewsCard.jsx

@@ -3,20 +3,25 @@ import moment from "moment";
 import ReactMarkdown from 'react-markdown';
 import { Translate } from "react-translated";
 import { LanguageContext } from '../News.jsx';
-const NewsCard = ({ item }) => {
+const NewsCard = ({ item,showCategoriesOrTopics }) => {
     const [limitDescription, setLimitDescription] = useState();
+    const [itemTopic, setItemTopic] = useState(null);
+
     const numberLimit = 150;
     const title = item.title && item.title;
     const description = item.description && item.description;
-    const category = item.taxonomy_contact_category
-        ? item.taxonomy_contact_category[0].title
-        : "";
+
     useEffect(() => {
         if (description.length >= numberLimit) {
             setLimitDescription(description.substring(0, numberLimit) + "...");
         } else {
             setLimitDescription(description);
         }
+        if (item.topics && item.topics.length > 1) {
+            setItemTopic(item.topics[0].title);
+        } else {
+            setItemTopic(null)
+        }
     }, [item]);
     moment.locale(useContext(LanguageContext))
     const created = moment(item.created).startOf('minute').fromNow();
@@ -32,8 +37,20 @@ const NewsCard = ({ item }) => {
                 }}
             />
             <div className="r-item-text">
-                {category ? <span className="r-item-categorie">{category}</span> : ""}
                 <span className="r-item-title">{title}</span>
+                {showCategoriesOrTopics === "topic" ? (
+                    itemTopic && (
+                        <span className="r-item-categorie">{item.topics[0].title}</span>
+                    )
+                ) : showCategoriesOrTopics === "category" ? (
+                    item.local_category ? (
+                        <span className="r-item-categorie">{item.local_category.title}</span>
+                    ) : (
+                        item.category && (
+                            <span className="r-item-categorie">{item.category.title}</span>
+                        )
+                    )
+                ) : ""}
                 {description ?
                     <ReactMarkdown className="r-item-description">{limitDescription}</ReactMarkdown>
                     : ""

imio/smartweb/core/webcomponents/src/components/News/NewsList/NewsList.jsx

@@ -2,7 +2,7 @@ import NewsCard from "../NewsCard/NewsCard";
 import { Link } from "react-router-dom";
 import React from "react";
 import removeAccents from "remove-accents";
-const NewsList = ({ itemsArray, onChange, parentCallback }) => {
+const NewsList = ({ itemsArray, onChange, showCategoriesOrTopics }) => {
     function handleClick(event) {
         onChange(event);
     }
@@ -26,7 +26,7 @@ const NewsList = ({ itemsArray, onChange, parentCallback }) => {
                                 },
                             }}
                         >
-                            <NewsCard item={item} key={item.created} />
+                            <NewsCard item={item} showCategoriesOrTopics={showCategoriesOrTopics} key={item.created} />
                         </Link>
                     </li>
                 ))}

imio/smartweb/core/webcomponents/src/utils/Map.jsx

@@ -107,9 +107,7 @@ function Map(props) {
                     className="r-map-popup"
                     style={{ textDecoration: "none" }}
                     to={{
-                        pathname: removeAccents(
-                            mark.title.replace(/\s/g, "-").toLowerCase()
-                        ),
+                        pathname: "/" + removeAccents(mark.title).replace(/[^a-zA-Z ]/g, "").replace(/\s/g, "-").toLowerCase(),
                         search: `?u=${mark.UID}`,
                         state: {
                             idItem: mark.UID,

imio/smartweb/core/webcomponents/src/utils/translation.js

@@ -252,10 +252,58 @@ export default {
         de: "Benutzerdefiniert (Von ... bis ...)",
         nl: "Aangepast (Van ... tot ...)",
     },
+    "au": {
+        en: "to",
+        fr: "au",
+        de: "bis",
+        nl: "tot",
+    },
     "Personnalisé": {
         en: "Custom",
         fr: "Personnalisé",
         de: "Benutzerdefiniert",
         nl: "Aangepast",
-    }
+    },
+    "Monday": {
+        en: "Monday",
+        fr: "Lundi",
+        de: "Montag",
+        nl: "Maandag",
+    },
+    "Tuesday": {
+        en: "Tuesday",
+        fr: "Mardi",
+        de: "Dienstag",
+        nl: "Dinsdag",
+    },
+    "Wednesday": {
+        en: "Wednesday",
+        fr: "Mercredi",
+        de: "Mittwoch",
+        nl: "Woensdag",
+    },
+    "Thursday": {
+        en: "Thursday",
+        fr: "Jeudi",
+        de: "Donnerstag",
+        nl: "Donderdag",
+    },
+    "Friday": {
+        en: "Friday",
+        fr: "Vendredi",
+        de: "Freitag",
+        nl: "Vrijdag",
+    },
+    "Saturday": {
+        en: "Saturday",
+        fr: "Samedi",
+        de: "Samstag",
+        nl: "Zaterdag",
+    },
+    "Sunday": {
+        en: "Sunday",
+        fr: "Dimanche",
+        de: "Sonntag",
+        nl: "Zondag",
+    },
 }

{imio.smartweb.core-1.2.44.dist-info → imio.smartweb.core-1.2.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.44
+Version: 1.2.45
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -189,6 +189,25 @@ Changelog
 =========
 
 
+1.2.45 (2024-05-06)
+-------------------
+
+- WEB-4101 : Allow to choose to display topic or category on event & news.
+  This affects all related content types: SectionNews, SectionEvents, NewsView, EventsView.
+  Local category is alway taken before category (1 value).
+  Topic is always the first in list (1 value).
+  [laulaz, thomlamb]
+
+- Add end date on event cards
+  [thomlamb]
+
+- Add tradcution for directory timetable
+  [thomlamb]
+
+- SUP-36869 : Fix root ulr on Leaflet Marker.
+  [thomlamb]
+
+
 1.2.44 (2024-04-18)
 -------------------