From 5b4580fc1c62ab53df8fe653432b928274dfecea Mon Sep 17 00:00:00 2001
From: Reena  Aheer <ranireena68@gmail.com>
Date: Thu, 9 Feb 2023 10:15:45 +0100
Subject: [PATCH] add filed Include_app_name

---
 apimanager/metrics/forms.py                   | 41 +++++++++----------
 .../templates/metrics/monthly_summary.html    |  6 +--
 .../templates/metrics/yearly_summary.html     |  6 +--
 3 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/apimanager/metrics/forms.py b/apimanager/metrics/forms.py
index 916ac52..fd680c2 100644
--- a/apimanager/metrics/forms.py
+++ b/apimanager/metrics/forms.py
@@ -212,18 +212,16 @@ class CustomSummaryForm(forms.Form):
         required=True,
         initial=(datetime.now() - timedelta(6)).strftime(API_MANAGER_DATE_FORMAT),
     )
-    #exclude_app_names = forms.CharField(
-    #    label=_('Exclude App Names'),
-    #    widget=forms.TextInput(
-    #        attrs={
-    #            'class': FORM_CONTROL,
-    #        }
-    #    ),
-    #    required=False,
-    #    initial='API-Manager',
-    #)
-    #include_obp_apps = forms.BooleanField(required=False, label=_('Include System Data'))
-    include_obp_apps = forms.BooleanField(required=False)
+    include_app_names = forms.CharField(
+        label=_('Include App Names'),
+        widget=forms.TextInput(
+            attrs={
+                'class': FORM_CONTROL,
+            }
+        ),
+        required=False,
+    )
+
 
     def __init__(self, *args, **kwargs):
         kwargs.setdefault('label_suffix', '')
@@ -237,16 +235,15 @@ class MonthlyMetricsSummaryForm(forms.Form):
         #initial=str(datetime.now().strftime('%Y-%m-%dT%H:%M:%S.%fZ')),
         initial=str(datetime.now().strftime(API_MANAGER_DATE_FORMAT)),
     )
-    #exclude_app_names = forms.CharField(
-    #    label=_('Exclude App Names'),
-    #    widget=forms.TextInput(
-    #        attrs={
-    #            'class': FORM_CONTROL,
-    #        }
-    #    ),
-    #    required=False,
-    #    initial='API-Manager',
-    #)
+    include_app_names = forms.CharField(
+        label=_('Include App Names'),
+        widget=forms.TextInput(
+            attrs={
+                'class': FORM_CONTROL,
+            }
+        ),
+        required=False,
+    )
 
     def __init__(self, *args, **kwargs):
         kwargs.setdefault('label_suffix', '')
diff --git a/apimanager/metrics/templates/metrics/monthly_summary.html b/apimanager/metrics/templates/metrics/monthly_summary.html
index c0cee4f..5cc4082 100644
--- a/apimanager/metrics/templates/metrics/monthly_summary.html
+++ b/apimanager/metrics/templates/metrics/monthly_summary.html
@@ -45,10 +45,10 @@
 					</div>
 				</div>
 				<div class="col-xs-4 col-sm-3">
-					{% if form.exclude_app_names.errors %}<div class="alert alert-danger">{{ form.exclude_app_names.errors }}</div>{% endif %}
+					{% if form.include_app_names.errors %}<div class="alert alert-danger">{{ form.include_app_names.errors }}</div>{% endif %}
 					<div class="form-group">
-						{{ form.exclude_app_names.label_tag }}
-						{{ form.exclude_app_names }}
+						{{ form.include_app_names.label_tag }}
+						{{ form.include_app_names }}
 					</div>
 				</div>
 			</div>
diff --git a/apimanager/metrics/templates/metrics/yearly_summary.html b/apimanager/metrics/templates/metrics/yearly_summary.html
index 505c8dd..28ce3eb 100644
--- a/apimanager/metrics/templates/metrics/yearly_summary.html
+++ b/apimanager/metrics/templates/metrics/yearly_summary.html
@@ -51,10 +51,10 @@
 					</div>
 				</div>
 				<div class="col-xs-4 col-sm-3">
-					{% if form.exclude_app_names.errors %}<div class="alert alert-danger">{{ form.exclude_app_names.errors }}</div>{% endif %}
+					{% if form.include_app_names.errors %}<div class="alert alert-danger">{{ form.include_app_names.errors }}</div>{% endif %}
 					<div class="form-group">
-						{{ form.exclude_app_names.label_tag }}
-						{{ form.exclude_app_names }}
+						{{ form.include_app_names.label_tag }}
+						{{ form.include_app_names }}
 					</div>
 				</div>
 			</div>