Update: add delete view, modify form

cpovc_forms/forms.py

@@ -8317,7 +8317,7 @@ class OVCPreventivePrePostProgramAssessmentForm (forms.Form):
         ('Often', 'Often')
     )
 
-    TYPE_ASSESSMENT = forms.ChoiceField(choices=CHOICES_TYPE_ASSESSMENT,
+    type_of_assessment = forms.ChoiceField(choices=CHOICES_TYPE_ASSESSMENT,
                                         widget = forms.RadioSelect())
 
     date_of_assessment = forms.DateTimeField(

cpovc_forms/models.py

@@ -1520,7 +1520,7 @@ class OVCPrevSinovyoCaregiverEvaluation(models.Model):
     fs_hopeful = models.CharField(max_length=80)
     fi_money_important_items = models.CharField(max_length=40)
     fi_worried_money = models.CharField(max_length=40)
-    event = models.ForeignKey(OVCPreventiveEvents,default='15657fa6-c860-11ec-b9d4-00e18c9fac49', on_delete=models.CASCADE)
+    event = models.ForeignKey(OVCPreventiveEvents, on_delete=models.CASCADE)
     fmp_pre_grouping_id = models.UUIDField(default=uuid.uuid1, editable=False)
     timestamp_created = models.DateTimeField(default=timezone.now)
     timestamp_updated = models.DateTimeField(default=timezone.now)
@@ -1533,4 +1533,6 @@ class Meta:
     def __unicode__(self):
         return str(self.evaluation_id)
 
-
+    def get_all_objects(self):
+        queryset = self._meta.model.objects.all()
+        return queryset

cpovc_forms/urls.py

@@ -177,6 +177,8 @@
     # 
     re_path('ovc-preventive-progress-assessment/(?P<id>\d+)/', views.ovc_preventive_pre_post_program_assessment_view, name='progress-assessment'),
     # 
-    re_path('ovc-preventive-progress-assessment-edit/(?P<id>\d+)/', views.ovc_preventive_pre_post_program_assessment_edit_view, name='progress-assessment-edit'),
+    re_path('ovc-preventive-progress-assessment-edit/(?P<id>[\w-]+)/$', views.ovc_preventive_pre_post_program_assessment_edit_view, name='progress-assessment-edit'),
+
+    re_path('ovc-preventive-progress-assessment-delete/(?P<id>[\w-]+)/$', views.ovc_preventive_pre_post_program_assessment_delete_view, name='progress-assessment-delete')
 
 ]

cpovc_forms/views.py

@@ -10036,12 +10036,20 @@ def new_graduation_monitoring_form(request, id):
                            'new_graduation_form_month_2': new_graduation_form_month_2,
                            'new_graduation_form_month_3': new_graduation_form_month_3,
                            'recommended_action': recommended_action})
+
+
 import pdb
 def ovc_preventive_pre_post_program_assessment_view(request, id):
-
+
+    user_id = request.user.id
+    username = request.user.get_username()
+
     child = RegPerson.objects.get(id=id)
     house_hold = OVCHouseHold.objects.get(id=OVCHHMembers.objects.get(person=child).house_hold_id)
     care_giver = RegPerson.objects.get(id=OVCRegistration.objects.get(person=child).caretaker_id)
+    care_giver_id = care_giver.id
+    if care_giver.id == id:
+        care_giver_id = id
     care_giver_gender = care_giver.sex_id
     if care_giver_gender == 'SMAL':
         care_giver_gender = 'Male'
@@ -10055,43 +10063,26 @@ def ovc_preventive_pre_post_program_assessment_view(request, id):
             person=id,
             is_void=False,
         ).count()
-        #ovc_care_event = OVCCareEvents.objects.create(
-        #   event_type_id=event_type_id,
-        #   event_counter=event_counter,
-        #   event_score=0,
-        #   created_by=request.user.id,
-        #   person=RegPerson.objects.get(pk=int(id)),
-        #   house_hold=house_hold
-        # )
-
-
-        #pdb.set_trace()
+        ovc_preventive_event = OVCPreventiveEvents(
+            event_type_id = event_type_id,
+            event_counter = event_counter,
+            event_score = 0,
+            date_of_event = timezone.now(),
+            date_of_previous_event = timezone.now(),
+            created_by = user_id,
+            app_user = AppUser.objects.get(username=username),
+            person = RegPerson.objects.get(pk=care_giver.id),
+            house_hold =house_hold
+                )
         if form.is_valid():
-            # save event
-            # ovc_preventive_events = OVCPreventiveEvents.objects.create(
-            # event_type_id=event_type_id,
-            # event_counter=event_counter,
-            # event_score=0,
-            # # date_of_previous_event=OVCPreventiveEvents.objects.get(event_type_id=event_type_id).date_of_event,
-            # created_by=request.user.id,
-            # is_void=False
-            #     event_type_id=event_type_id,
-            #     event_counter=event_counter,
-            #     event_score=0,
-            #     date_of_event=timezone.now(),
-            #     date_of_previous_event=timezone.now(),
-            #     created_by=request.user.id,
-            #     timestamp_created=timezone.now(),
-            #     is_void=False,
-            #     app_user=AppUser.objects.get(pk=request.user.id, is_active=True),
-            #     person=RegPerson.objects.get(id=request.user.id),
-            #     house_hold=house_hold,
-            # ).save()
+            ovc_preventive_event.save()
             form = form.cleaned_data
             OVCPrevSinovyoCaregiverEvaluation(
-                # event_id=ovc_preventive_events,
-                person_id=RegPerson.objects.get(id=request.user.id),
-                ref_caregiver_id=care_giver.id,
+                event_id=ovc_preventive_event.event,
+                person_id=user_id,
+                ref_caregiver_id=care_giver_id,
+                date_of_assessment=request.POST.get('date_of_assessment'),
+                type_of_assessment=request.POST.get('type_of_assessment'),
                 bd_age=care_giver.age,
                 bd_sex=care_giver.sex_id,
                 bd_read=request.POST.get('bd_read'),
@@ -10135,40 +10126,27 @@ def ovc_preventive_pre_post_program_assessment_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'),
-
             ).save()
             messages.success(request, 'Form saved succesfully!')
         else:
             messages.error(request, 'Error saving form!')
-        return redirect('progress-assessment/<int:id>/')
-    else:
-        form = OVCPreventivePrePostProgramAssessmentForm()
-        instance = OVCPrevSinovyoCaregiverEvaluation.objects.all() # request.user.id
-        pdb.set_trace()
+        return redirect('progress-assessment/(?P<id>\d+)/')
+    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')
 
-        return render(request=request, template_name='forms/caregiver_progress_assessment.html',
+    return render(request=request, template_name='forms/caregiver_progress_assessment.html',
                       context={'form': form, 'child': child, 'care_giver': care_giver,
-                            'care_giver_gender': care_giver_gender, "instance": instance}) # 'temporary_data':# temporary_data })
+                     'care_giver_gender': care_giver_gender, 'objects': evaluation})
+
 
 def ovc_preventive_pre_post_program_assessment_edit_view(request, id):
-    child = RegPerson.objects.get(id=id)
-    care_giver = RegPerson.objects.get(id=OVCRegistration.objects.get(person=child).caretaker_id)
-    object = OVCPrevSinovyoCaregiverEvaluation.objects.get(ref_caregiver_id=care_giver.id)
-    care_giver = RegPerson.objects.get(id=OVCRegistration.objects.get(person=child).caretaker_id)
-    care_giver_gender = care_giver.sex_id
-    if care_giver_gender == 'SMAL':
-        care_giver_gender = 'Male'
-    else:
-        care_giver_gender = 'Female'
+    object = OVCPrevSinovyoCaregiverEvaluation.objects.get(evaluation_id=id)
     if request.method == 'POST':
         form = OVCPreventivePrePostProgramAssessmentForm(request.POST)
         #pdb.set_trace()
-        OVCPrevSinovyoCaregiverEvaluation.objects.filter(ref_caregiver_id=care_giver.id).update(
+        OVCPrevSinovyoCaregiverEvaluation.objects.filter(evaluation_id=id).update(
             # event_id=ovc_preventive_events,
-            person_id=RegPerson.objects.get(id=id),
-            ref_caregiver_id=care_giver.id,
-            bd_age=care_giver.age,
-            bd_sex=care_giver.sex_id,
             bd_read=request.POST.get('bd_read'),
             bd_education_level=request.POST.get('bd_education_level'),
             bd_biological_children=request.POST.get('bd_biological_children'),
@@ -10212,10 +10190,10 @@ def ovc_preventive_pre_post_program_assessment_edit_view(request, id):
             fi_worried_money=request.POST.get('fi_worried_money') )
 
     data = {
-        # 'person_id': object.person_id,
-        # object.ref_caregiver_id,   
-        # 'bd_age': object.bd_age,
-        # 'bd_sex': object.bd_sex,    
+        'person_id': object.person_id,
+        'ref_caregiver_id': object.ref_caregiver_id,   
+        'bd_age': object.bd_age,
+        'bd_sex': object.bd_sex,    
         'bd_read': object.bd_read,     
         'bd_education_level': object.bd_education_level,    
         'bd_biological_children': object.bd_biological_children,      
@@ -10258,26 +10236,16 @@ def ovc_preventive_pre_post_program_assessment_edit_view(request, id):
         'fi_money_important_items': object.fi_money_important_items, 
         'fi_worried_money': object.fi_worried_money,
     }
-
     form = OVCPreventivePrePostProgramAssessmentForm(data=data)
     edit = True
-    return render(request, template_name='forms/caregiver_progress_assessment.html', 
-    context={'form': form, 'edit_form':edit,'care_giver': care_giver, 'status': 200 })
+    return render(request, template_name='forms/delete_caregiver_progress_assessment.html', 
+    context={'form': form, 'edit_form':edit, 'status': 200 })
 
 
 
 def ovc_preventive_pre_post_program_assessment_delete_view(request, id):
-    child = RegPerson.objects.get(id=id)
+    delete_instance = OVCPrevSinovyoCaregiverEvaluation.objects.filter(evaluation_id=id)
+    delete_instance.delete()
+    delete_instance = True
     messages.success(request, 'Delete was Successfully!')
-    form = OVCPreventivePrePostProgramAssessmentForm()
-    care_giver = RegPerson.objects.get(id=OVCRegistration.objects.get(person=child).caretaker_id)
-    OVCPrevSinovyoCaregiverEvaluation.objects.filter(ref_caregiver_id=care_giver.id).delete()
-    house_hold = OVCHouseHold.objects.get(id=OVCHHMembers.objects.get(person=child).house_hold_id)
-    messages.success(request, 'Delete was Successfully!')
-    return render(request=request, template_name='forms/caregiver_progress_assessment.html', context={
-        'child': child,
-        'form': form,
-        'care_giver': care_giver,
-    })
-
-
+    return render(request, template_name='forms/delete_caregiver_progress_assessment.html', context={'delete_instance': delete_instance})

templates/forms/caregiver_progress_assessment.html

@@ -56,14 +56,9 @@
 <h1 class="page-header">Forms
     <small>OVC Care Giver Preventive Pre and Post Program Assessment Form 
         {% if edit_form %}
-        <b>{{care_giver.first_name}} {{care_giver.surname}} | {{ form.bd_sex }} | {{ form.bd_age}} YRS
+        <b>{{care_giver.first_name}} {{care_giver.surname}} | {{ care_giver_gender }} | {{ care_giver.age}} YRS
         </b></small></h1>
         {%else%}
-        <b>{{ child.first_name }} {{ child.surname }} | {% if child.date_of_birth|gen_age == 0 %}
-                            UNDER 1 YEAR
-                        {% else %}
-                            {{ child.date_of_birth|gen_age }} YRS
-                        {% endif %}</b></small></h1>
         {%endif%}
     </b></small>
 </h1>
@@ -94,11 +89,10 @@ <h1 class="page-header">Forms
                             class="fa fa-minus"></i></a>
                     <a href="#" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-collapse"><i
                             class="fa fa-times"></i></a>
+                    <br>
                 </div>
-                <h4 class="panel-title"> OVC Preventive Pre and Post Program Assessment Form </h4>
             </div>
             {% if edit_form %}
-
             <p></p>
             {% else %}
 
@@ -107,15 +101,15 @@ <h4 class="panel-title"> OVC Preventive Pre and Post Program Assessment Form </h
                             <div id="case-events"  class="table-responsive">
                                 <table id="" class="table table-striped ">
                                     <div class="" >
-                                        <h3 class="" style="color: dimgrey;"><b>  </b></h3>
+                                        <h3 class="" ><b>  </b></h3>
                                     </div>
                                     <thead>
 
                                     </thead>
                                                 <tbody>
                                                     <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 style="padding-left: 45px;"><strong>Care giver name:</strong> {{care_giver.first_name}} {{care_giver.surname}}</p>
+                                                            <P style="padding-left: 45px;"><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>
 
@@ -130,7 +124,7 @@ <h3 class="" style="color: dimgrey;"><b>  </b></h3>
             {% endif %}
 
             <div class="panel-form">
-                <form class="form-horizontal form-bordered" action="." method="POST" data-parsley-validate="true"
+                <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">
@@ -141,7 +135,7 @@ <h3 class="" style="color: dimgrey;"><b>  </b></h3>
                         <table class="table table-responsive">
                                 <td class="">
                                     <td><strong>Type of assessment: </strong><br><br>
-                                    {{ form.TYPE_ASSESSMENT }}</td>
+                                    {{ form.type_of_assessment }}</td>
 
                         <td><strong>Date of assessment: </strong><br><br>
                             {{ form.date_of_assessment }}</td>
@@ -605,37 +599,41 @@ <h3 class="" style="color: dimgrey;"><b>7. FINANCES </b></h3>
     </div>
 
     <!-- List of fomrs start -->
-<div class="card-block table-border-style">
-            <div class="table-responsive">
-                   <table class="table table-success table-striped" border="1" id="past-hst">
-                            <thead>
-                                <tr>
-                                    <th colspan="3">Type of Assessment</th>
-                                    <th colspan="5">Name of Caregiver</th>
-                                    <th colspan="12">Date of assessment</th>
-                                    <th colspan="6">Action</th>
-                                </tr>
-                            </thead>
-                    {% if object %}
-
-                    {% for data in object %}
-
-                        <tr>
+
+                    <div class="card-block table-border-style">
+                        <div class="table-responsive">
+                                <table class="table table-success table-bordered" border="1" id="past-hst">
+                                        <thead>
+                                        <tbody>
+                                            <tr>
+                                                <th>Type of Assessment</th>
+                                                <th >Name of Caregiver</th>
+                                                <th>Date of assessment</th>
+                                                <th colspan="6">Action</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                        {% if objects %}
 
-                            <td>{{data.date_of_assessment}}</td>
-                            <td><a href="{% url 'edit_fmppostevaluation' data.assessment_id%}"><button type="button" class="btn btn-sm btn-primary m-r-5"><i class="fa fa-pencil"></i>&nbsp;Edit</button></a>
-                            <a href="{% url 'delete_evaluation' data.assessment_id%}"><button type="button" class="btn btn-sm btn-danger m-r-5"><i class="fa fa-trash"></i>&nbsp;Delete</button></a></td>
-                        </tr>
-                    {% endfor %}
-                    {% else %}
+                                        {%for data in objects%}
+                                            <tr>
+                                                <td>{{data.date_of_assessment}}</td>
+                                                <td>{{data.ref_caregiver.first_name}} {{data.ref_caregiver.surname}}</td>
+                                                <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>
+                                                <a href="{% url 'progress-assessment-delete' data.evaluation_id%}"><button type="button" class="btn btn-sm btn-danger m-r-5"><i class="fa fa-trash"></i>&nbsp;Delete</button></a></td>
+                                            </tr>
+                                            {%endfor%}
+                                        </body>
+                                    </table>
+                                </div>
+                            </div>
+                        {% else %}
                     <div>
                         <h3>No data available</h3>
                     </div>
                     {% endif %}
-                </table>
-            </div>
-            </div>
-        </div>
+
     <!-- list of forms end -->
 
             </div>
@@ -725,17 +723,5 @@ <h3>No data available</h3>
         } );
 </script>
 
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-<script>
-$(document).ready(function(){
-  $("#RSA_1").click(function(){
-    $("#RSA_2").toggle();
-  });
-    $("#RSB_1").click(function(){
-      $("#RSB_2").toggle();
-    });
-});
-</script>
-
 
 {% endblock %}