This method intentionally ignores the currently enabled own bands. The grid + * status in the user list is meant to be a simple and robust any-band indicator.
* * @param member member to inspect - * @return true if the station is still a new locator on any enabled band + * @return true if the gross grid square was worked on any band */ - public boolean isNewLocatorOnAnyEnabledBand(ChatMember member) { + public boolean isGridSquareWorkedAny(ChatMember member) { if (member == null || member.getQra() == null) { return false; } - EnumSetThis is the predicate behind the optional "Only new grids" filter. It no + * longer depends on active station band settings.
+ * + * @param member member to inspect + * @return true if the gross grid square is still new + */ + public boolean isNewGridSquare(ChatMember member) { + if (member == null || member.getQra() == null) { return false; } - for (Band band : enabledBands) { - if (!workedGrossFieldCache.isGrossFieldWorked(band, member.getQra())) { - return true; - } - } - - return false; + return !workedGrossFieldCache.isGrossFieldWorkedAny(member.getQra()); } public long getCurrentEpochTime() { diff --git a/src/main/java/kst4contest/controller/DBController.java b/src/main/java/kst4contest/controller/DBController.java index 3ec64e4..583d588 100644 --- a/src/main/java/kst4contest/controller/DBController.java +++ b/src/main/java/kst4contest/controller/DBController.java @@ -682,8 +682,7 @@ public class DBController { String workedBandColumnName = helper_resolveWorkedBandColumnName(chatMemberToStore); if (workedBandColumnName == null) { - System.out.println("[DBCtrl, Error]: unknown at which band the qso had been!"); - return false; + return helper_updateWorkedAnyOnChatMember(chatMemberToStore); } // String updateWorkedSql = @@ -717,6 +716,47 @@ public class DBController { } } + /** + * Updates only the global worked-any flag of a stored chatmember row. + * + *This is used when an external logger confirms that a station was worked, + * but the software cannot reliably map the QSO to one of the persisted band + * columns. The UI status "x" is based on this global worked flag, so this method + * makes no-band or unsupported-band log entries persistent as worked-any.
+ * + * @param chatMemberToStore chatmember that contains the worked call and optional locator + * @return true if an existing database row was updated + * @throws SQLException if the database write fails + */ + private synchronized boolean helper_updateWorkedAnyOnChatMember(ChatMember chatMemberToStore) throws SQLException { + + if (chatMemberToStore == null + || chatMemberToStore.getCallSignRaw() == null + || chatMemberToStore.getCallSignRaw().isBlank()) { + return false; + } + + String updateWorkedAnySql = + "UPDATE ChatMember SET worked = 1, " + + "qra = CASE WHEN ? IS NOT NULL AND TRIM(?) <> '' AND LOWER(TRIM(?)) <> 'unknown' THEN ? ELSE qra END, " + + "lastFlagsChangeEpochMs = ? WHERE callsign = ?;"; + + try (PreparedStatement preparedStatement = connection.prepareStatement(updateWorkedAnySql)) { + String qra = chatMemberToStore.getQra(); + + preparedStatement.setString(1, qra); + preparedStatement.setString(2, qra); + preparedStatement.setString(3, qra); + preparedStatement.setString(4, qra); + preparedStatement.setLong(5, System.currentTimeMillis()); + preparedStatement.setString(6, chatMemberToStore.getCallSignRaw()); + + int affectedRows = preparedStatement.executeUpdate(); + return affectedRows > 0; + } + } + + /** * Updates all not-QRV flags for a chatmember row. The method uses the normalized * raw callsign and updates the timestamp so that automatic contest cleanup can diff --git a/src/main/java/kst4contest/controller/WorkedGrossFieldCache.java b/src/main/java/kst4contest/controller/WorkedGrossFieldCache.java index 2bfa2ba..fd7feeb 100644 --- a/src/main/java/kst4contest/controller/WorkedGrossFieldCache.java +++ b/src/main/java/kst4contest/controller/WorkedGrossFieldCache.java @@ -119,6 +119,31 @@ public final class WorkedGrossFieldCache { .contains(grossField); } + /** + * Checks whether a locator gross field has already been worked on any band. + * + *The UI grid status and the "Only new grids" filter use this any-band logic. + * This avoids user errors caused by wrong active-band settings and fits single + * band contests such as NAC better.
+ * + * @param locatorOrGrossField six-character locator or four-character gross field + * @return true if the gross field exists in the cache on any band + */ + public synchronized boolean isGrossFieldWorkedAny(String locatorOrGrossField) { + String grossField = extractGrossField(locatorOrGrossField); + if (grossField == null) { + return false; + } + + for (SetThe default table design is preserved as much as possible: + *
No font weight is changed here. The compact worked/grid status such as + * {@code xo} is emphasized only in the worked-any column.
+ */ + qraCol.setCellFactory(column -> new TableCellThis does not filter the list. It only colors the locator field: + * worked grid = darker, new grid = brighter.
+ */ + btnTglGridColor.setOnAction(new EventHandlerStatus characters follow the user feedback: + *
The call status is based on {@link ChatMember#isWorked()}, i.e. worked-any. + * The grid status is based on the four-character grid square worked on any band.
+ * + * @param member station row + * @return compact status text + */ + private String formatWorkedAnyGridStatus(ChatMember member) { + if (member == null) { + return ""; + } + + boolean callWorked = member.isWorked(); + boolean gridWorked = chatcontroller != null && chatcontroller.isGridSquareWorkedAny(member); + + if (callWorked && gridWorked) { + return "xo"; + } + + if (callWorked) { + return "x"; + } + + if (gridWorked) { + return "o"; + } + + return ""; + } + + /** + * Builds a tooltip for the worked-any/grid-status cell. + * + * @param member station row + * @return tooltip text + */ + private String buildWorkedAnyGridStatusTooltip(ChatMember member) { + if (member == null) { + return "empty = call not worked, grid not worked\n" + + "x = call worked\n" + + "o = grid worked\n" + + "xo = call and grid worked"; + } + + String grossField = WorkedGrossFieldCache.extractGrossField(member.getQra()); + String gridText = grossField == null ? "unknown grid" : "grid " + grossField; + + return "Worked status:\n" + + "empty = call not worked, grid not worked\n" + + "x = call worked\n" + + "o = grid worked\n" + + "xo = call and grid worked\n\n" + + "This station:\n" + + "Call worked: " + (member.isWorked() ? "yes" : "no") + "\n" + + "Grid worked: " + (chatcontroller != null && chatcontroller.isGridSquareWorkedAny(member) ? "yes" : "no") + + " (" + gridText + ")"; + } + // /** // * // * resets the style of the not selected direction buttons @@ -9706,6 +9959,72 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL // } + /** + * Returns the best currently selected ChatMember for actions that depend on a + * selected station. + * + *The normal source is selectedCallSignInfoStageChatMember. As a fallback, + * the current table selection and the ScoreService selection are checked. If + * nothing is selected yet, null is returned. This is valid and must be handled + * by the caller.
+ * + * @return selected ChatMember or null if no station is selected + */ + private ChatMember getEffectiveSelectedChatMember() { + if (selectedCallSignInfoStageChatMember != null) { + return selectedCallSignInfoStageChatMember; + } + + if (tbl_chatMember != null + && tbl_chatMember.getSelectionModel() != null + && tbl_chatMember.getSelectionModel().getSelectedItem() != null) { + return tbl_chatMember.getSelectionModel().getSelectedItem(); + } + + if (chatcontroller != null + && chatcontroller.getScoreService() != null + && chatcontroller.getScoreService().getSelectedChatMember() != null) { + return chatcontroller.getScoreService().getSelectedChatMember(); + } + + return null; + } + + /** + * Resolves the chat category for an outgoing operator message. + * + *If a station is selected, the message is sent in the category of that + * station. If no station is selected yet, the message is sent in the main chat + * category. This prevents NullPointerExceptions when the operator writes to the + * chat immediately after joining.
+ * + * @param selectedMember selected station, may be null + * @return category for the outgoing message, normally main or second category + */ + private ChatCategory resolveOutgoingChatCategory(ChatMember selectedMember) { + ChatCategory mainCategory = chatcontroller.getChatCategoryMain(); + ChatCategory secondCategory = chatcontroller.getChatCategorySecondChat(); + + if (selectedMember == null || selectedMember.getChatCategory() == null) { + return mainCategory; + } + + String categoryNumber = selectedMember.getChatCategory().getCategoryNumber() + ""; + + if (mainCategory != null + && categoryNumber.equals(mainCategory.getCategoryNumber() + "")) { + return mainCategory; + } + + if (secondCategory != null + && categoryNumber.equals(secondCategory.getCategoryNumber() + "")) { + return secondCategory; + } + + return mainCategory; + } + + /** * helper method, in cases of QRG ending qith 0 as double values, it will fill the ending 0 to the qrg string * @param raw