From d3936b24fe9a495b6215f44683fb9dbe6b9f927f Mon Sep 17 00:00:00 2001 From: Artjom Date: Wed, 12 Apr 2023 17:27:13 +0300 Subject: [PATCH] Fingerprints filter for records station computer (#15017) * add new labels and buttons for records stantion console * add fingerprint fields for server * set buttons and updates for fingerPrints filters * set fingerprints filters * final set for finger prints filters * add new trhaslates for station records computer * some fix for the PR * refactor server side station record console system * add message for filters * add tranlates * add new ui with several filters * updetes prints with server side logic * resolve conflicts with DNA * resolve conflicts with DNA * deleted unused variable and rename some fields * added description for new state * added select for filter * set multiplay filters for the console * added new translates * add class filters & fixed issue with reset line edit * fix dublicate with set the selectId for option button * fixed review notes * fixed review notes forget changet fix name * add event TextEntered for better usability * fixed review notes 3 * fixed formating in xaml * fixed array with _filterTypes * fixed ui and made it in minimalistic style * fixed generalstationRecordFilter class, move method * delete margin after line edit * fix placeholder for lineEdit * fix placeholder for lineEdit, the review note * Revert "fixed generalstationRecordFilter class, move method" This reverts commit 1b35c6ac44e7dafe9a1f0560eb177152b822f20b. * impliment short swith in method IsSkippedRecord * fixed review notes, remaked method IsSkipped and fix casing * fixed the review note about check null record name --- ...lStationRecordConsoleBoundUserInterface.cs | 8 ++ .../GeneralStationRecordConsoleWindow.xaml | 29 ++++--- .../GeneralStationRecordConsoleWindow.xaml.cs | 74 +++++++++++++++++- .../GeneralStationRecordConsoleComponent.cs | 1 + .../GeneralStationRecordConsoleSystem.cs | 77 ++++++++++++++++--- .../GeneralStationRecordsFilter.cs | 38 +++++++++ ...SharedGeneralStationRecordConsoleSystem.cs | 13 +++- .../general-station-records.ftl | 7 ++ 8 files changed, 223 insertions(+), 24 deletions(-) create mode 100644 Content.Shared/StationRecords/GeneralStationRecordsFilter.cs diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs index 3c8bcc9d21..34c3328792 100644 --- a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs +++ b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs @@ -16,6 +16,7 @@ public sealed class GeneralStationRecordConsoleBoundUserInterface : BoundUserInt _window = new(); _window.OnKeySelected += OnKeySelected; + _window.OnFiltersChanged += OnFiltersChanged; _window.OnClose += Close; _window.OpenCentered(); @@ -26,6 +27,13 @@ public sealed class GeneralStationRecordConsoleBoundUserInterface : BoundUserInt SendMessage(new SelectGeneralStationRecord(key)); } + private void OnFiltersChanged( + GeneralStationRecordFilterType type, string filterValue) + { + GeneralStationRecordsFilterMsg msg = new(type, filterValue); + SendMessage(msg); + } + protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml b/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml index 97df400c63..a915d329bc 100644 --- a/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml +++ b/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml @@ -1,17 +1,26 @@ - - - -