Skip to content

Commit cd924bc

Browse files
aleducodealeducode
committed
Merge branch 'master' of github.com:aleducode/help-abejorral
2 parents bf2a2cf + 20b1c4a commit cd924bc

File tree

8 files changed

+174
-14
lines changed

8 files changed

+174
-14
lines changed

‎abjhelp/static/images/index.jpeg

9.96 KB
Loading

‎abjhelp/templates/disclaimer_donor.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h4>Cómo funciona?</h4>
2727
(asegurate que todos sean correctos) en la plataforma de unconviteporabejorral.org
2828
</p>
2929
</div>
30-
<a href="{% url 'users:donor' %}"
30+
<a href="{% url 'users:help-requests' %}"
3131
class="btn btn-lg btn-block btn-success w-lg waves-effect waves-light"
3232
style="color:white">Entendido</a>
3333
</div>

‎abjhelp/templates/help_request.html

+47-4
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,56 @@
1111
<h3 class="mb-4 text-center">Solicitud de Ayuda</h3>
1212
<form method="POST">
1313
{% csrf_token %}
14-
{{form.as_p}}
15-
<button type="submit" class="btn btn-lg btn-block btn-info w-lg waves-effect waves-light" style="color:white">Solicitar</button>
14+
15+
<div class="form-group">
16+
<label>{{form.name.label}}</label>
17+
<input type="text" class="form-control {%if form.name.errors %}is-invalid{%endif%}"
18+
name="name" placeholder="name"
19+
value=" {%if form.errors %}{{form.name.value}}{%endif%} ">
20+
<div class="invalid-feedback">
21+
{% for error in form.name.errors %}
22+
{{error}}
23+
{% endfor %}
24+
</div>
25+
</div>
26+
<div class="form-group">
27+
<label>{{form.description.label}}</label>
28+
<textarea type="text" class="form-control {%if form.name.errors %}is-invalid{%endif%}"
29+
name="description" value=" {%if form.errors %}{{form.description.value}}{%endif%} ">
30+
</textarea>
31+
<div class="invalid-feedback">
32+
{% for error in form.description.errors %}
33+
{{error}}
34+
{% endfor %}
35+
</div>
36+
37+
</div>
38+
<div class="form-group">
39+
<label>{{form.phone_number.label}}</label>
40+
<input type="text" class="form-control {%if form.name.errors %}is-invalid{%endif%}"
41+
name="phone_number" value=" {%if form.errors %}{{form.description.value}}{%endif%} ">
42+
<div class="invalid-feedback">
43+
{% for error in form.phone_number.errors %}
44+
{{error}}
45+
{% endfor %}
46+
</div>
47+
</div>
48+
<div class="form-group">
49+
<label>{{form.address.label}}</label>
50+
<input type="text" class="form-control {%if form.name.errors %}is-invalid{%endif%}"
51+
name="address" value="{%if form.errors %}{{form.description.value}}{%endif%} ">
52+
<div class="invalid-feedback">
53+
{% for error in form.address.errors %}
54+
{{error}}
55+
{% endfor %}
56+
</div>
57+
</div>
58+
<button type="submit" class="btn btn-lg btn-block btn-info w-lg waves-effect waves-light"
59+
style="color:white">Solicitar</button>
1660
</form>
1761
</div>
1862
</div>
1963
</div>
2064
</div>
2165
</div>
22-
{% endblock content %}
23-
66+
{% endblock content %}

‎abjhelp/templates/information.html

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
{% extends 'base.html' %}
2+
3+
4+
{% block content %}
5+
6+
{% block css %}
7+
<style>
8+
.descrption{
9+
color: inherit
10+
}
11+
.descrption:hover{
12+
color: inherit;
13+
}
14+
</style>
15+
{% endblock css %}
16+
17+
<div class="page-content">
18+
<div class="container-fluid">
19+
<div class="col-xl-6 offset-lg-3">
20+
<div class="row">
21+
<a href="{% url 'users:index' %}">Regresar</a>
22+
<div class="col-12 text-center">
23+
<div class="card-title">
24+
<h3 class="mb-4">Listado de solicitudes</h3>
25+
</div>
26+
</div>
27+
28+
{% if helps %}
29+
{% for help in helps %}
30+
<div class="card" style="width: 100%;">
31+
<div class="card-body pt-0">
32+
<div>
33+
<ul class="verti-timeline list-unstyled mt-4">
34+
<li class="event-list ml-1 pl-0">
35+
<div class="media">
36+
<div class="mr-3">
37+
<i class="bx bx-message-alt-dots h1 text-primary"></i>
38+
</div>
39+
<a href="{% url 'users:detail' help.pk %}" class="descrption">
40+
<div class="media-body">
41+
<div>
42+
<h5 class="font-size-14">{{help.name|title}}</h5>
43+
<p class="text-justify text-muted mb-0">
44+
{{help.description|truncatechars:200 }} <a
45+
href="{% url 'users:detail' help.pk %}">Leer Más</a>
46+
</p>
47+
</div>
48+
<div class="mt-2 border-top">
49+
<ul class="list-inline mt-3 mb-0">
50+
<li class="list-inline-item mr-3">
51+
52+
{% if help.is_active %}
53+
<span class="badge badge-primary">Disponible</span>
54+
55+
{% else %}
56+
<span class="badge badge-success">Completado</span>
57+
{% endif %}
58+
</li>
59+
<li class="list-inline-item mr-3" data-toggle="tooltip"
60+
data-placement="top" title=""
61+
data-original-title="Fecha de solicitud">
62+
<i class="bx bx-calendar mr-1"></i>{{help.created|date:"d-m-Y"}}
63+
</li>
64+
</ul>
65+
</div>
66+
</div>
67+
</a>
68+
</div>
69+
</li>
70+
</ul>
71+
72+
</div>
73+
</div>
74+
</div>
75+
76+
77+
{% endfor %}
78+
79+
{% endif %}
80+
</div>
81+
82+
83+
</div> <!-- container-fluid -->
84+
</div>
85+
<!-- End Page-content -->
86+
</div>
87+
{% endblock content %}

‎abjhelp/users/forms.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class HelpRequestForm(forms.Form):
99
name = forms.CharField(
1010
min_length=2,
1111
max_length=50,
12-
label='¿Cuál es tu nombre?',
12+
label='Nombre',
1313
error_messages={
1414
'required': 'Este campo es requerido',
1515
},
@@ -20,6 +20,9 @@ class HelpRequestForm(forms.Form):
2020
description = forms.CharField(
2121
label='Descripción del pedido',
2222
required=False,
23+
error_messages={
24+
'required': 'Este campo es requerido',
25+
},
2326
widget=forms.Textarea(
2427
attrs={
2528
"rows": 5, "cols": 20,

‎abjhelp/users/urls.py

+10
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,15 @@
4444
view=users_view.ThanksDonorView.as_view(),
4545
name='thanks_donor'
4646
),
47+
path(
48+
route="solicitudes",
49+
view=users_view.InformationView.as_view(),
50+
name='help-requests'
51+
),
52+
path(
53+
route="detalle/<str:pk>/",
54+
view=users_view.RequestDetailView.as_view(),
55+
name='detail'
56+
),
4757

4858
]

‎abjhelp/users/views.py

+25-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
"""Branches Views."""
22

33
# Django
4-
from django.views.generic import TemplateView, FormView
4+
from django.views.generic import TemplateView, FormView, DetailView
55
from django.urls import reverse_lazy
66

77
# Forms
88
from abjhelp.users.forms import HelpRequestForm, DonorRequestForm
9+
from abjhelp.users.models import HelpRequest
910

1011

1112
class DashboardView(TemplateView):
@@ -54,3 +55,26 @@ class ThanksDonorView(TemplateView):
5455

5556
class AdvisorView(TemplateView):
5657
template_name = 'legal_advisor.html'
58+
59+
60+
class InformationView(TemplateView):
61+
template_name = 'information.html'
62+
63+
def get_context_data(self, **kwargs):
64+
context = super().get_context_data(**kwargs)
65+
context["helps"] = HelpRequest.objects.all()
66+
return context
67+
68+
class RequestDetailView(DetailView):
69+
template_name = 'detail.html'
70+
slug_field = 'pk'
71+
slug_url_kwarg = 'pk'
72+
queryset = HelpRequest.objects.all()
73+
context_object_name = 'help'
74+
75+
def get_context_data(self, **kwargs):
76+
context = super().get_context_data(**kwargs)
77+
help_request = self.get_object()
78+
context["whatsapp"] = f'https://wa.me/57{help_request.phone_number}?text=Hola+{help_request.name},+te+escribo+por+el+pedido+que+hiciste+en+la+app+Un+Convite+por+Abejorral+https://unconviteporabejorral.org/detalle/{help_request.pk}'
79+
return context
80+

‎local.yml

-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ services:
1010
context: .
1111
dockerfile: ./compose/local/django/Dockerfile
1212
image: abjhelp_local_django
13-
container_name: django
1413
depends_on:
1514
- postgres
1615
- mailhog
@@ -28,7 +27,6 @@ services:
2827
context: .
2928
dockerfile: ./compose/production/postgres/Dockerfile
3029
image: abjhelp_production_postgres
31-
container_name: postgres
3230
volumes:
3331
- local_postgres_data:/var/lib/postgresql/data
3432
- local_postgres_data_backups:/backups
@@ -52,18 +50,15 @@ services:
5250

5351
mailhog:
5452
image: mailhog/mailhog:v1.0.0
55-
container_name: mailhog
5653
ports:
5754
- "8025:8025"
5855

5956
redis:
6057
image: redis:5.0
61-
container_name: redis
6258

6359
celeryworker:
6460
<<: *django
6561
image: abjhelp_local_celeryworker
66-
container_name: celeryworker
6762
depends_on:
6863
- redis
6964
- postgres
@@ -74,7 +69,6 @@ services:
7469
celerybeat:
7570
<<: *django
7671
image: abjhelp_local_celerybeat
77-
container_name: celerybeat
7872
depends_on:
7973
- redis
8074
- postgres
@@ -85,7 +79,6 @@ services:
8579
flower:
8680
<<: *django
8781
image: abjhelp_local_flower
88-
container_name: flower
8982
ports:
9083
- "5555:5555"
9184
command: /start-flower

0 commit comments

Comments
 (0)