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

Cancelled and queued registrations in admin screen #428

Merged
merged 11 commits into from
Nov 15, 2023
Merged

Cancelled and queued registrations in admin screen #428

merged 11 commits into from
Nov 15, 2023

Conversation

Scarletto
Copy link
Contributor

Closes #179.

Summary

Added queued filter to API AdminEventRegistration request.
Added lists of AdminEventRegistrations queuedRegistrations and cancelledRegistrations to EventAdminState and EventAdminCubit.
Turned the EventAdminScreen into a screen with tabs, and gave queued and cancelled registrations their own type of tiles with useful info.

How to test

Steps to test the changes you made:

  1. Go to any event.
  2. Click on the gear icon to go to admin view.

Note about search

Search in its current form still only searches regular registrations.
I think this is OK as this is the most relevant use of search, and I want to avoid double work because of #427.

@Scarletto Scarletto changed the title Cancelled waiting in admin screen Cancelled and queued registrations in admin screen May 14, 2023
@Scarletto Scarletto self-assigned this May 14, 2023
JAicewizard
JAicewizard reviewed Jun 7, 2023
View reviewed changes
lib/ui/screens/event_admin_screen.dart Outdated Show resolved Hide resolved
lib/ui/screens/event_admin_screen.dart Outdated Show resolved Hide resolved
lib/ui/screens/event_admin_screen.dart Outdated Show resolved Hide resolved
lib/ui/screens/event_admin_screen.dart Outdated Show resolved Hide resolved
lib/ui/screens/event_admin_screen.dart Show resolved Hide resolved
@JAicewizard JAicewizard force-pushed the cancelled_waiting_in_admin_screen branch 3 times, most recently from b02f9b6 to b78c78f Compare September 1, 2023 10:38
@JAicewizard
Copy link
Contributor

I rebased to make the it reviewable. I dont know if the registrations worked before.
Cancelations also don't work. I canceled someone on the scarletto event (183) and they do not show up. This is a bug in concrexit so ill file an issue

@DeD1rk
Copy link
Member

DeD1rk commented Sep 1, 2023

Not sure what's wrong on staging (have only tried on production) but this seems to work well on production (e.g. weekend has all types). One small thing: the tab headers should have just a single capital: they're not oswald. That will probably make it look much better and make the headers fit their 1/3rd width space

@JAicewizard
Copy link
Contributor

See concrexit/#3315

@DeD1rk
Copy link
Member

DeD1rk commented Sep 5, 2023

I fixed the things. Will try the testflight. @JAicewizard is it ready then?

@JAicewizard
Copy link
Contributor

No don't merge yet, I want to relase a point release tomorrow (hopefully with the multiple backends). There are quite a few fixes in already. Then merge features, as there are quite a few almost empty.

@DeD1rk DeD1rk force-pushed the cancelled_waiting_in_admin_screen branch from 9a842b1 to 9576227 Compare September 5, 2023 16:04
@JAicewizard JAicewizard force-pushed the cancelled_waiting_in_admin_screen branch from 9576227 to 6932372 Compare October 4, 2023 17:08
@JAicewizard
Copy link
Contributor

This looks good to merge BTW, rebased to maybe @Scarletto you can double check again?

Marijn Meuleman and others added 10 commits November 8, 2023 20:56
@JAicewizard
Implemented fetching from api using 'queued' parameter; added cancell…
5626b77 
…ed registrations and queued registrations to the admin state and cubit

Fixed ordering because nice

Implemented fetching from api using 'queued' parameter; added cancelled registrations and queued registrations to the admin state and cubit
@JAicewizard
Made a TabBar+TabBarView to separate the types of registration status
22eca50 
Style change

Styling

changed dependency

Fix DateTime formatting
@JAicewizard
add message for empty tabs
61e80a1
@JAicewizard
Implemented fetching from api using 'queued' parameter; added cancell…
b01b33d 
…ed registrations and queued registrations to the admin state and cubit
@JAicewizard
Fixed ordering because nice
6a16eda
@JAicewizard
Made a TabBar+TabBarView to separate the types of registration status
e0f141d
@JAicewizard
Style change
d88cdc1
@JAicewizard
Styling
6e4df47
@JAicewizard
changed dependency
3666668
@JAicewizard
Fix pubspec
a164af7
@JAicewizard JAicewizard force-pushed the cancelled_waiting_in_admin_screen branch from 6932372 to 6f7a946 Compare November 8, 2023 20:02
@Scarletto Scarletto merged commit c76a69c into master Nov 15, 2023
5 checks passed
@Scarletto Scarletto deleted the cancelled_waiting_in_admin_screen branch November 15, 2023 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DeD1rk DeD1rk DeD1rk left review comments

@JAicewizard JAicewizard JAicewizard approved these changes

Assignees

@Scarletto Scarletto

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Show cancellations and waiting list in admin view
3 participants
@Scarletto @JAicewizard @DeD1rk