feedc0de/QtZeiterfassung
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Plugin advanced view #29

Merged
0xFEEDC0DE64 merged 11 commits from plugin-advanced-view into master 2017-12-18 21:52:59 +01:00
Conversation 0 Commits 11 Files Changed 36 +1075 -845
36 changed files with 1075 additions and 845 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 01583dea10 - Show all commits

2
plugins/advancedviewplugin/advanvedviewdialog.cpp
View File

@@ -32,10 +32,12 @@ AdvanvedViewDialog::AdvanvedViewDialog(StripsWidget &stripsWidget) :
ui->setupUi(this); ui->setupUi(this);
ui->bookingsView->setModel(m_bookingsModel); ui->bookingsView->setModel(m_bookingsModel);
ui->bookingsView->setEnabled(m_bookingsModel->enabled());
connect(m_bookingsModel, &BookingsModel::enabledChanged, ui->bookingsView, &QWidget::setEnabled); connect(m_bookingsModel, &BookingsModel::enabledChanged, ui->bookingsView, &QWidget::setEnabled);
connect(ui->bookingsView, &QWidget::customContextMenuRequested, this, &AdvanvedViewDialog::contextMenuBooking); connect(ui->bookingsView, &QWidget::customContextMenuRequested, this, &AdvanvedViewDialog::contextMenuBooking);
ui->timeAssignmentsView->setModel(m_timeAssignmentsModel); ui->timeAssignmentsView->setModel(m_timeAssignmentsModel);
ui->timeAssignmentsView->setEnabled(m_timeAssignmentsModel->enabled());
connect(m_timeAssignmentsModel, &TimeAssignmentsModel::enabledChanged, ui->timeAssignmentsView, &QWidget::setEnabled); connect(m_timeAssignmentsModel, &TimeAssignmentsModel::enabledChanged, ui->timeAssignmentsView, &QWidget::setEnabled);
connect(ui->timeAssignmentsView, &QWidget::customContextMenuRequested, this, &AdvanvedViewDialog::contextMenuTimeAssignment); connect(ui->timeAssignmentsView, &QWidget::customContextMenuRequested, this, &AdvanvedViewDialog::contextMenuTimeAssignment);
} }

2
plugins/advancedviewplugin/advanvedviewdialog.ui
View File

@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>640</width> <width>1024</width>
<height>480</height> <height>480</height>
</rect> </rect>
</property> </property>

2
plugins/advancedviewplugin/models/bookingsmodel.cpp
View File

@@ -7,7 +7,7 @@ BookingsModel::BookingsModel(StripsWidget &stripsWidget, QObject *parent) :
m_stripsWidget(stripsWidget) m_stripsWidget(stripsWidget)
{ {
connect(&stripsWidget, &StripsWidget::bookingsChanged, this, &BookingsModel::bookingsChanged); connect(&stripsWidget, &StripsWidget::bookingsChanged, this, &BookingsModel::bookingsChanged);
connect(&stripsWidget, &StripsWidget::refreshingBookingsChanged, this, &BookingsModel::enabledChanged); connect(&stripsWidget, &StripsWidget::refreshingBookingsChanged, [=](bool refreshing){ enabledChanged(!refreshing); });
} }
StripsWidget &BookingsModel::stripsWidget() const StripsWidget &BookingsModel::stripsWidget() const

2
plugins/advancedviewplugin/models/timeassignmentsmodel.cpp
View File

@@ -7,7 +7,7 @@ TimeAssignmentsModel::TimeAssignmentsModel(StripsWidget &stripsWidget, QObject *
m_stripsWidget(stripsWidget) m_stripsWidget(stripsWidget)
{ {
connect(&stripsWidget, &StripsWidget::timeAssignmentsChanged, this, &TimeAssignmentsModel::timeAssignmentsChanged); connect(&stripsWidget, &StripsWidget::timeAssignmentsChanged, this, &TimeAssignmentsModel::timeAssignmentsChanged);
connect(&stripsWidget, &StripsWidget::refreshingBookingsChanged, this, &TimeAssignmentsModel::enabledChanged); connect(&stripsWidget, &StripsWidget::refreshingTimeAssignmentsChanged, [=](bool refreshing){ enabledChanged(!refreshing); });
} }
StripsWidget &TimeAssignmentsModel::stripsWidget() const StripsWidget &TimeAssignmentsModel::stripsWidget() const

26
zeiterfassunglib/stripswidget.cpp
View File

@@ -140,11 +140,11 @@ void StripsWidget::refresh()
m_stripsLayout->addWidget(new QLabel(tr("Loading..."), this)); m_stripsLayout->addWidget(new QLabel(tr("Loading..."), this));
refreshBookings(); refreshBookings(false);
refreshTimeAssignments(); refreshTimeAssignments(false);
} }
void StripsWidget::refreshBookings() void StripsWidget::refreshBookings(bool createLabel)
{ {
if(!m_date.isValid()) if(!m_date.isValid())
{ {
@@ -152,7 +152,14 @@ void StripsWidget::refreshBookings()
return; return;
} }
if(m_bookings.count()) if(createLabel)
{
clearStrips();
m_stripsLayout->addWidget(new QLabel(tr("Loading..."), this));
}
if(!m_bookings.empty())
{ {
m_bookings.clear(); m_bookings.clear();
Q_EMIT bookingsChanged(m_bookings); Q_EMIT bookingsChanged(m_bookings);
@@ -170,7 +177,7 @@ void StripsWidget::refreshBookings()
connect(m_getBookingsReply.get(), &ZeiterfassungReply::finished, this, &StripsWidget::getBookingsFinished); connect(m_getBookingsReply.get(), &ZeiterfassungReply::finished, this, &StripsWidget::getBookingsFinished);
} }
void StripsWidget::refreshTimeAssignments() void StripsWidget::refreshTimeAssignments(bool createLabel)
{ {
if(!m_date.isValid()) if(!m_date.isValid())
{ {
@@ -178,7 +185,14 @@ void StripsWidget::refreshTimeAssignments()
return; return;
} }
if(m_timeAssignments.count()) if(createLabel)
{
clearStrips();
m_stripsLayout->addWidget(new QLabel(tr("Loading..."), this));
}
if(!m_timeAssignments.empty())
{ {
m_timeAssignments.clear(); m_timeAssignments.clear();
Q_EMIT timeAssignmentsChanged(m_timeAssignments); Q_EMIT timeAssignmentsChanged(m_timeAssignments);

4
zeiterfassunglib/stripswidget.h
View File

@@ -46,8 +46,8 @@ public:
bool endEnabled() const; bool endEnabled() const;
void refresh(); void refresh();
void refreshBookings(); void refreshBookings(bool createLabel = true);
void refreshTimeAssignments(); void refreshTimeAssignments(bool createLabel = true);
bool createStrips(); bool createStrips();
void clearStrips(); void clearStrips();