GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1281:6aa3d9aeb6d5

Add init of DisplayedEvent. Add save on EventProduct modif

perrinel -

r1281:6aa3d9aeb6d5

parent child

Context file:

r1281:6aa3d9aeb6d5

gui/src/Catalogue/CatalogueExplorer.cpp +4 -1

                 });
                 connect(ui->inspector, &CatalogueInspectorWidget::eventProductUpdated,
-                        [this](auto event, auto eventProduct) { ui->events->setEventChanges(event, true); });
+                        [this](auto event, auto eventProduct) {
+                            sqpApp->catalogueController().updateEventProduct(eventProduct);
+                            ui->events->setEventChanges(event, true);
+                        });
             }
             CatalogueExplorer::~CatalogueExplorer()

gui/src/Catalogue/CatalogueInspectorWidget.cpp +33 -3

                 connect(ui->leEventProduct, &QLineEdit::editingFinished, [ui, inspector, this]() {
                     if (ui->leEventProduct->text() != m_DisplayedEventProduct->getProductId()) {
+                        auto oldProductId = m_DisplayedEventProduct->getProductId();
                         m_DisplayedEventProduct->setProductId(ui->leEventProduct->text());
-                        emit inspector->eventProductUpdated(m_DisplayedEvent, m_DisplayedEventProduct);
+                        auto eventProducts = m_DisplayedEvent->getEventProducts();
+                        for (auto &eventProduct : eventProducts) {
+                            if (eventProduct.getProductId() == oldProductId) {
+                                eventProduct.setProductId(m_DisplayedEventProduct->getProductId());
+                            }
+                        }
+                        m_DisplayedEvent->setEventProducts(eventProducts);
+                        emit inspector->eventUpdated(m_DisplayedEvent);
                     }
                 });
                     auto time = DateUtils::secondsSinceEpoch(ui->dateTimeEventTStart->dateTime());
                     if (time != m_DisplayedEventProduct->getTStart()) {
                         m_DisplayedEventProduct->setTStart(time);
-                        emit inspector->eventProductUpdated(m_DisplayedEvent, m_DisplayedEventProduct);
+                        auto eventProducts = m_DisplayedEvent->getEventProducts();
+                        for (auto &eventProduct : eventProducts) {
+                            if (eventProduct.getProductId() == m_DisplayedEventProduct->getProductId()) {
+                                eventProduct.setTStart(m_DisplayedEventProduct->getTStart());
+                            }
+                        }
+                        m_DisplayedEvent->setEventProducts(eventProducts);
+                        emit inspector->eventUpdated(m_DisplayedEvent);
                     }
                 });
                     auto time = DateUtils::secondsSinceEpoch(ui->dateTimeEventTEnd->dateTime());
                     if (time != m_DisplayedEventProduct->getTEnd()) {
                         m_DisplayedEventProduct->setTEnd(time);
-                        emit inspector->eventProductUpdated(m_DisplayedEvent, m_DisplayedEventProduct);
+                        auto eventProducts = m_DisplayedEvent->getEventProducts();
+                        for (auto &eventProduct : eventProducts) {
+                            if (eventProduct.getProductId() == m_DisplayedEventProduct->getProductId()) {
+                                eventProduct.setTEnd(m_DisplayedEventProduct->getTEnd());
+                            }
+                        }
+                        m_DisplayedEvent->setEventProducts(eventProducts);
+                        emit inspector->eventUpdated(m_DisplayedEvent);
                     }
                 });
             }
             void CatalogueInspectorWidget::setEventProduct(const std::shared_ptr<DBEvent> &event,
                                                            const std::shared_ptr<DBEventProduct> &eventProduct)
             {
+                impl->m_DisplayedEvent = event;
                 impl->m_DisplayedEventProduct = eventProduct;
                 blockSignals(true);

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages