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

[feature/OP-515=> QA] Intégration des FIE : partnership côdiplomation #380

Merged
merged 75 commits into from
Jan 9, 2025
Merged
Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
b420ff0
osis-9265 : partnership model
Jul 11, 2024
bcf93e1
osis-9265 : partnership model
Jul 11, 2024
18ecee3
Merge remote-tracking branch 'origin/feature/OP-515' into feature/OP-515
Jul 11, 2024
1bbdfeb
makemigrations to create migration
Jul 11, 2024
e859b50
osis-9265 : partnership model
Jul 11, 2024
2b9dd68
osis-9265 : partnership model
Jul 12, 2024
eee5b5f
osis-9265 : partnership model
Jul 12, 2024
445af6d
osis-9265 : partnership model
Jul 12, 2024
05a1897
first part of adding field to the form
Jul 12, 2024
4f9bacc
Merge remote-tracking branch 'origin/feature/OP-515' into feature/OP-515
Jul 12, 2024
1fba36a
first part of adding field to the form
Jul 12, 2024
459018d
osis-9265 : partnership form and model
Jul 15, 2024
ab98d8b
osis-9265 : partnership
Jul 16, 2024
b961cf5
osis-9265 : partnership
Jul 16, 2024
151c300
osis-9265 : delete migration
Jul 23, 2024
5777ccd
no dependencies from base
Jul 23, 2024
28fed44
osis-9265 : modification form partnership course
Aug 2, 2024
7e18ca3
osis-9265 : modification form partnership course
Aug 2, 2024
abc28c2
osis-9265 : update template partnership_detail_course
Aug 26, 2024
956c9da
osis-9265 : update template partnership_detail_course
Aug 26, 2024
fbb4b77
osis-9265 : update template partnership_detail_course and form relation
Aug 27, 2024
66b6ad0
osis-9265 : partnership form and template
Sep 5, 2024
2237c35
Merge remote-tracking branch 'origin/dev' into dev
Sep 30, 2024
0bd7f69
Merge branch 'refs/heads/dev' into feature/OP-515
Sep 30, 2024
ca3937c
osis-9265 et OP-515: common fie update
Oct 11, 2024
4caea3a
osis-9265 et OP-515: parntership complement
Oct 11, 2024
a1fff7c
osis-9265 et OP-515: parntership complement
Oct 11, 2024
ecdf2ed
osis-9265 et OP-515: parntership complement
Oct 11, 2024
83d05e8
osis-9265: partnership update forms
Oct 24, 2024
6c21f8a
osis-9265: partnership update template
Oct 25, 2024
4d9ff00
osis-9265: partnership update template and permission
Nov 4, 2024
9e679e6
osis-9265: partnership update template and permission
Nov 4, 2024
18ac3ca
osis-9265: partnership update template and permission
Nov 4, 2024
48b241c
osis-9265: partnership update template and permission
Nov 4, 2024
a39601d
OP-515: Allow SCOPE import for PartnershipEntityManager
albrugnetti Nov 7, 2024
a391809
OP-515: Add missing import Dict
albrugnetti Nov 7, 2024
54c9e45
osis-9265: partnership remove predicates
Nov 8, 2024
8db672f
osis-9265: partnership update translate en-be
Nov 14, 2024
b09cdd6
osis-9265: partnership update translate en-be
Nov 14, 2024
61ea32e
osis-9265: partnership update translate en-be
Nov 14, 2024
d134277
osis-9265: partnership update translate en-be
Nov 14, 2024
fbde9a2
osis-9265: partnership update translate en-be
Nov 26, 2024
f06ff9d
osis-9265: partnership update translate en-be
Nov 27, 2024
c3b7fae
osis-9265: partnership update translate en-be
Nov 27, 2024
a31bdb0
osis-9265: partnership update translate en-be
Nov 27, 2024
6aa3958
osis-9265: partnership update translate en-be
Nov 27, 2024
f934cb0
osis-9265: partnership update translate en-be
Nov 28, 2024
b66c5c2
osis-9265: partnership update template
Nov 28, 2024
a8df345
osis-9265: partnership update template
Nov 28, 2024
3f364d8
osis-9265: partnership update template
Dec 2, 2024
a88b684
osis-9265: partnership update template
Dec 2, 2024
19d59ea
osis-9265: partnership update template
Dec 2, 2024
bce6a57
osis-9265: partnership update template
Dec 4, 2024
ee16b01
osis-9265: partnership update template
Dec 4, 2024
bdbee56
osis-9265: partnership update template
Dec 4, 2024
64dbd31
osis-9265: partnership update template
Dec 4, 2024
de0fe24
osis-9265: partnership update template
Dec 4, 2024
54a07d9
osis-9265: partnership update template
Dec 4, 2024
d8ed0e5
osis-9265: partnership update template
Dec 4, 2024
86e1148
osis-9265: partnership update template
Dec 4, 2024
6106401
osis-9265: partnership update template
Dec 4, 2024
3b6e9fb
osis-9265: partnership review code
Jan 7, 2025
d8cf0b6
osis-9265: partnership review code
Jan 7, 2025
35e88be
osis-9265: partnership review code
Jan 7, 2025
46cd543
osis-9265: partnership review code
Jan 7, 2025
db3cd7f
osis-9265: partnership review code
Jan 9, 2025
cbc88ff
osis-9265: partnership review code
Jan 9, 2025
df17023
osis-9265: partnership review code
Jan 9, 2025
9c71d46
quality checks
Jan 9, 2025
d66464c
osis-9265: partnership review code
Jan 9, 2025
5dfb7e4
osis-9265: partnership review code
Jan 9, 2025
60ab1e4
osis-9265: partnership review code
Jan 9, 2025
10db9c8
osis-9265: partnership review code
Jan 9, 2025
29ff01b
osis-9265: partnership review code
Jan 9, 2025
ce0a99c
osis-9265: partnership review code
Jan 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
osis-9265: partnership update template
Anne laurence Dermine committed Dec 2, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 3f364d8c6d8aab38001773df47efad7953cfd454
2 changes: 2 additions & 0 deletions forms/partnership/partnership.py
Original file line number Diff line number Diff line change
@@ -279,12 +279,14 @@ class PartnershipCourseForm(PartnershipBaseForm):

all_student = forms.BooleanField(
label=_('all_student'),
required=False,
# widget= forms.CheckboxSelectMultiple(),
# choices=[(True, 'Oui'), (False, 'Non')],
)

diploma_prod_by_ucl = forms.BooleanField(
label=_('diploma_prod_by_ucl'),
required=False,
# widget=forms.CheckboxSelectMultiple(),
# choices=[(True, 'Oui'), (False, 'Non')],
)
2 changes: 1 addition & 1 deletion locale/fr_BE/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
@@ -1412,7 +1412,7 @@ msgid "type"
msgstr "Type"

msgid "type_diploma_by_ucl"
msgstr "Type de diplome"
msgstr "Type de diplôme"

msgid "ucl"
msgstr "UCLouvain"
2 changes: 1 addition & 1 deletion models/enums/partnership.py
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ def with_synced_dates(cls):
]

class PartnershipDiplomaWithUCL(ChoiceEnum):
UNIQUE = _('Unique')
UNIQUE = _('Unique conjoint')
SEPARED = _('Séparé')
NO_CODIPLOMA = _('Non co-diplômant')
SHARED = _('Partagé')
Copy link
Contributor

Choose a reason for hiding this comment

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

cf. remarque sur les traductions

Original file line number Diff line number Diff line change
@@ -36,12 +36,11 @@ <h1>{{ partnership }}</h1>
<h5>{% trans 'partner' %} : {{ form.instance.entity.organization.name }}</h5>
<hr>
<div>
<div>
{% bootstrap_form form %}
{# {{ form.as_p }}#}
</div>
{% endfor %}
<button class="btn btn-primary" type="submit">Enregistrer</button>
<button class="btn btn-primary" type="submit">{% trans 'save' %}</button>
</form>
</div>
</div>