Skip to content

Commit d5c6830

Browse files
committed
change backend only
1 parent a612535 commit d5c6830

File tree

2 files changed

+34
-26
lines changed

2 files changed

+34
-26
lines changed

website/templates/index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ <h2>Fill Out Reminder Form:</h2>
9494
<input type="tel" class="form-control" id="add_phone_num" name="add_phone_num" placeholder="Enter Phone Number"
9595
pattern="[0-9]{3}-[0-9]{3}-[0-9]{4}">
9696
</div>
97+
<div class="form-group">
98+
<label for="add_case_num_1">Additional Case Number <small>(ex: CF-1234-5678)</small></label>
99+
<input type="text" class="form-control" id="add_case_num_1" name="add_case_num_1" placeholder="Enter case number">
100+
</div>
101+
<button type="submit" class="btn btn-primary">Add Case Number</button>
97102
<button type="submit" class="btn btn-primary">Submit</button>
98103
</form>
99104
</div>

website/views.py

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,11 @@ def index(request):
1919
# Render the HTML template index.html with the data in the context variable
2020
return render(request, 'index.html')
2121

22-
def check_valid_case(request):
22+
def check_valid_case(case_num, year, county):
2323
# Process form data and requests arraignment data form api/case
24-
case_num = request.POST['case_num']
25-
year = request.POST['year']
26-
county = request.POST['county']
27-
phone_num = request.POST['phone_num']
28-
add_num = request.POST['add_phone_num']
2924
resp = requests.get(
30-
f"https://courtbot-python.herokuapp.com/api/case?year={year}&county={county}&case_num={case_num}"
25+
#f"https://courtbot-python.herokuapp.com/api/case?year={year}&county={county}&case_num={case_num}"
26+
f"http://127.0.0.1:8000/api/case?year={year}&county={county}&case_num={case_num}"
3127
)
3228
resp_json = json.loads(resp.content)
3329
if resp_json.get('error', None):
@@ -36,7 +32,8 @@ def check_valid_case(request):
3632

3733

3834
def set_case_reminder(arraignment_datetime, case_num, phone_num):
39-
reminder_request = requests.post('https://courtbot-python.herokuapp.com/api/reminders', {
35+
#reminder_request = requests.post('https://courtbot-python.herokuapp.com/api/reminders', {
36+
reminder_request = requests.post('http://127.0.0.1:8000/api/reminders', {
4037
"arraignment_datetime": arraignment_datetime,
4138
"case_num": case_num,
4239
"phone_num": f"+1-{phone_num}"
@@ -52,25 +49,31 @@ def set_case_reminder(arraignment_datetime, case_num, phone_num):
5249
def schedule_reminders(request):
5350
# If valid case and arraignment time, posts reminder data to api/reminder
5451
# Includes option for extra phone number for additional recipient
55-
case_num = request.POST['case_num']
52+
#case_num = request.POST['case_num']
53+
case_num_list = [
54+
value for key, value in request.POST.items()
55+
if key.find("case_num") > -1 and value
56+
]
57+
year = request.POST['year']
58+
county = request.POST['county']
5659
phone_num = request.POST['phone_num']
5760
add_num = request.POST.get('add_phone_num', None)
58-
59-
valid_case_message, arraignment_datetime = check_valid_case(request)
60-
if not arraignment_datetime:
61-
messages.error(request, valid_case_message)
62-
faq_message = (
63-
f'Please check the case for further information using steps provided at http://court.bot/#faq'
64-
)
65-
messages.error(request, faq_message)
66-
else:
67-
reminder_set, reminder_message = set_case_reminder(arraignment_datetime, case_num, phone_num)
68-
# messages.error(request, message)
69-
messages.info(request, reminder_message)
70-
if not reminder_set:
71-
return redirect('/#form')
72-
if add_num:
73-
_, another_reminder_message = set_case_reminder(arraignment_datetime, case_num, add_num)
74-
messages.info(request, another_reminder_message)
61+
for case_num in case_num_list:
62+
valid_case_message, arraignment_datetime = check_valid_case(case_num, year, county)
63+
if not arraignment_datetime:
64+
messages.error(request, valid_case_message)
65+
faq_message = (
66+
f'Please check the case for further information using steps provided at http://court.bot/#faq'
67+
)
68+
messages.error(request, faq_message)
69+
else:
70+
reminder_set, reminder_message = set_case_reminder(arraignment_datetime, case_num, phone_num)
71+
# messages.error(request, message)
72+
messages.info(request, reminder_message)
73+
if not reminder_set:
74+
return redirect('/#form')
75+
if add_num:
76+
_, another_reminder_message = set_case_reminder(arraignment_datetime, case_num, add_num)
77+
messages.info(request, another_reminder_message)
7578
return redirect('/#form')
7679

0 commit comments

Comments
 (0)