Skip to content

Commit

Permalink
review task tags
Browse files Browse the repository at this point in the history
  • Loading branch information
jflamy committed Jul 25, 2024
1 parent 7b4a798 commit dbaa83e
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion owlcms/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
org.eclipse.jdt.core.compiler.storeAnnotations=disabled
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,LOW
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,REVIEW
org.eclipse.jdt.core.computeJavaBuildOrder=ignore
org.eclipse.jdt.core.encoding=utf8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public static List<Athlete> doFindFiltered(EntityManager em, String lastName, Gr
if (group != null && group.getName() == "*") {
group = null;
}
// FIXME this does not appear to work with ageDivision/Championship
// REVIEW this does not appear to work with ageDivision/Championship
String qlString = "select a from Athlete a"
+ filteringSelection(lastName, group, category, ageGroup, ageDivision, gender, weighedIn, team)
+ " order by a.category";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,11 @@ synchronized public HashMap<String, Object> computeReportingInfo(String ageGroup
}

public void doGlobalRankings(List<Athlete> athletes, Boolean scoringSystemOnly) {
/*
* TODO: make dependent on age group. age-group dependent would be for the registration category only (that shown on scoreboard and main medaling
* for session). secondary medals for other eligibility categories would be computed separately, during reporting.
*/

//long beforeDedup = System.currentTimeMillis();
TreeSet<Athlete> noDup = new TreeSet<>(Comparator.comparing(Athlete::getFullId));
for (Athlete pAthlete : athletes) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2294,6 +2294,7 @@ private void recomputeOrderAndRanks(boolean recomputeCategoryRanks) {
}

private List<Athlete> updateScoringSystemRanking(EntityManager em, List<Athlete> l) {
//TODO: make scoringSystemRankings dependent on age group.
if (Competition.getCurrent().isDisplayScoreRanks()) {
// long beforeRanks = System.currentTimeMillis();
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public void doClose(boolean noAction) {
this.close();
return;
}
// FIXME: this should be done after processing the JuryEvent in FieldOfPlay
// REVIEW: this should be done after processing the JuryEvent in FieldOfPlay
resumeLifting(noAction);

this.close();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public Component buildNewForm(CrudOperation operation, Athlete aFromList, boolea
if (this.getCurrentGroup() != null && !this.getCurrentGroup().getName().equals("*")) {
aFromList.setGroup(getCurrentGroup());
}
this.binder.readBean(aFromList); // FIXME should be getEditedAthlete() ?
this.binder.readBean(aFromList); // REVIEW should be getEditedAthlete() ?

// binder has read bean.
filterCategories(getEditedAthlete().getCategory(), operation != CrudOperation.ADD);
Expand Down
2 changes: 2 additions & 0 deletions src/main/markdown/ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
- (beta01) Publicresults
- When a user opens a scoreboard and a timer is running, the timer is now immediately synchronized
- If the publicresults application is restarted, and sessions are in a break, the remaining time is now immediately synchronized

See also [version 50 release notes](https://github.com/owlcms/owlcms4/releases/tag/50.0.0)

0 comments on commit dbaa83e

Please sign in to comment.