Merge lp:~forsslundsystems/forssim/caseRevisionhandling into lp:forssim

Proposed by parhe
Status: Merged
Merged at revision: not available
Proposed branch: lp:~forsslundsystems/forssim/caseRevisionhandling
Merge into: lp:forssim
Diff against target: None lines
To merge this branch: bzr merge lp:~forsslundsystems/forssim/caseRevisionhandling
Reviewer Review Type Date Requested Status
Ulrika Dreifaldt Approve
Review via email: mp+8885@code.launchpad.net
To post a comment you must log in.
Revision history for this message
parhe (par-hellstrom) wrote :

Fixed bug in case revision system. Wrong anamnes and objectives where displayed when a case had been properly updated.

Revision history for this message
Ulrika Dreifaldt (ulrika-dreifaldt) wrote :

Looks good.
Ulrika & Jocke

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'FsWisdom/SelectCaseWindow.cpp'
2--- FsWisdom/SelectCaseWindow.cpp 2009-06-12 13:32:57 +0000
3+++ FsWisdom/SelectCaseWindow.cpp 2009-07-16 14:36:05 +0000
4@@ -252,8 +252,10 @@
5
6
7 QSqlQuery query;
8- query.prepare("select anamnes from forsCaseVersion join forsCase on forsCase.forsCaseId = forsCaseVersion.forsCaseId where forsCase.name = :caseName;");
9+
10+ query.prepare("select anamnes from forsCaseVersion join forsCase on forsCase.forsCaseId = forsCaseVersion.forsCaseId where forsCase.name = :caseName && forsCaseVersion.version = :version;");
11 query.bindValue(":caseName",selectedCase.getName());
12+ query.bindValue(":version",selectedCase.getVersion());
13
14 query.exec();
15 query.next();
16@@ -270,8 +272,9 @@
17 const Case& selectedCase = applicationNode->getLocalCaseList()->getCaseForSelectedRow(ui.caseListWidget);
18
19 QSqlQuery query;
20- query.prepare("select objectives from forsCaseVersion join forsCase on forsCase.forsCaseId = forsCaseVersion.forsCaseId where forsCase.name = :caseName;");
21+ query.prepare("select objectives from forsCaseVersion join forsCase on forsCase.forsCaseId = forsCaseVersion.forsCaseId where forsCase.name = :caseName && forsCaseVersion.version = :version;");
22 query.bindValue(":caseName",selectedCase.getName());
23+ query.bindValue(":version",selectedCase.getVersion());
24
25 query.exec();
26 query.next();

Subscribers

People subscribed via source and target branches

to all changes: