Skip to content

Sskp: Add GUe to column B #2145

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

Merged
mariusheine merged 5 commits into from
Jan 27, 2026
+184 −169
Merged

Sskp: Add GUe to column B #2145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0de7835
Sskp: Add GUe to column B
TruongQuangSB Jan 23, 2026
894db9e
Merge branch 'main' into sskp-add-gue
TruongQuangSB Jan 27, 2026
67c44af
Sskp: fix sort column B
TruongQuangSB Jan 27, 2026
875a06c
Update columns B comparator
TruongQuangSB Jan 27, 2026
423bcde
Update table reference
eclipse-set-bot Jan 27, 2026
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
26 changes: 20 additions & 6 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskp/SskpTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import java.util.function.Function;

import org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum;
import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
Expand Down Expand Up @@ -62,6 +63,10 @@ public class SskpTransformationService
@Reference
private EventAdmin eventAdmin;

private static final List<String> FREQUENCY_ODER = List.of("2000", //$NON-NLS-1$
"1000/2000", "1000", //$NON-NLS-1$ //$NON-NLS-2$
"500"); //$NON-NLS-1$

/**
* constructor.
*/
Expand Down Expand Up @@ -113,8 +118,6 @@ private static String getCellContent(final TableCell cell) {

@Override
public Comparator<RowGroup> getRowGroupComparator() {
final List<String> gmOrder = List.of("2000", "1000/2000", "1000", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"500"); //$NON-NLS-1$
return TableRowGroupComparator.builder().sortByRouteAndKm(obj -> {
if (obj instanceof final PZB_Element pzb) {
final List<Basis_Objekt> bezugPunkts = PZBElementExtensions
Expand All @@ -129,14 +132,25 @@ public Comparator<RowGroup> getRowGroupComparator() {
})
.sort(Bezugselement, CellComparatorType.LEXICOGRAPHICAL,
SortDirectionEnum.ASC)
.sort(Wirkfrequenz, Comparator.comparing(
SskpTransformationService::getCellContent,
Comparator.nullsLast(Comparator.comparing(
gmOrder::indexOf, Integer::compareUnsigned))))
.sort(Wirkfrequenz,
Comparator.comparing(
SskpTransformationService::getCellContent,
Comparator.nullsLast(frequencyComparator())))
.build();

}

@SuppressWarnings("boxing")
private static Comparator<String> frequencyComparator() {
return (first, second) -> {
final Function<String, Integer> getPiority = value -> {
return FREQUENCY_ODER.indexOf(value.replace("GÜ", "").trim()); //$NON-NLS-1$ //$NON-NLS-2$
};
return Integer.compareUnsigned(getPiority.apply(first),
getPiority.apply(second));
};
}

@Override
public ColumnDescriptor fillHeaderDescriptions(
final ColumnDescriptorModelBuilder builder) {
Expand Down
11 changes: 6 additions & 5 deletions ....set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskp/SskpTransformator.xtend
View file
Open in desktop
Copy link
Contributor

@mariusheine mariusheine Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TruongQuangSB The ordering of the rows is broken now. See table diffs in #2146

Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ class SskpTransformator extends AbstractPlanPro2TableModelTransformator {

private def fillRowGroupContent(TableRow instance, PZB_Element pzb,
Fstr_DWeg dweg) {

val pzbGUEs = (pzb.container.PZBElement.map[PZBElementGUE].filterNull.
filter[IDPZBElementMitnutzung?.value === pzb] +
#[pzb.PZBElementGUE]).filterNull

// A: Sskp.Bezug.BezugsElement
fillIterable(
instance,
Expand All @@ -119,7 +124,7 @@ class SskpTransformator extends AbstractPlanPro2TableModelTransformator {
instance,
cols.getColumn(Wirkfrequenz),
pzb,
[PZBArt?.translate]
['''«PZBArt?.translate»«IF !pzbGUEs.nullOrEmpty» GÜ«ENDIF»''']
)

val isPZB2000 = pzb.PZBArt?.wert === ENUMPZBArt.ENUMPZB_ART_2000_HZ ||
Expand Down Expand Up @@ -517,10 +522,6 @@ class SskpTransformator extends AbstractPlanPro2TableModelTransformator {
}
}

val pzbGUEs = (pzb.container.PZBElement.map[PZBElementGUE].filterNull.
filter[IDPZBElementMitnutzung?.value === pzb] +
#[pzb.PZBElementGUE]).filterNull

if (!pzbGUEs.empty) {
// R: Sskp.Gue.Pruefgeschwindigkeit
fillIterable(
Expand Down
Loading
Loading