Add counties to the association form

code4romania · Jan 4, 2024 · a09e902 · a09e902
1 parent 759a239
commit a09e902
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 27 deletions.
diff --git a/backend/donations/views/my_account.py b/backend/donations/views/my_account.py
@@ -52,6 +52,7 @@ def get(self, request, *args, **kwargs):
             "limit": settings.DONATIONS_LIMIT,
             "ngo": user_ngo,
             "donors": grouped_donors,
+            "counties": settings.FORM_COUNTIES,
         }
         return render(request, self.template_name, context)
 
@@ -63,6 +64,7 @@ def get(self, request, *args, **kwargs):
         context = {
             "user": request.user,
             "ngo": request.user.ngo if request.user.ngo else None,
+            "counties": settings.FORM_COUNTIES,
         }
 
         return render(request, self.template_name, context)
@@ -107,6 +109,7 @@ def post(self, request, *args, **kwargs):
         context = {
             "user": request.user,
             "ngo": request.user.ngo if request.user.ngo else None,
+            "counties": settings.FORM_COUNTIES,
         }
 
         return render(request, self.template_name, context)
diff --git a/backend/templates/v1/components/county.html b/backend/templates/v1/components/county.html
@@ -1,6 +1,3 @@
-
-
-
 <select class="form-control" id="county" name="county" required x-moz-errormessage="Județul este obligatoriu" title="Județul este obligatoriu">
     <option value="" class="select-placeholder">Județul</option>
     <optgroup label="București">

diff --git a/backend/templates/v1/components/ngo-details-form.html b/backend/templates/v1/components/ngo-details-form.html
@@ -43,35 +43,13 @@
                 <input class="form-control" type="text" name="ong-adresa" placeholder="Adresa Asociației" value="{{ ngo.address if ngo }}" required maxlength="100" />
             </div>
             <div class="col-xs-4">
-                <select class="form-control" id="ong-judet" name="ong-judet" required x-moz-errormessage="Județul este obligatoriu" title="Județul este obligatoriu">
-                    <option value="">Județul</option>
-                    <option value="RO" {{ "selected" if county == ngo.county }}>Toată țara</option>
-                    <optgroup label="București">
-                        {% for number in range(1, 7) %}
-                            <option value="{{ number }}" {{ "selected" if number|string == ngo.county }}>Sector {{ number }}</option>
-                        {% endfor %}
-                    </optgroup>
-                    {% for county in counties %}
-                        <option value="{{ county }}" {{ "selected" if county == ngo.county }} >{{ county }}</option>
-                    {% endfor %}
-                </select>
+                {% include "components/county.html" %}
             </div>
         </div>
         <div class="form-group">
             <div class="col-xs-12">
                 <label for="ong-activitate">În ce regiune iși desfășoară ONG-ul activitatea?</label>
-                <select class="form-control" id="ong-activitate" name="ong-activitate" required x-moz-errormessage="Zona de activitate este obligatorie" title="Zona de activitate este obligatorie">
-                    <option value="">Zona de activitate</option>
-                    <option value="RO" {{ "selected" if county == ngo.active_region }}>National</option>
-                    <optgroup label="București">
-                        {% for number in range(1, 7) %}
-                            <option value="{{ number }}" {{ "selected" if number|string == ngo.active_region }}>Sector {{ number }}</option>
-                        {% endfor %}
-                    </optgroup>
-                    {% for county in counties %}
-                        <option value="{{ county }}" {{ "selected" if county == ngo.active_region }} >{{ county }}</option>
-                    {% endfor %}
-                </select>
+                {% include "components/county.html" %}
             </div>
         </div>
         <div class="form-group choose-url-group">