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.

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

Merge 4.0-rc1 into develop #827

Merged
merged 454 commits into from
Jan 8, 2025
Merged

Merge 4.0-rc1 into develop #827

merged 454 commits into from
Jan 8, 2025

Conversation

miggol
Copy link
Contributor

@miggol miggol commented Dec 19, 2024

From this merge onwards, fetc.tst will start tracking develop again.

The following fixtures need to be reloaded:

main/fixtures/settings.json
observations/fixtures/registrations.json
proposals/fixtures/institutions.json
studies/fixtures/recruitments.json
studies/fixtures/specialdetails.json

EdoStorm96 and others added 30 commits September 17, 2024 14:32
…and_secretary_pages_redesign

Feature/review and secretary pages redesign
EdoStorm96 and others added 28 commits December 19, 2024 10:40
* feat: make legacy docs optional in pdf

* feat: reorganize pdf_diff_stuff

* fix: more reorganizing code

* fix: weird unrelated bug that was in here ...

* feat: implement PersonalDataSection

* fix: reorganize back

* feat: create TitleSection helper

* feat: add new attachments to the pdf (sloppily)

* feat: renaming and reoirdering some sections

* feat: make a class for Attachment Sections pdf

* fix: bug with how sessions are fetched for diff

* feat: ensure handle_attachment can recognize revised attachment

* feat: create all sections for diff

* feat: remove all support for legacy docs

* feat: add verbose_name to Attachment.name & comments

* feat: add all documents titlesection

* feat: add all documents title section to diff

* black

* black

* feat: recursive AllAttachmentsSectionsDiff

* feat: docstrings

* style: black

* fix: remove rogue old_docs stuff

* style: black whitespace

* style: another black whitespace

* feat: implement logic for nonstandard proposals

* fix: some nonsense in AttachmentSection.

* fix: bugfix in _match_slot

* fix: stateful consistency

* style: black djlint

* add upload date to AttachmentSection

* style: black

* fix: remove "gewijzigd voor revisie" text

* feat: improve margins and do away with TitleSection

* fix: duplication bug

* fix: redo conflicting migrations

* i18n: Translations

* feat: Change attachment field order in diff and pdf

---------

Co-authored-by: Michael Villeneuve <[email protected]>
Brings new email templates into major/4. Required a small migrations fix
* fix: Embargo KeyError

* style
…dation_bug

fix: avoid double validation of submit form
* feat: Import code from old branch to avoid merge

* wip: Working on attachments in new branch

* fix: Mishmash of migrations

* wip: Various fixes for attachments

* feat: Attachment renderable templates & updates

* feat: Change var name and minor changes

* feat: Verbose name for Attachment.upload

* feat: Attachment views

* feat: Attachment form template

* wip: Minor changes

* feat: Add author field to Attachment

* feat: Classmethod to initialize kind from an attachment

* feat: Provide manager object to children

* feat: Download view for attachments

* feat: Break out BaseAttachFormView to make attachment edit view

* fix: Move classes around to prevent circular imports

* wip: Remove attachments manager for now

* feat: Initialize stepper outside of context-getting

* wip: Start managing attachments by Checkers

* feat: Make sure slots know what they're attaching to

* fix: Minor fixes and comment updates

* cleanup: Remove old code and simplify object getting

* feat: Just fill in study slots by hand for now

* feat: Detach functionality for Attachments

* feat: Get Attachment subclasses without kind

* feat: Make slots less dependent on kinds

* feat: Detach view and links, editing flag for AttachFormView

* feat: Extra/optional attachments with DMP example

* feat: New desiredness flags

* feat: New add_slot method

* feat: Template enhancements and cleanup

* style: Black

* style: djlint

* add cdh_files/ to .gitignore

* fix: create and implement attachment filename generator

* feat: proper implementation of filename generator

* fix: bug in Study.research_settings_contains_schools

* fix: Remove FnGen from model

* feat: Auto retrieve Kind from attachment if none provided

* feat: Classmethod to get a slot from a proposal

* wip: Get filename from slot instead of kind

* feat: Rename and finalize generate_filename() function

* feat: Point methods in right direction

* style

* feat: Custom fn_part for kinds

* feat: Add order variable for Slots and FnGen

* fix: Turn get_fn_part into classmethod

* fix: Kind derivation for empty slot matching

* fix: Delete anachronistic migration

* feat: Functions to enumerate slots

* feat: Template changes to display normalized filename after <br />

* feat: Download filenames in PDF and DIFF are now the normalized versions

* style

* Feat/fetc filename in pdf (#837)

* feat: create custom attachment row

* feat: make us of the custom attachment row

* style: black

* fix: Prevent collapsing of value in PDF

* fix: Hyphenate kind in fetc filename

* fix: Merge accident, double return statement

* fix: Actually implement stepper.filled_slots

* fix: We can't assume all owners are represented in att_dict

---------

Co-authored-by: Edo Storm <[email protected]>
Co-authored-by: Edo Storm <[email protected]>
@miggol miggol merged commit 4d4c1a4 into develop Jan 8, 2025
4 checks passed
@miggol miggol mentioned this pull request Jan 8, 2025
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants