Feature/embargo #521
Feature/embargo #521
Conversation
…earlier, more complicated, implementation commented out, which I will probably remove next commit...
… Ty's wishes. It is nice now!
…with cache ... with the api archive view
…name changes. Publiek archief -> Archief
proposals/api/views.py
Outdated
| 'study_set__observation', 'study_set__session_set', | ||
| 'study_set__intervention', 'study_set__session_set__task_set' | ||
| ) | ||
| #breakpoint() |
There was a problem hiding this comment.
This commented out breakpoint probably should be removed :)
| if cleaned_data['embargo'] is None: | ||
| self.add_error('embargo', _('Dit veld is verplicht.')) | ||
|
|
||
| embargo_end_date = cleaned_data['embargo_end_date'] | ||
| two_years_from_now = timezone.now().date() + timezone.timedelta(days=730) | ||
|
|
||
| if embargo_end_date is not None and \ | ||
| embargo_end_date > two_years_from_now: | ||
| self.add_error('embargo_end_date', _( | ||
| 'De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar van vandaag.')) |
There was a problem hiding this comment.
These checks should be added to the docstring
proposals/models.py
Outdated
| class ProposalQuerySet(models.QuerySet): | ||
|
|
||
| DECISION_MADE = 55 | ||
| TODAY = datetime.date.today() |
There was a problem hiding this comment.
If you define a class property and set it with an expression (like TODAY here), said expression is evaluated only once, namely when the app starts up.
Thus, TODAY will actually be THE_DAY_THE_APP_STARTED.
Seeing as the line is not that complicated, it's probably best to just call the method inside the methods in the class. To shorten it a bit, you could change the import to import date from datetime, and use date.today().
proposals/models.py
Outdated
| _('Als de deelnemers van je onderzoek moeten worden misleid, kan \ | ||
| je ervoor kiezen je applicatie pas later op te laten nemen in het \ | ||
| semi-publieke archief. Wil je dat jouw onderzoek tijdelijk onder \ | ||
| embargo wordt geplaatst?'), |
There was a problem hiding this comment.
The help text is misleading. It probably should clarify it will be hidden from both the public as well as the users only archive
proposals/urls.py
Outdated
| @@ -33,13 +33,13 @@ | |||
| path('export/', ProposalsExportView.as_view(), name='archive_export'), | |||
| path('export/<int:pk>/', ProposalsExportView.as_view(), | |||
| name='archive_export'), | |||
| path('hide/<int:pk>/', HideFromArchiveView.as_view(), | |||
| path('hide/<int:pk>/', ChangeArchiveStatusView.as_view(), | |||
There was a problem hiding this comment.
Very minor point, but the URL itself probably should be changed as well :)
This PR introduces an embargo option for researchers to keep their applications out of the users only archive until a specified date. It also reorganizes the archive naming scheme in the code, adds a querysetManager for different Queryset needs, and reintroduced functionality for the secretary to manually change the archive status of a proposal.
Also contains a fix for issue 505