SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit 281e0d3f authored by George Katsikas's avatar George Katsikas :goat:
Browse files

fix past appraisal choices not being rendered

fixes #233
parent a7d6e0cc
No related branches found
No related tags found
No related merge requests found
...@@ -116,24 +116,28 @@ class RadioAppraisalForm(forms.Form): ...@@ -116,24 +116,28 @@ class RadioAppraisalForm(forms.Form):
qualification = Qualification.objects.filter( qualification = Qualification.objects.filter(
submission=self.submission, fellow=self.fellow submission=self.submission, fellow=self.fellow
).first() ).first()
if qualification and qualification.expertise_level not in dict( if qualification:
self.fields["expertise_level"].choices if qualification.expertise_level not in dict(
): self.fields["expertise_level"].choices
self.fields["expertise_level"].choices += ( ):
( self.fields["expertise_level"].choices += (
qualification.expertise_level, (
qualification.get_expertise_level_display(), qualification.expertise_level,
), qualification.get_expertise_level_display(),
) ),
)
self.initial["expertise_level"] = qualification.expertise_level self.initial["expertise_level"] = qualification.expertise_level
readiness = Readiness.objects.filter( readiness = Readiness.objects.filter(
submission=self.submission, fellow=self.fellow submission=self.submission, fellow=self.fellow
).first() ).first()
if readiness and readiness.status not in dict(self.fields["readiness"].choices): if readiness:
self.fields["readiness"].choices += ( if readiness.status not in dict(self.fields["readiness"].choices):
(readiness.status, readiness.get_status_display()), self.fields["readiness"].choices += (
) (readiness.status, readiness.get_status_display()),
)
self.initial["readiness"] = readiness.status self.initial["readiness"] = readiness.status
self.helper = FormHelper() self.helper = FormHelper()
...@@ -182,8 +186,10 @@ class RadioAppraisalForm(forms.Form): ...@@ -182,8 +186,10 @@ class RadioAppraisalForm(forms.Form):
qualification, _ = Qualification.objects.get_or_create( qualification, _ = Qualification.objects.get_or_create(
submission=self.submission, fellow=self.fellow submission=self.submission, fellow=self.fellow
) )
print(expertise_level)
qualification.expertise_level = expertise_level qualification.expertise_level = expertise_level
qualification.save() qualification.save()
print(qualification)
if ( if (
readiness_status := self.cleaned_data["readiness"] readiness_status := self.cleaned_data["readiness"]
...@@ -191,9 +197,10 @@ class RadioAppraisalForm(forms.Form): ...@@ -191,9 +197,10 @@ class RadioAppraisalForm(forms.Form):
readiness, _ = Readiness.objects.get_or_create( readiness, _ = Readiness.objects.get_or_create(
submission=self.submission, fellow=self.fellow submission=self.submission, fellow=self.fellow
) )
print(readiness_status)
readiness.status = readiness_status readiness.status = readiness_status
readiness.save() readiness.save()
print(readiness)
@property @property
def is_qualified(self): def is_qualified(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment