From 05e191e31a86034bc58904a4b172ea6f491c44eb Mon Sep 17 00:00:00 2001 From: Teo Sarca Date: Tue, 5 Dec 2017 23:22:32 +0200 Subject: [PATCH] HUsToPickViewFactory: initial sorted by best before date https://github.com/metasfresh/metasfresh-webui-api/issues/717 --- .../ui/web/picking/husToPick/HUsToPickViewFactory.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/metas/ui/web/picking/husToPick/HUsToPickViewFactory.java b/src/main/java/de/metas/ui/web/picking/husToPick/HUsToPickViewFactory.java index 7c77d76ec..16f8a36db 100644 --- a/src/main/java/de/metas/ui/web/picking/husToPick/HUsToPickViewFactory.java +++ b/src/main/java/de/metas/ui/web/picking/husToPick/HUsToPickViewFactory.java @@ -11,6 +11,7 @@ import de.metas.ui.web.view.json.JSONViewDataType; import de.metas.ui.web.window.datatypes.WindowId; import de.metas.ui.web.window.descriptor.factory.standard.LayoutFactory; +import de.metas.ui.web.window.model.DocumentQueryOrderBy; /* * #%L @@ -84,10 +85,9 @@ protected void customizeHUEditorViewRepository(final SqlHUEditorViewRepositoryBu @Override protected void customizeHUEditorView(HUEditorViewBuilder huViewBuilder) { - // TODO: check if this is working... - // huViewBuilder - // .clearOrderBys() - // .orderBy(DocumentQueryOrderBy.byFieldName(HUEditorRow.FIELDNAME_BestBeforeDate)) - // .orderBy(DocumentQueryOrderBy.byFieldName(HUEditorRow.FIELDNAME_M_HU_ID)); + huViewBuilder + .clearOrderBys() + .orderBy(DocumentQueryOrderBy.builder().fieldName(HUEditorRow.FIELDNAME_BestBeforeDate).ascending(true).nullsLast(true).build()) + .orderBy(DocumentQueryOrderBy.byFieldName(HUEditorRow.FIELDNAME_M_HU_ID)); } }