Skip to content
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

Strange counting #54

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

Strange counting #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e954fa
Made som changes to issue #6
May 17, 2021
aade940
Merge pull request #26 from rorsman/fewer-examples
rorsman May 17, 2021
a032cf2
Fixes #5 by making the cards displayed more standard
May 20, 2021
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
11 changes: 7 additions & 4 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 @@ -12,6 +12,7 @@

@Controller
public class IndexController {
public static final int TOTAL_AMOUNT_TO_SHOW = 3;
private FlashCardService flashCardService;

@Autowired
Expand All @@ -22,18 +23,20 @@ public void setFlashCardService(FlashCardService flashCardService) {
@RequestMapping("/")
public String index(Model model) {
StringBuilder ctaBuilder = new StringBuilder();
List<FlashCard> cards = flashCardService.getRandomFlashCards(5);
List<FlashCard> cards = flashCardService.getRandomFlashCards(TOTAL_AMOUNT_TO_SHOW);
ctaBuilder.append("Refresh your memory about ");
for (FlashCard card : cards) {
ctaBuilder.append(card.getTerm());
if (card != cards.get(cards.size() - 1)) {
ctaBuilder.append(", ");
}
}
ctaBuilder.append(" and ");
Long totalCount = flashCardService.getCurrentCount();
ctaBuilder.append(totalCount);
ctaBuilder.append(" more");
if (totalCount > TOTAL_AMOUNT_TO_SHOW) {
ctaBuilder.append(" and ");
ctaBuilder.append(totalCount - TOTAL_AMOUNT_TO_SHOW);
ctaBuilder.append(" more");
}
model.addAttribute("cta", ctaBuilder.toString());
model.addAttribute("flashCardCount", totalCount);
return "index";
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/teamtreehouse/flashy/services/FlashCardServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,9 @@ public FlashCard getNextFlashCardBasedOnViews(Map<Long, Long> idToViewCounts) {
continue;
}
Long lowestScore = idToViewCounts.get(leastViewedId);
if (entry.getValue() >= lowestScore) {
break;
if (entry.getValue() < lowestScore) {
leastViewedId = entry.getKey();
}
leastViewedId = entry.getKey();
}
return flashCardRepository.findOne(leastViewedId);
}
Expand Down