Reporting Enhancements

Issue-ID: PORTAL-314
Remote DB logic is added to enhance RAPTOR to pull content from different DB as well as Different DB TYPE

Change-Id: I5cb343cd9daa912d78e7a8e409d28c8845d9afb4
Signed-off-by: RAMALINGAM, SUNDAR (sr7234) <sr7234@us.att.com>

5 files changed, 34 insertions, 14 deletions

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/conf/sql.properties b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/conf/sql.properties
index c643bb97..c5e4b57b 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/conf/sql.properties
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/conf/sql.properties
@@ -5,8 +5,8 @@
 load.custom.report.xml = SELECT cr.report_xml FROM cr_report cr WHERE rep_id=?
 
 # need to copy to oracle
-load.remoteDB.schema = SELECT 'local' SCHEMA_ID, 'local' SCHEMA_DESC, null DATASOURCE_TYPE  FROM dual union SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE  FROM SCHEMA_INFO a  where schema_id <> 'local' order by schema_id
-load.remoteDB.schema.where = SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE  FROM SCHEMA_INFO a where schema_id = '[schema_id]'
+load.remoteDB.schema = SELECT 'local' SCHEMA_ID, 'local' SCHEMA_DESC, null DATASOURCE_TYPE, null CONNECTION_URL, null USER_NAME, null PASS, null DRIVER_CLASS   FROM dual union SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE, CONNECTION_URL, USER_NAME, PASSWORD, DRIVER_CLASS  FROM SCHEMA_INFO a  where schema_id <> 'local' order by schema_id
+load.remoteDB.schema.where = SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE, CONNECTION_URL, USER_NAME, PASSWORD, DRIVER_CLASS  FROM SCHEMA_INFO a where schema_id = '[schema_id]'
 #formfield rendering
 
 formfield.id.name.sql.prefix=SELECT id, name FROM (
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-run-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-run-controller.js
index daa47900..45c300fe 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-run-controller.js
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-run-controller.js
@@ -80,8 +80,8 @@ appDS2.controller("reportRunController", ['$scope','$rootScope','$routeParams','
 				}
 				else
 					$scope.reportData.reportHeading = $scope.reportData.reportName;
-				if(!$scope.urlParams.hideChart && $scope.reportData.chartAvailable && $scope.reportData.totalRows>1){
-		      		// console.log('raptor.htm?action=chart.run&'+convertQueryString($scope.urlParams));
+				if( ($scope.urlParams.hideChart === undefined || $scope.urlParams.hideChart) && $scope.reportData.chartAvailable && $scope.reportData.totalRows>=1){
+		      		//console.log('raptor.htm?action=chart.run&'+convertQueryString($scope.urlParams));
 			    	$http.get('raptor.htm?action=chart.run&'+convertQueryString($scope.urlParams)).then(
 			      		 	function(response){
 			      		 	  $scope.showChart =  true;
@@ -175,7 +175,7 @@ appDS2.controller("reportRunController", ['$scope','$rootScope','$routeParams','
 		    		//console.log(stacktraceFP + " " + $scope.reportData.errormessage);
 		    	}		   
 		    if(!pagination) {	
-		      if(!$scope.urlParams.hideChart && $scope.reportData.chartAvailable && $scope.reportData.totalRows>1){
+				if( ($scope.urlParams.hideChart === undefined || $scope.urlParams.hideChart) && $scope.reportData.chartAvailable && $scope.reportData.totalRows>=1){
 		      		// console.log('raptor.htm?action=chart.run&c_master='+$scope.urlParams.c_master+'&'+formFieldsUrl+'display_content=Y&r_page='+(paginationOptions.pageNumber-1));
 			    	$http.get('raptor.htm?action=chart.run&c_master='+$scope.urlParams.c_master+'&'+formFieldsUrl+'display_content=Y&r_page='+(paginationOptions.pageNumber-1)).then(
 			      		 	function(response) {
@@ -209,6 +209,7 @@ appDS2.controller("reportRunController", ['$scope','$rootScope','$routeParams','
 
 	  $scope.gridOptions = {
 			  	pageNumber: 1,
+			  	useExternalPagination: true,
 			  	sort : null,
 			    paginationPageSizes: [5],
 			    paginationPageSize: 5,
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-step-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-step-controller.js
index 43f877c3..54a14242 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-step-controller.js
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-step-controller.js
@@ -95,8 +95,14 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout
 		{name:'HidePdf', selected:false}
 	]
 	
+/*	$scope.definitionData.dbSrcOptions=[
+		{text:'local', value:'local', selected:true},
+		{text:'e911dev_leto07', value:'e911dev_leto07', selected:false},
+	]*/
+	
 	$scope.pageSizeValues=['10','25','50','100','500'];
 	$scope.pageSizeOptions =[];
+	$scope.dbSrcOptions =[];
 	$scope.maxRowValues = ['500','1000','2000','3000','4000','5000','10000','15000','20000','25000','30000','35000','40000','45000','50000','65000']
 	$scope.maxRowOptions =[];
 	$scope.frozenColValues = ['0','1','2','3','4'];
@@ -110,7 +116,8 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout
 	/******create*****/
 	if(!$scope.isEdit){
 		$scope.definitionData.reportType = 'Linear';
-		$scope.definitionData.dbInfo = 'Local';
+		//$scope.definitionData.dbInfo = 'Local';
+		//$scope.definitionData.dbSrcOptions = ['Local'];
 	}
 	/****end create***/
 	
@@ -120,6 +127,10 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout
 		raptorReportFactory.getDefinitionByReportId(id).then(function(data){
 			$scope.showLoader=false;
 			$scope.definitionData = data;
+			$scope.definitionData.dbSrc=data.dbInfo;
+			$scope.definitionData.dbSrcOptions = data.dbInfoList;
+			console.log($scope.definitionData.dbSrcOptions[0].name);
+
 			$scope.showLoader = false;
 			for(x in data.displayOptions){
 				if(data.displayOptions[x].name=='HideFormFields')
@@ -156,6 +167,7 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout
 	}
 
 	$scope.constructureDefDropDown = function(){
+
 		for(i in $scope.pageSizeValues){
 			var v = {
 				value :$scope.pageSizeValues[i],
@@ -202,6 +214,10 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout
 
 	$scope.constructDef = function(){
 		var data =Object.assign({}, $scope.definitionData);
+		if($scope.definitionData.dbSrc){
+			console.log("Hello World ", $scope.definitionData.dbSrc);
+			data.dbInfo = $scope.definitionData.dbSrc;
+		}
 		for(x in $scope.definitionData.displayOptions){
 			if($scope.definitionData.displayOptions[x].name=='HideFormFields')
 				data.displayOptions[x].selected = $scope.displayOptions.hideFormFields
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html
index 7b2c23e1..ba609151 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html
@@ -112,7 +112,7 @@ body {
 	<div ng-if="showGrid">
 		<div id="grid1" ui-grid="gridOptions" ui-grid-pagination
 			ui-grid-pinning ui-grid-resize-columns class="grid"
-			style="height: {{gridHeight">
+			style="height: {{gridHeight}}">
 			<div class="no-rows" ng-show="!gridOptions.data.length">
 				<div class="msg">
 					<span>{{reportData.message}}</span>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step1.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step1.html
index a9baadf8..64d31d97 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step1.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step1.html
@@ -24,20 +24,23 @@
 	<div class="form-row" >
 		<label for="textinputID-2a">Report Description</label>
 		<div class="field-group">
-		 	<textarea b2b-reset b2b-reset-textarea ng-model="definitionData.reportDescr" ng-disabled="disabled" ng-trim="false" placeholder="{{placeholderText}}" rows="{{textAreaRows}}" maxlength="{{textAreaMaxlength}}" class="span12" id="textareaID1Tooltip1"  ng-focus='showTooltip1=true' ng-blur='showTooltip1=false' aria-describedby="textareaID1TooltipContent1"></textarea>
+		 	<textarea b2b-reset b2b-reset-textarea ng-model="definitionData.reportDescr" ng-disabled="false" ng-trim="false" placeholder="{{placeholderText}}" rows="{{textAreaRows}}" maxlength="{{textAreaMaxlength}}" class="span12" id="textareaID1Tooltip1"  ng-focus='showTooltip1=true' ng-blur='showTooltip1=false' aria-describedby="textareaID1TooltipContent1"></textarea>
 		</div>
 	</div>
 	<div class="form-row" >
 		<label for="textinputID-2a">Report Type</label>
 		<div class="field-group">
-			<input id="reportType" ddh-reset="" class="span12" type="text"	data-ng-model="definitionData.reportType"	ng-disabled="true">
+			<input id="reportType" ddh-reset="" class="span12" type="text"	data-ng-model="definitionData.reportType"	ng-disabled="false">
 		</div>
 	</div>
 	<div class="form-row" >
-		<label for="textinputID-2a">Data Source</label>
-		<div class="field-group">
-			<input id="dataSrc" ddh-reset="" class="span12" type="text"	data-ng-model="definitionData.dbInfo"	ng-disabled="true">
-		</div>
+		<label for="selectInputID-2a">Data Source</label>
+		<select id="dataSrc" name="dataSrc"  b2b-dropdown placeholder-text="Select DBSource" ng-model="definitionData.dbSrc">
+            <option b2b-dropdown-list option-repeat="d in definitionData.dbSrcOptions" value="{{d.id}}">{{d.name}}</option>
+        </select>
+<!-- 		<div class="field-group"> -->
+<!-- 			<input id="dataSrc" ddh-reset="" class="span12" type="text"	data-ng-model="definitionData.dbInfo"	ng-disabled="true"> -->
+<!-- 		</div> -->
 	</div>
 	<div class="form-row" >
 		<label for="textinputID-2a">Form Help Text</label>
@@ -210,4 +213,4 @@
 <!-- 		<button class="btn btn-alt btn-small" type="button" ng-click="next()" ng-show="$scope.isEdit" >Next</button>
  -->	</div>
   
-</div>
\ No newline at end of file
+</div>