Closed rounds should include unpublished rounds #3867

frjo · 2024-04-10T10:01:11Z

Make all filters include unpublished rounds when search for closed rounds.

This include unpublished rounds:

Lines 581 to 600 in 8e14455

    
           class OpenRoundFilter(Select2MultipleChoiceFilter): 
        
               def __init__(self, *args, **kwargs): 
        
                   super().__init__( 
        
                       self, 
        
                       *args, 
        
                       choices=[("open", "Open"), ("closed", "Closed"), ("new", "Not Started")], 
        
                       **kwargs, 
        
                   ) 
        
               def filter(self, qs, value): 
        
                   if value is None or len(value) != 1: 
        
                       return qs 
        
                   value = value[0] 
        
                   if value == "closed": 
        
                       return qs.closed() 
        
                   if value == "new": 
        
                       return qs.new() 
        
                   return qs.open()

This does not include unpublished rounds:

hypha/hypha/apply/funds/views_partials.py

Lines 92 to 122 in 8e14455

    
           @login_required 
        
           @require_http_methods(["GET"]) 
        
           def sub_menu_rounds(request): 
        
               selected_rounds = request.GET.getlist("round") 
        
               selected_fund = request.GET.get("fund") 
        
               qs = Round.objects.all() 
        
               if selected_fund: 
        
                   fund = Page.objects.get(id=selected_fund) 
        
                   qs = Round.objects.child_of(fund) 
        
               open_rounds = [ 
        
                   {"id": item.id, "selected": str(item.id) in selected_rounds, "title": str(item)} 
        
                   for item in qs.open().order_by("-end_date").distinct() 
        
               ] 
        
               closed_rounds = [ 
        
                   {"id": item.id, "selected": str(item.id) in selected_rounds, "title": str(item)} 
        
                   for item in qs.closed() 
        
                   .filter(submissions__isnull=False) 
        
                   .order_by("-end_date") 
        
                   .distinct() 
        
               ] 
        
               ctx = { 
        
                   "open_rounds": open_rounds, 
        
                   "closed_rounds": closed_rounds, 
        
                   "selected_rounds": selected_rounds, 
        
               } 
        
               return render(request, "submissions/submenu/rounds.html", ctx)

This does not include unpublished rounds:

hypha/hypha/apply/funds/admin_helpers.py

Lines 84 to 100 in 8e14455

    
           class RoundStateListFilter(admin.SimpleListFilter): 
        
               title = "state" 
        
               parameter_name = "form-state" 
        
               def lookups(self, request, model_admin): 
        
                   return ( 
        
                       ("open", _("Open")), 
        
                       ("closed", _("Closed")), 
        
                   ) 
        
               def queryset(self, request, queryset): 
        
                   value = self.value() 
        
                   if value == "open": 
        
                       return queryset.open() 
        
                   elif value == "closed": 
        
                       return queryset.closed() 
        
                   return queryset

wes-otf · 2024-04-19T14:59:46Z

This is a bit of an odd one the more I dig into it, maybe we need to have a conversation on how we want to define "Closed", "Open" and "Unpublished"? Because on top of the issues that @sandeepsajan0 mentioned in #3869, if you schedule a round ahead of time, that also won't show up in Wagtail under any filter besides All which can be a little unruly to navigate when you have lots of rounds (should we have a Scheduled filter?).

Then there's also issue of making this congruent with labs. If we want staff to stop unpublishing rounds and instead close them via changing end dates as discussed on Monday in the dev standup, it would be a bit confusing to expect them to unpublish a lab when they wanted it unavailable to the public.

I'm almost wondering if it would make more sense to automatically unpublish a round on closing rather than keeping it in a "live" state and change some of the "Unpublish" verbiage to just be "Close". This seems like it would solve for most of the problems listed here, but I'm open to other thoughts! @frjo @sandeepsajan0 @theskumar

frjo added the Type: Bug Bugs! Things that are broken :-/ label Apr 10, 2024

wes-otf self-assigned this Apr 10, 2024

wes-otf linked a pull request Apr 10, 2024 that will close this issue

WIP: Make it easy for staff to close rounds & filter on unpublished rounds #3869

Draft

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Closed rounds should include unpublished rounds #3867

Closed rounds should include unpublished rounds #3867

frjo commented Apr 10, 2024

wes-otf commented Apr 19, 2024

Closed rounds should include unpublished rounds #3867

Closed rounds should include unpublished rounds #3867

Comments

frjo commented Apr 10, 2024

wes-otf commented Apr 19, 2024