Skip to content

Commit

Permalink
SPWS01-101 SPWS01-100
Browse files Browse the repository at this point in the history
  • Loading branch information
neerajdarwin committed Jan 10, 2025
1 parent ef6b8f6 commit 7caeca0
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 9 deletions.
10 changes: 9 additions & 1 deletion ProjectApplication/project_core/forms/call.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,15 @@ class CallForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)

if "flag" in self.instance.long_name.lower():
self.fields['overall_budget_question'].help_text = (
'Select if you prefer to request the overall budget total, rather than detailed budget categories (e.g., for FLAG calls for pre- and full proposals)'
)
else:
self.fields['overall_budget_question'].help_text = (
'Select if you would like to request the overall budget total. Budget details can be broken down separately by selecting the categories that budget can be allocated to.'
)

self.budget_categories_order_key = f'budget_categories-{CheckboxSelectMultipleSortable.order_of_values_name}'

budget_category_choices, enabled_budget_categories = CheckboxSelectMultipleSortable.get_choices_initial(
Expand Down Expand Up @@ -308,7 +317,6 @@ class Meta:
'overarching_project_question': 'Select if you would to ask about the overarching project',
'scientific_clusters_question': 'Select if you would to include a sub-section about "Research Clusters"',
'keywords_in_general_information_question': 'Select if you would like to request keywords in the "General Information" section',
'overall_budget_question': 'Select if you would like to request the overall budget total. Budget details can be broken down separately by selecting the categories that budget can be allocated to'
}

labels = {
Expand Down
2 changes: 1 addition & 1 deletion ProjectApplication/project_core/forms/overall_budget.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class OverallBudgetForm(ModelForm):
call_id = forms.IntegerField(widget=forms.HiddenInput(), required=False)
overall_budget = FlexibleDecimalField(
required=False,
help_text='Approximate budget as detailed in programme description including the 5% opportunity fund.',
help_text='Please report the total budget figure. A detailed budget should be uploaded in the following section, adhering to the structure in the respective template. For further information on eligible costs, please refer to the call text.',
label='Requested overall budget (CHF)',
widget=forms.TextInput(attrs={'class': 'custom-overall-budget-class'})
)
Expand Down
2 changes: 1 addition & 1 deletion ProjectApplication/project_core/forms/proposal.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def __init__(self, *args, **kwargs):
self._raise_duplicated_title = False

if self._call.overall_budget_question:
self.fields['overall_budget'] = FlexibleDecimalField(help_text = 'Approximate budget as detailed in programme description including the 5% opportunity fund', label = 'Requested overall budget (CHF)')
self.fields['overall_budget'] = FlexibleDecimalField(help_text = 'Please report the total budget figure. A detailed budget should be uploaded in the following section, adhering to the structure in the respective template. For further information on eligible costs, please refer to the call text.', label = 'Requested overall budget (CHF)')

if self.instance.id:
self.fields['call_id'].initial = self.instance.call.id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def __init__(self, *args, **kwargs):
self._raise_duplicated_title = False

if self._call.overall_budget_question:
self.fields['overall_budget'] = FlexibleDecimalField(help_text='Approximate budget as detailed in programme description including the 5% opportunity fund', label='Requested overall budget (CHF)', required=False)
self.fields['overall_budget'] = FlexibleDecimalField(help_text='Please report the total budget figure. A detailed budget should be uploaded in the following section, adhering to the structure in the respective template. For further information on eligible costs, please refer to the call text.', label='Requested overall budget (CHF)', required=False)

if self.instance.id:
self.fields['call_id'].initial = self.instance.call.id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ Maximum budget: {{ maximum_budget|thousands_separator }} CHF
<input type="hidden" id="total_budget" value="{{ maximum_budget}}">
{% if "flag" in call_name|lower %}
<p>
The above-indicated maximum budget is only available to a Flagship Initiatives programme located in the Antarctic region.
Applicants can apply for a maximum funding of 1’500’000 CHF for a Flagship Initiatives programme in regions other than Antarctica.
Please adhere to the structure in the budget template provided and give details of all items and related costs.
For further information on eligible costs, please refer to the call text.
The above-indicated maximum budget is only available to a Flagship Initiatives programme located in the Antarctic region. Applicants can apply for a maximum funding of 1’500’000 CHF for a Flagship Initiatives programme in regions other than Antarctica / Southern Ocean.
</p>
{% else %}
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% crispy form %}
</td>
<td>
<a href="javascript:void()" class="btn-danger delete-row" onclick="deleteRow(this)" style="display: none;">X</a>
<a href="javascript:void()" class="btn-danger delete-row" onclick="deleteRow(this)" style="display: none; font-size:20px">X</a>
</td>
</tr>
{% endfor %}
Expand Down

0 comments on commit 7caeca0

Please sign in to comment.