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

Devel #56

Merged
0xFEEDC0DE64 merged 84 commits from devel into master 2017-12-29 13:34:28 +01:00
Conversation 0 Commits 84 Files Changed 223 +175 -154
16 changed files with 175 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b07f7c44f6 - Show all commits

24
zeiterfassunglib/stripswidget.cpp
View File

@@ -270,14 +270,6 @@ bool StripsWidget::createStrips()
}
auto timeAssignment = *timeAssignmentsIter++;
if(timeAssignment.time != timeAssignmentTime)
{
errorMessage = tr("Expected %0 but received %1 in time assignment.\nTime assignment ID: %2")
.arg(timeAssignmentTime.toString(tr("HH:mm:ss")))
.arg(timeAssignment.time.toString(tr("HH:mm:ss")))
.arg(timeAssignment.id);
goto after;
}
appendTimeAssignmentStrip(timeAssignment.id, timeAssignment.timespan, buildProjectString(timeAssignment.project),
timeAssignment.subproject, timeAssignment.workpackage, timeAssignment.text);
@@ -321,14 +313,6 @@ bool StripsWidget::createStrips()
}
timeAssignment = *timeAssignmentsIter++;
if(timeAssignment.time != timeAssignmentTime)
{
errorMessage = tr("Expected %0 but received %1 in time assignment.\nTime assignment ID: %2")
.arg(timeAssignmentTime.toString(tr("HH:mm:ss")))
.arg(timeAssignment.time.toString(tr("HH:mm:ss")))
.arg(timeAssignment.id);
goto after;
}
appendTimeAssignmentStrip(timeAssignment.id, timeAssignment.timespan, buildProjectString(timeAssignment.project),
timeAssignment.subproject, timeAssignment.workpackage, timeAssignment.text);
@@ -384,14 +368,6 @@ bool StripsWidget::createStrips()
}
timeAssignment = *timeAssignmentsIter++;
if(timeAssignment.time != timeAssignmentTime)
{
errorMessage = tr("Expected %0 but received %1 in time assignment.\nTime assignment ID: %2")
.arg(timeAssignmentTime.toString(tr("HH:mm:ss")))
.arg(timeAssignment.time.toString(tr("HH:mm:ss")))
.arg(timeAssignment.id);
goto after;
}
appendTimeAssignmentStrip(timeAssignment.id, timeAssignment.timespan, buildProjectString(timeAssignment.project),
timeAssignment.subproject, timeAssignment.workpackage, timeAssignment.text);