Skip to content
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

Jump to bottom

Filter flight paths #1488

Merged
merged 13 commits into from
Aug 12, 2022
Merged

Filter flight paths #1488

merged 13 commits into from
Aug 12, 2022

Conversation

Jatin2020-24
Copy link
Contributor

@Jatin2020-24 Jatin2020-24 commented Jun 17, 2022 •
edited
Loading

Functionalities Added:

  1. Operations will be moved to inactivated state if not used for more than 30 days.
  2. Creator can activate them.

@Jatin2020-24 Jatin2020-24 marked this pull request as draft June 17, 2022 19:28
ReimarBauer
ReimarBauer reviewed Jun 19, 2022
View reviewed changes
mslib/mscolab/server.py
def update_counter():
operations = Operation.query.filter().all()
for operation in operations:
a = (datetime.datetime.utcnow() - operation.last_used).days
Copy link
Member

@ReimarBauer ReimarBauer Jun 19, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

at the moment operation.state is a boolean (operation.active) this can be simplified

ReimarBauer
ReimarBauer reviewed Jun 19, 2022
View reviewed changes
mslib/msui/mscolab.py Outdated Show resolved Hide resolved
ReimarBauer
ReimarBauer reviewed Jun 19, 2022
View reviewed changes
mslib/msui/mscolab.py Outdated Show resolved Hide resolved
ReimarBauer
ReimarBauer requested changes Jul 7, 2022
View reviewed changes
Copy link
Member

@ReimarBauer ReimarBauer left a comment

Choose a reason for hiding this comment

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

see comment and also chat

mslib/mscolab/models.py Outdated Show resolved Hide resolved
ReimarBauer
ReimarBauer requested changes Jul 16, 2022
View reviewed changes
Copy link
Member

@ReimarBauer ReimarBauer left a comment

Choose a reason for hiding this comment

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

see comment

somehow locally I do have lots of tests failing because last_used is not initialized, e.g. pytest -k test_filemanager

It is unclear to me why the CIs don't run in this problem

mslib/mscolab/file_manager.py Outdated Show resolved Hide resolved
mslib/mscolab/file_manager.py Outdated Show resolved Hide resolved
@Jatin2020-24 Jatin2020-24 marked this pull request as ready for review July 21, 2022 12:09
ReimarBauer
ReimarBauer reviewed Aug 5, 2022
View reviewed changes
mslib/mscolab/models.py Outdated Show resolved Hide resolved
@ReimarBauer
Copy link
Member

please merge your gsoc branch into your filter_* branch

ReimarBauer
ReimarBauer reviewed Aug 12, 2022
View reviewed changes
.github/workflows/testing-develop.yml
./.github/workflows/testing.yml
with:
xdist: no
branch_name: filter_flight_paths
Copy link
Member

@ReimarBauer ReimarBauer Aug 12, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

this has to become improved.

We have to desinguish for image_name and branch_name.
This needs an aditional var in testing.yml too.

ReimarBauer
ReimarBauer reviewed Aug 12, 2022
View reviewed changes
mslib/msui/_tests/test_mscolab.py
@mock.patch("PyQt5.QtWidgets.QMessageBox.information")
@mock.patch("PyQt5.QtWidgets.QInputDialog.getText", return_value=("new_name", True))
def test_handle_rename_operation(self, mockbox, mockpatch):
self._connect_to_mscolab()
Copy link
Member

Choose a reason for hiding this comment

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

more tests ;) not related to the filter flight path.
That would be better to seperate this to another PR next time ;)

Thx :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay, I'll take care of this next time.

ReimarBauer
ReimarBauer approved these changes Aug 12, 2022
View reviewed changes
Copy link
Member

@ReimarBauer ReimarBauer left a comment

Choose a reason for hiding this comment

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

Thx

@ReimarBauer ReimarBauer merged commit 0cacbf4 into Open-MSS:GSOC2022-JatinJain Aug 12, 2022
ReimarBauer pushed a commit that referenced this pull request Nov 21, 2022
@Jatin2020-24 @ReimarBauer
Filter flight paths (#1488)
344fc19 
* filter_flight_paths

* fixed_msui

* changed endpoints names and fixed typos

* inactivated_operation_list_updated

* added_tests

* fixed_pytest_error

* added_mscolab_tests

* enable_github_testing

* changed_branch name_in_testing-develop.yml

* initialized_"last_used"_attribute

* refactored_failing_tests

* refactored_failing_tests
ReimarBauer added a commit that referenced this pull request Nov 21, 2022
@ReimarBauer @Jatin2020-24
Merge gsoc2022 jatin jain to develop (#1599)
466e24e 
* Filter flight paths (#1488)

* filter_flight_paths

* fixed_msui

* changed endpoints names and fixed typos

* inactivated_operation_list_updated

* added_tests

* fixed_pytest_error

* added_mscolab_tests

* enable_github_testing

* changed_branch name_in_testing-develop.yml

* initialized_"last_used"_attribute

* refactored_failing_tests

* refactored_failing_tests

* Multiple Flightpath on Topview (#1510)

* multiple_flightpath_dockwidget

* updated_multiple_flightpath_dockwidget

* connect_slots_and_signals_to_open_ftml_files

* Update ui_multiple_flightpath_dockwidget.py

* updated_author_and_copyright_year

* plot_multiple_flighttracks

* remove_flighttrack_added

* remove_unchecked_flighttracks_from_canvas

* Update mpl_qtwidget.py

* reversed_plotting_of_lat_lon

* plot_flighttracks_from_MSUIMainWindow

* plot_inactive_flighttracks

* fixed_naming

* sync_listViews

* fixed_namespaces

* Mscolab Chat Improvements (#1508)

* timestamps_below_messages

* added_ToDo

* updated_multiple_flightpath_dockwidget (#1544)

* updated_multiple_flightpath_dockwidget

* set_activated_track_as_uncheckable

* changed_flags_naming

* improved_list_naming

* flickering_topview_solved

* change_color_of_selected_flightpath

* show_color_icon

* update_previously_activated_flighttrack_wp_model_in_dict

* check_previously_activated_track

* change_linewidth

* plot_operations_topview

* bug_fixes

* checkmark_protection_behaviour_updated

* show_flighttrack_color_icon

* defined_coloring_of_operation_flightpaths

* add_todos

* add_comments

* fixed_coloring_of_flighttracks

* clear_operation_list_after_logout

* signals_disconnected_after_logout

* update_last_used_operation

* fixed_test

* fixed_color

* implemented_operation_permission_revoked

* revoked_mscolab_permission

* change_operations_linewidth

* fixed_uncheck_operations

* remove_filter_flightpaths_test

* color_change_updated

* removed_activation_of_operations_on_addition

* Update msui.py

* fixed_tracks_coloring

* add_todos

* Add Documentation for Multiple Flightpath Dockwidget (#1595)

* small_code_enhancements

* update_documentation

* flake8

* Empty-Commit

Co-authored-by: Jatin Jain <72596619+Jatin2020-24@users.noreply.github.com>
Co-authored-by: Jatin Jain <jatinalwar2001@gmail.com>
ReimarBauer pushed a commit that referenced this pull request Nov 21, 2022
@Jatin2020-24 @ReimarBauer
Merge gsoc2022 jatin jain to develop (#1599)
64a6085 
* Filter flight paths (#1488)

* filter_flight_paths

* fixed_msui

* changed endpoints names and fixed typos

* inactivated_operation_list_updated

* added_tests

* fixed_pytest_error

* added_mscolab_tests

* enable_github_testing

* changed_branch name_in_testing-develop.yml

* initialized_"last_used"_attribute

* refactored_failing_tests

* refactored_failing_tests

* Multiple Flightpath on Topview (#1510)

* multiple_flightpath_dockwidget

* updated_multiple_flightpath_dockwidget

* connect_slots_and_signals_to_open_ftml_files

* Update ui_multiple_flightpath_dockwidget.py

* updated_author_and_copyright_year

* plot_multiple_flighttracks

* remove_flighttrack_added

* remove_unchecked_flighttracks_from_canvas

* Update mpl_qtwidget.py

* reversed_plotting_of_lat_lon

* plot_flighttracks_from_MSUIMainWindow

* plot_inactive_flighttracks

* fixed_naming

* sync_listViews

* fixed_namespaces

* Mscolab Chat Improvements (#1508)

* timestamps_below_messages

* added_ToDo

* updated_multiple_flightpath_dockwidget (#1544)

* updated_multiple_flightpath_dockwidget

* set_activated_track_as_uncheckable

* changed_flags_naming

* improved_list_naming

* flickering_topview_solved

* change_color_of_selected_flightpath

* show_color_icon

* update_previously_activated_flighttrack_wp_model_in_dict

* check_previously_activated_track

* change_linewidth

* plot_operations_topview

* bug_fixes

* checkmark_protection_behaviour_updated

* show_flighttrack_color_icon

* defined_coloring_of_operation_flightpaths

* add_todos

* add_comments

* fixed_coloring_of_flighttracks

* clear_operation_list_after_logout

* signals_disconnected_after_logout

* update_last_used_operation

* fixed_test

* fixed_color

* implemented_operation_permission_revoked

* revoked_mscolab_permission

* change_operations_linewidth

* fixed_uncheck_operations

* remove_filter_flightpaths_test

* color_change_updated

* removed_activation_of_operations_on_addition

* Update msui.py

* fixed_tracks_coloring

* add_todos

* Add Documentation for Multiple Flightpath Dockwidget (#1595)

* small_code_enhancements

* update_documentation

* flake8

* Empty-Commit

Co-authored-by: Jatin Jain <72596619+Jatin2020-24@users.noreply.github.com>
Co-authored-by: Jatin Jain <jatinalwar2001@gmail.com>
@ReimarBauer ReimarBauer mentioned this pull request Nov 21, 2022
Merged
ReimarBauer added a commit that referenced this pull request Nov 21, 2022
@ReimarBauer @Jatin2020-24
Merge gsoc2022 jatin jain to develop (#1599) (#1600)
a44d1af 
* Filter flight paths (#1488)

* filter_flight_paths

* fixed_msui

* changed endpoints names and fixed typos

* inactivated_operation_list_updated

* added_tests

* fixed_pytest_error

* added_mscolab_tests

* enable_github_testing

* changed_branch name_in_testing-develop.yml

* initialized_"last_used"_attribute

* refactored_failing_tests

* refactored_failing_tests

* Multiple Flightpath on Topview (#1510)

* multiple_flightpath_dockwidget

* updated_multiple_flightpath_dockwidget

* connect_slots_and_signals_to_open_ftml_files

* Update ui_multiple_flightpath_dockwidget.py

* updated_author_and_copyright_year

* plot_multiple_flighttracks

* remove_flighttrack_added

* remove_unchecked_flighttracks_from_canvas

* Update mpl_qtwidget.py

* reversed_plotting_of_lat_lon

* plot_flighttracks_from_MSUIMainWindow

* plot_inactive_flighttracks

* fixed_naming

* sync_listViews

* fixed_namespaces

* Mscolab Chat Improvements (#1508)

* timestamps_below_messages

* added_ToDo

* updated_multiple_flightpath_dockwidget (#1544)

* updated_multiple_flightpath_dockwidget

* set_activated_track_as_uncheckable

* changed_flags_naming

* improved_list_naming

* flickering_topview_solved

* change_color_of_selected_flightpath

* show_color_icon

* update_previously_activated_flighttrack_wp_model_in_dict

* check_previously_activated_track

* change_linewidth

* plot_operations_topview

* bug_fixes

* checkmark_protection_behaviour_updated

* show_flighttrack_color_icon

* defined_coloring_of_operation_flightpaths

* add_todos

* add_comments

* fixed_coloring_of_flighttracks

* clear_operation_list_after_logout

* signals_disconnected_after_logout

* update_last_used_operation

* fixed_test

* fixed_color

* implemented_operation_permission_revoked

* revoked_mscolab_permission

* change_operations_linewidth

* fixed_uncheck_operations

* remove_filter_flightpaths_test

* color_change_updated

* removed_activation_of_operations_on_addition

* Update msui.py

* fixed_tracks_coloring

* add_todos

* Add Documentation for Multiple Flightpath Dockwidget (#1595)

* small_code_enhancements

* update_documentation

* flake8

* Empty-Commit

Co-authored-by: Jatin Jain <72596619+Jatin2020-24@users.noreply.github.com>
Co-authored-by: Jatin Jain <jatinalwar2001@gmail.com>

Co-authored-by: Jatin Jain <jatinalwar2001@gmail.com>
Co-authored-by: Jatin Jain <72596619+Jatin2020-24@users.noreply.github.com>
joernu76 pushed a commit that referenced this pull request Nov 21, 2022
@Jatin2020-24 @ReimarBauer @joernu76
Merge gsoc2022 jatin jain to develop (#1599)
e7a50d8 
* Filter flight paths (#1488)

* filter_flight_paths

* fixed_msui

* changed endpoints names and fixed typos

* inactivated_operation_list_updated

* added_tests

* fixed_pytest_error

* added_mscolab_tests

* enable_github_testing

* changed_branch name_in_testing-develop.yml

* initialized_"last_used"_attribute

* refactored_failing_tests

* refactored_failing_tests

* Multiple Flightpath on Topview (#1510)

* multiple_flightpath_dockwidget

* updated_multiple_flightpath_dockwidget

* connect_slots_and_signals_to_open_ftml_files

* Update ui_multiple_flightpath_dockwidget.py

* updated_author_and_copyright_year

* plot_multiple_flighttracks

* remove_flighttrack_added

* remove_unchecked_flighttracks_from_canvas

* Update mpl_qtwidget.py

* reversed_plotting_of_lat_lon

* plot_flighttracks_from_MSUIMainWindow

* plot_inactive_flighttracks

* fixed_naming

* sync_listViews

* fixed_namespaces

* Mscolab Chat Improvements (#1508)

* timestamps_below_messages

* added_ToDo

* updated_multiple_flightpath_dockwidget (#1544)

* updated_multiple_flightpath_dockwidget

* set_activated_track_as_uncheckable

* changed_flags_naming

* improved_list_naming

* flickering_topview_solved

* change_color_of_selected_flightpath

* show_color_icon

* update_previously_activated_flighttrack_wp_model_in_dict

* check_previously_activated_track

* change_linewidth

* plot_operations_topview

* bug_fixes

* checkmark_protection_behaviour_updated

* show_flighttrack_color_icon

* defined_coloring_of_operation_flightpaths

* add_todos

* add_comments

* fixed_coloring_of_flighttracks

* clear_operation_list_after_logout

* signals_disconnected_after_logout

* update_last_used_operation

* fixed_test

* fixed_color

* implemented_operation_permission_revoked

* revoked_mscolab_permission

* change_operations_linewidth

* fixed_uncheck_operations

* remove_filter_flightpaths_test

* color_change_updated

* removed_activation_of_operations_on_addition

* Update msui.py

* fixed_tracks_coloring

* add_todos

* Add Documentation for Multiple Flightpath Dockwidget (#1595)

* small_code_enhancements

* update_documentation

* flake8

* Empty-Commit

Co-authored-by: Jatin Jain <72596619+Jatin2020-24@users.noreply.github.com>
Co-authored-by: Jatin Jain <jatinalwar2001@gmail.com>
Co-authored-by: ReimarBauer <rb.proj@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ReimarBauer ReimarBauer ReimarBauer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Jatin2020-24 @ReimarBauer