Skip to content

Commit c5486f3

Browse files
aleducodealeducode
committed
wizard helps.
1 parent 7e8fa9a commit c5486f3

File tree

7 files changed

+113
-140
lines changed

7 files changed

+113
-140
lines changed

‎abjhelp/templates/detail.html

+34-45
Original file line numberDiff line numberDiff line change
@@ -4,59 +4,48 @@
44
{% block content %}
55
<div class="page-content">
66
<div class="container-fluid">
7-
<div class="col-xl-12">
8-
9-
10-
<div class="card overflow-hidden">
11-
<div class="bg-soft-primary">
12-
<div class="row">
13-
<div class="col-7">
14-
<div class="text-primary p-3">
15-
<h5 class="text-primary">Pedido {{help.pk}}</h5>
16-
</div>
17-
</div>
18-
<div class="col-5 align-self-end">
19-
<img src="{% static 'backoffice/assets/images/profile-img.png' %}" alt="" class="img-fluid">
20-
</div>
7+
<div class="col-xl-6 offset-lg-3">
8+
<a href="{% url 'users:help-requests' %}">Regresar</a>
9+
10+
<div class="card overflow-hidden mt-2">
11+
<div class="bg-soft-primary">
12+
<div class="row">
13+
<div class="col-7">
14+
<div class="text-primary p-3">
15+
<h5 class="text-primary">Pedido #{{help.pk}}</h5>
2116
</div>
2217
</div>
18+
<div class="col-5 align-self-end">
19+
<img src="{% static 'backoffice/assets/images/profile-img.png' %}" alt="" class="img-fluid">
20+
</div>
2321
</div>
24-
<!-- end card -->
25-
26-
<div class="card">
27-
<div class="card-body">
28-
<h3 class="subtitle has-text-left">{{help.name|upper}}</h3>
22+
</div>
23+
</div>
24+
<!-- end card -->
2925

30-
<p class="has-text-left is-size-6">{{help.description}}</p>
31-
<div class="table-responsive">
32-
<table class="table table-nowrap mb-0">
33-
<tbody>
34-
<tr>
35-
<th scope="row">Ubicacion:</th>
36-
<td>{{help.address}}</td>
37-
</tr>
38-
</tbody>
39-
</table>
40-
</div>
41-
<h3 class="subtitle has-text-left">Contactar:</h3>
42-
</div>
43-
<div></div>
44-
<h3 class="subtitle has-text-left">
45-
<a class="button hover-grow is-half request-phone-button" href="tel:+541127123431">
46-
47-
<span>+57{{help.phone_number}}</span>
26+
<div class="card">
27+
<div class="card-body">
28+
<h3 class="subtitle has-text-left">{{help.name|title}}</h3>
29+
30+
<p class="has-text-left is-size-6">{{help.description}}</p>
31+
<h5 class="font-size-15 font-weight-bold">Ubicación: </h5>{{help.address}}
32+
<h5 class="font-size-15 font-weight-bold mt-3">Contactar</h5>
33+
<div class="row">
34+
<div class="col-12 mt-3">
35+
<a type="button" href="tel:+57{{help.phone_number}}"
36+
class="btn btn-dark waves-effect waves-light mr-3">
37+
<i class="bx bx-phone-outgoing font-size-24 align-middle mr-2"></i> Llamar
4838
</a>
49-
<a class="button hover-grow request-whatsapp-button"
50-
href="https://wa.me/541127123431?text=Hola+mariano,+te+escribo+por+el+pedido+que+hiciste:+necesito+de+manera+urgente+mercaderia+https://argentinaporvos.org/pedidos/29">
51-
<span class="icon is-small">
52-
53-
<img src="https://argentinaporvos.s3.amazonaws.com/static/img/whatsapp.svg" alt="">
54-
</span>
55-
<span>Contactar vía WhatsApp</span>
39+
<a type="button" href="{{whatsapp}}" class="btn btn-success waves-effect waves-light">
40+
<i class="bx bxl-whatsapp font-size-24 align-middle mr-2"></i> Whatsapp
5641
</a>
57-
</h3>
42+
</div>
5843
</div>
44+
</div>
45+
5946

47+
</div>
48+
6049
</div>
6150
</div>
6251
</div>

‎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

-11
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,6 @@ <h3 class="mb-4 text-center">Solicitud de Ayuda</h3>
1212
<form method="POST">
1313
{% csrf_token %}
1414

15-
16-
<div class="form-group">
17-
<input class="form-check-input" type="checkbox" id="inlineFormCheck" switch="info" checked>
18-
<label class="form-check-label" for="switch7" data-on-label="Si" data-off-label="No">
19-
Es para mi?
20-
</label>
21-
</div>
22-
<div class="form-group">
23-
<input type="checkbox" id="inlineFormCheck" switch="info" checked />
24-
<label class="form-check-label" for="switch7" data-on-label="Si" data-off-label="No">¿Es para mi?</label>
25-
</div>
2615
<div class="form-group">
2716
<label>{{form.name.label}}</label>
2817
<input type="text" class="form-control {%if form.name.errors %}is-invalid{%endif%}"

‎abjhelp/templates/information.html

+67-72
Original file line numberDiff line numberDiff line change
@@ -2,91 +2,86 @@
22

33

44
{% 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+
517
<div class="page-content">
618
<div class="container-fluid">
7-
<div class="col-xl-12">
19+
<div class="col-xl-6 offset-lg-3">
820
<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+
928
{% if helps %}
10-
1129
{% for help in helps %}
12-
<div class="col-xl-4 col-sm-6">
13-
<div class="card">
14-
<div class="card-body">
15-
<div class="media">
16-
<div class="avatar-md mr-4">
17-
<span class="avatar-title rounded-circle bg-soft-primary text-primary font-size-16">
18-
{{help.name.0|upper}}
19-
</span>
20-
21-
</div>
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">
2251

23-
<div class="media-body overflow-hidden">
24-
<h5 class="text-truncate font-size-15"><a href="{% url 'users:detail' help.pk %}" class="text-dark">{{help.name}}</a></h5>
25-
<p class="text-justify">{{help.description|truncatewords:3 }}</p></p>
26-
<!--<div class="team">Tel: {{help.phone_number}}</div>-->
27-
</div>
28-
</div>
29-
</div>
30-
<div class="px-4 py-3 border-top">
31-
<ul class="list-inline mb-0">
32-
<li class="list-inline-item mr-3">
33-
34-
{% if help.is_active %}
35-
<span class="badge badge-primary">Disponible</span>
36-
37-
{% else %}
38-
<span class="badge badge-success">Completado</span>
39-
{% endif %}
40-
</li>
41-
<li class="list-inline-item mr-3" data-toggle="tooltip" data-placement="top" title=""
42-
data-original-title="Due Date">
43-
<i class="bx bx-calendar mr-1"></i>{{help.created|date:"d-m-Y"}}
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>
4469
</li>
4570
</ul>
71+
4672
</div>
4773
</div>
4874
</div>
75+
76+
4977
{% endfor %}
50-
51-
{% endif %}
5278

53-
</div>
54-
<!-- end row -->
55-
56-
<div class="row">
57-
<div class="col-lg-12">
58-
<ul class="pagination pagination-rounded justify-content-center mt-2 mb-5">
59-
<li class="page-item disabled">
60-
<a href="#" class="page-link"><i class="mdi mdi-chevron-left"></i></a>
61-
</li>
62-
<li class="page-item">
63-
<a href="#" class="page-link">1</a>
64-
</li>
65-
<li class="page-item active">
66-
<a href="#" class="page-link">2</a>
67-
</li>
68-
<li class="page-item">
69-
<a href="#" class="page-link">3</a>
70-
</li>
71-
<li class="page-item">
72-
<a href="#" class="page-link">4</a>
73-
</li>
74-
<li class="page-item">
75-
<a href="#" class="page-link">5</a>
76-
</li>
77-
<li class="page-item">
78-
<a href="#" class="page-link"><i class="mdi mdi-chevron-right"></i></a>
79-
</li>
80-
</ul>
81-
</div>
82-
</div>
83-
<!-- end row -->
84-
85-
</div> <!-- container-fluid -->
86-
</div>
87-
<!-- End Page-content -->
79+
{% endif %}
8880
</div>
89-
</div>
81+
82+
83+
</div> <!-- container-fluid -->
9084
</div>
91-
</div>
85+
<!-- End Page-content -->
86+
</div>
9287
{% endblock content %}

‎abjhelp/users/urls.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
name='thanks_donor'
4646
),
4747
path(
48-
route="informacion",
48+
route="solicitudes",
4949
view=users_view.InformationView.as_view(),
50-
name='information'
50+
name='help-requests'
5151
),
52-
path(
52+
path(
5353
route="detalle/<str:pk>/",
5454
view=users_view.RequestDetailView.as_view(),
5555
name='detail'
56-
),
56+
),
5757

5858
]

‎abjhelp/users/views.py

+7
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,10 @@ class RequestDetailView(DetailView):
7171
slug_url_kwarg = 'pk'
7272
queryset = HelpRequest.objects.all()
7373
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)