From 9c71d6ff3b4dd817acccf7b754de13249aa5426c Mon Sep 17 00:00:00 2001 From: Isaac Kimaiyo <40719885+Kimaiyo077@users.noreply.github.com> Date: Tue, 28 Apr 2020 12:16:06 +0300 Subject: [PATCH] add delete functionality for indicators (#498) --- indicators/urls.py | 4 +- indicators/views.py | 7 ++ static/vue.js/collected_data_table.js | 1 - static/vue.js/indicators/target_period.js | 5 -- .../indicators/indicator_confirm_delete.html | 74 ++++++++++++++++--- templates/indicators/indicator_list.html | 11 ++- 6 files changed, 83 insertions(+), 19 deletions(-) diff --git a/indicators/urls.py b/indicators/urls.py index f95f0b22..c342a7aa 100755 --- a/indicators/urls.py +++ b/indicators/urls.py @@ -7,7 +7,7 @@ IndicatorUpdate, IndicatorDelete, PeriodicTargetDeleteView, PeriodicTargetView, CollectedDataReportData, CollectedDataCreate, CollectedDataDelete, CollectedDataList, CollectedDataUpdate, CollectedDataAdd, CollectedDataEdit, - CollectedDataDeleteVue, collecteddata_import, indicator_report, + CollectedDataDeleteVue, collecteddata_import, indicator_report, indicator_delete, TVAReport, TVAPrint, DisaggregationReport, DisaggregationPrint, IndicatorReport, program_indicator_report, indicator_data_report, IndicatorExport, service_json, collected_data_json, program_indicators_json, IndicatorReportData, IndicatorDataExport, ObjectiveView, objectives_list, objectives_tree, @@ -33,7 +33,7 @@ path('indicator_update//', IndicatorUpdate.as_view(), name='indicator_update'), path('indicator_delete//', - IndicatorDelete.as_view(), name='indicator_delete'), + indicator_delete, name='indicator_delete'), path('periodic_target_delete//', PeriodicTargetDeleteView.as_view(), name='pt_delete'), diff --git a/indicators/views.py b/indicators/views.py index d75670de..080a01c3 100755 --- a/indicators/views.py +++ b/indicators/views.py @@ -674,6 +674,13 @@ def form_valid(self, form): form_class = IndicatorForm +def indicator_delete(request, pk): + indicator = Indicator.objects.get(pk=int(pk)) + indicator.delete() + + return redirect('/indicators/home/0/0/0/') + + class PeriodicTargetDeleteView(DeleteView): model = PeriodicTarget diff --git a/static/vue.js/collected_data_table.js b/static/vue.js/collected_data_table.js index 745c9873..fc11b10b 100644 --- a/static/vue.js/collected_data_table.js +++ b/static/vue.js/collected_data_table.js @@ -81,7 +81,6 @@ $(document).ready(() => { this.documentation = '' this.disaggregations = {} this.show_disaggregations = false - console.log(this.collectedData) if(this.showModal) { let self = this; diff --git a/static/vue.js/indicators/target_period.js b/static/vue.js/indicators/target_period.js index 96f789be..8ff26a56 100644 --- a/static/vue.js/indicators/target_period.js +++ b/static/vue.js/indicators/target_period.js @@ -42,7 +42,6 @@ new Vue({ this.makeRequest('GET', '/indicators/indicator_data') .then(response => { - console.log(response) if(response.data){ this.level_1_label = response.data.level_1_label this.frequencies = [{"id": "1", "text":`Life of ${this.level_1_label}`}, @@ -319,9 +318,7 @@ new Vue({ this.modalHeader = "Add Target Periods" this.target_period_data.forEach(target =>{ - console.log(target) if(target.indicator.id == this.indicator_id){ - console.log("gere") this.isEdit = true this.overall_target = target.indicator.lop_target this.sum = target.indicator.lop_target @@ -410,7 +407,6 @@ new Vue({ const id = this.indicator_id this.targets = this.targets.map(function (obj) { - console.log(obj) obj['indicator_id'] = obj['id']; obj['start_date'] = moment(obj['start_date']).format("YYYY-MM-DD") obj['end_date'] = moment(obj['end_date']).format("YYYY-MM-DD") @@ -426,7 +422,6 @@ new Vue({ periodic_targets: this.targets } - console.log(data) try { const response = await this.makeRequest( 'POST', diff --git a/templates/indicators/indicator_confirm_delete.html b/templates/indicators/indicator_confirm_delete.html index 65307716..949e1fe8 100755 --- a/templates/indicators/indicator_confirm_delete.html +++ b/templates/indicators/indicator_confirm_delete.html @@ -1,12 +1,68 @@ -{% extends "base.html" %} -{% block page_title %}Indicator Confirm Delete{% endblock %} + -{% block content %} + diff --git a/templates/indicators/indicator_list.html b/templates/indicators/indicator_list.html index 82fff0a5..fbcd4094 100755 --- a/templates/indicators/indicator_list.html +++ b/templates/indicators/indicator_list.html @@ -98,7 +98,7 @@

Toggle Dropdown -