From ee0453e9449325982ef59f1bdc2f852c7321fd59 Mon Sep 17 00:00:00 2001
From: Reena  Aheer <ranireena68@gmail.com>
Date: Mon, 6 Feb 2023 12:33:27 +0100
Subject: [PATCH 1/2] Refactor/ Remove include_system_data checkbox

---
 apimanager/metrics/forms.py                      |  6 ++++--
 .../static/metrics/js/include_system_calls.js    | 13 -------------
 .../templates/metrics/custom_summary.html        | 12 +-----------
 .../metrics/templates/metrics/daily_summary.html | 10 ----------
 .../templates/metrics/hourly_summary.html        | 10 ----------
 .../templates/metrics/monthly_summary.html       | 10 ----------
 .../templates/metrics/quarterly_summary.html     | 10 ----------
 .../templates/metrics/weekly_summary.html        | 10 ----------
 .../templates/metrics/yearly_summary.html        | 16 ++--------------
 9 files changed, 7 insertions(+), 90 deletions(-)

diff --git a/apimanager/metrics/forms.py b/apimanager/metrics/forms.py
index f940852..2edef8a 100644
--- a/apimanager/metrics/forms.py
+++ b/apimanager/metrics/forms.py
@@ -222,7 +222,8 @@ class CustomSummaryForm(forms.Form):
         required=False,
         initial='API-Manager',
     )
-    include_obp_apps = forms.BooleanField(required=False, label=_('Include System Data'))
+    #include_obp_apps = forms.BooleanField(required=False, label=_('Include System Data'))
+    include_obp_apps = forms.BooleanField(required=False)
 
     def __init__(self, *args, **kwargs):
         kwargs.setdefault('label_suffix', '')
@@ -246,7 +247,8 @@ class MonthlyMetricsSummaryForm(forms.Form):
         required=False,
         initial='API-Manager',
     )
-    include_obp_apps = forms.BooleanField(required=False, label=_('Include System Data'))
+    #include_obp_apps = forms.BooleanField(required=False, label=_('Include System Data'))
+    include_obp_apps = forms.BooleanField(required=False)
 
     def __init__(self, *args, **kwargs):
         kwargs.setdefault('label_suffix', '')
diff --git a/apimanager/metrics/static/metrics/js/include_system_calls.js b/apimanager/metrics/static/metrics/js/include_system_calls.js
index fd81a16..e69de29 100644
--- a/apimanager/metrics/static/metrics/js/include_system_calls.js
+++ b/apimanager/metrics/static/metrics/js/include_system_calls.js
@@ -1,13 +0,0 @@
-document.getElementsByClassName("include_system_calls")[0].innerHTML=`<div>
-      <input type="checkbox" id="include_system_calls_id" name="Include System Calls">
-      <label for="systemCalls">Include System Calls</label>
-    </div>`
-
-    function systemCalls(){
-    let checkbox = document.getElementById('include_system_calls_id');
-    if (checkbox.checked == false) {
-	   document.getElementById("obp_app_table").style.display = "none";
-    }else{
-	    document.getElementById("obp_app_table").style.display = "";
-    }
-}
\ No newline at end of file
diff --git a/apimanager/metrics/templates/metrics/custom_summary.html b/apimanager/metrics/templates/metrics/custom_summary.html
index 83a9283..fc18666 100644
--- a/apimanager/metrics/templates/metrics/custom_summary.html
+++ b/apimanager/metrics/templates/metrics/custom_summary.html
@@ -56,18 +56,11 @@
 						{{ form.exclude_app_names }}
 					</div>
 				</div>
-				<div class="col-xs-4 col-sm-3">
-					<div class="form-group include_system_calls">
-						{{ form.include_obp_apps }}
-						{{ form.include_obp_apps.label_tag }}
-					</div>
-				</div>
 			</div>
-			<button type="submit" class="btn btn-primary" onclick="systemCalls()">{% trans "Update Filter" %}</button>
+			<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
 		</form>
 	</div>
     	<div class="tab-content">
-			{% if form.include_obp_apps.value %}
     		{% block tab_content %}
     		<div class="tab-pane active">
     			<h2>{% trans "Period" %}: {% trans "From: " %}{{ from_date }} {% trans "To: " %}{{ to_date }} </h2>
@@ -145,9 +138,6 @@
 		</table>
     		</div>
     		{% endblock tab_content %}
-			{% else %}
-			<h2>{% trans "Period: " %} : {% trans "From: " %} {{ from_date }} {% trans "To: " %} {{ to_date }}</h2>
-			{% endif %}
     	</div>
     </div>
 
diff --git a/apimanager/metrics/templates/metrics/daily_summary.html b/apimanager/metrics/templates/metrics/daily_summary.html
index 237f3c7..861adce 100644
--- a/apimanager/metrics/templates/metrics/daily_summary.html
+++ b/apimanager/metrics/templates/metrics/daily_summary.html
@@ -56,12 +56,6 @@
 						{{ form.exclude_app_names }}
 					</div>
 				</div>
-				<div class="col-xs-4 col-sm-3">
-					<div class="form-group include_system_calls">
-						{{ form.include_obp_apps }}
-						{{ form.include_obp_apps.label_tag }}
-					</div>
-				</div>
 			</div>
 			<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
 		</form>
@@ -69,7 +63,6 @@
 	</div>
 
     	<div class="tab-content">
-			{% if form.include_obp_apps.value %}
     		{% block tab_content %}
     		<div class="tab-pane active">
     			<h2>{% trans "Period" %} : {% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
@@ -148,9 +141,6 @@
 		</table>
     		</div>
     		{% endblock tab_content %}
-			{% else %}
-			<h2>{% trans "Period" %} : {% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
-			{% endif %}
     	</div>
     </div>
 
diff --git a/apimanager/metrics/templates/metrics/hourly_summary.html b/apimanager/metrics/templates/metrics/hourly_summary.html
index 9d72f3b..703fb2e 100644
--- a/apimanager/metrics/templates/metrics/hourly_summary.html
+++ b/apimanager/metrics/templates/metrics/hourly_summary.html
@@ -55,12 +55,6 @@
 						{{ form.exclude_app_names }}
 					</div>
 				</div>
-				<div class="col-xs-4 col-sm-3">
-					<div class="form-group include_system_calls">
-						{{ form.include_obp_apps }}
-						{{ form.include_obp_apps.label_tag }}
-					</div>
-				</div>
 			</div>
 			<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
 		</form>
@@ -68,7 +62,6 @@
 	</div>
 
     	<div class="tab-content">
-			{% if form.include_obp_apps.value %}
     		{% block tab_content %}
     		<div class="tab-pane active">
     			<h2>{% trans "Period" %}: {% trans "From" %}{{ from_date }} {% trans "to" %} {{ to_date }}</h2>
@@ -147,9 +140,6 @@
 		</table>
     		</div>
     		{% endblock tab_content %}
-			{% else %}
-			<h2>{% trans "Period" %} : {% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
-			{% endif %}
     	</div>
     </div>
 
diff --git a/apimanager/metrics/templates/metrics/monthly_summary.html b/apimanager/metrics/templates/metrics/monthly_summary.html
index 5a293fc..4d696a5 100644
--- a/apimanager/metrics/templates/metrics/monthly_summary.html
+++ b/apimanager/metrics/templates/metrics/monthly_summary.html
@@ -51,12 +51,6 @@
 						{{ form.exclude_app_names }}
 					</div>
 				</div>
-				<div class="col-xs-4 col-sm-3">
-					<div class="form-group include_system_calls">
-						{{ form.include_obp_apps }}
-						{{ form.include_obp_apps.label_tag }}
-					</div>
-				</div>
 			</div>
 			<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
 		</form>
@@ -64,7 +58,6 @@
 	</div>
 
     	<div class="tab-content">
-			{% if form.include_obp_apps.value %}
     		{% block tab_content %}
     		<div class="tab-pane active">
     			<h2>{% trans "Period" %}: {% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
@@ -142,9 +135,6 @@
 		</table>
     		</div>
     		{% endblock tab_content %}
-			{% else %}
-			<h2>{% trans "Period" %} : {% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
-			{% endif %}
     	</div>
     </div>
 
diff --git a/apimanager/metrics/templates/metrics/quarterly_summary.html b/apimanager/metrics/templates/metrics/quarterly_summary.html
index 5adfb75..932378a 100644
--- a/apimanager/metrics/templates/metrics/quarterly_summary.html
+++ b/apimanager/metrics/templates/metrics/quarterly_summary.html
@@ -55,12 +55,6 @@
 						{{ form.exclude_app_names }}
 					</div>
 				</div>
-				<div class="col-xs-4 col-sm-3">
-					<div class="form-group include_system_calls">
-						{{ form.include_obp_apps }}
-						{{ form.include_obp_apps.label_tag }}
-					</div>
-				</div>
 			</div>
 			<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
 		</form>
@@ -68,7 +62,6 @@
 	</div>
 
     	<div class="tab-content">
-			{% if form.include_obp_apps.value %}
     		{% block tab_content %}
     		<div class="tab-pane active">
     			<h2>{% trans "Period" %}:{% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
@@ -151,9 +144,6 @@
 		</table>
     		</div>
     		{% endblock tab_content %}
-			{% else %}
-			<h2>{% trans "Period" %} : {% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
-			{% endif %}
     	</div>
     </div>
 
diff --git a/apimanager/metrics/templates/metrics/weekly_summary.html b/apimanager/metrics/templates/metrics/weekly_summary.html
index 9029bb5..91d4c45 100644
--- a/apimanager/metrics/templates/metrics/weekly_summary.html
+++ b/apimanager/metrics/templates/metrics/weekly_summary.html
@@ -57,18 +57,11 @@
 						{{ form.exclude_app_names }}
 					</div>
 				</div>
-				<div class="col-xs-4 col-sm-3">
-					<div class="form-group include_system_calls">
-						{{ form.include_obp_apps }}
-						{{ form.include_obp_apps.label_tag }}
-					</div>
-				</div>
 			</div>
 			<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
 		</form>
 	</div>
     	<div class="tab-content">
-			{% if form.include_obp_apps.value %}
     		{% block tab_content %}
     		<div class="tab-pane active">
     			<h2>{% trans "Period" %} : {% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
@@ -147,9 +140,6 @@
 		</table>
     		</div>
     		{% endblock tab_content %}
-			{% else %}
-			<h2>{% trans "Period" %} : {% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
-			{% endif %}
     	</div>
     </div>
 
diff --git a/apimanager/metrics/templates/metrics/yearly_summary.html b/apimanager/metrics/templates/metrics/yearly_summary.html
index 99f531b..d6a2735 100644
--- a/apimanager/metrics/templates/metrics/yearly_summary.html
+++ b/apimanager/metrics/templates/metrics/yearly_summary.html
@@ -57,24 +57,15 @@
 						{{ form.exclude_app_names }}
 					</div>
 				</div>
-				<div class="col-xs-4 col-sm-3">
-					<div class="form-group include_system_calls">
-						{{ form.include_obp_apps }}
-						{{ form.include_obp_apps.label_tag }}
-					</div>
-				</div>
 			</div>
-			<button type="submit" class="btn btn-primary" onclick="systemCalls()">{% trans "Update Filter" %}</button>
+			<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
 		</form>
 	</div>
     	<div class="tab-content">
-			{% if form.include_obp_apps.value %}
     		{% block tab_content %}
-
     		<div class="tab-pane active">
     			<h2>{% trans "Period" %} : {% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
-		<table border="1" id="obp_app_table">
-
+		<table border="1">
             <tr>
                 <th></th>
                 <th></th>
@@ -149,9 +140,6 @@
 		</table>
     		</div>
     		{% endblock tab_content %}
-			{% else %}
-			<h2>{% trans "Period" %} : {% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
-			{% endif %}
     	</div>
     </div>
 </div>

From 8e25bd77406f06cd84aa8026b070a4b858a49d77 Mon Sep 17 00:00:00 2001
From: Reena  Aheer <ranireena68@gmail.com>
Date: Mon, 6 Feb 2023 12:43:30 +0100
Subject: [PATCH 2/2] Refactor/ Remove include_system_data checkbox

---
 apimanager/metrics/templates/metrics/daily_summary.html     | 2 +-
 apimanager/metrics/templates/metrics/hourly_summary.html    | 2 +-
 apimanager/metrics/templates/metrics/monthly_summary.html   | 2 +-
 apimanager/metrics/templates/metrics/quarterly_summary.html | 2 +-
 apimanager/metrics/templates/metrics/weekly_summary.html    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apimanager/metrics/templates/metrics/daily_summary.html b/apimanager/metrics/templates/metrics/daily_summary.html
index 861adce..4145f7a 100644
--- a/apimanager/metrics/templates/metrics/daily_summary.html
+++ b/apimanager/metrics/templates/metrics/daily_summary.html
@@ -67,7 +67,7 @@
     		<div class="tab-pane active">
     			<h2>{% trans "Period" %} : {% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
 
-		<table border="1" id="obp_app_table">
+		<table border="1">
             <tr>
                 <th></th>
                 <th></th>
diff --git a/apimanager/metrics/templates/metrics/hourly_summary.html b/apimanager/metrics/templates/metrics/hourly_summary.html
index 703fb2e..f48abe8 100644
--- a/apimanager/metrics/templates/metrics/hourly_summary.html
+++ b/apimanager/metrics/templates/metrics/hourly_summary.html
@@ -66,7 +66,7 @@
     		<div class="tab-pane active">
     			<h2>{% trans "Period" %}: {% trans "From" %}{{ from_date }} {% trans "to" %} {{ to_date }}</h2>
 
-		<table border="1" id="obp_app_table" summary="Table about call APIs in every hours">
+		<table border="1" summary="Table about call APIs in every hours">
             <tr>
                 <th></th>
                 <th></th>
diff --git a/apimanager/metrics/templates/metrics/monthly_summary.html b/apimanager/metrics/templates/metrics/monthly_summary.html
index 4d696a5..5a095ac 100644
--- a/apimanager/metrics/templates/metrics/monthly_summary.html
+++ b/apimanager/metrics/templates/metrics/monthly_summary.html
@@ -62,7 +62,7 @@
     		<div class="tab-pane active">
     			<h2>{% trans "Period" %}: {% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
 
-		<table border="1" id="obp_app_table">
+		<table border="1">
             <tr>
                 <th></th>
                 <th></th>
diff --git a/apimanager/metrics/templates/metrics/quarterly_summary.html b/apimanager/metrics/templates/metrics/quarterly_summary.html
index 932378a..e9d121d 100644
--- a/apimanager/metrics/templates/metrics/quarterly_summary.html
+++ b/apimanager/metrics/templates/metrics/quarterly_summary.html
@@ -66,7 +66,7 @@
     		<div class="tab-pane active">
     			<h2>{% trans "Period" %}:{% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
 
-		<table border="1" id="obp_app_table">
+		<table border="1">
             <tr>
                 <th></th>
                 <th></th>
diff --git a/apimanager/metrics/templates/metrics/weekly_summary.html b/apimanager/metrics/templates/metrics/weekly_summary.html
index 91d4c45..7d0c39b 100644
--- a/apimanager/metrics/templates/metrics/weekly_summary.html
+++ b/apimanager/metrics/templates/metrics/weekly_summary.html
@@ -66,7 +66,7 @@
     		<div class="tab-pane active">
     			<h2>{% trans "Period" %} : {% trans "From" %} {{ from_date }} {% trans "to" %} {{ to_date }}</h2>
 
-		<table border="1" id="obp_app_table">
+		<table border="1">
             <tr>
                 <th></th>
                 <th></th>