Skip to content

Repositry test #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Repositry test #9

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4c418b3
add few more acronyms, set number of examples on homepage to 3
DimaSanKiev Aug 15, 2016
3ef612a
Addresses issue #6 by changing the number of examples to 3
DimaSanKiev Aug 15, 2016
19eae7a
Addresses bug described in #6 where the total count call to action wa…
DimaSanKiev Aug 15, 2016
b9b60c4
Merge pull request #8 from DimaSanKiev/fewer-examples
DimaSanKiev Aug 15, 2016
d219043
Fixes #6 by making the cards displayed more standard
DimaSanKiev Aug 16, 2016
aaabb4c
Merge pull request #9 from DimaSanKiev/bogus-counting
DimaSanKiev Aug 16, 2016
99f939a
Refactor code to be more clear to read
DimaSanKiev Aug 17, 2016
94c509d
Merge pull request #10 from DimaSanKiev/code-refactoring
DimaSanKiev Aug 17, 2016
f704040
remove unnecessary imports and variable
DimaSanKiev Aug 17, 2016
08c1516
Add FlashCardServiceImplTest
DimaSanKiev Aug 17, 2016
89a8e0f
Merge pull request #11 from DimaSanKiev/testing-service
DimaSanKiev Aug 17, 2016
129ef2a
add FlashCardRepositoryTest class
DimaSanKiev Aug 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Addresses bug described in #6 where the total count call to action wa… 
…s off
  • Loading branch information
@DimaSanKiev
DimaSanKiev committed Aug 15, 2016
commit 19eae7aaafc96be867cbfebccace2908c2dc79e8
8 changes: 5 additions & 3 deletions src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ public String index(Model model) {
ctaBuilder.append(", ");
}
}
ctaBuilder.append(" and ");
Long totalCount = flashCardService.getCurrentCount();
ctaBuilder.append(totalCount);
ctaBuilder.append(" more");
if (totalCount > AMOUNT_TO_SHOW) {
ctaBuilder.append(" and ");
ctaBuilder.append(totalCount - AMOUNT_TO_SHOW);
ctaBuilder.append(" more");
}
model.addAttribute("cta", ctaBuilder.toString());
model.addAttribute("flashCardCount", totalCount);
return "index";
Expand Down