Skip to content

Commit

Permalink
Update: modify delete view, modify form, modify template
Browse files Browse the repository at this point in the history
  • Loading branch information
@wekesa360
wekesa360 committed May 2, 2022
1 parent 4438555 commit e985bfd
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 43 deletions.
30 changes: 22 additions & 8 deletions cpovc_forms/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10037,6 +10037,12 @@ def new_graduation_monitoring_form(request, id):


def ovc_preventive_pre_post_program_assessment_view(request, id):
""" ovc care pre-post progrss assessment form view
Args:
request, id
Return:
render template
"""
user_id = request.user.id
username = request.user.get_username()
child = RegPerson.objects.get(id=id)
Expand Down Expand Up @@ -10070,8 +10076,8 @@ def ovc_preventive_pre_post_program_assessment_view(request, id):
house_hold=house_hold
)
if form.is_valid():
# save form input and event counter
ovc_preventive_event.save()
form = form.cleaned_data
OVCPrevSinovyoCaregiverEvaluation(
event_id=ovc_preventive_event.event,
person_id=user_id,
Expand Down Expand Up @@ -10123,7 +10129,7 @@ def ovc_preventive_pre_post_program_assessment_view(request, id):
messages.success(request, 'Form saved succesfully!')
else:
messages.error(request, 'Error saving form!')
return redirect('progress-assessment/(?P<id>\d+)/')
return redirect('progress-assessment')
form = OVCPreventivePrePostProgramAssessmentForm()
event = OVCPreventiveEvents.objects.filter(person_id=care_giver.id).values_list('event')
evaluation = OVCPrevSinovyoCaregiverEvaluation.objects.filter(event_id__in=event).order_by('date_of_assessment')
Expand All @@ -10133,9 +10139,14 @@ def ovc_preventive_pre_post_program_assessment_view(request, id):


def ovc_preventive_pre_post_program_assessment_edit_view(request, id):
"""edit a form instance
Args: id
Return: render template"""
object = OVCPrevSinovyoCaregiverEvaluation.objects.get(evaluation_id=id)
if request.method == 'POST':
form = OVCPreventivePrePostProgramAssessmentForm(request.POST)
# get update saved form instance
OVCPrevSinovyoCaregiverEvaluation.objects.filter(evaluation_id=id).update(
bd_read=request.POST.get('bd_read'),
bd_education_level=request.POST.get('bd_education_level'),
Expand Down Expand Up @@ -10176,7 +10187,7 @@ def ovc_preventive_pre_post_program_assessment_edit_view(request, id):
fs_hopeful=request.POST.get('fs_hopeful'),
fi_money_important_items=request.POST.get('fi_money_important_items'),
fi_worried_money=request.POST.get('fi_worried_money') )

# fetch data from model
data = {
'person_id': object.person_id,
'ref_caregiver_id': object.ref_caregiver_id,
Expand Down Expand Up @@ -10225,13 +10236,16 @@ def ovc_preventive_pre_post_program_assessment_edit_view(request, id):
form = OVCPreventivePrePostProgramAssessmentForm(data=data)
edit = True
return render(request, template_name='forms/caregiver_progress_assessment.html',
context={'form': form, 'edit_form':edit, 'status': 200 })
context={'form': form, 'edit_form': edit, 'status': 200})

def ovc_preventive_pre_post_program_assessment_delete_view(request):
"""
Adelete a given form instance based on evaluation id
Args: request
def ovc_preventive_pre_post_program_assessment_delete_view(request):
import pdb

Return: Json response
"""
id = request.GET.get('evaluation_id', None)
# pdb.set_trace()
delete_instance = OVCPrevSinovyoCaregiverEvaluation.objects.filter(evaluation_id=id)
Expand Down
70 changes: 35 additions & 35 deletions templates/forms/caregiver_progress_assessment.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,54 +95,56 @@ <h1 class="page-header">Forms
{% if edit_form %}
<p></p>
{% else %}

<form class="form-horizontal form-bordered" action="#" method="POST" data-parsley-validate="true"
name="form-wizard-hhva" id="new_hhva">
{% csrf_token %}
<div class="panel panel-default">
<div class="panel panel-inverse">
<div id="case-events" class="table-responsive">
<table id="" class="table table-striped ">
<div class="panel ">
{% if edit_form %}
<p></p>
{% else %}
<table id="" class="table table-striped ">
<tbody>
<tr>
<td><strong>Type of assessment: </strong><br><br>
{{ form.type_of_assessment }}</td>
<td> </td>
<td> </td>
<td><strong>Date of assessment: </strong><br><br>
{{ form.date_of_assessment }}</td>
</tr>

{% endif %}

<div class="" >
<h3 class="" style="color: dimgrey;"><b> </b></h3>
</div>
<thead>

</thead>
<tbody>
<tr>
<br>
</tr>
<tr>
<td><p style="padding-left: 5px;"><strong>Care giver name:</strong> {{care_giver.first_name}} {{care_giver.surname}}</p>
<p style="padding-left: 5px;"><strong>Age:</strong> {{care_giver.age}}</p></td>
<td><P><strong>Gender:</strong> {{care_giver_gender}}</p>
<P><strong>Designation:</strong> {{care_giver.designation}}</p></td><td></td>
<td><p style="padding-left: 5px;"><strong>Care giver name:</strong> {{care_giver.first_name}} {{care_giver.surname}}</p></td>
<td><p style="padding-left: 5px;"><strong>Age:</strong> {{care_giver.age}}</p></td>
<td><P><strong>Gender:</strong> {{care_giver_gender}}</p></td>
<td><P><strong>Designation:</strong> {{care_giver.designation}}</p></td>
</tr>

</tbody>
<p>&nbsp;</p>

</table>
</div>
<br><br>
</div>
</div>
</div>

</div>
{% endif %}

<div class="panel-form">
<form class="form-horizontal form-bordered" action="{{ request.get_full_path }}" method="POST" data-parsley-validate="true"
name="form-wizard-hhva" id="new_hhva">
{% csrf_token %}
<div class="panel-body">
<div class="panel panel-form">
{% if edit_form %}
<p></p>
{% else %}
<table class="table table-responsive">
<td><strong>Type of assessment: </strong><br><br>
{{ form.type_of_assessment }}</td>

<td><strong>Date of assessment: </strong><br><br>
{{ form.date_of_assessment }}</td>
</tr>
</table>
{% endif %}
<div id="case-events" class="table-responsive">
<div class="table-responsive">
<table id="" class="table ">


Expand All @@ -155,7 +157,6 @@ <h3 class="" style="color: dimgrey;"><b>1. BACKGROUND DETAILS </b></h3>
<tbody>

<tr>
<br><br>
<td> 1. Can you read?</td>
<td>
<div class="form-group m-r-10">
Expand Down Expand Up @@ -580,9 +581,9 @@ <h3 class="" style="color: dimgrey;"><b>7. FINANCES </b></h3>
</div>
</div>
{% endif %}
<br><br>
</div>
</div>

</form>
</div>
</div>
Expand All @@ -591,9 +592,9 @@ <h3 class="" style="color: dimgrey;"><b>7. FINANCES </b></h3>

<!-- List of fomrs start -->
{% if objects %}
<div class="card-block table-border-style">
<div class="panel panel-inverse">
<div class="table-responsive">
<table id="tableData" class="table table-success table-striped table-bordered" border="1" id="past-hst">
<table id="tableData" class="table table-success table-bordered" border="1" id="past-hst">
<thead>
<tr>
<th>#</th>
Expand All @@ -612,7 +613,7 @@ <h3 class="" style="color: dimgrey;"><b>7. FINANCES </b></h3>
<td>{{ data.type_of_assessment }}</td>
<td><a href="{% url 'progress-assessment-edit' data.evaluation_id%}"><button type="button" class="btn btn-sm btn-primary m-r-5"><i class="fa fa-pencil"></i>&nbsp;Edit</button></a>
{% comment %} <input id='data_id_jx' typ="text" value="" hidden/> {% endcomment %}
<a><button onClick="deleteEvaluation('{{data.evaluation_id}}')" type="button" class="btn btn-sm btn-danger m-r-5"><i class="fa fa-trash"></i>&nbsp;Delete</button></td></a>
<a><button onClick="deleteEvaluation('{{data.evaluation_id}}')" type="button" class="btn btn-sm btn-danger m-r-5"><i class="fa fa-trash"></i>&nbsp;Delete</button></td></a>
</tr>
{%endfor%}
</tbody>
Expand All @@ -639,7 +640,6 @@ <h3>No data available</h3>
</div>
<!-- end row -->


<script type="text/javascript">
// Delete Django Ajax Call
function deleteEvaluation(evaluation_id) {
Expand Down

0 comments on commit e985bfd

Please sign in to comment.