From 10403e280cced7e5f08bef1ee717587506aa9a90 Mon Sep 17 00:00:00 2001
From: gamonoid <contact@gamonoid.com>
Date: Sun, 8 Oct 2017 16:52:10 +0200
Subject: [PATCH] Add export tab to admin reports

---
 admin/reports/index.php | 26 ++++++++++++++++++--------
 admin/reports/lib.js    | 14 +++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/admin/reports/index.php b/admin/reports/index.php
index d93847be..22ef8233 100644
--- a/admin/reports/index.php
+++ b/admin/reports/index.php
@@ -1,38 +1,48 @@
-<?php 
+<?php
 
 $moduleName = 'Reports';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
 ?><div class="span9">
-			  
+
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
 		<li class="active"><a id="tabReport" href="#tabPageReport"><?=t('Reports')?></a></li>
+		<li class=""><a id="tabExports" href="#tabPageExports"><?=t('Exports')?></a></li>
 	</ul>
-	 
+
 	<div class="tab-content">
 		<div class="tab-pane active" id="tabPageReport">
 			<div id="Report" class="reviewBlock" data-content="List" style="padding-left:5px;">
-		
+
 			</div>
 			<div id="ReportForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
-		
+
 			</div>
 		</div>
+		<div class="tab-pane" id="tabPageExports">
+			<div id="Exports" class="reviewBlock" data-content="List" style="padding-left:5px;">
 
+			</div>
+			<div id="ExportsForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
+		</div>
 	</div>
 
 </div>
 <script>
 var modJsList = new Array();
 
-modJsList['tabReport'] = new ReportAdapter('Report','Report','','report_group');
+modJsList['tabReport'] = new ReportAdapter('Report','Report','{"type":"Reports"}','report_group');
 modJsList['tabReport'].setShowAddNew(false);
 modJsList['tabReport'].setRemoteTable(true);
 
-
+modJsList['tabExports'] = new ReportAdapter('Report','Exports','{"type":"Exports"}','report_group');
+modJsList['tabExports'].setShowAddNew(false);
+modJsList['tabExports'].setRemoteTable(true);
 
 var modJs = modJsList['tabReport'];
 
 </script>
-<?php include APP_BASE_PATH.'footer.php';?>      
+<?php include APP_BASE_PATH.'footer.php';?>
diff --git a/admin/reports/lib.js b/admin/reports/lib.js
index 989e8716..ccfdceac 100644
--- a/admin/reports/lib.js
+++ b/admin/reports/lib.js
@@ -78,17 +78,17 @@ ReportAdapter.method('processFormFieldsWithObject', function(object) {
 					that.remoteFieldsExists = true;
 				}
 			});
-			
+
 		}
 	}
-	
+
 	var tempArray = [];
 	that._formFileds.forEach(function(entry) {
 		if(jQuery.inArray(entry[0], fieldsToDelete) < 0){
 			tempArray.push(entry);
 		}
 	});
-	
+
 	that._formFileds = tempArray;
 });
 
@@ -107,7 +107,7 @@ ReportAdapter.method('renderForm', function(object) {
 	}
 
 	this.currentReport = object;
-	
+
 });
 
 ReportAdapter.method('renderFormNew', function(object) {
@@ -284,8 +284,8 @@ ReportAdapter.method('addSuccessCallBack', function(callBackData,serverData) {
 		link = '<a href="'+modJs.getCustomActionUrl("download",{'file':fileName})+'" target="_blank" style="font-size:14px;font-weight:bold;">Download Report <img src="_BASE_images/download.png"></img> </a>';
 	}
 	link = link.replace(/_BASE_/g,this.baseUrl);
-	
-	if(this.currentReport.output == "PDF"){
+
+	if(this.currentReport.output == "PDF" || this.currentReport.output == "JSON"){
 
 		this.showMessage("Download Report",link);
 
@@ -352,7 +352,7 @@ ReportAdapter.method('fillForm', function(object) {
 		}else{
 			$("#"+this.getTableName()+'Form #'+fields[i][0]).val(object[fields[i][0]]);
 		}
-	    
+
 	}
 });