Skip to content

Commit 0c29808

Browse files
committed
Show request details in popup modal
1 parent 62c0817 commit 0c29808

File tree

1 file changed

+98
-15
lines changed

1 file changed

+98
-15
lines changed

mainapp/templates/mainapp/request_list.html

Lines changed: 98 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33

44
{% block css %}
55
<style>
6-
.table{
7-
table-layout: fixed;
8-
}
6+
.table{
7+
table-layout: fixed;
8+
}
99

10-
.table td{
11-
word-wrap: break-word;
12-
}
10+
.table td{
11+
word-wrap: break-word;
12+
}
13+
#req-summary { margin-top: 15px; }
14+
.modal-body .row { padding: 5px 0 }
1315
</style>
1416
<style>
15-
@media only screen and (max-width: 800px) {
17+
@media only screen and (max-width: 800px) {
1618

1719
#requests-table table, thead, tbody, th, td, tr {
1820
display: block;
@@ -56,13 +58,14 @@
5658
#requests-table td:nth-of-type(4):before { content: "Requestee - അപേക്ഷകന്‍റെ പേര്"; }
5759
#requests-table td:nth-of-type(5):before { content: "Phone - ഫോണ്‍ നമ്പര്‍"; }
5860
#requests-table td:nth-of-type(6):before { content: "Date - തീയതി"; }
59-
#requests-table td:nth-of-type(7):before { content: "More details - കൂടുതൽ വിശദാംശങ്ങൾ"; }
61+
#requests-table td:nth-of-type(9):before { content: "More details - കൂടുതൽ വിശദാംശങ്ങൾ"; }
6062
}
61-
@media only screen and (max-width: 420px) {
63+
@media only screen and (max-width: 420px) {
6264
#requests-table td {
63-
min-height: 60px;
65+
min-height: 60px;
6466
}
65-
}
67+
}
68+
6669
</style>
6770
{% endblock %}
6871

@@ -95,7 +98,17 @@ <h2 class="text-center">ഇതു വരെ ആവശ്യപ്പെട്ട
9598
<td>{{ req.requestee }}</td>
9699
<td><a href="tel:{{ req.requestee_phone }}" >{{ req.requestee_phone }}</a></td>
97100
<td>{{ req.dateadded }}</td>
98-
<td><a class="btn btn-sm btn-success" href="{%url 'requestdetailsview' req.id %}" target="_blank">More details</a>
101+
<td class="hide">
102+
{% if req.latlng %}
103+
<a class="btn btn-sm btn-success" href="https://maps.google.com/?q={{ req.latlng }}" target="_blank">Open in maps</a>
104+
<br>
105+
Accuracy: {{ req.latlng_accuracy }}
106+
{% else %}
107+
NA
108+
{% endif %}
109+
</td>
110+
<td class="hide">{{ req.summarise | linebreaks }} </td>
111+
<td><button class="show-details btn btn-sm btn-success">More details</button>
99112
</tr>
100113
{% endfor %}
101114
</tbody>
@@ -125,9 +138,79 @@ <h2 class="text-center">ഇതു വരെ ആവശ്യപ്പെട്ട
125138

126139
</div>
127140

141+
<!-- Modal -->
142+
<div id="req-details" class="modal fade" role="dialog">
143+
<div class="modal-dialog">
144+
145+
<!-- Modal content-->
146+
<div class="modal-content">
147+
<div class="modal-header">
148+
<button type="button" class="close" data-dismiss="modal">&times;</button>
149+
<h4 class="modal-title">Request Details</h4>
150+
</div>
151+
<div class="modal-body">
152+
<div class="container">
153+
<div class="row">
154+
<span class="col-xs-6">District: <span id="req-dist"></span></span>
155+
<span class="col-xs-6">Requestee: <span id="req-requestee"></span></span>
156+
</div>
157+
<div class="row">
158+
<span class="col-xs-6">Contact: <span id="req-contact"></span></span>
159+
<span class="col-xs-6">Date: <span id="req-date"></span></span>
160+
</div>
161+
<div class="row">
162+
<span class="col-xs-6">Location: <span id="req-loc"></span></span>
163+
<span class="col-xs-6">GPS Location: <span id="req-gps"></span></span>
164+
</div>
165+
<div class="row">
166+
<div class="col-xs-12">
167+
<h3>Summary</h3>
168+
<p id="req-summary"></p>
169+
</div>
170+
</div>
171+
</div>
172+
</div>
173+
<div class="modal-footer">
174+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
175+
</div>
176+
</div>
177+
178+
</div>
179+
</div>
180+
128181
<script>
182+
const iDist = 1
183+
const iLoc = 2
184+
const iRequestee = 3
185+
const iContact = 4
186+
const iDate = 5
187+
const iGps = 6
188+
const iSummary = 7
189+
129190
window.onload = function() {
130191
$("input.search").keyup(search);
192+
$(".show-details").click(showDetails);
193+
}
194+
195+
function showDetails(evt) {
196+
var tds = $(evt.target).parent().siblings()
197+
var dist = tds.eq(iDist).text().toLowerCase()
198+
var loc = tds.eq(iLoc).text().toLowerCase()
199+
var requestee = tds.eq(iRequestee).text().toLowerCase()
200+
var phone = tds.eq(iContact).html()
201+
var date = tds.eq(iDate).text()
202+
var gps = tds.eq(iGps).html()
203+
var summary = tds.eq(iSummary).html()
204+
205+
$("#req-dist").text(dist)
206+
$("#req-loc").text(loc)
207+
$("#req-requestee").text(requestee)
208+
$("#req-contact").html(phone)
209+
$("#req-date").text(date)
210+
$("#req-gps").html(gps)
211+
$("#req-summary").html(summary)
212+
213+
$("#req-details").modal("show")
131214
}
132215

133216
function search() {
@@ -136,9 +219,9 @@ <h2 class="text-center">ഇതു വരെ ആവശ്യപ്പെട്ട
136219
if (i == 0) return
137220
el = $(el)
138221
var tds = el.find("td")
139-
var loc = tds.eq(1).text().toLowerCase()
140-
var requestee = tds.eq(2).text().toLowerCase()
141-
var phone = tds.eq(3).text()
222+
var loc = tds.eq(iLoc).text().toLowerCase()
223+
var requestee = tds.eq(iRequestee).text().toLowerCase()
224+
var phone = tds.eq(iContact).text()
142225
var locKey = $("#search-loc").val().toLowerCase()
143226
var reqKey = $("#search-requestee").val().toLowerCase()
144227
var phoneKey = $("#search-phone").val()

0 commit comments

Comments
 (0)