mirror of
https://github.com/praktimarc/kst4contest.git
synced 2026-09-17 06:27:28 +02:00
Move band-offer star from callsign to worked status cell
This commit is contained in:
@@ -1187,10 +1187,6 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
|
|||||||
baseCallsign = member.getCallSign();
|
baseCallsign = member.getCallSign();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isSelectedBandOfferForMainView(member)) {
|
|
||||||
baseCallsign += " ★";
|
|
||||||
}
|
|
||||||
|
|
||||||
callsgn.setValue(baseCallsign);
|
callsgn.setValue(baseCallsign);
|
||||||
|
|
||||||
// System.out.println(member.getCallSign() + " / " + member.getState()+ " <<<<<<<<<<<<<<<<<< state ");
|
// System.out.println(member.getCallSign() + " / " + member.getState()+ " <<<<<<<<<<<<<<<<<< state ");
|
||||||
@@ -1609,7 +1605,7 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ObservableValue<String> call(CellDataFeatures<ChatMember, String> cellDataFeatures) {
|
public ObservableValue<String> call(CellDataFeatures<ChatMember, String> cellDataFeatures) {
|
||||||
return new SimpleStringProperty(formatWorkedAnyGridStatus(cellDataFeatures.getValue()));
|
return new SimpleStringProperty(formatWorkedAnyGridStatusForMainView(cellDataFeatures.getValue()));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
wkdAny_subcol.prefWidthProperty().bind(tbl_chatMemberTable.widthProperty().divide(14));
|
wkdAny_subcol.prefWidthProperty().bind(tbl_chatMemberTable.widthProperty().divide(14));
|
||||||
@@ -9691,6 +9687,14 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
|
|||||||
return "xo";
|
return "xo";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String formatWorkedAnyGridStatusForMainView(ChatMember member) {
|
||||||
|
String baseStatus = formatWorkedAnyGridStatus(member);
|
||||||
|
if (member != null && !member.isWorked() && isSelectedBandOfferForMainView(member)) {
|
||||||
|
return baseStatus + " ★";
|
||||||
|
}
|
||||||
|
return baseStatus;
|
||||||
|
}
|
||||||
|
|
||||||
if (callWorked) {
|
if (callWorked) {
|
||||||
return "x";
|
return "x";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user