Skip to content

Commit 1e464c9

Browse files
aleemcahnaleemcahn
authored
Merge pull request #562 from Esmat-Farjad/fix/import_files_fixes
import activity plan file and import report files fixed and cash and …
2 parents 8b789ca + 1c526f2 commit 1e464c9

File tree

7 files changed

+172
-180
lines changed

7 files changed

+172
-180
lines changed

‎src/project_reports/templates/project_reports/report_activity_plans/partials/_activity_plan_info.html

+53
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,58 @@
3535
</div>
3636
</div>
3737
</div>
38+
{% if display_block %}
39+
<div class="bg-gray-f5 border border-gray-e6">
40+
<p class="p-2 text-gray-53 font-semibold border-b border-gray-e6 flex gap-2 items-center">
41+
Activity Plan Cash & In Kind Details Info
42+
</p>
43+
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 p-3 py-4">
44+
{% for item in cashinkind_detail %}
45+
<div class="field-col">
46+
<span class="">Implementation Modality</span>
47+
<span class="text-read-only">{{item.implement_modality_type.name}}</span>
48+
</div>
49+
<div class="field-col">
50+
<span>Package Type</span>
51+
<span class="text-read-only">{{item.package_type.name}}</span>
52+
</div>
53+
{% if item.unit_type %}
54+
<div class="field-col">
55+
<span>Unit type</span>
56+
<span class="text-read-only">{{item.unit_type.name}}</span>
57+
</div>
58+
{% endif %}
59+
{% if item.ration_type %}
60+
<div class="field-col">
61+
<span>Ration type</span>
62+
<span class="text-read-only">{{item.ration_type.name}}</span>
63+
</div>
64+
{% endif %}
65+
{% if item.ration_size %}
66+
<div class="field-col">
67+
<span>Ration size</span>
68+
<span class="text-read-only">{{item.ration_size.name}}</span>
69+
</div>
70+
{% endif %}
71+
<div class="field-col">
72+
<span>Transfer Mechanism Type</span>
73+
<span class="text-read-only">{{item.transfer_mechanism_type.name}}</span>
74+
</div>
75+
<div class="field-col">
76+
<span>Transfer Category</span>
77+
<span class="text-read-only">{{item.transfer_category.name}}</span>
78+
</div>
79+
<div class="field-col">
80+
<span>Transfer Value</span>
81+
<span class="text-read-only">{{item.units}}</span>
82+
</div>
83+
<div class="field-col">
84+
<span>No.of Transfers</span>
85+
<span class="text-read-only">{{item.no_of_transfers}}</span>
86+
</div>
87+
{% endfor %}
88+
</div>
89+
</div>
90+
{% endif %}
3891
</div>
3992
{% endif %}

‎src/project_reports/templates/project_reports/report_activity_plans/report_activity_plan_form.html

+7-107
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
</a>
6565
</span>
6666
<span class="btn btn-gray" style="float:right">
67-
<a <a href="{% url 'create_report_target_location' report_activity_plan.pk %}" class="btn btn-gray">
68-
<svg style="" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4 text-red">
67+
<a href="{% url 'create_report_target_location' report_activity_plan.pk %}" class="btn btn-gray">
68+
<svg viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4 text-red">
6969
<path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
7070
</svg>
7171
Location
@@ -105,7 +105,11 @@
105105
<div class="select-field">
106106
<span class="label">Project Activity Plan</span>
107107
<p class="help-text">{{ form.activity_plan.help_text }}
108-
<span class="icon-info mr-1 "></span>Only `In-progress` Activity plans are displayed. If you the don't see your indicator in the list, go to <a target="_blank" href="{% url 'activity-plans-list' project.pk %}" class="text-red underline">activity plans</a> page to add new activity plan or update existing one.
108+
<span class="icon-info mr-1"></span>Only `In-progress` Activity plans are displayed. If you the don't see your indicator in the list, go to <a target="_blank" href="{% url 'activity-plans-list' project.pk %}" class="text-red underline">activity plans</a> page to add new activity plan or update existing one. <br>
109+
</p>
110+
<p class="help-text">
111+
<span class="icon-info mr-1"></span>
112+
The Activity plan is presented in the following order in the dropdown list: (Activity Plan: Activity Domain - Activity Type - Indicator.)
109113
</p>
110114
{{ form.activity_plan }}
111115
<p class="sign-up-field-error">{{ form.activity_plan.errors }}</p>
@@ -127,110 +131,6 @@
127131
<p class="sign-up-field-error">{{ form.response_types.errors }}</p>
128132
</div>
129133
</div>
130-
131-
132-
133-
</div>
134-
</div>
135-
</div>
136-
137-
138-
139-
<!-- Indicator types start to diaplay -->
140-
<div id="{{ form.prefix }}-indicator-types">
141-
<div class="row">
142-
<div class="multiple-fields-row">
143-
{% if report_activity_plan.indicator.package_type %}
144-
<div class="field-col">
145-
<div class="select-field">
146-
<label>{{ form.package_type.label }}/Ration</label>
147-
{{ form.package_type }}
148-
<small class="sign-up-field-error">{{ form.package_type.errors }}</small>
149-
</div>
150-
</div>
151-
{% endif %}
152-
{% if report_activity_plan.indicator.grant_type %}
153-
<div class="field-col">
154-
<div class="select-field">
155-
<label>{{ form.grant_type.label }}/Assistance Type</label>
156-
{{ form.grant_type }}
157-
<small class="sign-up-field-error">{{ form.grant_type.errors }}</small>
158-
</div>
159-
</div>
160-
{% endif %}
161-
</div>
162-
</div>
163-
<div class="row">
164-
<div class="col col-lg">
165-
<div class="multiple-fields-row three-items">
166-
{% if report_activity_plan.indicator.unit_type %}
167-
<div class="field-col">
168-
<div class="select-field">
169-
<label>{{ form.unit_type.label }}</label>
170-
{{ form.unit_type }}
171-
<small class="sign-up-field-error">{{ form.unit_type.errors }}</small>
172-
</div>
173-
</div>
174-
{% endif %}
175-
{% if report_activity_plan.indicator.units %}
176-
<div class="field-col" style="margin-bottom: 7px;">
177-
<div class="select-field">
178-
<label>{{ form.units.label }}</label>
179-
{{ form.units }}
180-
<small class="sign-up-field-error">{{ form.units.errors }}</small>
181-
</div>
182-
</div>
183-
{% endif %}
184-
{% if report_activity_plan.indicator.no_of_transfers %}
185-
<div class="field-col" style="margin-bottom: 7px;">
186-
<div class="select-field">
187-
<label>{{ form.no_of_transfers.label }}</label>
188-
{{ form.no_of_transfers }}
189-
<small class="sign-up-field-error">{{ form.no_of_transfers.errors }}</small>
190-
</div>
191-
</div>
192-
{% endif %}
193-
</div>
194-
</div>
195-
</div>
196-
<div class="row">
197-
<div class="multiple-fields-row">
198-
{% if report_activity_plan.indicator.implement_modility_type %}
199-
<div class="field-col">
200-
<div class="select-field">
201-
<label>{{ form.implement_modility_type.label }}</label>
202-
{{ form.implement_modility_type }}
203-
<small class="sign-up-field-error">{{ form.implement_modility_type.errors }}</small>
204-
</div>
205-
</div>
206-
{% endif %}
207-
{% if report_activity_plan.indicator.transfer_mechanism_type %}
208-
<div class="field-col">
209-
<div class="select-field">
210-
<label>{{ form.transfer_mechanism_type.label }}</label>
211-
{{ form.transfer_mechanism_type }}
212-
<small class="sign-up-field-error">{{ form.transfer_mechanism_type.errors }}</small>
213-
</div>
214-
</div>
215-
{% endif %}
216-
{% if report_activity_plan.indicator.transfer_category or form.initial.indicator.transfer_category %}
217-
<div class="field-col">
218-
<div class="select-field">
219-
<label>{{ form.transfer_category.label }}</label>
220-
{{ form.transfer_category }}
221-
<small class="sign-up-field-error">{{ form.transfer_category.errors }}</small>
222-
</div>
223-
</div>
224-
{% endif %}
225-
{% if report_activity_plan.indicator.currency or form.initial.indicator.currency %}
226-
<div class="field-col">
227-
<div class="select-field">
228-
<label>{{ form.currency.label }}</label>
229-
{{ form.currency }}
230-
<small class="sign-up-field-error">{{ form.currency.errors }}</small>
231-
</div>
232-
</div>
233-
{% endif %}
234134
</div>
235135
</div>
236136
</div>

0 commit comments

Comments
 (0)