summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports
diff options
context:
space:
mode:
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports')
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html9
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/directive/dynamicform.js39
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-del-confirm.html38
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-formfield-del-confirm.html37
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html39
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-user-del-confirm.html38
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html41
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-col-edit.html338
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-formfield-edit.html253
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-test-run-sql.html89
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-chart-wizard.html1897
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html156
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-search.html7
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-step.html35
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step1.html213
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step2.html26
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step3.html34
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step4.html47
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step5.html172
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step6.html34
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step7.html16
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step1.json22
22 files changed, 2239 insertions, 1341 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html
index 7f470d40..ce70dc58 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html
@@ -21,7 +21,6 @@
<link rel="stylesheet" type="text/css" href="app/fusion/external/angular-bootstrap/ui-bootstrap-csp.css">
<link rel="stylesheet" type="text/css" href="app/fusion/external/angular-gridster/dist/angular-gridster.min.css">
<!-- digital-design-library must be loaded late -->
- <link rel="stylesheet" type="text/css" href="app/fusion/external/ds2/css/digital-ng-library/digital-design-library.css">
<link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
<!-- Common scripts -->
@@ -66,12 +65,14 @@
<script src="./app/fusion/scripts/DS2-controllers/ds2-reports/report-chart-controller.js"></script>
<script src="./app/fusion/scripts/DS2-view-models/ds2-reports/directive/dynamicform.js"></script>
<script src="./app/fusion/scripts/DS2-controllers/ds2-reports/report-router.js"></script>
+ <script src= "app/fusion/scripts/DS2-services/ds2-raptor-report/reportModalControllers.js"></script>
+
</head>
<body class="appBody" ng-app="abs">
- <div ds2-Header class="header-container" ></div>
- <div ds2-menu id="menuContainer" class="menu-container" ></div>
+ <div ds2-Header class="header-container" ></div>
+ <div ds2-menu id="menuContainer" class="menu-container" ></div>
<div ng-view id="rightContentProfile" class="content-container"></div>
- <div ds2-Footer class="footer-container"></div>
+ <div ds2-Footer class="footer-container"></div>
</body>
</html>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/directive/dynamicform.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/directive/dynamicform.js
index 9064b0dc..5147719f 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/directive/dynamicform.js
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/directive/dynamicform.js
@@ -12,22 +12,42 @@ appDS2
link: function ($scope, element, attrs) {
$scope.element=element;
$scope.datetimeformat = "MM/dd/yyyy hh:mm a";
- console.log("$scope");
- console.log($scope);
$scope.buildField = function (field, parentElement) {
var x = '';
if(field.visible) {
+
if (field.fieldType === 'LIST_MULTI_SELECT') {
- x = angular.element('<label><i>'+field.fieldDisplayName+'<span ng-show="ngShowFieldId"> [ '+field.fieldId+' ] </span>:</i></label><br>'+
+ /*x = angular.element('<label><i>'+field.fieldDisplayName+'<span ng-show="ngShowFieldId"> [ '+field.fieldId+' ] </span>:</i></label><br>'+
'<div class="select2-container ebz-listbox form-field" style="height:100px;" tabindex="0" >'+
'<label ng-repeat="item in ngModel.'+field.fieldId+'" style="display:block;">'+
'<input type="checkbox" style="margin-top: 10px;" ng-model="item.defaultValue" ng-change="triggerFormFields('+field.triggerOtherFormFields+')" att-checkbox title="{{item.title}}"/> {{item.title}}<br/>'+
'</label>'+
- '</div>');
+ '</div>');*/
+
+ x = angular.element(
+ '<div class="listbox-container">'+
+ '<h3 id="source_listbox-2---multiselectable">'+field.fieldDisplayName+'</h3>'+
+ '<div class="listbox-list" tabindex="-1">'+
+ '<b2b-list-box listbox-data= "ngModel.'+field.fieldId+'" aria-multiselectable="true">'+
+ '<div tabindex="-1" data-index="{{$index}}" b2b-accessibility-click="13,32" ng-repeat="number in ngModel.'+field.fieldId+'" role="option" class="b2b-list-box-item" ng-class="{'+
+ "'b2b-list-box-item--selected'"+
+ ': number.selected}" ng-bind-html="number.title | unsafe"></div>'+
+ '</b2b-list-box>'+
+ '</div>'+
+ '</div>');
} else if (field.fieldType === 'LIST_BOX') {
- x = angular.element('<label><i>'+field.fieldDisplayName+'<span ng-show="ngShowFieldId"> [ '+field.fieldId+' ] </span>:</i></label><br> <div class="form-field" att-select="formFieldLuValues.'+field.fieldId+'" ng-model="ngModel.'+field.fieldId+'" ng-change="triggerFormFields('+field.triggerOtherFormFields+')"></div>');
+ var temp =
+ '<div >'+
+ '<label><i>'+field.fieldDisplayName+'<span ng-show="ngShowFieldId"> [ '+field.fieldId+' ] </span>:</i></label>'+
+ '<select id="dropdown1" name="dropdown1" aria-describedby="dropdown1" b2b-dropdown placeholder-text="Select" ng-model="ngModel.'+field.fieldId+'" ng-change="triggerFormFields('+field.triggerOtherFormFields+')">'+
+ ' <option b2b-dropdown-list option-repeat="d in formFieldLuValues.'+ field.fieldId +'" value="{{d.value}}">{{d.title}}</option>'+
+ ' </select>'+
+ '</div>';
+
+ x = angular.element(temp);
+ //x = angular.element('<label><i>'+field.fieldDisplayName+'<span ng-show="ngShowFieldId"> [ '+field.fieldId+' ] </span>:</i></label><br> <div class="form-field" att-select="formFieldLuValues.'+field.fieldId+'" ng-model="ngModel.'+field.fieldId+'" ng-change="triggerFormFields('+field.triggerOtherFormFields+')"></div>');
} else if((field.fieldType === 'text' || field.fieldType === 'TEXT') && field.validationType === 'DATE'){
- x = angular.element('<label><i>'+field.fieldDisplayName+'<span ng-show="ngShowFieldId"> [ '+field.fieldId+' ] </span>:</i></label><br> <input id="'+field.fieldId+'" type="text" ng-model="ngModel.'+field.fieldId+'" tabindex="0" ng-change="triggerFormFields('+field.triggerOtherFormFields+')" att-datepicker>');
+ x = angular.element('<label><i>'+field.fieldDisplayName+'<span ng-show="ngShowFieldId"> [ '+field.fieldId+' ] </span>:</i></label><br> <div class="datepicker-container" > <input id="'+field.fieldId+'" type="text" ng-model="ngModel.'+field.fieldId+'" tabindex="0" ng-change="triggerFormFields('+field.triggerOtherFormFields+')" b2b-datepicker></div>');
} else if((field.fieldType === 'text' || field.fieldType === 'TEXT') && field.validationType === 'TIMESTAMP_MIN'){
x = angular.element('<label><i>'+field.fieldDisplayName+'<span ng-show="ngShowFieldId"> [ '+field.fieldId+' ] </span>:</i></label><br> <input id="'+field.fieldId+'" type="text" date-format="datetimeformat" ng-model="ngModel.'+field.fieldId+'" tabindex="0" ng-change="triggerFormFields('+field.triggerOtherFormFields+')" att-date-time-picker>');
} else if(field.fieldType === 'text' || field.fieldType === 'TEXT'){
@@ -35,9 +55,10 @@ appDS2
} else if(field.fieldType === 'CHECK_BOX'){
x = angular.element('<label><i>'+field.fieldDisplayName+'<span ng-show="ngShowFieldId"> [ '+field.fieldId+' ] </span>:</i></label><br> <input type="checkbox" ng-model="ngModel.'+field.fieldId+'" tabindex="0" ng-change="triggerFormFields('+field.triggerOtherFormFields+')" att-checkbox>');
}
+ parentElement.append(x);
+ $compile(x)($scope);
}
- parentElement.append(x);
- $compile(x)($scope);
+
};
$scope.buildForm = function() {
// create elements <table> and a <tbody>
@@ -80,7 +101,7 @@ appDS2
formField.formFieldValues.forEach(function(entry,i) {
$scope.formFieldLuValues[formField.fieldId].push({ index: i, value: entry.id, title: entry.name});
if(entry.defaultValue){
- $scope.ngModel[formField.fieldId]={ index: i, value: entry.id, title: entry.name};
+ //$scope.ngModel[formField.fieldId]={ index: i, value: entry.id, title: entry.name};
}
});
}
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-del-confirm.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-del-confirm.html
index da255bbf..3f0338c9 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-del-confirm.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-del-confirm.html
@@ -1,26 +1,18 @@
-<div style="height:400px">
- <div class="b2b-modal-header ng-scope in">
- <h2 id="myModalLabel" modal-title="">Remove Report</h2>
- <div class="corner-button in">
- <button type="button" class="close" aria-label="Close"
- ng-click="$dismiss('cancel')"></button>
- </div>
+
+<div class="b2b-modal-header ng-scope in">
+ <h2 id="myModalLabel" modal-title="">Remove Report</h2>
+ <div class="corner-button in">
+ <button type="button" class="close" aria-label="Close"
+ ng-click="$dismiss('cancel')"></button>
</div>
- <div class="b2b-modal-body ng-scope ng-isolate-scope in" style="margin-bottom: -50px;">
- <form name="workflowForm" class="css-form" novalidate>
-
- <div class="form-row input-emphasized-field">
- <label class="span12 input-emphasized" for="textinputID-2a">The selected report will be removed. Do you want to continue</label>
- </div>
-
- <div class="b2b-modal-footer ng-scope ng-isolate-scope in">
- <div class="cta-button-group in">
- <button class="btn btn-alt btn-small" type="button" ng-click="ok()">OK</button>
- <button class="btn btn-alt btn-small" type="button"
- ng-click="cancel()">Cancel</button>
- </div>
- </div>
- </form>
- <br />
+</div>
+<div class="b2b-modal-body ng-scope ng-isolate-scope in">
+ <h2>The selected report will be removed. Do you want to continue</h2>
+</div>
+<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+ <div class="cta-button-group in">
+ <button class="btn btn-alt btn-small" type="button" ng-click="ok()">OK</button>
+ <button class="btn btn-alt btn-small" type="button"
+ ng-click="cancel()">Cancel</button>
</div>
</div> \ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-formfield-del-confirm.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-formfield-del-confirm.html
index 7bdf5a29..20dd9202 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-formfield-del-confirm.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-formfield-del-confirm.html
@@ -1,26 +1,17 @@
-<div style="height:400px">
- <div class="b2b-modal-header ng-scope in">
- <h2 id="myModalLabel" modal-title="">Remove Formfield</h2>
- <div class="corner-button in">
- <button type="button" class="close" aria-label="Close"
- ng-click="$dismiss('cancel')"></button>
- </div>
+<div class="b2b-modal-header">
+ <h2 id="myModalLabel" modal-title="">Remove Formfield</h2>
+ <div class="corner-button in">
+ <button type="button" class="close" aria-label="Close"
+ ng-click="$dismiss('cancel')"></button>
</div>
- <div class="b2b-modal-body ng-scope ng-isolate-scope in" style="margin-bottom: -50px;">
- <form name="workflowForm" class="css-form" novalidate>
-
- <div class="form-row input-emphasized-field">
- <label class="span12 input-emphasized" for="textinputID-2a">The selected formfield {{tempFieldId}} will be removed. Do you want to continue</label>
- </div>
-
- <div class="b2b-modal-footer ng-scope ng-isolate-scope in">
- <div class="cta-button-group in">
- <button class="btn btn-alt btn-small" type="button" ng-click="ok()">OK</button>
- <button class="btn btn-alt btn-small" type="button"
- ng-click="cancel()">Cancel</button>
- </div>
- </div>
- </form>
- <br />
+</div>
+<div class="b2b-modal-body">
+ The selected formfield {{tempFieldId}} will be removed. Do you want to continue?
+</div>
+<div class="b2b-modal-footer">
+ <div class="cta-button-group in">
+ <button class="btn btn-alt btn-small" type="button" ng-click="ok()">OK</button>
+ <button class="btn btn-alt btn-small" type="button"
+ ng-click="cancel()">Cancel</button>
</div>
</div> \ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html
index 01d1e609..629b9a91 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html
@@ -1,26 +1,19 @@
-<div style="height:300px">
- <div class="b2b-modal-header ng-scope in">
- <h2 id="myModalLabel" modal-title="">Remove Report Role</h2>
- <div class="corner-button in">
- <button type="button" class="close" aria-label="Close"
- ng-click="$dismiss('cancel')"></button>
- </div>
+
+<div class="b2b-modal-header">
+ <h2 id="myModalLabel" modal-title="">Remove Report Role</h2>
+ <div class="corner-button in">
+ <button type="button" class="close" aria-label="Close"
+ ng-click="$dismiss('cancel')"></button>
</div>
- <div class="b2b-modal-body ng-scope ng-isolate-scope in" style="margin-bottom: -50px;">
- <form name="workflowForm" class="css-form" novalidate>
-
- <div class="form-row input-emphasized-field">
- <label class="span12 input-emphasized" for="textinputID-2a">{{securityRoleName}} will be removed. Would you want to continue?</label>
- </div>
-
- <div class="b2b-modal-footer ng-scope ng-isolate-scope in">
- <div class="cta-button-group in">
- <button class="btn btn-alt btn-small" type="button" ng-click="ok()">OK</button>
- <button class="btn btn-alt btn-small" type="button"
- ng-click="cancel()">Cancel</button>
- </div>
- </div>
- </form>
- <br />
+</div>
+<div class="b2b-modal-body">
+ {{securityRoleName}}
+ will be removed. Would you want to continue?
+</div>
+<div class="b2b-modal-footer">
+ <div class="cta-button-group in">
+ <button class="btn btn-alt btn-small" type="button" ng-click="ok()">OK</button>
+ <button class="btn btn-alt btn-small" type="button"
+ ng-click="cancel()">Cancel</button>
</div>
</div> \ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-user-del-confirm.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-user-del-confirm.html
index 6620fe7c..5af1b227 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-user-del-confirm.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-user-del-confirm.html
@@ -1,26 +1,18 @@
-<div style="height:300px">
- <div class="b2b-modal-header ng-scope in">
- <h2 id="myModalLabel" modal-title="">Remove Report User</h2>
- <div class="corner-button in">
- <button type="button" class="close" aria-label="Close"
- ng-click="$dismiss('cancel')"></button>
- </div>
+<div class="b2b-modal-header">
+ <h2 id="myModalLabel" modal-title="">Remove Report User</h2>
+ <div class="corner-button in">
+ <button type="button" class="close" aria-label="Close"
+ ng-click="$dismiss('cancel')"></button>
</div>
- <div class="b2b-modal-body ng-scope ng-isolate-scope in" style="margin-bottom: -50px;">
- <form name="workflowForm" class="css-form" novalidate>
-
- <div class="form-row input-emphasized-field">
- <label class="span12 input-emphasized" for="textinputID-2a">{{securityUserName}} will be removed. Would you want to continue?</label>
- </div>
-
- <div class="b2b-modal-footer ng-scope ng-isolate-scope in">
- <div class="cta-button-group in">
- <button class="btn btn-alt btn-small" type="button" ng-click="ok()">OK</button>
- <button class="btn btn-alt btn-small" type="button"
- ng-click="cancel()">Cancel</button>
- </div>
- </div>
- </form>
- <br />
+</div>
+<div class="b2b-modal-body"">
+ {{securityUserName}}
+ will be removed. Would you want to continue?
+</div>
+<div class="b2b-modal-footer">
+ <div class="cta-button-group in">
+ <button class="btn btn-alt btn-small" type="button" ng-click="ok()">OK</button>
+ <button class="btn btn-alt btn-small" type="button"
+ ng-click="cancel()">Cancel</button>
</div>
</div> \ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html
index 21bb046f..06f2049a 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html
@@ -1,23 +1,24 @@
-<div>
- <div class="b2b-modal-header ng-scope in">
- <h1><i class="icon-primary-alert"></i></h1>
- <h2 id="myModalLabel" modal-title="">Confirm</h2>
- <div class="corner-button in">
- <button type="button" class="close" aria-label="Close"
- ng-click="$dismiss('cancel')"></button>
- </div>
+
+<div class="b2b-modal-header">
+ <h1>
+ <i class="icon-primary-alert"></i>
+ </h1>
+ <h2 id="myModalLabel" modal-title="">Confirm</h2>
+ <div class="corner-button in">
+ <button type="button" class="close" aria-label="Close"
+ ng-click="$dismiss('cancel')"></button>
</div>
- <div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0"
- role="region" aria-label="Modal header text content"
- style="height: 55px;">
- You are about to {{rowData.accessAllowed?"grant":"revoke"}} {{rowData.name}} edit access. Would you like to continue?
- </div>
- <div class="b2b-modal-footer ng-scope ng-isolate-scope in">
- <div class="cta-button-group in">
- <button class="btn btn-alt btn-medium" type="button"
- ng-click="toggleEditAccessStatus(rowData);">Ok</button>
- <button class="btn btn-clear btn-medium" type="button"
- ng-click="cancelEditAccessToggle(rowData);">Cancel</button>
- </div>
+</div>
+<div class="b2b-modal-body" tabindex="0" role="region"
+ aria-label="Modal header text content" style="height: 55px;">
+ You are about to {{rowData.accessAllowed?"grant":"revoke"}}
+ {{rowData.name}} edit access. Would you like to continue?
+</div>
+<div class="b2b-modal-footer">
+ <div class="cta-button-group in">
+ <button class="btn btn-alt btn-medium" type="button"
+ ng-click="toggleEditAccessStatus(rowData);">Ok</button>
+ <button class="btn btn-clear btn-medium" type="button"
+ ng-click="cancelEditAccessToggle(rowData);">Cancel</button>
</div>
</div>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-col-edit.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-col-edit.html
index e74f89a8..3aadf27e 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-col-edit.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-col-edit.html
@@ -1,130 +1,232 @@
<style>
#columnEditTable table tbody td {
- border: none;
+ border: none;
}
#columnEditTable table tbody tr {
- border: none;
+ border: none;
}
-.colTableLeftColumn {
- width: 45%;
- text-align: right;
- vertical-align:middle;
-}
-
-.colTableInput {
- width:220px;
-}
-
-#columnEditTable .selectWrap{
- width:220px;
-}
-
-#drilldownOption .selectWrap{
- width:450px;
-}
</style>
-<div style="height: 700px;">
- <div class="b2b-modal-header ng-scope in">
- <h2 id="myModalLabel" modal-title="">Report Column - Edit </h2>
- <div class="corner-button in">
- <button type="button" class="close" aria-label="Close"
- ng-click="$dismiss('cancel')"></button>
- </div>
+<div class="b2b-modal-header">
+ <h2 id="myModalLabel" modal-title="">Report Column - Edit</h2>
+ <div class="corner-button in">
+ <button type="button" class="close" aria-label="Close"
+ ng-click="$dismiss('cancel')"></button>
</div>
- <div class="b2b-modal-body ng-scope ng-isolate-scope in" style="margin-bottom: -50px;">
- <form name="workflowForm" class="css-form" novalidate>
-
-<!-- <div class="form-row input-emphasized-field">
- <label class="span12 input-emphasized" for="textinputID-2a">The selected report will be removed. Do you want to continue</label>
- </div> -->
- <div id="columnEditTable">
- <table class="striped">
-<!-- <caption><span>Table caption</span></caption> -->
-<!-- <thead>
- <tr>
- <th>Column ID:</th>
- <th>Name</th>
- <th>ID</th>
- <th>Edit</th>
- </tr>
- </thead> -->
- <tbody>
- <tr>
- <td class="colTableLeftColumn">Column ID:</td>
- <td>{{columnEditData.colId}}</td>
- </tr>
-
- <tr>
- <td class="colTableLeftColumn">Display Name:</td>
- <td><input type="text" name="displayName" ng-model="colName.value" class="colTableInput"></td>
- </tr>
-
-<!-- <tr>
- <td class="colTableLeftColumn">Display Width (px):</td>
- <td><input type="text" name="displayWidth" ng-model="displayWidth" class="colTableInput"></td>
- </tr> -->
-
- <tr>
- <td class="colTableLeftColumn">Display Alignment: </td>
- <td>
- <select name="displayAlignment" b2b-dropdown ng-model="selectedDisplayAlignment.value" placeholder-text="Select">
- <option b2b-dropdown-list option-repeat="d in displayAlignmentOptions" value="{{d.value}}">{{d.text}}</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td class="colTableLeftColumn">Display Header Alignment:</td>
- <td>
- <select name="displayHeaderAlignment" b2b-dropdown ng-model="selectedDisplayHeaderAlignment.value" placeholder-text="Select">
- <option b2b-dropdown-list option-repeat="d in displayAlignmentOptions" value="{{d.value}}">{{d.text}}</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td class="colTableLeftColumn">Sortable:</td>
- <td>
- <select name="sortable" b2b-dropdown ng-model="sortable.value" placeholder-text="Select">
- <option b2b-dropdown-list option-repeat="d in ynOptions" value="{{d.value}}">{{d.text}}</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td class="colTableLeftColumn">Visible:</td>
- <td>
- <select name="visible" b2b-dropdown ng-model="visible.value" placeholder-text="Select">
- <option b2b-dropdown-list option-repeat="d in ynOptions" value="{{d.value}}">{{d.text}}</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td class="colTableLeftColumn" style="width:350px;">Drill-down Link:</td>
- <td id="drilldownOption">
- <select name="drillDown" b2b-dropdown ng-model="selectedDrillDownReport.value" placeholder-text="Select">
- <option b2b-dropdown-list option-repeat="d in drilldownReports" value="{{d.id}}">{{d.name}}</option>
- </select>
- </td>
- </tr>
-
-
- </tbody>
- </table>
- </div>
- <div class="b2b-modal-footer ng-scope ng-isolate-scope in">
- <div class="cta-button-group in">
- <button class="btn btn-alt btn-small" type="button" ng-click="save()">Save</button>
- <button class="btn btn-alt btn-small" type="button"
- ng-click="cancel()">Cancel</button>
+</div>
+<div class="b2b-modal-body">
+ <div ng-show="processingData" class="span loader-container">
+ <i class="icon-primary-spinner" role="img"
+ aria-label="Please wait while we load your content"></i>
</div>
- </div>
- </form>
- <br />
- </div>
-</div> \ No newline at end of file
+
+ <div id="columnEditTable" ng-hide="processingData">
+ <table class="striped">
+ <tbody>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Column ID:</td>
+ <td>{{colInfo.colId}}</td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Column Name:</td>
+ <td>{{colInfo.colName}}</td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Depends on formfield:</td>
+ <td><input type="text" name="dependsOnFF"
+ ng-model="colInfo.depeondsOnForField" class="colTableInput"></td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Datatype:</td>
+ <td>
+ <select id="dataTypeDD" name="dataTypeDD" aria-describedby="dataTypeDD" b2b-dropdown placeholder-text="Select Data Type" ng-model="colInfo.dataType">
+ <option b2b-dropdown-list option-repeat="d in dataTypeOptions" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Group By Pos:</td>
+ <td>
+ <input type="text" name="groupByPos" ng-model="colInfo.groupByPos" class="colTableInput">
+ </td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Custom Text for Sub-Total:</td>
+ <td><input type="text" name="subTotalCus"
+ ng-model="colInfo.subTotalCustomText" class="colTableInput"></td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Hide Repeated Values:</td>
+ <td>
+ <label for="noWrap" class="checkbox">
+ <input id="hideFormFieldsRun" type="checkbox" ng-model="colInfo.hideRepeatedKey" /> <i class="skin"></i>
+ </label>
+ </td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Multi Group Column Level:</td>
+ <td>
+ <select id="mgcLevel" name="mgcLevel" aria-describedby="mgcLevel" b2b-dropdown placeholder-text="Select Level" ng-model="colInfo.level">
+ <option b2b-dropdown-list option-repeat="d in multiGroupColLevel" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Multi group Column Range : Colspan:</td>
+ <td>
+ <input type="text" name="colSpan" ng-model="colInfo.colspan" class="colTableInput">
+ </td>
+ </tr>
+ <!-- <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Dataformat:</td>
+ <td>
+ <select id="mgcLevel" name="mgcLevel" aria-describedby="mgcLevel" b2b-dropdown placeholder-text="Select Level" ng-model="colInfo.level">
+ <option b2b-dropdown-list option-repeat="d in multiGroupColLevel" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </td>
+ </tr> -->
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Display Name:</td>
+ <td>
+ <input type="text" name="colSpan" ng-model="colInfo.displayName" class="colTableInput">
+ </td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Display Width (In Pxls):</td>
+ <td>
+ <input type="text" id="displayWidth" name="displayWidth" ng-model="colInfo.displayWidth" class="colTableInput">
+ </td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">No Wrap ?:</td>
+ <td>
+ <label for="noWrap" class="checkbox">
+ <input id="noWrap" type="checkbox" ng-model="colInfo.noWrap" /><i class="skin"></i>
+ </label>
+ </td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Indent Parameter to display value:</td>
+ <td>
+ <select id="indentPara" name="indentPara" aria-describedby="indentPara" b2b-dropdown placeholder-text="Select Indent" ng-model="colInfo.indentation">
+ <option b2b-dropdown-list option-repeat="d in indentValues" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Display Alignment:</td>
+ <td>
+ <select id="displayAlign" name="displayAlign" aria-describedby="displayAlign" b2b-dropdown placeholder-text="Select Display Alignment" ng-model="colInfo.displayAlignment">
+ <option b2b-dropdown-list option-repeat="d in displayAlignmentOptions" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Display Header Alignment:</td>
+ <td>
+ <select id="displayHAlign" name="displayHAlign" aria-describedby="displayAlign" b2b-dropdown placeholder-text="Select Display Header Alignment" ng-model="colInfo.displayHeaderAlignment">
+ <option b2b-dropdown-list option-repeat="d in displayAlignmentOptions" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Sortable:</td>
+ <td>
+ <label for="sortable" class="checkbox">
+ <input id="sortable" type="checkbox" ng-model="colInfo.sortable" /><i class="skin"></i>
+ </label>
+ </td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Visible:</td>
+ <td>
+ <label for="visibleCheck" class="checkbox">
+ <input id="visibleCheck" type="checkbox" ng-model="colInfo.visible" /><i class="skin"></i>
+ </label>
+ </td>
+ </tr>
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Drill-down Link: <a href="javascript:void(0);" ng-click="getDrillReportFormField(colInfo.drilldownURL,colInfo.drilldownParams)"><span class="icon-misc-pen" ></span></a></td>
+ <td id="drilldownOption">
+ <select name="drillDown" b2b-dropdown ng-model="colInfo.drilldownURL">
+ <option b2b-dropdown-list option-repeat="d in drilldownReports" value="{{d.id}}">{{d.name}}</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr ng-hide="!isEditCol">
+ <td class="colTableLeftColumn">Total for the column:</td>
+ <td id="totalForTheCol">
+ <select name="totalForTheCol" b2b-dropdown ng-model="colInfo.displayTotal" placeholder-text="Select">
+ <option b2b-dropdown-list option-repeat="d in totalForTheColList" value="{{d.id}}">{{d.name}}</option>
+ </select>
+ </td>
+ </tr>
+ <tr >
+ <table class="striped" ng-repeat="ff in drilDownFormField" ng-init="outerIndex=$index" ng-show="!isEditCol">
+ <thead>
+ <tr>
+ <th>{{ff.name}}</th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody type="body" ng-repeat="dd in drilDownValues[$index]" ng-init="innerIndex=$index">
+ <tr>
+ <td>
+ <label for="{{dd.radioGroup}}" class="radio">
+ <input type="radio" ng-model="selectedDrillReportFormField[outerIndex]" id="{{dd.radioGroup}}" name="optionsRadio{{outerIndex}}" value="{{dd.radioGroup}}">
+ <i class="skin"></i>
+ </label>
+ </td>
+ <td>{{ dd.selection }} </td>
+ <td ng-if="dd.selection=='Value set'" ng-bind="dd.value"></td>
+ <td ng-if='dd.selection=="No Value"'>
+ Accept default
+ </td>
+ <td ng-if='dd.selection=="Fixed Value"'>
+ <div class="field-group">
+ <input id="emptyMessage" ddh-reset="" class="span12" type="text" data-ng-model="drillDownParams[outerIndex].valValue">
+ </div>
+ </td>
+ <td ng-if='dd.selection=="Value of Column"'>
+ <select name="drillDown" b2b-dropdown ng-model="drillDownParams[outerIndex].valColId" placeholder-text="Select">
+ <option b2b-dropdown-list option-repeat="d in childReportCol" value="{{d.id}}">{{d.name}}</option>
+ </select>
+ </td>
+ <td ng-if='dd.selection=="Value of form field"'>
+ <select name="drillDownField" b2b-dropdown ng-model="drillDownParams[outerIndex].valFieldId" placeholder-text="Select">
+ <option b2b-dropdown-list option-repeat="d in childReportFF" value="{{d.id}}">{{d.name}}</option>
+ </select>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </tr>
+
+ <!-- <tr>
+ <td class="colTableLeftColumn">Advanced Display Formatting:</td>
+ <td id="drilldownOption">
+ <select name="drillDown" b2b-dropdown ng-model="colInfo.drilldownURL" placeholder-text="Select">
+ <option b2b-dropdown-list option-repeat="d in drilldownReports" value="{{d.id}}">{{d.name}}</option>
+ </select>
+ </td>
+ </tr> -->
+
+ </tbody>
+ </table>
+ </div>
+
+</div>
+<div class="b2b-modal-footer ng-scope">
+ <div class="cta-button-group in">
+ <button class="btn btn-alt btn-small" type="button" ng-show="isEditCol"
+ ng-click="save()">Save</button>
+ <button class="btn btn-alt btn-small" type="button" ng-hide="isEditCol"
+ ng-click="complete()">Complete</button>
+ <button class="btn btn-alt btn-small" type="button"
+ ng-click="cancel()">Cancel</button>
+ </div>
+ </div> \ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-formfield-edit.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-formfield-edit.html
index c88eb596..3c17ff7b 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-formfield-edit.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-formfield-edit.html
@@ -1,149 +1,154 @@
<style>
#columnEditTable table tbody td {
- border: none;
+ border: none;
}
#columnEditTable table tbody tr {
- border: none;
+ border: none;
}
.colTableLeftColumn {
width: 45%;
text-align: right;
- vertical-align:middle;
+ vertical-align: middle;
}
.colTableInput {
- width:220px;
+ width: 220px;
}
-#columnEditTable .selectWrap{
- width:220px;
+#columnEditTable .selectWrap {
+ width: 220px;
+}
+table {
+ border-bottom: none;
}
</style>
-<div style="height: 700px;">
- <div class="b2b-modal-header ng-scope in">
- <h2 id="myModalLabel" modal-title="">Report Form Field - Edit</h2>
- <div class="corner-button in">
- <button type="button" class="close" aria-label="Close"
- ng-click="$dismiss('cancel')"></button>
- </div>
+<div class="b2b-modal-header">
+ <h2 id="myModalLabel" modal-title="">Report Form Field - Edit</h2>
+ <div class="corner-button in">
+ <button type="button" class="close" aria-label="Close"
+ ng-click="$dismiss('cancel')"></button>
</div>
- <div class="b2b-modal-body ng-scope ng-isolate-scope in" style="margin-bottom: -50px;">
- <form name="workflowForm" class="css-form" novalidate>
-
-<!-- <div class="form-row input-emphasized-field">
- <label class="span12 input-emphasized" for="textinputID-2a">The selected report will be removed. Do you want to continue</label>
- </div> -->
- <div id="columnEditTable">
- <table class="striped">
-<!-- <caption><span>Table caption</span></caption> -->
-<!-- <thead>
- <tr>
- <th>Column ID:</th>
- <th>Name</th>
- <th>ID</th>
- <th>Edit</th>
- </tr>
- </thead> -->
- <tbody>
-<!-- <tr>
- <td class="colTableLeftColumn">Field ID:</td>
- <td>{{formFieldEditData.fieldId}}</td>
- </tr> -->
-
- <tr>
- <td class="colTableLeftColumn">Field Name:</td>
- <td><input type="text" name="displayName" ng-model="fieldName.value" class="colTableInput"></td>
- </tr>
-
- <tr>
- <td class="colTableLeftColumn">Field Type: </td>
- <td>
- <select name="displayAlignment" b2b-dropdown ng-model="selectedFieldType.value" placeholder-text="Select">
- <option b2b-dropdown-list option-repeat="d in fieldTypeOptions" value="{{d.value}}">{{d.text}}</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td class="colTableLeftColumn">Visible:</td>
- <td>
- <select name="displayHeaderAlignment" b2b-dropdown ng-model="selectedVisible.value" placeholder-text="Select">
- <option b2b-dropdown-list option-repeat="d in ynOptions" value="{{d.value}}">{{d.text}}</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td class="colTableLeftColumn">SQL as Default Value:</td>
- <td>
- <label for="checkbox1" class="checkbox">
- <input id="checkbox1" type="checkbox" ng-model="sqlDefaultValueSelected.value" /><i class="skin"></i><span></span>
- </label>
- </td>
- </tr>
-
- <tr ng-hide="sqlDefaultValueSelected.value">
- <td class="colTableLeftColumn">Default Value:</td>
- <td><input type="text" name="defaultValue" ng-model="defaultValue.value" class="colTableInput"></td>
- </tr>
-
-
- <tr ng-show="sqlDefaultValueSelected.value">
- <td class="colTableLeftColumn">Default SQL:</td>
- <td>
- <textarea b2b-reset b2b-dragon-input b2b-reset-textarea ng-model="fieldDefaultSQL.value" style="height:80px">
- </textarea>
- </td>
- <td>
- <p><button ng-click="formFieldVerifySQL(fieldDefaultSQL.value)" class="btn btn-alt btn-small">Verify</button></p>
- </td>
- </tr>
-
-<!-- <tr>
- <td class="colTableLeftColumn">Verify Field Value As: </td>
- <td>
- <select name="displayAlignment" b2b-dropdown ng-model="selectedVerifyFieldValue.value" placeholder-text="Select">
- <option b2b-dropdown-list option-repeat="d in verifyFieldValueOptions" value="{{d.value}}">{{d.text}}</option>
- </select>
- </td>
- </tr> -->
-
- <tr>
- <td class="colTableLeftColumn">SQL Generating Custom List of Values:</td>
- <td>
- <textarea b2b-reset b2b-dragon-input b2b-reset-textarea ng-model="fieldSqlContent.value" style="height:80px">
- </textarea>
- </td>
- <td>
- <p><button ng-click="formFieldVerifySQL(fieldSqlContent.value)" class="btn btn-alt btn-small">Verify</button></p>
- </td>
- </tr>
+</div>
+<div class="b2b-modal-body">
+ <div ng-show="dataProcessing" class="span loader-container">
+ <i class="icon-primary-spinner" role="img"
+ aria-label="Please wait while we load your content"></i>
+ </div>
+ <div id="columnEditTable" ng-hide="dataProcessing">
+ <table class="striped">
+ <tbody>
+ <tr>
+ <td class="colTableLeftColumn">Field Name:</td>
+ <td><input type="text" name="displayName"
+ ng-model="formFieldEditData.fieldName" class="colTableInput"></td>
+ </tr>
-<!-- <tr>
- <td class="colTableLeftColumn">Drill-down Link:</td>
- <td>
- <select name="drillDown" b2b-dropdown ng-model="selectedDrillDownLink.value" placeholder-text="Select">
- <option b2b-dropdown-list option-repeat="d in drillDownOptions" value="{{d.value}}">{{d.text}}</option>
- </select>
- </td>
- </tr> -->
+ <tr>
+ <td class="colTableLeftColumn">Field Type:</td>
+ <td><select name="fieldType" b2b-dropdown
+ ng-model="formFieldEditData.fieldType" placeholder-text="Select">
+ <option b2b-dropdown-list option-repeat="d in fieldTypeOptions"
+ value="{{d.value}}">{{d.text}}</option>
+ </select></td>
+ </tr>
+ <tr>
+ <td class="colTableLeftColumn">Visible:</td>
+ <td>
+ <select name="visible" b2b-dropdown ng-model="formFieldEditData.visible">
+ <option b2b-dropdown-list option-repeat="d in ynOptions" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="colTableLeftColumn">Is used in Group By Clause?</td>
+ <td>
+ <label for="checkboxGrp" class="checkbox">
+ <input id="checkboxGrp" type="checkbox" ng-model="formFieldEditData.groupFormField" /><i class="skin"></i><span></span>
+ </label>
+ </td>
+ </tr>
+ <tr>
+ <td class="colTableLeftColumn">SQL as Default Value:</td>
+ <td>
+ <label for="cehckboxSql" class="checkbox"> <input
+ id="cehckboxSql" type="checkbox"
+ ng-model="sqlAsDefaultValue.value" /><i class="skin"></i><span></span>
+ </label>
+ </td>
+ </tr>
+ <tr ng-show="sqlAsDefaultValue.value">
+ <td class="colTableLeftColumn">Default SQL:</td>
+ <td>
+ <textarea b2b-reset b2b-dragon-input b2b-reset-textarea
+ ng-model="formFieldEditData.fieldDefaultSQL" style="height: 80px">
+ </textarea>
+ </td>
+ <td>
+ <p>
+ <button ng-click="formFieldVerifySQL(formFieldEditData.fieldDefaultSQL)"
+ class="btn btn-alt btn-small">Verify</button>
+ </p>
+ </td>
+ </tr>
+ <tr ng-hide="formFieldEditData.fieldDefaultSQL">
+ <td class="colTableLeftColumn">Default Value:</td>
+ <td><input type="text" name="defaultValue"
+ ng-model="formFieldEditData.defaultValue" class="colTableInput"></td>
+ </tr>
- </tbody>
- </table>
- </div>
- <div class="b2b-modal-footer ng-scope ng-isolate-scope in">
- <div class="cta-button-group in">
- <button class="btn btn-alt btn-small" type="button" ng-click="save()">Save</button>
- <button class="btn btn-alt btn-small" type="button"
- ng-click="cancel()">Cancel</button>
- </div>
-
+ <tr>
+ <td class="colTableLeftColumn">Verify Field Value As:</td>
+ <td><select name="visible" b2b-dropdown
+ ng-model="formFieldEditData.validationType" placeholder-text="Select">
+ <option b2b-dropdown-list option-repeat="d in verifyFieldValueOptions"
+ value="{{d.value}}">{{d.text}}</option>
+ </select></td>
+ </tr>
+ <tr>
+ <td class="colTableLeftColumn">SQL Generating Custom List of
+ Values:</td>
+ <td><textarea b2b-reset b2b-dragon-input b2b-reset-textarea
+ ng-model="formFieldEditData.fieldSQL" style="height: 80px">
+ </textarea></td>
+ <td>
+ <p>
+ <button ng-click="formFieldVerifySQL(formFieldEditData.fieldSQL)"
+ class="btn btn-alt btn-small">Verify</button>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td class="colTableLeftColumn">Provide Predefined List of Values: Do not use Predefined list - Generate list from database :</td>
+ <td>
+ <input type="text" name="defaultValue" ng-model="predefinedValues.value" class="colTableInput">
+ </td>
+ <td>
+ <p>
+ <button ng-click="addPredefinedValueList();" class="btn btn-alt btn-small">Add to List</button>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td class="colTableLeftColumn"></td>
+ <td>
+ <div ng-repeat = "rowData in formFieldEditData.predefinedValueList">
+ <span>{{rowData.id}}</span>
+ <a ng-click="removePredefinedValueList(rowData.id)" class="icon-misc-trash"></a>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</div>
- </form>
- <br />
+</div>
+<div class="b2b-modal-footer">
+ <div class="cta-button-group in">
+ <button class="btn btn-alt btn-small" type="button" ng-click="save()" ng-show="type=='edit'">Save</button>
+ <button class="btn btn-alt btn-small" type="button" ng-click="add()" ng-show="type=='add'">Add</button>
+ <button class="btn btn-alt btn-small" type="button" ng-click="cancel()">Cancel</button>
</div>
</div> \ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-test-run-sql.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-test-run-sql.html
index a7955cad..e3fda72b 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-test-run-sql.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-test-run-sql.html
@@ -1,62 +1,57 @@
-<style>
+<!-- <style>
.colTableLeftColumn {
width: 45%;
text-align: right;
- vertical-align:middle;
+ vertical-align: middle;
}
.colTableInput {
- width:220px;
+ width: 220px;
}
-#columnEditTable .selectWrap{
- width:220px;
+#columnEditTable .selectWrap {
+ width: 220px;
}
</style>
-
-<div style="height: 700px;">
- <div class="b2b-modal-header ng-scope in">
- <h2 id="myModalLabel" modal-title="">SQL Test Run - {{isError?'Failed':'Executed'}}</h2>
- <div class="corner-button in">
- <button type="button" class="close" aria-label="Close"
- ng-click="$dismiss('cancel')"></button>
- </div>
+ -->
+<div class="b2b-modal-header">
+ <h2 id="myModalLabel" modal-title="">SQL Test Run -
+ {{isError?'Failed':'Executed'}}</h2>
+ <div class="corner-button in">
+ <button type="button" class="close" aria-label="Close"
+ ng-click="$dismiss('cancel')"></button>
</div>
- <div class="b2b-modal-body ng-scope ng-isolate-scope in" style="margin-bottom: -50px;">
- <form name="workflowForm" class="css-form" novalidate>
-<!-- <div class="form-row input-emphasized-field">
- <label class="span12 input-emphasized" for="textinputID-2a">The selected report will be removed. Do you want to continue</label>
- </div> -->
- <div>
-
- <div ng-show="isError">
- <h2>Error Message:</h2><br>
- <p>{{errormessage}}</p>
- <h2>Stack Trace:</h2><br>
- <p>{{stacktrace}}</p>
+</div>
+<div class="b2b-modal-body">
+ <div>
- </div>
- <table class="striped">
- <thead>
- <tr>
- <th ng-repeat="colName in queryData.reportDataColumns">{{colName}}</th>
- </tr>
- </thead>
- <tbody>
- <tr ng-repeat="rowData in queryData.reportDataRows">
- <td ng-repeat="keyName in queryData.reportDataColumns">{{rowData[keyName]}}</td>
- </tr>
+ <div ng-show="isError">
+ <h2>Error Message:</h2>
+ <br>
+ <p>{{errormessage}}</p>
+ <h2>Stack Trace:</h2>
+ <br>
+ <p>{{stacktrace}}</p>
- </tbody>
- </table>
- </div>
- <div class="b2b-modal-footer ng-scope ng-isolate-scope in">
- <div class="cta-button-group in">
- <button class="btn btn-alt btn-small" type="button"
- ng-click="close()">Close</button>
+ </div>
+ <table class="striped">
+ <thead>
+ <tr>
+ <th ng-repeat="colName in queryData.reportDataColumns">{{colName}}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat="rowData in queryData.reportDataRows">
+ <td ng-repeat="keyName in queryData.reportDataColumns">{{rowData[keyName]}}</td>
+ </tr>
+
+ </tbody>
+ </table>
</div>
+
+</div>
+<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+ <div class="cta-button-group in">
+ <button class="btn btn-alt btn-small" type="button" ng-click="close()">Close</button>
</div>
- </form>
- <br />
- </div>
-</div> \ No newline at end of file
+</div>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-chart-wizard.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-chart-wizard.html
index 8558729e..ed3c4ba9 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-chart-wizard.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-chart-wizard.html
@@ -1,897 +1,1080 @@
<style>
table tbody td {
- border: none;
+ border: none;
}
table tbody tr {
- border: none;
+ border: none;
}
-table{
- border: none;
- margin-bottom:0px;
+table {
+ border: none;
+ margin-bottom: 0px;
}
-#RangeTable{
+#RangeTable {
margin-top: 5px;
border: 1px solid black;
}
</style>
<div id="page-content">
-<h1 class="heading-page">Report Chart Configuration</h1>
+ <h1 class="heading-page">Report Chart Configuration</h1>
-<div ng-show="showLoader" class="span loader-container">
- <i class="icon-primary-spinner" role="img"
- aria-label="Please wait while we load your content"></i>
-</div>
+ <div ng-show="showLoader" class="span loader-container">
+ <i class="icon-primary-spinner" role="img"
+ aria-label="Please wait while we load your content"></i>
+ </div>
-<div ng-hide="showLoader">
-<div>
-<table>
- <thead>
- <tr>
- <th width="30%">Chart Type</th>
- <th></th>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td>
- <select name="chartType" b2b-dropdown ng-model="reportRunJson.chartType">
- <option b2b-dropdown-list option-repeat="d in chartTypeOptions" value="{{d.value}}">{{d.text}}</option>
- </select>
- </td>
- <td></td>
- </tr>
- </tbody>
-</table>
-
-<table>
- <thead>
- <tr>
- <th width="50px">Width (px)</th>
- <th>Height (px)</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <input type="text" name="displayName" ng-model="reportRunJson.width" style="width:100px;">
- </td>
- <td>
- <input type="text" name="displayName" ng-model="reportRunJson.height" style="width:100px;">
- </td>
- </tr>
- </tbody>
-</table>
-
-<table>
- <thead>
- <tr>
- <th width="50px">Title</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <fieldset role="radiogroup" radio-group-accessibility>
- <td>
- <label for="optionsRadiosShowTitleTrue" class="radio">
- <input type="radio" ng-model="reportRunJson.showTitle" id="optionsRadiosShowTitleTrue" name="optionsRadiosShowTitleTrue" value="true">
- <i class="skin"></i>
- <span>Show</span>
- </label>
- </td>
- <td>
- <label for="optionsRadiosShowTitleFalse" class="radio">
- <input type="radio" ng-model="reportRunJson.showTitle" id="optionsRadiosShowTitleFalse" name="optionsRadiosShowTitleFalse" value="false">
- <i class="skin"></i>
- <span>Hide</span>
- </label>
- </td>
- </fieldset>
- </tr>
-
- </tbody>
-</table>
-
-<table>
- <thead>
- <tr>
- <th width="30%">Domain Axis</th>
- <th width="30%">Category</th>
- <th width="40%"></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <select name="chartType" b2b-dropdown ng-model="reportRunJson.domainAxis">
- <option b2b-dropdown-list option-repeat="d in reportRunJson.chartColumnJSONList" value="{{d.value}}">{{d.title}}</option>
- </select>
- </td>
- <td>
- <select name="chartType" b2b-dropdown ng-model="reportRunJson.categoryAxis">
- <option b2b-dropdown-list option-repeat="d in reportRunJson.chartColumnJSONList" value="{{d.value}}">{{d.title}}</option>
- </select>
- </td>
- </tr>
- </tbody>
-</table>
-
-
- <div id="RangeTable">
-
-<table ng-repeat="rangeReport in reportRunJson.rangeAxisList">
- <thead>
- <tr>
- <th width="18%">Range Axis</th>
- <th width="15%">Y Axis</th>
- <th width="15%">Chart Title</th>
- <th width="22%">Color</th>
- <th width="25%">Line Type</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <select name="chartType" b2b-dropdown ng-model="rangeReport.rangeAxisLabelJSON.value" placeholder-text="Select" ng-disabled="rangeReport.removed=='true'">
- <option b2b-dropdown-list option-repeat="d in reportRunJson.chartColumnJSONList" value="{{d.value}}">{{d.title}}</option>
- </select>
- </td>
- <td>
- <input type="text" name="displayName" ng-model="rangeReport.rangeYAxis" ng-disabled="rangeReport.removed=='true'" style="width:100px;">
- </td>
- <td>
- <input type="text" name="displayName" ng-model="rangeReport.rangeChartGroup" ng-disabled="rangeReport.removed=='true'" style="width:150px;">
- </td>
- <td>
- <select name="chartType" b2b-dropdown ng-model="rangeReport.rangeColor" ng-disabled="rangeReport.removed=='true'">
- <option b2b-dropdown-list option-repeat="d in rangeColors" value="{{d.value}}">{{d.title}}</option>
- </select>
- </td>
- <td>
- <select name="lineType" b2b-dropdown ng-model="rangeReport.rangeLineType" ng-disabled="rangeReport.removed=='true'">
- <option b2b-dropdown-list option-repeat="d in lineTypes" value="{{d.value}}">{{d.title}}</option>
- </select>
- </td>
- <td>
- <button ng-show="$index==0" type="submit" style="width: 90px; height:35px;margin-left:5px;" class="btn btn-secondary btn-small" ng-click="addRangeAxisRow()">Add</button>
- <span ng-hide="$index==0">
- <button ng-if="rangeReport.removed!='true'" type="submit" style="width: 90px; height:35px;margin-left:5px;" class="btn btn-secondary btn-small" ng-click="removeRangeAxisRow($index)">Remove</button>
- <button ng-if="rangeReport.removed=='true'" type="submit" style="width: 90px; height:35px;margin-left:5px;" class="btn btn-secondary btn-small" disabled="disabled">Removed</button>
- </span>
- </td>
- </tr>
-
- </tbody>
-</table>
-</div>
+ <div ng-hide="showLoader">
+ <div>
+ <div class="form-row">
+ <label for="checkbox1" class="checkbox"> <input
+ id="checkbox1" type="checkbox" ng-model="reportRunJson.animation" /><i
+ class="skin"></i><span>Animation</span>
+ </label>
+ </div>
+ <table>
+ <thead>
+ <tr>
+ <th width="30%">Chart Type</th>
+ <th></th>
+ </tr>
+ </thead>
-</div>
-
-<div ng-show=false style="min-height:500px" data-ng-init="init()">
- <div class="fn-ebz-container" >
- <label class="fn-ebz-text-label">Chart Type</label><BR>
- <div class="form-field" att-select="chartTypes" ng-model="reportRunJson.chartTypeJSON" placeholder="Select an Option" show-input-filter="true" ng-change="actionClicked()"></div>
- </div>
-
-
- <div class="fn-ebz-container" style="position:relative; top: -8px;">
- <label class="fn-ebz-text-label">Animate</label><BR>
- <div><input type="checkbox" ng-model="reportRunJson.animation" att-checkbox data-ng-value="true"></div>
- </div>
- <BR>
-
- <div class="fn-ebz-container" >
- <label class="fn-ebz-text-label">Width (Px)</label><BR>
- <input type="text" name="chartWidth" maxlength=4 only-digits ng-model="reportRunJson.width" style="width:80px"/>
- </div>
-
- <div class="fn-ebz-container" >
- <label class="fn-ebz-text-label">Height (Px)</label><BR>
- <input type="text" name="chartHeight" maxlength=4 only-digits ng-model="reportRunJson.height" style="width:80px"/>
- </div>
- <BR>
-
- <div class="fn-ebz-container">
- <label class="fn-ebz-text-label">Title</label><BR>
- <span><input name="tle" type="radio" ng-model="reportRunJson.showTitle" data-ng-value="true"/>Show</span>
- <span><input name="tle" type="radio" ng-model="reportRunJson.showTitle" data-ng-value="false"/>Hide</span>
- </div>
- <BR>
-
-
- <div class="fn-ebz-container" >
- <label class="fn-ebz-text-label">Domain Axis</label><BR>
- <div class="form-field" att-select="reportRunJson.chartColumnJSONList" ng-model="reportRunJson.domainAxisJSON" placeholder="Select an Option" show-input-filter="true"></div>
- </div>
-
- <div class="fn-ebz-container" >
- <label class="fn-ebz-text-label">Category</label><BR>
- <div class="form-field" att-select="reportRunJson.chartColumnJSONList" ng-model="reportRunJson.categoryAxis" placeholder="" show-input-filter="true"></div>
- </div>
- <BR>
-
-<div style="border:2px;border-style:solid;border-color:#808080;margin-bottom:9px">
-<div ng-repeat="rangeReport in reportRunJson.rangeAxisList">
- <div style="margin-left:5px">
- <div class="fn-ebz-container">
- <label class="fn-ebz-text-label">Range Axis</label><BR>
- <div class="form-field" att-select="reportRunJson.chartColumnJSONList"
- ng-model="rangeReport.rangeAxisLabelJSON" placeholder="Select an Option" show-input-filter="true"></div>
- </div>
-
-
- <div class="fn-ebz-container" >
- <label class="fn-ebz-text-label">Y Axis</label><BR>
- <input id="yaxs" type="text" name="yAxis" maxlength=50 ng-model=rangeReport.rangeYAxis style="width:100px"/>
- </div>
-
- <div class="fn-ebz-container" >
- <label class="fn-ebz-text-label">Chart Title</label><BR>
- <input type="text" name="chartTitle" maxlength=50 ng-model="rangeReport.rangeChartGroup" style="width:200px"/>
- </div>
-
- <div class="fn-ebz-container" >
- <label class="fn-ebz-text-label">Color</label><BR>
- <div class="form-field" att-select="rangeColors" ng-model="rangeReport.rangeColorJSON" placeholder="Select an Option" show-input-filter="true"></div>
- </div>
-
- <div class="fn-ebz-container" >
- <label class="fn-ebz-text-label">Line Type</label><BR>
- <div class="form-field" att-select="lineTypes" ng-model="rangeReport.rangeLineTypeJSON" placeholder="Select an Option" show-input-filter="true"></div>
- </div>
-
- <div class="fn-ebz-container" ng-show="reportRunJson.chartTypeJSON.value=='FlexTimeChart' ||
- reportRunJson.chartTypeJSON.value=='AnnotationChart'" style="position:relative; top: -8px;">
- <label class="fn-ebz-text-label">Area</label><BR>
- <input type="checkbox" ng-model="rangeReport.showAsArea" att-checkbox data-ng-value="true">
- </div>
-
- <div class="fn-ebz-container" style="position:relative; top: 25px;">
- <a href="javascript:void(0)" ng-show="{{$index==0}}" style="float: right;" att-button btn-type="secondary" size="small" att-accessibility-click="13,32"
- ng-click="addRangeAxisRow(rangeReport);" >Add</a>
- <a href="javascript:void(0)" ng-show="{{$index>0}}" style="float: right;" att-button btn-type="secondary" size="small" att-accessibility-click="13,32" ng-click="removeRangeAxisRow($index);" >
- Remove</a>
- </div>
- </div>
- </div>
- </div>
- <BR>
-
-<accordion close-others="true" css="att-accordion--no-box">
- <accordion-group id="additionalOptions" heading="Additional Options" child-length="10">
- <div class="fn-ebz-container">
- <label class="fn-ebz-text-label">Primary Axis Label</label><BR>
- <input type="text" name="prAxis" maxlength=50 ng-model="reportRunJson.primaryAxisLabel" style="width:210px"/>
- </div>
- <div class="fn-ebz-container" >
- <label class="fn-ebz-text-label">Secondary Axis Label</label><BR>
- <input type="text" name="secAxis" maxlength=75 ng-model="reportRunJson.secondaryAxisLabel" style="width:210px"/>
- </div>
- <BR>
- <div class="fn-ebz-container" >
- <label class="fn-ebz-text-label">Range Axis Minimum Range</label><BR>
- <input type="text" name="rAxisMinRange" only-digits ng-model="reportRunJson.minRange" style="width:210px"/>
- </div>
- <div class="fn-ebz-container">
- <label class="fn-ebz-text-label">Maximum Range</label><BR>
- <input type="text" name="rAxisMaxRange" only-digits ng-model="reportRunJson.maxRange" ng-maxLength="35" style="width:210px"/>
- </div><BR>
- </accordion-group>
-</accordion>
-
-
-
-
-<div ng-show="reportRunJson.chartType=='BarChart3D'">
-
- <accordion close-others="true" css="att-accordion--no-box">
- <accordion-group id="accBar" heading="Bar Chart Options" child-length="10">
-
-
- <div style="border:2px;border-style:solid;border-color:#808080;margin-bottom:9px">
- <div class="fn-ebz-container" style="position:relative;margin:10px;" >
- <label class="fn-ebz-text-label">Orientation</label><BR>
- <span><input name="orient" type="radio" ng-model="reportRunJson.barChartOptions.verticalOrientation" data-ng-value="true"/>Vertical</span>
- <span><input name="orient" type="radio" ng-model="reportRunJson.barChartOptions.verticalOrientation" data-ng-value="false"/>Horizontal</span>
+ <tbody>
+ <tr>
+ <td><select name="chartType" b2b-dropdown
+ ng-model="reportRunJson.chartType">
+ <option b2b-dropdown-list option-repeat="d in chartTypeOptions"
+ value="{{d.value}}">{{d.text}}</option>
+ </select></td>
+ <td></td>
+ </tr>
+ </tbody>
+ </table>
+
+ <table>
+ <thead>
+ <tr>
+ <th width="50px">Width (px)</th>
+ <th>Height (px)</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><input type="text" name="displayName"
+ ng-model="reportRunJson.width" style="width: 100px;"></td>
+ <td><input type="text" name="displayName"
+ ng-model="reportRunJson.height" style="width: 100px;"></td>
+ </tr>
+ </tbody>
+ </table>
+
+ <table>
+ <thead>
+ <tr>
+ <th width="50px">Title</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <fieldset role="radiogroup" radio-group-accessibility>
+ <td><label for="optionsRadiosShowTitleTrue" class="radio">
+ <input type="radio" ng-model="reportRunJson.showTitle"
+ id="optionsRadiosShowTitleTrue"
+ name="optionsRadiosShowTitleTrue" value="true"> <i
+ class="skin"></i> <span>Show</span>
+ </label></td>
+ <td><label for="optionsRadiosShowTitleFalse" class="radio">
+ <input type="radio" ng-model="reportRunJson.showTitle"
+ id="optionsRadiosShowTitleFalse"
+ name="optionsRadiosShowTitleFalse" value="false"> <i
+ class="skin"></i> <span>Hide</span>
+ </label></td>
+ </fieldset>
+ </tr>
+
+ </tbody>
+ </table>
+
+ <table>
+ <thead>
+ <tr>
+ <th width="30%">Domain Axis</th>
+ <th width="30%">Category</th>
+ <th width="40%"></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><select name="chartType" b2b-dropdown
+ ng-model="reportRunJson.domainAxis">
+ <option b2b-dropdown-list
+ option-repeat="d in reportRunJson.chartColumnJSONList"
+ value="{{d.value}}">{{d.title}}</option>
+ </select></td>
+ <td><select name="chartType" b2b-dropdown
+ ng-model="reportRunJson.categoryAxis">
+ <option b2b-dropdown-list
+ option-repeat="d in reportRunJson.chartColumnJSONList"
+ value="{{d.value}}">{{d.title}}</option>
+ </select></td>
+ </tr>
+ </tbody>
+ </table>
+
+
+ <div id="RangeTable">
+
+ <table ng-repeat="rangeReport in reportRunJson.rangeAxisList">
+ <thead>
+ <tr>
+ <th width="18%">Range Axis</th>
+ <th width="15%">Y Axis</th>
+ <th width="15%">Chart Title</th>
+ <th width="22%">Color</th>
+ <th width="25%">Line Type</th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><select name="chartType" b2b-dropdown
+ ng-model="rangeReport.rangeAxisLabelJSON.value"
+ placeholder-text="Select"
+ ng-disabled="rangeReport.removed=='true'">
+ <option b2b-dropdown-list
+ option-repeat="d in reportRunJson.chartColumnJSONList"
+ value="{{d.value}}">{{d.title}}</option>
+ </select></td>
+ <td><input type="text" name="displayName"
+ ng-model="rangeReport.rangeYAxis"
+ ng-disabled="rangeReport.removed=='true'" style="width: 100px;">
+ </td>
+ <td><input type="text" name="displayName"
+ ng-model="rangeReport.rangeChartGroup"
+ ng-disabled="rangeReport.removed=='true'" style="width: 150px;">
+ </td>
+ <td><select name="chartType" b2b-dropdown
+ ng-model="rangeReport.rangeColor"
+ ng-disabled="rangeReport.removed=='true'">
+ <option b2b-dropdown-list option-repeat="d in rangeColors"
+ value="{{d.value}}">{{d.title}}</option>
+ </select></td>
+ <td><select name="lineType" b2b-dropdown
+ ng-model="rangeReport.rangeLineType"
+ ng-disabled="rangeReport.removed=='true'">
+ <option b2b-dropdown-list option-repeat="d in lineTypes"
+ value="{{d.value}}">{{d.title}}</option>
+ </select></td>
+ <td><span>
+ <button ng-if="rangeReport.removed!='true'" type="submit"
+ style="width: 90px; height: 35px; margin-left: 5px;"
+ class="btn btn-secondary btn-small"
+ ng-click="removeRangeAxisRow($index)">Remove</button>
+ <button ng-if="rangeReport.removed=='true'" type="submit"
+ style="width: 90px; height: 35px; margin-left: 5px;"
+ class="btn btn-secondary btn-small" disabled="disabled">Removed</button>
+ </span></td>
+ </tr>
+
+ </tbody>
+ </table>
+ <div align="right" style="margin-right:20px">
+ <button type="submit" class="btn btn-secondary btn-small" ng-click="addRangeAxisRow()">Add</button>
+ </div>
+ </div>
</div>
-
- <div class="fn-ebz-container" style="position:relative;margin:10px;">
- <label class="fn-ebz-text-label">Stacked</label><BR>
- <span><input name="stack" type="radio" ng-model="reportRunJson.barChartOptions.stackedChart" data-ng-value="true"/>Yes</span>
- <span><input name="stack" type="radio" ng-model="reportRunJson.barChartOptions.stackedChart" data-ng-value="false"/>No</span>
- </div>
-
- <div class="fn-ebz-container" style="position:relative;margin:10px;">
- <label class="fn-ebz-text-label">Show Controls</label><BR>
- <span><input name="shwcontrol" type="radio" ng-model="reportRunJson.barChartOptions.displayBarControls" data-ng-value="true"/>Yes</span>
- <span><input name="shwcontrol" type="radio" ng-model="reportRunJson.barChartOptions.displayBarControls" data-ng-value="false"/>No</span>
- </div>
-
- <div class="fn-ebz-container" style="position:relative;margin:10px;">
- <label class="fn-ebz-text-label">XAxis Date Type</label><BR>
- <span><input name="xAxisDtype" type="radio" ng-model="reportRunJson.barChartOptions.xAxisDateType" data-ng-value="true"/>Yes</span>
- <span><input name="xAxisDtype" type="radio" ng-model="reportRunJson.barChartOptions.xAxisDateType" data-ng-value="false"/>No</span>
- </div>
-
- <div class="fn-ebz-container" style="position:relative;margin:10px;">
- <label class="fn-ebz-text-label">Display less XAxis tickers</label><BR>
- <span><input name="xTicker" type="radio" ng-model="reportRunJson.barChartOptions.minimizeXAxisTickers" data-ng-value="true"/>Yes</span>
- <span><input name="xTicker" type="radio" ng-model="reportRunJson.barChartOptions.minimizeXAxisTickers" data-ng-value="false"/>No</span>
- </div><BR>
-
- <div class="fn-ebz-container" style="position:relative;margin:10px;">
- <label class="fn-ebz-text-label">Is Time Axis?</label><BR>
- <span><input name="timeAxis" type="radio" ng-model="reportRunJson.barChartOptions.timeAxis" data-ng-value="true"/>Yes</span>
- <span><input name="timeAxis" type="radio" ng-model="reportRunJson.barChartOptions.timeAxis" data-ng-value="false"/>No</span>
- </div>
-
- <div class="fn-ebz-container" style="position:relative;margin:10px;">
- <label class="fn-ebz-text-label">Log Scale (Y Axis)</label><BR>
- <span><input type="checkbox" ng-model="reportRunJson.barChartOptions.yAxisLogScale" att-checkbox data-ng-value="true"></span>
-
- </div>
- </div>
- </accordion-group>
-</accordion>
-</div>
- {{reportRunJson.chartType}}
- <div ng-show="reportRunJson.chartType=='TimeSeriesChart'">
- <accordion close-others="true" css="att-accordion--no-box">
- <accordion-group id="accTimeChart" heading="Time Series Chart Options" child-length="10">
-
- <div style="border:2px;border-style:solid;border-color:#808080;margin-bottom:9px">
- <div style="margin-left:5px">
+ <div ng-show=false style="min-height: 500px" data-ng-init="init()">
<div class="fn-ebz-container">
- <label class="fn-ebz-text-label">Render as</label><BR>
- <span><input name="renderAs" type="radio" ng-model="reportRunJson.timeSeriesChartOptions.lineChartRenderer" value="line"/>Line</span>
- <span><input name="orient" type="radio" ng-model="reportRunJson.timeSeriesChartOptions.lineChartRenderer" value="area"/>Area</span>
+ <label class="fn-ebz-text-label">Chart Type</label><BR>
+ <div class="form-field" att-select="chartTypes"
+ ng-model="reportRunJson.chartTypeJSON"
+ placeholder="Select an Option" show-input-filter="true"
+ ng-change="actionClicked()"></div>
</div>
-
- <div class="fn-ebz-container" style="position:relative;margin:10px;">
- <label class="fn-ebz-text-label">X Axis Label</label><BR>
- <span><input type="checkbox" ng-model="reportRunJson.timeSeriesChartOptions.showXAxisLabel" att-checkbox data-ng-value="true"></span>
- </div><BR>
-
- <div class="fn-ebz-container" style="position:relative;bottom:10px;">
- <label class="fn-ebz-text-label">X Axis <br>Tickers</label><BR>
- <span style="position:relative;top:10px;"><input type="checkbox" ng-model="reportRunJson.timeSeriesChartOptions.addXAxisTicker" att-checkbox data-ng-value="true"></span>
- </div>
-
- <div class="fn-ebz-container" style="position:relative;margin:20px;">
- <label class="fn-ebz-text-label">Is Time Axis?</label><BR>
- <span><input name="timeAxisChart" type="radio" ng-model="reportRunJson.timeSeriesChartOptions.nonTimeAxis" data-ng-value="true"/>Yes</span>
- <span><input name="timeAxisChart" type="radio" ng-model="reportRunJson.timeSeriesChartOptions.nonTimeAxis" data-ng-value="false"/>No</span>
- </div>
-
- <div class="fn-ebz-container" style="position:relative;margin:10px;">
- <label class="fn-ebz-text-label">Multi Series?</label><BR>
- <span><input name="mSeries" type="radio" ng-model="reportRunJson.timeSeriesChartOptions.multiSeries" data-ng-value="true"/>Yes</span>
- <span><input name="mSeries" type="radio" ng-model="reportRunJson.timeSeriesChartOptions.multiSeries" data-ng-value="false"/>No</span>
- </div>
- </div>
- </div>
-
- </accordion-group>
- </accordion>
-
- </div>
-
- <div>
-
- <accordion close-others="true" css="att-accordion--no-box">
- <accordion-group id="accFlexTimeChart" heading="Flex Time Series Chart Options" child-length="10">
-
- <div style="border:2px;border-style:solid;border-color:#808080;margin-bottom:9px">
- <div style="margin-left:5px">
- <div class="fn-ebz-container">
- <label class="fn-ebz-text-label">Zoom-In Window</label><BR>
- <span><input type="text" name="zWindow" only-digits maxlength=3 ng-model="reportRunJson.flexTimeSeriesChartOptions.zoomIn"></span>
- </div>
-
- <div class="fn-ebz-container" style="position:relative;margin:10px;">
- <label class="fn-ebz-text-label">Time Axis Type</label><BR>
- <span><input name="timeAxisType" type="radio" ng-model="reportRunJson.flexTimeSeriesChartOptions.timeAxisType" value="weekly"/>Weekly</span>
- <span><input name="timeAxisType" type="radio" ng-model="reportRunJson.flexTimeSeriesChartOptions.timeAxisType" value="daily"/>Daily</span>
- <span><input name="timeAxisType" type="radio" ng-model="reportRunJson.flexTimeSeriesChartOptions.timeAxisType" value="hourly"/>Hourly</span>
- <span><input name="timeAxisType" type="radio" ng-model="reportRunJson.flexTimeSeriesChartOptions.timeAxisType" value="30min"/>30 Min</span>
+
+
+ <div class="fn-ebz-container" style="position: relative; top: -8px;">
+ <label class="fn-ebz-text-label">Animate</label><BR>
+ <div>
+ <input type="checkbox" ng-model="reportRunJson.animation"
+ att-checkbox data-ng-value="true">
+ </div>
+ </div>
+ <BR>
+
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Width (Px)</label><BR> <input
+ type="text" name="chartWidth" maxlength=4 only-digits
+ ng-model="reportRunJson.width" style="width: 80px" />
+ </div>
+
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Height (Px)</label><BR> <input
+ type="text" name="chartHeight" maxlength=4 only-digits
+ ng-model="reportRunJson.height" style="width: 80px" />
+ </div>
+ <BR>
+
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Title</label><BR> <span><input
+ name="tle" type="radio" ng-model="reportRunJson.showTitle"
+ data-ng-value="true" />Show</span> <span><input name="tle"
+ type="radio" ng-model="reportRunJson.showTitle"
+ data-ng-value="false" />Hide</span>
+ </div>
+ <BR>
+
+
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Domain Axis</label><BR>
+ <div class="form-field"
+ att-select="reportRunJson.chartColumnJSONList"
+ ng-model="reportRunJson.domainAxisJSON"
+ placeholder="Select an Option" show-input-filter="true"></div>
+ </div>
+
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Category</label><BR>
+ <div class="form-field"
+ att-select="reportRunJson.chartColumnJSONList"
+ ng-model="reportRunJson.categoryAxis" placeholder=""
+ show-input-filter="true"></div>
+ </div>
+ <BR>
+
+ <div
+ style="border: 2px; border-style: solid; border-color: #808080; margin-bottom: 9px">
+ <div ng-repeat="rangeReport in reportRunJson.rangeAxisList">
+ <div style="margin-left: 5px">
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Range Axis</label><BR>
+ <div class="form-field"
+ att-select="reportRunJson.chartColumnJSONList"
+ ng-model="rangeReport.rangeAxisLabelJSON"
+ placeholder="Select an Option" show-input-filter="true"></div>
+ </div>
+
+
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Y Axis</label><BR> <input
+ id="yaxs" type="text" name="yAxis" maxlength=50
+ ng-model=rangeReport.rangeYAxis style="width: 100px" />
+ </div>
+
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Chart Title</label><BR> <input
+ type="text" name="chartTitle" maxlength=50
+ ng-model="rangeReport.rangeChartGroup" style="width: 200px" />
+ </div>
+
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Color</label><BR>
+ <div class="form-field" att-select="rangeColors"
+ ng-model="rangeReport.rangeColorJSON"
+ placeholder="Select an Option" show-input-filter="true"></div>
+ </div>
+
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Line Type</label><BR>
+ <div class="form-field" att-select="lineTypes"
+ ng-model="rangeReport.rangeLineTypeJSON"
+ placeholder="Select an Option" show-input-filter="true"></div>
+ </div>
+
+ <div class="fn-ebz-container"
+ ng-show="reportRunJson.chartTypeJSON.value=='FlexTimeChart' ||
+ reportRunJson.chartTypeJSON.value=='AnnotationChart'"
+ style="position: relative; top: -8px;">
+ <label class="fn-ebz-text-label">Area</label><BR> <input
+ type="checkbox" ng-model="rangeReport.showAsArea" att-checkbox
+ data-ng-value="true">
+ </div>
+
+ <div class="fn-ebz-container"
+ style="position: relative; top: 25px;">
+ <a href="javascript:void(0)" ng-show="{{$index==0}}"
+ style="float: right;" att-button btn-type="secondary"
+ size="small" att-accessibility-click="13,32"
+ ng-click="addRangeAxisRow(rangeReport);">Add</a> <a
+ href="javascript:void(0)" ng-show="{{$index>0}}"
+ style="float: right;" att-button btn-type="secondary"
+ size="small" att-accessibility-click="13,32"
+ ng-click="removeRangeAxisRow($index);"> Remove</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <BR>
+
+ <accordion close-others="true" css="att-accordion--no-box">
+ <accordion-group id="additionalOptions" heading="Additional Options"
+ child-length="10">
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Primary Axis Label</label><BR>
+ <input type="text" name="prAxis" maxlength=50
+ ng-model="reportRunJson.primaryAxisLabel" style="width: 210px" />
+ </div>
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Secondary Axis Label</label><BR>
+ <input type="text" name="secAxis" maxlength=75
+ ng-model="reportRunJson.secondaryAxisLabel" style="width: 210px" />
+ </div>
+ <BR>
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Range Axis Minimum Range</label><BR>
+ <input type="text" name="rAxisMinRange" only-digits
+ ng-model="reportRunJson.minRange" style="width: 210px" />
+ </div>
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Maximum Range</label><BR> <input
+ type="text" name="rAxisMaxRange" only-digits
+ ng-model="reportRunJson.maxRange" ng-maxLength="35"
+ style="width: 210px" />
+ </div>
+ <BR>
+ </accordion-group> </accordion>
+
+
+
+
+ <div ng-show="reportRunJson.chartType=='BarChart3D'">
+
+ <accordion close-others="true" css="att-accordion--no-box">
+ <accordion-group id="accBar" heading="Bar Chart Options"
+ child-length="10">
+
+
+ <div
+ style="border: 2px; border-style: solid; border-color: #808080; margin-bottom: 9px">
+ <div class="fn-ebz-container"
+ style="position: relative; margin: 10px;">
+ <label class="fn-ebz-text-label">Orientation</label><BR> <span><input
+ name="orient" type="radio"
+ ng-model="reportRunJson.barChartOptions.verticalOrientation"
+ data-ng-value="true" />Vertical</span> <span><input name="orient"
+ type="radio"
+ ng-model="reportRunJson.barChartOptions.verticalOrientation"
+ data-ng-value="false" />Horizontal</span>
+ </div>
+
+ <div class="fn-ebz-container"
+ style="position: relative; margin: 10px;">
+ <label class="fn-ebz-text-label">Stacked</label><BR> <span><input
+ name="stack" type="radio"
+ ng-model="reportRunJson.barChartOptions.stackedChart"
+ data-ng-value="true" />Yes</span> <span><input name="stack"
+ type="radio"
+ ng-model="reportRunJson.barChartOptions.stackedChart"
+ data-ng-value="false" />No</span>
+ </div>
+
+ <div class="fn-ebz-container"
+ style="position: relative; margin: 10px;">
+ <label class="fn-ebz-text-label">Show Controls</label><BR> <span><input
+ name="shwcontrol" type="radio"
+ ng-model="reportRunJson.barChartOptions.displayBarControls"
+ data-ng-value="true" />Yes</span> <span><input name="shwcontrol"
+ type="radio"
+ ng-model="reportRunJson.barChartOptions.displayBarControls"
+ data-ng-value="false" />No</span>
+ </div>
+
+ <div class="fn-ebz-container"
+ style="position: relative; margin: 10px;">
+ <label class="fn-ebz-text-label">XAxis Date Type</label><BR>
+ <span><input name="xAxisDtype" type="radio"
+ ng-model="reportRunJson.barChartOptions.xAxisDateType"
+ data-ng-value="true" />Yes</span> <span><input name="xAxisDtype"
+ type="radio"
+ ng-model="reportRunJson.barChartOptions.xAxisDateType"
+ data-ng-value="false" />No</span>
+ </div>
+
+ <div class="fn-ebz-container"
+ style="position: relative; margin: 10px;">
+ <label class="fn-ebz-text-label">Display less XAxis
+ tickers</label><BR> <span><input name="xTicker" type="radio"
+ ng-model="reportRunJson.barChartOptions.minimizeXAxisTickers"
+ data-ng-value="true" />Yes</span> <span><input name="xTicker"
+ type="radio"
+ ng-model="reportRunJson.barChartOptions.minimizeXAxisTickers"
+ data-ng-value="false" />No</span>
+ </div>
+ <BR>
+
+ <div class="fn-ebz-container"
+ style="position: relative; margin: 10px;">
+ <label class="fn-ebz-text-label">Is Time Axis?</label><BR> <span><input
+ name="timeAxis" type="radio"
+ ng-model="reportRunJson.barChartOptions.timeAxis"
+ data-ng-value="true" />Yes</span> <span><input name="timeAxis"
+ type="radio" ng-model="reportRunJson.barChartOptions.timeAxis"
+ data-ng-value="false" />No</span>
+ </div>
+
+ <div class="fn-ebz-container"
+ style="position: relative; margin: 10px;">
+ <label class="fn-ebz-text-label">Log Scale (Y Axis)</label><BR>
+ <span><input type="checkbox"
+ ng-model="reportRunJson.barChartOptions.yAxisLogScale"
+ att-checkbox data-ng-value="true"></span>
+
+ </div>
+ </div>
+
+ </accordion-group> </accordion>
+ </div>
+ {{reportRunJson.chartType}}
+ <div ng-show="reportRunJson.chartType=='TimeSeriesChart'">
+ <accordion close-others="true" css="att-accordion--no-box">
+ <accordion-group id="accTimeChart"
+ heading="Time Series Chart Options" child-length="10">
+
+ <div
+ style="border: 2px; border-style: solid; border-color: #808080; margin-bottom: 9px">
+ <div style="margin-left: 5px">
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Render as</label><BR> <span><input
+ name="renderAs" type="radio"
+ ng-model="reportRunJson.timeSeriesChartOptions.lineChartRenderer"
+ value="line" />Line</span> <span><input name="orient"
+ type="radio"
+ ng-model="reportRunJson.timeSeriesChartOptions.lineChartRenderer"
+ value="area" />Area</span>
+ </div>
+
+ <div class="fn-ebz-container"
+ style="position: relative; margin: 10px;">
+ <label class="fn-ebz-text-label">X Axis Label</label><BR> <span><input
+ type="checkbox"
+ ng-model="reportRunJson.timeSeriesChartOptions.showXAxisLabel"
+ att-checkbox data-ng-value="true"></span>
+ </div>
+ <BR>
+
+ <div class="fn-ebz-container"
+ style="position: relative; bottom: 10px;">
+ <label class="fn-ebz-text-label">X Axis <br>Tickers
+ </label><BR> <span style="position: relative; top: 10px;"><input
+ type="checkbox"
+ ng-model="reportRunJson.timeSeriesChartOptions.addXAxisTicker"
+ att-checkbox data-ng-value="true"></span>
+ </div>
+
+ <div class="fn-ebz-container"
+ style="position: relative; margin: 20px;">
+ <label class="fn-ebz-text-label">Is Time Axis?</label><BR> <span><input
+ name="timeAxisChart" type="radio"
+ ng-model="reportRunJson.timeSeriesChartOptions.nonTimeAxis"
+ data-ng-value="true" />Yes</span> <span><input
+ name="timeAxisChart" type="radio"
+ ng-model="reportRunJson.timeSeriesChartOptions.nonTimeAxis"
+ data-ng-value="false" />No</span>
+ </div>
+
+ <div class="fn-ebz-container"
+ style="position: relative; margin: 10px;">
+ <label class="fn-ebz-text-label">Multi Series?</label><BR> <span><input
+ name="mSeries" type="radio"
+ ng-model="reportRunJson.timeSeriesChartOptions.multiSeries"
+ data-ng-value="true" />Yes</span> <span><input name="mSeries"
+ type="radio"
+ ng-model="reportRunJson.timeSeriesChartOptions.multiSeries"
+ data-ng-value="false" />No</span>
+ </div>
+ </div>
+ </div>
+
+ </accordion-group> </accordion>
+
+ </div>
+
+ <div>
+
+ <accordion close-others="true" css="att-accordion--no-box">
+ <accordion-group id="accFlexTimeChart"
+ heading="Flex Time Series Chart Options" child-length="10">
+
+ <div
+ style="border: 2px; border-style: solid; border-color: #808080; margin-bottom: 9px">
+ <div style="margin-left: 5px">
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Zoom-In Window</label><BR>
+ <span><input type="text" name="zWindow" only-digits
+ maxlength=3
+ ng-model="reportRunJson.flexTimeSeriesChartOptions.zoomIn"></span>
+ </div>
+
+ <div class="fn-ebz-container"
+ style="position: relative; margin: 10px;">
+ <label class="fn-ebz-text-label">Time Axis Type</label><BR>
+ <span><input name="timeAxisType" type="radio"
+ ng-model="reportRunJson.flexTimeSeriesChartOptions.timeAxisType"
+ value="weekly" />Weekly</span> <span><input name="timeAxisType"
+ type="radio"
+ ng-model="reportRunJson.flexTimeSeriesChartOptions.timeAxisType"
+ value="daily" />Daily</span> <span><input name="timeAxisType"
+ type="radio"
+ ng-model="reportRunJson.flexTimeSeriesChartOptions.timeAxisType"
+ value="hourly" />Hourly</span> <span><input name="timeAxisType"
+ type="radio"
+ ng-model="reportRunJson.flexTimeSeriesChartOptions.timeAxisType"
+ value="30min" />30 Min</span>
+ </div>
+ </div>
+ </div>
+ </accordion-group> </accordion>
+
+ </div>
+
+
+
+
+
+
+
+
+ <accordion close-others="true" css="att-accordion--no-box">
+ <accordion-group id="accCommonOptions" heading="Common Options"
+ child-length="10">
+
+ <div
+ style="border: 2px; border-style: solid; border-color: #808080; margin-bottom: 9px">
+ <div style="margin-left: 5px">
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Legend Angle</label><BR> <span><input
+ name="langle" type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendLabelAngle"
+ value="up45" />up 45&deg;</span> <span><input name="langle"
+ type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendLabelAngle"
+ value="up90" />up 90&deg;</span> <span><input name="langle"
+ type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendLabelAngle"
+ value="down45" />down 45&deg;</span> <span><input name="langle"
+ type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendLabelAngle"
+ value="down90" />down 90&deg;</span> <span><input name="langle"
+ type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendLabelAngle"
+ value="standard" />Standard</span>
+ </div>
+
+ <div class="fn-ebz-container"
+ style="position: relative; margin: 15px;">
+ <label class="fn-ebz-text-label">Legend Position</label><BR>
+ <span><input name="lgPosition" type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendPosition"
+ value="top" />Top</span> <span><input name="lgPosition"
+ type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendPosition"
+ value="bottom" />Bottom</span>
+ </div>
+ <BR>
+
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Legend</label><BR> <span><input
+ name="lgd" type="radio"
+ ng-model="reportRunJson.commonChartOptions.hideLegend"
+ data-ng-value="false" />Yes</span> <span><input name="lgd"
+ type="radio"
+ ng-model="reportRunJson.commonChartOptions.hideLegend"
+ data-ng-value="true" />No</span>
+ </div>
+
+ <div class="fn-ebz-container"
+ style="position: relative; margin: 10px;">
+ <label class="fn-ebz-text-label">Animation</label><BR> <span><input
+ name="anmtate" type="radio"
+ ng-model="reportRunJson.commonChartOptions.animateAnimatedChart"
+ data-ng-value="true" />Yes</span> <span><input name="anmtate"
+ type="radio"
+ ng-model="reportRunJson.commonChartOptions.animateAnimatedChart"
+ data-ng-value="false" />No</span>
+ </div>
+ <BR>
+
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Top Margin</label><BR> <input
+ type="text" name="reportRunJson.commonChartOptions.topMargin"
+ only-digits maxlength=3
+ ng-model="reportRunJson.commonChartOptions.topMargin"
+ style="width: 210px" />
+ </div>
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Bottom Margin</label><BR> <input
+ type="text" name="reportRunJson.commonChartOptions.bottomMargin"
+ only-digits maxlength=3
+ ng-model="reportRunJson.commonChartOptions.bottomMargin"
+ style="width: 210px" />
+ </div>
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Left Margin</label><BR> <input
+ type="text" name="reportRunJson.commonChartOptions.leftMargin"
+ only-digits maxlength=3
+ ng-model="reportRunJson.commonChartOptions.leftMargin"
+ style="width: 210px" />
+ </div>
+ <div class="fn-ebz-container">
+ <label class="fn-ebz-text-label">Right Margin</label><BR> <input
+ type="text" name="reportRunJson.commonChartOptions.rightMargin"
+ only-digits maxlength=3
+ ng-model="reportRunJson.commonChartOptions.rightMargin"
+ style="width: 210px">
+ </div>
+ <BR>
+ </div>
+ </div>
+ </accordion-group> </accordion>
+ <br />
+ <br /> <a href="javascript:void(0)" att-button btn-type="primary"
+ att-accessibility-click="13,32" ng-click="saveChartData();">Save</a>
+ <a
+ href="report#/report_run/c_master={{reportRunJson.reportID}}&refresh=Y"
+ att-button btn-type="primary" att-accessibility-click="13,32">Run</a>
</div>
- </div>
- </div>
- </accordion-group>
- </accordion>
-
- </div>
-
-
-
-
-
-
-
-
- <accordion close-others="true" css="att-accordion--no-box">
- <accordion-group id="accCommonOptions" heading="Common Options" child-length="10">
-
- <div style="border:2px;border-style:solid;border-color:#808080;margin-bottom:9px">
- <div style="margin-left:5px">
- <div class="fn-ebz-container">
- <label class="fn-ebz-text-label">Legend Angle</label><BR>
- <span><input name="langle" type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" value="up45"/>up 45&deg;</span>
- <span><input name="langle" type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" value="up90"/>up 90&deg;</span>
- <span><input name="langle" type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" value="down45"/>down 45&deg;</span>
- <span><input name="langle" type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" value="down90"/>down 90&deg;</span>
- <span><input name="langle" type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" value="standard"/>Standard</span>
- </div>
-
- <div class="fn-ebz-container" style="position:relative;margin:15px;">
- <label class="fn-ebz-text-label">Legend Position</label><BR>
- <span><input name="lgPosition" type="radio" ng-model="reportRunJson.commonChartOptions.legendPosition" value="top"/>Top</span>
- <span><input name="lgPosition" type="radio" ng-model="reportRunJson.commonChartOptions.legendPosition" value="bottom"/>Bottom</span>
- </div><BR>
-
- <div class="fn-ebz-container">
- <label class="fn-ebz-text-label">Legend</label><BR>
- <span><input name="lgd" type="radio" ng-model="reportRunJson.commonChartOptions.hideLegend" data-ng-value="false"/>Yes</span>
- <span><input name="lgd" type="radio" ng-model="reportRunJson.commonChartOptions.hideLegend" data-ng-value="true"/>No</span>
- </div>
-
- <div class="fn-ebz-container" style="position:relative;margin:10px;">
- <label class="fn-ebz-text-label">Animation</label><BR>
- <span><input name="anmtate" type="radio" ng-model="reportRunJson.commonChartOptions.animateAnimatedChart" data-ng-value="true" />Yes</span>
- <span><input name="anmtate" type="radio" ng-model="reportRunJson.commonChartOptions.animateAnimatedChart" data-ng-value="false"/>No</span>
- </div><BR>
-
- <div class="fn-ebz-container">
- <label class="fn-ebz-text-label">Top Margin</label><BR>
- <input type="text" name="reportRunJson.commonChartOptions.topMargin" only-digits maxlength=3 ng-model="reportRunJson.commonChartOptions.topMargin" style="width:210px"/>
- </div>
- <div class="fn-ebz-container">
- <label class="fn-ebz-text-label">Bottom Margin</label><BR>
- <input type="text" name="reportRunJson.commonChartOptions.bottomMargin" only-digits maxlength=3 ng-model="reportRunJson.commonChartOptions.bottomMargin" style="width:210px"/>
- </div>
- <div class="fn-ebz-container">
- <label class="fn-ebz-text-label">Left Margin</label><BR>
- <input type="text" name="reportRunJson.commonChartOptions.leftMargin" only-digits maxlength=3 ng-model="reportRunJson.commonChartOptions.leftMargin" style="width:210px"/>
- </div>
- <div class="fn-ebz-container">
- <label class="fn-ebz-text-label">Right Margin</label><BR>
- <input type="text" name="reportRunJson.commonChartOptions.rightMargin" only-digits maxlength=3 ng-model="reportRunJson.commonChartOptions.rightMargin" style="width:210px">
- </div><BR>
- </div>
- </div>
- </accordion-group>
-</accordion>
- <br/><br/>
- <a href="javascript:void(0)" att-button btn-type="primary" att-accessibility-click="13,32" ng-click="saveChartData();">Save</a>
- <a href="report#/report_run/c_master={{reportRunJson.reportID}}&refresh=Y" att-button btn-type="primary" att-accessibility-click="13,32">Run</a>
-</div>
-<div>
- <b2b-expanders class="mpc-expanders" is-open="additionalOptionOpen">
- <b2b-expander-heading>
- <div class="row">
- <div class="span6">
- <div class="heading-medium b2b-blue" ng-class=" { 'b2b-toggle-header-active': !additionalOptionOpen, 'b2b-toggle-header-inactive': additionalOptionOpen } ">Additional Options</div>
- <p class="p-small">
- </p>
- </div>
- <div style="position: absolute;right: 250px;" class="span1">
- <i class="pull-right b2b-toggle-header-icon" b2b-expander-toggle b2b-accessibility-click="13,32" expand-icon="icon-primary-collapsed" collapse-icon="icon-primary-expanded" tabindex="0" aria-posinset="1" aria-setsize="2"></i>
- </div>
- </div>
- </b2b-expander-heading>
- <b2b-expander-body>
- <div>
- <div id="RangeTable">
- <table>
- <thead>
- <tr>
- <th width="30%">Primary Axis Label</th>
- <th width="30%">Secondary Axis Label</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <input type="text" name="primaryAxisLabel" ng-model="reportRunJson.primaryAxisLabel" style="width:200px;">
- </td>
- <td>
- <input type="text" name="secondaryAxisLabel" ng-model="reportRunJson.secondaryAxisLabel" style="width:200px;">
- </td>
- </tr>
- </tbody>
- </table>
- <table>
- <thead>
- <tr>
- <th width="30%">Range Axis Minimum Range</th>
- <th width="30%">Maximum Range</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <input type="text" name="minRange" ng-model="reportRunJson.minRange" style="width:200px;">
- </td>
- <td>
- <input type="text" name="maxRange" ng-model="reportRunJson.maxRange" style="width:200px;">
- </td>
- </tr>
- </tbody>
- </table>
- </div>
+ <div>
+ <b2b-expanders class="mpc-expanders" is-open="additionalOptionOpen">
+ <b2b-expander-heading>
+ <div class="row">
+ <div class="span6">
+ <div class="heading-medium b2b-blue"
+ ng-class=" { 'b2b-toggle-header-active': !additionalOptionOpen, 'b2b-toggle-header-inactive': additionalOptionOpen } ">Additional
+ Options</div>
+ <p class="p-small"></p>
+ </div>
+ <div style="position: absolute; right: 250px;" class="span1">
+ <i class="pull-right b2b-toggle-header-icon" b2b-expander-toggle
+ b2b-accessibility-click="13,32"
+ expand-icon="icon-primary-collapsed"
+ collapse-icon="icon-primary-expanded" tabindex="0"
+ aria-posinset="1" aria-setsize="2"></i>
+ </div>
</div>
- </b2b-expander-body>
- </b2b-expanders>
-
- <!-- BAR CHART OPTION SECTION STARTS HERE -->
- <b2b-expanders ng-show="reportRunJson.chartType=='BarChart3D'" class="mpc-expanders" is-open="barChartOptionOpen">
- <b2b-expander-heading>
- <div class="row">
- <div class="span6">
- <div class="heading-medium b2b-blue" ng-class=" { 'b2b-toggle-header-active': !barChartOptionOpen, 'b2b-toggle-header-inactive': barChartOptionOpen } ">Bar Chart Options</div>
- <p class="p-small">
- </p>
- </div>
- <div style="position: absolute;right: 250px;" class="span1">
- <i class="pull-right b2b-toggle-header-icon" b2b-expander-toggle b2b-accessibility-click="13,32" expand-icon="icon-primary-collapsed" collapse-icon="icon-primary-expanded" tabindex="0" aria-posinset="1" aria-setsize="2"></i>
- </div>
- </div>
- </b2b-expander-heading>
- <b2b-expander-body>
- <div>
+ </b2b-expander-heading> <b2b-expander-body>
+ <div>
<div id="RangeTable">
- <table>
- <thead>
- <tr>
- <th width="25%">Orientation</th>
- <th width="18%">Stacked</th>
- <th width="18%">Show Controls</th>
- <th width="18%">XAxis Date Type</th>
- <th width="21%">Display less XAxis tickers</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <label for="optionsOrientationVertical" class="radio">
- <input type="radio" ng-model="reportRunJson.barChartOptions.verticalOrientation" id="optionsOrientationVertical" name="optionsOrientationVertical" value="true">
- <i class="skin"></i>
- <span>Vertical</span>
- </label>
- <label for="optionsOrientationHorizontal" class="radio">
- <input type="radio" ng-model="reportRunJson.barChartOptions.verticalOrientation" id="optionsOrientationHorizontal" name="optionsOrientationHorizontal" value="false">
- <i class="skin"></i>
- <span>Horizontal</span>
- </label>
- </td>
-
- <td>
- <label for="optionsStackedYes" class="radio">
- <input type="radio" ng-model="reportRunJson.barChartOptions.stackedChart" id="optionsStackedYes" name="optionsStackedYes" value="true">
- <i class="skin"></i>
- <span>Yes</span>
- </label>
- <label for="optionsStackedNo" class="radio">
- <input type="radio" ng-model="reportRunJson.barChartOptions.stackedChart" id="optionsStackedNo" name="optionsStackedNo" value="false">
- <i class="skin"></i>
- <span>No</span>
- </label>
- </td>
- <td>
- <label for="optionsShowControlYes" class="radio">
- <input type="radio" ng-model="reportRunJson.barChartOptions.displayBarControls" id="optionsShowControlYes" name="optionsShowControlYes" value="true">
- <i class="skin"></i>
- <span>Yes</span>
- </label>
- <label for="optionsShowControlNo" class="radio">
- <input type="radio" ng-model="reportRunJson.barChartOptions.displayBarControls" id="optionsShowControlNo" name="optionsShowControlNo" value="false">
- <i class="skin"></i>
- <span>No</span>
- </label>
- </td>
- <td>
- <label for="optionsXAxisDateTypeYes" class="radio">
- <input type="radio" ng-model="reportRunJson.barChartOptions.xAxisDateType" id="optionsXAxisDateTypeYes" name="optionsXAxisDateTypeYes" value="true">
- <i class="skin"></i>
- <span>Yes</span>
- </label>
- <label for="optionsXAxisDateTypeNo" class="radio">
- <input type="radio" ng-model="reportRunJson.barChartOptions.xAxisDateType" id="optionsXAxisDateTypeNo" name="optionsXAxisDateTypeNo" value="false">
- <i class="skin"></i>
- <span>No</span>
- </label>
- </td>
- <td>
- <label for="optionsMinimizeXAxisTickersYes" class="radio">
- <input type="radio" ng-model="reportRunJson.barChartOptions.minimizeXAxisTickers" id="optionsMinimizeXAxisTickersYes" name="optionsMinimizeXAxisTickersYes" value="true">
- <i class="skin"></i>
- <span>Yes</span>
- </label>
- <label for="optionsMinimizeXAxisTickersNo" class="radio">
- <input type="radio" ng-model="reportRunJson.barChartOptions.minimizeXAxisTickers" id="optionsMinimizeXAxisTickersNo" name="optionsMinimizeXAxisTickersNo" value="false">
- <i class="skin"></i>
- <span>No</span>
- </label>
- </td>
- </tr>
- </tbody>
- </table>
- <table>
- <thead>
- <tr>
- <th width="25%">Is Time Axis?</th>
- <th width="25%">Log Scale (Y Axis)</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <label for="optionsTimeAxisYes" class="radio">
- <input type="radio" ng-model="reportRunJson.barChartOptions.timeAxis" id="optionsTimeAxisYes" name="optionsTimeAxisYes" value="true">
- <i class="skin"></i>
- <span>Yes</span>
- </label>
- <label for="optionsTimeAxisNo" class="radio">
- <input type="radio" ng-model="reportRunJson.barChartOptions.timeAxis" id="optionsTimeAxisNo" name="optionsTimeAxisNo" value="false">
- <i class="skin"></i>
- <span>No</span>
- </label>
- </td>
- <td>
- <label for="logScaleYAxisCheckBox" class="checkbox">
- <input id="logScaleYAxisCheckBox" type="checkbox" ng-model="reportRunJson.barChartOptions.yAxisLogScale" /><i class="skin"></i><span></span>
- </label>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
+ <table>
+ <thead>
+ <tr>
+ <th width="30%">Primary Axis Label</th>
+ <th width="30%">Secondary Axis Label</th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><input type="text" name="primaryAxisLabel"
+ ng-model="reportRunJson.primaryAxisLabel" style="width: 200px;">
+ </td>
+ <td><input type="text" name="secondaryAxisLabel"
+ ng-model="reportRunJson.secondaryAxisLabel"
+ style="width: 200px;"></td>
+ </tr>
+ </tbody>
+ </table>
+ <table>
+ <thead>
+ <tr>
+ <th width="30%">Range Axis Minimum Range</th>
+ <th width="30%">Maximum Range</th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><input type="text" name="minRange"
+ ng-model="reportRunJson.minRange" style="width: 200px;">
+ </td>
+ <td><input type="text" name="maxRange"
+ ng-model="reportRunJson.maxRange" style="width: 200px;">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</div>
- </b2b-expander-body>
- </b2b-expanders>
- <!-- BAR CHART OPTION SECTION ENDS HERE -->
-
- <!-- TIME SERIES CHART OPTION SECTION STARTS HERE -->
- <b2b-expanders ng-show="reportRunJson.chartType=='TimeSeriesChart'" class="mpc-expanders" is-open="timeSeriesChartOptionOpen">
- <b2b-expander-heading>
- <div class="row">
- <div class="span6">
- <div class="heading-medium b2b-blue" ng-class=" { 'b2b-toggle-header-active': !timeSeriesChartOptionOpen, 'b2b-toggle-header-inactive': timeSeriesChartOptionOpen } ">Time Series Chart Options</div>
- <p class="p-small">
- </p>
- </div>
- <div style="position: absolute;right: 250px;" class="span1">
- <i class="pull-right b2b-toggle-header-icon" b2b-expander-toggle b2b-accessibility-click="13,32" expand-icon="icon-primary-collapsed" collapse-icon="icon-primary-expanded" tabindex="0" aria-posinset="1" aria-setsize="2"></i>
- </div>
- </div>
- </b2b-expander-heading>
- <b2b-expander-body>
- <div>
- <div>
- <table>
- <thead>
- <tr>
- <th width="20%">Render as</th>
- <th width="20%">X Axis Label</th>
- <th width="20%">X Axis Tickers</th>
- <th width="20%">Is Time Axis?</th>
- <th width="20%">Multi Series</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <label for="optionsLineChartRendererLine" class="radio">
- <input type="radio" ng-model="reportRunJson.timeSeriesChartOptions.lineChartRenderer" id="optionsLineChartRendererLine" name="optionsLineChartRendererLine" value="line">
- <i class="skin"></i>
- <span>Line</span>
- </label>
- <label for="optionsLineChartRendererArea" class="radio">
- <input type="radio" ng-model="reportRunJson.timeSeriesChartOptions.lineChartRenderer" id="optionsLineChartRendererArea" name="optionsLineChartRendererArea" value="area">
- <i class="skin"></i>
- <span>Area</span>
- </label>
- </td>
- <td>
- <label for="xAxisLabelCheckBox" class="checkbox">
- <input id="xAxisLabelCheckBox" type="checkbox" ng-model="reportRunJson.timeSeriesChartOptions.showXAxisLabel" /><i class="skin"></i><span></span>
- </label>
- </td>
- <td>
- <label for="addXAxisTickerCheckBox" class="checkbox">
- <input id="addXAxisTickerCheckBox" type="checkbox" ng-model="reportRunJson.timeSeriesChartOptions.addXAxisTicker" /><i class="skin"></i><span></span>
- </label>
- </td>
- <td>
- <label for="isTimeAxisCheckBox" class="checkbox">
- <input id="isTimeAxisCheckBox" type="checkbox" ng-model="reportRunJson.timeSeriesChartOptions.nonTimeAxis" /><i class="skin"></i><span></span>
- </label>
- </td>
- <td>
- <label for="multiSeriesCheckBox" class="checkbox">
- <input id="multiSeriesCheckBox" type="checkbox" ng-model="reportRunJson.timeSeriesChartOptions.multiSeries" /><i class="skin"></i><span></span>
- </label>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
+ </b2b-expander-body> </b2b-expanders>
+
+ <!-- BAR CHART OPTION SECTION STARTS HERE -->
+ <b2b-expanders ng-show="reportRunJson.chartType=='BarChart3D'"
+ class="mpc-expanders" is-open="barChartOptionOpen">
+ <b2b-expander-heading>
+ <div class="row">
+ <div class="span6">
+ <div class="heading-medium b2b-blue"
+ ng-class=" { 'b2b-toggle-header-active': !barChartOptionOpen, 'b2b-toggle-header-inactive': barChartOptionOpen } ">Bar
+ Chart Options</div>
+ <p class="p-small"></p>
+ </div>
+ <div style="position: absolute; right: 250px;" class="span1">
+ <i class="pull-right b2b-toggle-header-icon" b2b-expander-toggle
+ b2b-accessibility-click="13,32"
+ expand-icon="icon-primary-collapsed"
+ collapse-icon="icon-primary-expanded" tabindex="0"
+ aria-posinset="1" aria-setsize="2"></i>
+ </div>
</div>
- </b2b-expander-body>
- </b2b-expanders>
- <!-- TIME SERIES CHART OPTION SECTION ENDS HERE -->
-
- <b2b-expanders class="mpc-expanders" is-open="commonOptionOpen">
- <b2b-expander-heading>
- <div class="row">
- <div class="span6">
- <div class="heading-medium b2b-blue" ng-class=" { 'b2b-toggle-header-active': !commonOptionOpen, 'b2b-toggle-header-inactive': commonOptionOpen } ">Common Options</div>
- <p class="p-small">
- </p>
- </div>
- <div style="position: absolute;right: 250px;" class="span1">
- <i class="pull-right b2b-toggle-header-icon" b2b-expander-toggle b2b-accessibility-click="13,32" expand-icon="icon-primary-collapsed" collapse-icon="icon-primary-expanded" tabindex="0" aria-posinset="1" aria-setsize="2"></i>
- </div>
- </div>
- </b2b-expander-heading>
- <b2b-expander-body>
- <div >
- <div>
- <div style="border:2px;border-style:solid;border-color:#808080;margin-bottom:9px">
- <div style="margin-left:0px">
- <table>
- <thead>
- <tr>
- <th>Legend Angle</th>
- <th>Legend Position</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <fieldset role="radiogroup" radio-group-accessibility>
- <td>
- <label for="optionsRadios1" class="radio">
- <input type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" id="optionsRadios1" name="optionsRadio1" value="up45">
- <i class="skin"></i>
- <span>up 45&deg;</span>
- </label>
- <label for="optionsRadios2" class="radio">
- <input type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" id="optionsRadios2" name="optionsRadio2" value="up90">
- <i class="skin"></i>
- <span>up 90&deg;</span>
- </label>
- <label for="optionsRadios3" class="radio">
- <input type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" id="optionsRadios3" name="optionsRadio3" value="down45">
- <i class="skin"></i>
- <span>down 45&deg;</span>
- </label>
- <label for="optionsRadios4444" class="radio">
- <input type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" id="optionsRadios4444" name="optionsRadio44" value="down90">
- <i class="skin"></i>
- <span>down 90&deg;</span>
- </label>
- <label for="optionsRadios5555" class="radio">
- <input type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" id="optionsRadios5555" name="optionsRadio55" value="standard">
- <i class="skin"></i>
- <span>Standard</span>
- </label>
- </td>
- </fieldset>
-
- <fieldset role="radiogroup" radio-group-accessibility>
- <td>
- <label for="optionsRadiosTop" class="radio">
- <input type="radio" ng-model="reportRunJson.commonChartOptions.legendPosition" id="optionsRadiosTop" name="optionsRadioTop" value="top">
- <i class="skin"></i>
- <span>Top</span>
- </label>
- <label for="optionsRadiosBottom" class="radio">
- <input type="radio" ng-model="reportRunJson.commonChartOptions.legendPosition" id="optionsRadiosBottom" name="optionsRadioBottom" value="bottom">
- <i class="skin"></i>
- <span>Bottom</span>
- </label>
- </td>
- </fieldset>
- </tr>
- </tbody>
- </table>
-
-
- <table>
+ </b2b-expander-heading> <b2b-expander-body>
+ <div>
+ <div id="RangeTable">
+ <table>
<thead>
- <tr>
- <th width="20%">Legend</th>
- <th width="20%">Animation</th>
- <th></th>
- </tr>
+ <tr>
+ <th width="25%">Orientation</th>
+ <th width="18%">Stacked</th>
+ <th width="18%">Show Controls</th>
+ <th width="18%">XAxis Date Type</th>
+ <th width="21%">Display less XAxis tickers</th>
+ <th></th>
+ </tr>
</thead>
- <tbody>
- <tr>
- <fieldset role="radiogroup" radio-group-accessibility>
- <td>
- <label for="optionsRadiosHideLegendFalse" class="radio">
- <input type="radio" ng-model="reportRunJson.commonChartOptions.hideLegend" id="optionsRadiosHideLegendFalse" name="optionsRadiosHideLegendFalse" value="false">
- <i class="skin"></i>
- <span>Yes</span>
- </label>
- <label for="optionsRadiosHideLegendTrue" class="radio">
- <input type="radio" ng-model="reportRunJson.commonChartOptions.hideLegend" id="optionsRadiosHideLegendTrue" name="optionsRadiosHideLegendTrue" value="true">
- <i class="skin"></i>
- <span>No</span>
- </label>
- </td>
- </fieldset>
-
- <fieldset role="radiogroup" radio-group-accessibility>
- <td>
- <label for="optionsRadiosAnimateChartTrue" class="radio">
- <input type="radio" ng-model="reportRunJson.commonChartOptions.animateAnimatedChart" id="optionsRadiosAnimateChartTrue" name="optionsRadiosAnimateChartTrue" value="true">
- <i class="skin"></i>
- <span>Yes</span>
- </label>
- <label for="optionsRadiosAnimateChartFalse" class="radio">
- <input type="radio" ng-model="reportRunJson.commonChartOptions.animateAnimatedChart" id="optionsRadiosAnimateChartFalse" name="optionsRadiosAnimateChartFalse" value="false">
- <i class="skin"></i>
- <span>No</span>
- </label>
- </td>
- </fieldset>
- <td>
- </td>
- </tr>
- </tbody>
+ <tbody>
+ <tr>
+ <td><label for="optionsOrientationVertical" class="radio">
+ <input type="radio"
+ ng-model="reportRunJson.barChartOptions.verticalOrientation"
+ id="optionsOrientationVertical"
+ name="optionsOrientationVertical" value="true"> <i
+ class="skin"></i> <span>Vertical</span>
+ </label> <label for="optionsOrientationHorizontal" class="radio">
+ <input type="radio"
+ ng-model="reportRunJson.barChartOptions.verticalOrientation"
+ id="optionsOrientationHorizontal"
+ name="optionsOrientationHorizontal" value="false"> <i
+ class="skin"></i> <span>Horizontal</span>
+ </label></td>
+
+ <td><label for="optionsStackedYes" class="radio"> <input
+ type="radio"
+ ng-model="reportRunJson.barChartOptions.stackedChart"
+ id="optionsStackedYes" name="optionsStackedYes" value="true">
+ <i class="skin"></i> <span>Yes</span>
+ </label> <label for="optionsStackedNo" class="radio"> <input
+ type="radio"
+ ng-model="reportRunJson.barChartOptions.stackedChart"
+ id="optionsStackedNo" name="optionsStackedNo" value="false">
+ <i class="skin"></i> <span>No</span>
+ </label></td>
+ <td><label for="optionsShowControlYes" class="radio">
+ <input type="radio"
+ ng-model="reportRunJson.barChartOptions.displayBarControls"
+ id="optionsShowControlYes" name="optionsShowControlYes"
+ value="true"> <i class="skin"></i> <span>Yes</span>
+ </label> <label for="optionsShowControlNo" class="radio"> <input
+ type="radio"
+ ng-model="reportRunJson.barChartOptions.displayBarControls"
+ id="optionsShowControlNo" name="optionsShowControlNo"
+ value="false"> <i class="skin"></i> <span>No</span>
+ </label></td>
+ <td><label for="optionsXAxisDateTypeYes" class="radio">
+ <input type="radio"
+ ng-model="reportRunJson.barChartOptions.xAxisDateType"
+ id="optionsXAxisDateTypeYes" name="optionsXAxisDateTypeYes"
+ value="true"> <i class="skin"></i> <span>Yes</span>
+ </label> <label for="optionsXAxisDateTypeNo" class="radio"> <input
+ type="radio"
+ ng-model="reportRunJson.barChartOptions.xAxisDateType"
+ id="optionsXAxisDateTypeNo" name="optionsXAxisDateTypeNo"
+ value="false"> <i class="skin"></i> <span>No</span>
+ </label></td>
+ <td><label for="optionsMinimizeXAxisTickersYes"
+ class="radio"> <input type="radio"
+ ng-model="reportRunJson.barChartOptions.minimizeXAxisTickers"
+ id="optionsMinimizeXAxisTickersYes"
+ name="optionsMinimizeXAxisTickersYes" value="true"> <i
+ class="skin"></i> <span>Yes</span>
+ </label> <label for="optionsMinimizeXAxisTickersNo" class="radio">
+ <input type="radio"
+ ng-model="reportRunJson.barChartOptions.minimizeXAxisTickers"
+ id="optionsMinimizeXAxisTickersNo"
+ name="optionsMinimizeXAxisTickersNo" value="false"> <i
+ class="skin"></i> <span>No</span>
+ </label></td>
+ </tr>
+ </tbody>
+ </table>
+ <table>
+ <thead>
+ <tr>
+ <th width="25%">Is Time Axis?</th>
+ <th width="25%">Log Scale (Y Axis)</th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><label for="optionsTimeAxisYes" class="radio">
+ <input type="radio"
+ ng-model="reportRunJson.barChartOptions.timeAxis"
+ id="optionsTimeAxisYes" name="optionsTimeAxisYes" value="true">
+ <i class="skin"></i> <span>Yes</span>
+ </label> <label for="optionsTimeAxisNo" class="radio"> <input
+ type="radio" ng-model="reportRunJson.barChartOptions.timeAxis"
+ id="optionsTimeAxisNo" name="optionsTimeAxisNo" value="false">
+ <i class="skin"></i> <span>No</span>
+ </label></td>
+ <td><label for="logScaleYAxisCheckBox" class="checkbox">
+ <input id="logScaleYAxisCheckBox" type="checkbox"
+ ng-model="reportRunJson.barChartOptions.yAxisLogScale" /><i
+ class="skin"></i><span></span>
+ </label></td>
+ </tr>
+ </tbody>
</table>
+ </div>
+ </div>
+ </b2b-expander-body> </b2b-expanders>
+ <!-- BAR CHART OPTION SECTION ENDS HERE -->
+ <!-- TIME SERIES CHART OPTION SECTION STARTS HERE -->
+ <b2b-expanders ng-show="reportRunJson.chartType=='TimeSeriesChart'"
+ class="mpc-expanders" is-open="timeSeriesChartOptionOpen">
+ <b2b-expander-heading>
+ <div class="row">
+ <div class="span6">
+ <div class="heading-medium b2b-blue"
+ ng-class=" { 'b2b-toggle-header-active': !timeSeriesChartOptionOpen, 'b2b-toggle-header-inactive': timeSeriesChartOptionOpen } ">Time
+ Series Chart Options</div>
+ <p class="p-small"></p>
+ </div>
+ <div style="position: absolute; right: 250px;" class="span1">
+ <i class="pull-right b2b-toggle-header-icon" b2b-expander-toggle
+ b2b-accessibility-click="13,32"
+ expand-icon="icon-primary-collapsed"
+ collapse-icon="icon-primary-expanded" tabindex="0"
+ aria-posinset="1" aria-setsize="2"></i>
+ </div>
+ </div>
+ </b2b-expander-heading> <b2b-expander-body>
+ <div>
+ <div>
<table>
<thead>
- <tr>
- <th width="25%">Top Margin</th>
- <th width="25%">Bottom Margin</th>
- <th width="25%">Left Margin</th>
- <th width="25%">Right Margin</th>
- </tr>
+ <tr>
+ <th width="20%">Render as</th>
+ <th width="20%">X Axis Label</th>
+ <th width="20%">X Axis Tickers</th>
+ <th width="20%">Is Time Axis?</th>
+ <th width="20%">Multi Series</th>
+ </tr>
</thead>
- <tbody>
- <tr>
- <td>
- <input type="text" name="topMargin" ng-model="reportRunJson.commonChartOptions.topMargin" style="width:200px;">
- </td>
- <td>
- <input type="text" name="bottomMargin" ng-model="reportRunJson.commonChartOptions.bottomMargin" style="width:200px;">
- </td>
- <td>
- <input type="text" name="leftMargin" ng-model="reportRunJson.commonChartOptions.leftMargin" style="width:200px;">
- </td>
- <td>
- <input type="text" name="rightMargin" ng-model="reportRunJson.commonChartOptions.rightMargin" style="width:200px;">
- </td>
- </tr>
- </tbody>
+ <tbody>
+ <tr>
+ <td><label for="optionsLineChartRendererLine" class="radio">
+ <input type="radio"
+ ng-model="reportRunJson.timeSeriesChartOptions.lineChartRenderer"
+ id="optionsLineChartRendererLine"
+ name="optionsLineChartRendererLine" value="line"> <i
+ class="skin"></i> <span>Line</span>
+ </label> <label for="optionsLineChartRendererArea" class="radio">
+ <input type="radio"
+ ng-model="reportRunJson.timeSeriesChartOptions.lineChartRenderer"
+ id="optionsLineChartRendererArea"
+ name="optionsLineChartRendererArea" value="area"> <i
+ class="skin"></i> <span>Area</span>
+ </label></td>
+ <td><label for="xAxisLabelCheckBox" class="checkbox">
+ <input id="xAxisLabelCheckBox" type="checkbox"
+ ng-model="reportRunJson.timeSeriesChartOptions.showXAxisLabel" /><i
+ class="skin"></i><span></span>
+ </label></td>
+ <td><label for="addXAxisTickerCheckBox" class="checkbox">
+ <input id="addXAxisTickerCheckBox" type="checkbox"
+ ng-model="reportRunJson.timeSeriesChartOptions.addXAxisTicker" /><i
+ class="skin"></i><span></span>
+ </label></td>
+ <td><label for="isTimeAxisCheckBox" class="checkbox">
+ <input id="isTimeAxisCheckBox" type="checkbox"
+ ng-model="reportRunJson.timeSeriesChartOptions.nonTimeAxis" /><i
+ class="skin"></i><span></span>
+ </label></td>
+ <td><label for="multiSeriesCheckBox" class="checkbox">
+ <input id="multiSeriesCheckBox" type="checkbox"
+ ng-model="reportRunJson.timeSeriesChartOptions.multiSeries" /><i
+ class="skin"></i><span></span>
+ </label></td>
+ </tr>
+ </tbody>
</table>
- </div>
- </div>
- </div>
- </b2b-expander-body>
- </b2b-expanders>
+ </div>
+ </div>
+ </b2b-expander-body> </b2b-expanders>
+ <!-- TIME SERIES CHART OPTION SECTION ENDS HERE -->
-</div>
-</div>
+ <b2b-expanders class="mpc-expanders" is-open="commonOptionOpen">
+ <b2b-expander-heading>
+ <div class="row">
+ <div class="span6">
+ <div class="heading-medium b2b-blue"
+ ng-class=" { 'b2b-toggle-header-active': !commonOptionOpen, 'b2b-toggle-header-inactive': commonOptionOpen } ">Common
+ Options</div>
+ <p class="p-small"></p>
+ </div>
+ <div style="position: absolute; right: 250px;" class="span1">
+ <i class="pull-right b2b-toggle-header-icon" b2b-expander-toggle
+ b2b-accessibility-click="13,32"
+ expand-icon="icon-primary-collapsed"
+ collapse-icon="icon-primary-expanded" tabindex="0"
+ aria-posinset="1" aria-setsize="2"></i>
+ </div>
+ </div>
+ </b2b-expander-heading> <b2b-expander-body>
+ <div>
+ <div>
+ <div
+ style="border: 2px; border-style: solid; border-color: #808080; margin-bottom: 9px">
+ <div style="margin-left: 0px">
+ <table>
+ <thead>
+ <tr>
+ <th>Legend Angle</th>
+ <th>Legend Position</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <fieldset role="radiogroup" radio-group-accessibility>
+ <td><label for="optionsRadios1" class="radio"> <input
+ type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendLabelAngle"
+ id="optionsRadios1" name="optionsRadio1" value="up45">
+ <i class="skin"></i> <span>up 45&deg;</span>
+ </label> <label for="optionsRadios2" class="radio"> <input
+ type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendLabelAngle"
+ id="optionsRadios2" name="optionsRadio2" value="up90">
+ <i class="skin"></i> <span>up 90&deg;</span>
+ </label> <label for="optionsRadios3" class="radio"> <input
+ type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendLabelAngle"
+ id="optionsRadios3" name="optionsRadio3" value="down45">
+ <i class="skin"></i> <span>down 45&deg;</span>
+ </label> <label for="optionsRadios4444" class="radio"> <input
+ type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendLabelAngle"
+ id="optionsRadios4444" name="optionsRadio44" value="down90">
+ <i class="skin"></i> <span>down 90&deg;</span>
+ </label> <label for="optionsRadios5555" class="radio"> <input
+ type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendLabelAngle"
+ id="optionsRadios5555" name="optionsRadio55"
+ value="standard"> <i class="skin"></i> <span>Standard</span>
+ </label></td>
+ </fieldset>
+
+ <fieldset role="radiogroup" radio-group-accessibility>
+ <td><label for="optionsRadiosTop" class="radio">
+ <input type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendPosition"
+ id="optionsRadiosTop" name="optionsRadioTop" value="top">
+ <i class="skin"></i> <span>Top</span>
+ </label> <label for="optionsRadiosBottom" class="radio"> <input
+ type="radio"
+ ng-model="reportRunJson.commonChartOptions.legendPosition"
+ id="optionsRadiosBottom" name="optionsRadioBottom"
+ value="bottom"> <i class="skin"></i> <span>Bottom</span>
+ </label></td>
+ </fieldset>
+ </tr>
+ </tbody>
+ </table>
+
+
+ <table>
+ <thead>
+ <tr>
+ <th width="20%">Legend</th>
+ <th width="20%">Animation</th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <fieldset role="radiogroup" radio-group-accessibility>
+ <td><label for="optionsRadiosHideLegendFalse"
+ class="radio"> <input type="radio"
+ ng-model="reportRunJson.commonChartOptions.hideLegend"
+ id="optionsRadiosHideLegendFalse"
+ name="optionsRadiosHideLegendFalse" value="false">
+ <i class="skin"></i> <span>Yes</span>
+ </label> <label for="optionsRadiosHideLegendTrue" class="radio">
+ <input type="radio"
+ ng-model="reportRunJson.commonChartOptions.hideLegend"
+ id="optionsRadiosHideLegendTrue"
+ name="optionsRadiosHideLegendTrue" value="true"> <i
+ class="skin"></i> <span>No</span>
+ </label></td>
+ </fieldset>
+
+ <fieldset role="radiogroup" radio-group-accessibility>
+ <td><label for="optionsRadiosAnimateChartTrue"
+ class="radio"> <input type="radio"
+ ng-model="reportRunJson.commonChartOptions.animateAnimatedChart"
+ id="optionsRadiosAnimateChartTrue"
+ name="optionsRadiosAnimateChartTrue" value="true">
+ <i class="skin"></i> <span>Yes</span>
+ </label> <label for="optionsRadiosAnimateChartFalse" class="radio">
+ <input type="radio"
+ ng-model="reportRunJson.commonChartOptions.animateAnimatedChart"
+ id="optionsRadiosAnimateChartFalse"
+ name="optionsRadiosAnimateChartFalse" value="false">
+ <i class="skin"></i> <span>No</span>
+ </label></td>
+ </fieldset>
+ <td></td>
+ </tr>
+ </tbody>
+ </table>
+
+ <table>
+ <thead>
+ <tr>
+ <th width="25%">Top Margin</th>
+ <th width="25%">Bottom Margin</th>
+ <th width="25%">Left Margin</th>
+ <th width="25%">Right Margin</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><input type="text" name="topMargin"
+ ng-model="reportRunJson.commonChartOptions.topMargin"
+ style="width: 200px;"></td>
+ <td><input type="text" name="bottomMargin"
+ ng-model="reportRunJson.commonChartOptions.bottomMargin"
+ style="width: 200px;"></td>
+ <td><input type="text" name="leftMargin"
+ ng-model="reportRunJson.commonChartOptions.leftMargin"
+ style="width: 200px;"></td>
+ <td><input type="text" name="rightMargin"
+ ng-model="reportRunJson.commonChartOptions.rightMargin"
+ style="width: 200px;"></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </b2b-expander-body> </b2b-expanders>
+
+ </div>
+ </div>
<div>
- <button type="submit" style="width: 90px; height:35px;margin-top:20px; margin-left:5px;" class="btn btn-alt btn-small" ng-click="saveChartData();">Save</button>
- <a href="report#/report_run/c_master={{reportRunJson.reportID}}&refresh=Y">
- <button type="submit" style="width: 90px; height:35px;margin-top:20px; margin-left:5px;" class="btn btn-alt btn-small">Run</button>
- </a>
- </div>
+ <button type="submit"
+ style="width: 90px; height: 35px; margin-top: 20px; margin-left: 5px;"
+ class="btn btn-alt btn-small" ng-click="saveChartData();">Save</button>
+ <a
+ href="report#/report_run/c_master={{reportRunJson.reportID}}&refresh=Y">
+ <button type="submit"
+ style="width: 90px; height: 35px; margin-top: 20px; margin-left: 5px;"
+ class="btn btn-alt btn-small">Run</button>
+ </a>
+ </div>
</div>
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 aaa1cac0..7b2c23e1 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
@@ -1,96 +1,124 @@
<style>
table tbody td {
- border: none;
+ border: none;
}
table tbody tr {
- border: none;
+ border: none;
}
-table tbody{
- border: none;
+table tbody {
+ border: none;
}
table {
- border: none;
+ border: none;
}
.grid {
- width: 100%;
- height: 400;
+ width: 100%;
+ height: 400;
}
+
.no-rows {
- position: absolute;
- top: 0;
- bottom: 0;
- width: 100%;
- background: rgba(0, 0, 0, 0.4);
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ width: 100%;
+ background: rgba(0, 0, 0, 0.4);
}
.no-rows .msg {
- opacity: 1;
- position: absolute;
- top: 20%;
- left: 20%;
- width: 60%;
- height: 50%;
- line-height: 200%;
- background-color: #eee;
- border-radius: 4px;
- border: 1px solid #555;
- text-align: center;
- font-size: 24px;
- display: table;
+ opacity: 1;
+ position: absolute;
+ top: 20%;
+ left: 20%;
+ width: 60%;
+ height: 50%;
+ line-height: 200%;
+ background-color: #eee;
+ border-radius: 4px;
+ border: 1px solid #555;
+ text-align: center;
+ font-size: 24px;
+ display: table;
}
.no-rows .msg span {
- display: table-cell;
- vertical-align: middle;
+ display: table-cell;
+ vertical-align: middle;
}
+
.grid .ui-grid-header-cell {
- text-align:center;
+ text-align: center;
}
+
body {
- font-size:13px;
+ font-size: 13px;
}
</style>
-<div id="page-content">
- <div style="width:100%; overflow:hidden;">
- <div style="float:left;"><h1 class="heading-page">{{reportData.reportHeading}}</h1></div>
- <div style="float:left; margin-left: 10px; margin-right: 10px;">
- <a style="font-size:180%;" ng-href="report#/report_wizard/{{reportData.reportID}}" class="icon-misc-pen" ng-show="reportData.allowEdit"></a>
+<div id="page-content">
+ <div style="width: 100%; overflow: hidden;">
+ <div style="float: left;">
+ <h1 class="heading-page">{{reportData.reportHeading}}</h1>
+ </div>
+ <div style="float: left; margin-left: 10px; margin-right: 10px;">
+ <a style="font-size: 180%;"
+ ng-href="report#/report_wizard/{{reportData.reportID}}"
+ class="icon-misc-pen" ng-show="reportData.allowEdit"></a>
+ </div>
+ <div style="float: left; margin-left: 5px; margin-right: 10px;">
+ <a style="font-size: 180%;"
+ ng-href="report#/report_chart/{{reportData.reportID}}"
+ class="icon-misc-piechart" ng-show="reportData.allowEdit"></a>
</div>
- <div style="float:left; margin-left: 5px; margin-right: 10px;">
- <a style="font-size:180%;" ng-href="report#/report_chart/{{reportData.reportID}}" class="icon-misc-piechart" ng-show="reportData.allowEdit"></a>
+
+ <div ng-show="reportData.allowEdit && showFormFields"
+ style="margin-top: 5px;">
+ <label for="checkbox1" class="checkbox"> <input
+ id="checkbox1" type="checkbox" ng-model="showFormFieldId.value" /><i
+ class="skin"></i><span>show IDs</span>
+ </label>
</div>
+ </div>
+ <div ng-show="showLoader" class="span loader-container">
+ <i class="icon-primary-spinner" role="img"
+ aria-label="Please wait while we load your content"></i>
+ </div>
+ <h3 class="heading3">{{reportData.reportSubTitle}}</h3>
- <div ng-show ="reportData.allowEdit && showFormFields" style="margin-top:5px;">
- <label for="checkbox1" class="checkbox">
- <input id="checkbox1" type="checkbox" ng-model="showFormFieldId.value" /><i class="skin"></i><span>show IDs</span>
- </label>
- </div>
+ <div ng-show="isInProgress" style="font-size: 50px; color: #2ca02c">Loading...</div>
+
+ <form ng-show="showFormFields" class="row section-row"
+ style="margin: 10px">
+ <form-builder ng-form-fields="reportData.formFieldList"
+ ng-show-field-id="showFormFieldId.value"
+ ng-num-form-cols="reportData.numFormCols"
+ ng-model="formFieldSelectedValues"
+ ng-trigger-method="triggerOtherFormFields"></form-builder>
+ <br>
+ <br>
+ <button type="submit"
+ style="width: 90px; height: 35px; margin-top: 20px; margin-left: 5px;"
+ class="btn btn-alt btn-small" ng-click="runReport()">Run</button>
+ </form>
+ <button type="submit" ng-show="showBackButton"
+ style="width: 90px; height: 35px; margin-top: 20px; margin-left: 5px;"
+ class="btn btn-alt btn-small" ng-click="backToParentReport()">Back</button>
+ <iframe id="chartiframe" ng-show="showChart" width="100%"
+ height="550px" style="border: none" scrolling="no"></iframe>
+ <div id="errorDiv"></div>
+ <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">
+ <div class="no-rows" ng-show="!gridOptions.data.length">
+ <div class="msg">
+ <span>{{reportData.message}}</span>
+ </div>
+ </div>
+ </div>
</div>
- <h3 class="heading3">{{reportData.reportSubTitle}} </h3>
-
- <div ng-show="isInProgress" style="font-size:50px;color:#2ca02c">Loading...</div>
-
- <form ng-show="showFormFields" class="row section-row" style="margin: 10px">
- <form-builder ng-form-fields="reportData.formFieldList" ng-show-field-id="showFormFieldId.value" ng-num-form-cols="reportData.numFormCols" ng-model="formFieldSelectedValues" ng-trigger-method="triggerOtherFormFields"></form-builder>
- <br><br>
- <button type="submit" style="width: 90px; height:35px;margin-top:20px; margin-left:5px;" class="btn btn-alt btn-small" ng-click="runReport()">Run</button>
- </form>
- <button type="submit" ng-show="showBackButton" style="width: 90px; height:35px;margin-top:20px; margin-left:5px;" class="btn btn-alt btn-small" ng-click="backToParentReport()">Back</button>
- <iframe id="chartiframe" ng-show="showChart" width="100%" height="550px" style="border: none" scrolling="no"></iframe>
- <div id="errorDiv"></div>
- <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}}">
- <div class="no-rows" ng-show="!gridOptions.data.length">
- <div class="msg">
- <span>{{reportData.message}}</span>
- </div>
- </div>
- </div>
- </div>
- <!-- <a type="submit" ng-show="showBackButton" style="margin: 10px" ng-href="report.htm#/report_run/{{parentReportUrlParams}}" att-button btn-type="primary" size="small" title='Back'>Back</a> -->
-</div>
+ <!-- <a type="submit" ng-show="showBackButton" style="margin: 10px" ng-href="report.htm#/report_run/{{parentReportUrlParams}}" att-button btn-type="primary" size="small" title='Back'>Back</a> -->
+</div>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-search.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-search.html
index 7524acca..2fd0e436 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-search.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-search.html
@@ -29,7 +29,7 @@ body {
</div>
<div class="form-field form-field__glued pull-left size-onefifth" style="float:left; width:160px;margin-right: 40px;">
- <input ng-model="reportId" type="text" placeholder="Search value?" style="margin-top:5px;width:160px;">
+ <input ng-model="reportId" type="text" placeholder="Search value?" style="margin-top:5px;width:160px; margin-left: 10px;">
</div>
<label class="pull-left" style="float:left;margin-top: 10px;margin-right: 5px;">Report Name:</label>
@@ -41,12 +41,15 @@ body {
</div>
<div class="form-field form-field__glued pull-left size-onefifth" style="width:13% !important;">
- <input ng-model="reportName" type="text" placeholder="Search value?" style="margin-top:5px;width:160px;">
+ <input ng-model="reportName" type="text" placeholder="Search value?" style="margin-top:5px;width:160px; margin-left: 10px;">
</div>
<div>
<button style="margin-left:50px;margin-top:4px;" type="submit" class="btn btn-alt btn-small" ng-click="runReport();">Submit</button>
</div>
+<div ng-show="showLoader" class="span loader-container">
+ <i class="icon-primary-spinner" role="img"
+ aria-label="Please wait while we load your content"></i>
</div>
<br>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-step.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-step.html
new file mode 100644
index 00000000..9550ac33
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-step.html
@@ -0,0 +1,35 @@
+<div id="page-content" >
+ <br>
+ <div>
+ <b2b-tabset tab-id-selected="activeTabsId">
+ <b2b-tab ng-repeat="tab in stepTabs" tab-item="tab" id="{{tab.uniqueId}}" aria-controls="{{tab.tabPanelId}}" ng-disabled="tab.disabled">
+ {{tab.title}}
+ </b2b-tab>
+ </b2b-tabset>
+ <div class="tab-content" >
+ <div id="definitionTab" role="tabpanel" class="tab-pane" ng-class="{'active': 'definition'===activeTabsId}">
+ <div ng-include src="'app/fusion/scripts/DS2-view-models/ds2-reports/steps/step1.html'"></div>
+ </div>
+ <div id="sqlTab" role="tabpanel" class="tab-pane" ng-class="{'active': 'sql'===activeTabsId}">
+ <div ng-include src="'app/fusion/scripts/DS2-view-models/ds2-reports/steps/step2.html'"></div>
+ </div>
+ <div id="columnsTab" role="tabpanel" class="tab-pane" ng-class="{'active': 'columns'===activeTabsId}">
+ <div ng-include src="'app/fusion/scripts/DS2-view-models/ds2-reports/steps/step3.html'"></div>
+ </div>
+ <div id="columnsTab" role="tabpanel" class="tab-pane" ng-class="{'active': 'formFields'===activeTabsId}">
+ <div ng-include src="'app/fusion/scripts/DS2-view-models/ds2-reports/steps/step4.html'"></div>
+ </div>
+ <div id="columnsTab" role="tabpanel" class="tab-pane" ng-class="{'active': 'security'===activeTabsId}">
+ <div ng-include src="'app/fusion/scripts/DS2-view-models/ds2-reports/steps/step5.html'"></div>
+ </div>
+ <div id="columnsTab" role="tabpanel" class="tab-pane" ng-class="{'active': 'log'===activeTabsId}">
+ <div ng-include src="'app/fusion/scripts/DS2-view-models/ds2-reports/steps/step6.html'"></div>
+ </div>
+ <div id="columnsTab" role="tabpanel" class="tab-pane" ng-class="{'active': 'run'===activeTabsId}">
+ <div ng-include src="'app/fusion/scripts/DS2-view-models/ds2-reports/steps/step7.html'"></div>
+ </div>
+ </div>
+ </div>
+</div>
+
+ \ No newline at end of file
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
new file mode 100644
index 00000000..a9baadf8
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step1.html
@@ -0,0 +1,213 @@
+<h1 class="heading-page">Step 1 - Report Definition</h1>
+
+<div ng-show="showLoader" class="span loader-container">
+ <i class="icon-primary-spinner" role="img"
+ aria-label="Please wait while we load your content"></i>
+</div>
+
+<div class="span6" ng-hide="showLoader">
+
+ <div class="form-row" ng-if="isEdit">
+ <label for="textinputID-2a">Report ID</label>
+ <div class="field-group">
+ <input id="textinputID-2a" ddh-reset="" class="span12" type="text" data-ng-model="definitionData.reportId" ng-disabled="true">
+ </div>
+ </div>
+
+ <div class="form-row" >
+ <label for="textinputID-2a">Report Name</label>
+ <div class="field-group">
+ <input id="reportName" ddh-reset="" class="span12" type="text" data-ng-model="definitionData.reportName">
+ </div>
+ </div>
+ <br>
+ <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>
+ </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">
+ </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>
+ </div>
+ <div class="form-row" >
+ <label for="textinputID-2a">Form Help Text</label>
+ <div class="field-group">
+ <textarea b2b-reset b2b-reset-textarea ng-model="definitionData.formHelpTxt" 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>
+ </div>
+ </div>
+ <div class="form-row" >
+ <label for="textinputID-2a">Report Definition</label>
+ <div class="field-group">
+ <input id="reportType" ddh-reset="" class="span12" type="text" data-ng-model="definitionData.repDefType" ng-disabled="true">
+ </div>
+ </div>
+ <div class="form-row" >
+ <label for="pageSizeDD">Page Size</label>
+ <select id="pageSizeDD" name="pageSizeDD" aria-describedby="pageSizeDropdown" b2b-dropdown placeholder-text="Select Page Size" ng-model="definitionData.pageSize">
+ <option b2b-dropdown-list option-repeat="d in pageSizeOptions" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </div>
+ <div class="form-row">
+ <div class="listbox-container">
+ <label id="pageSizeDD">Display Area</label>
+ <div class="listbox-list" tabindex="-1">
+ <b2b-list-box current-index="currentIndex1" listbox-data="definitionData.displayArea">
+ <div tabindex="-1" data-index="{{$index}}" b2b-accessibility-click="13,32" ng-repeat="displayArea in definitionData.displayArea" role="option" class="b2b-list-box-item" ng-class="{'b2b-list-box-item--selected' : displayArea.selected}" ng-bind-html="displayArea.name | unsafe"></div>
+ </b2b-list-box>
+ </div>
+ </div>
+ </div>
+ <div class="form-row">
+ <label for="hideFormFieldsRun" class="checkbox">
+ <input id="hideFormFieldsRun" type="checkbox" ng-model="definitionData.hideFormFieldsAfterRun" /><i class="skin"></i><span>Hide Form fields after run?</span>
+ </label>
+ </div>
+ <div class="form-row" >
+ <label for="maxRowDD">Max Rows in Excel/CSV Download</label>
+ <select id="maxRowDD" name="maxRowDD" aria-describedby="maxRowOptions" b2b-dropdown placeholder-text="Select Max Row" ng-model="definitionData.maxRowsInExcelCSVDownload">
+ <option b2b-dropdown-list option-repeat="d in maxRowOptions" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </div>
+ <div class="form-row" >
+ <label for="frozenColDD">Columns to be Frozen</label>
+ <select id="frozenColDD" name="frozenColDD" aria-describedby="Columns to be Frozen" b2b-dropdown placeholder-text="Select Columns to be Frozen" ng-model="definitionData.frozenColumns">
+ <option b2b-dropdown-list option-repeat="d in frozenColOptions" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </div>
+ <div class="form-row" >
+ <label for="dataGridAlignDD">Data Grid Align</label>
+ <select id="dataGridAlignDD" name="dataGridAlignDD" aria-describedby="Data Grid Align" b2b-dropdown placeholder-text="Select Data Grid Align" ng-model="definitionData.dataGridAlign">
+ <option b2b-dropdown-list option-repeat="d in dataGridAlignOptions" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </div>
+ <div class="form-row" >
+ <label for="textinputID-2a">Empty message</label>
+ <div class="field-group">
+ <input id="emptyMessage" ddh-reset="" class="span12" type="text" data-ng-model="definitionData.emptyMessage">
+ </div>
+ </div>
+
+ <div class="form-row" >
+ <label for="highDataContainerDD">Height of the Data Container(%)</label>
+ <select id="highDataContainerDD" name="highDataContainerDD" aria-describedby="Height of the Data Container" b2b-dropdown placeholder-text="Select Height of the Data Container" ng-model="definitionData.dataContainerHeight">
+ <option b2b-dropdown-list option-repeat="d in dataContainerOptions" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </div>
+ <div class="form-row" >
+ <label for="widDataContainerDD">Width of the Data Container(%)</label>
+ <select id="widDataContainerDD" name="widDataContainerDD" aria-describedby="Width of the Data Container" b2b-dropdown placeholder-text="Select Width of the Data Container" ng-model="definitionData.dataContainerWidth">
+ <option b2b-dropdown-list option-repeat="d in dataContainerOptions" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </div>
+ <div class="form-row">
+ <label for="aScheduler" class="checkbox">
+ <input id="aScheduler" type="checkbox" ng-model="definitionData.allowScheduler" /><i class="skin"></i><span>Allow Scheduler</span>
+ </label>
+ </div>
+ <div class="form-row">
+ <label for="sizeByContent" class="checkbox">
+ <input id="sizeByContent" type="checkbox" ng-model="definitionData.sizedByContent" /><i class="skin"></i><span>Sized By Content</span>
+ </label>
+ </div>
+ <br>
+ <label id="pageSizeDD">Display Options:</label>
+ <br>
+ <div class="form-row">
+ <label for="hideFormField" class="checkbox">
+ <input id="hideFormField" type="checkbox" ng-model="displayOptions.hideFormFields" /><i class="skin"></i><span>Hide Form Fields</span>
+ </label>
+ </div>
+ <div class="form-row">
+ <label for="hideCart" class="checkbox">
+ <input id="hideCart" type="checkbox" checked ng-model="displayOptions.hideChart" /><i class="skin"></i><span>Hide Chart</span>
+ </label>
+ </div>
+ <div class="form-row">
+ <label for="hideReportData" class="checkbox">
+ <input id="hideReportData" type="checkbox" checked ng-model="displayOptions.hideReportData" /><i class="skin"></i><span>Hide Report Data</span>
+ </label>
+ </div>
+
+ <div class="form-row">
+ <label for="hideExcel" class="checkbox">
+ <input id="hideExcel" type="checkbox" checked ng-model="displayOptions.hideExcel" /><i class="skin"></i><span>Hide Excel</span>
+ </label>
+ </div>
+ <div class="form-row">
+ <label for="hidePDF" class="checkbox">
+ <input id="hidePDF" type="checkbox" checked ng-model="displayOptions.hidePdf" /><i class="skin"></i><span>Hide PDF</span>
+ </label>
+ </div>
+
+ <div class="form-row">
+ <label for="sortColRun" class="checkbox">
+ <input id="sortColRun" type="checkbox" checked ng-model="definitionData.runtimeColSortDisabled" /><i class="skin"></i><span>Disable column sort at runtime?</span>
+ </label>
+ </div>
+ <div class="form-row" >
+ <label for="runTimeFormNumDD">Run-time Form Number Columns</label>
+ <select id="runTimeFormNumDD" name="runTimeFormNumDD" aria-describedby="Run-time Form Number Columns" b2b-dropdown placeholder-text="Select Run-time Form Number Columns" ng-model="definitionData.numFormCols">
+ <option b2b-dropdown-list option-repeat="d in runTimeFormNumOptions" value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </div>
+ <div class="form-row" >
+ <label for="reportTitle">Report Title (if blank, the Report Name will be displayed)</label>
+ <div class="field-group">
+ <textarea b2b-reset b2b-reset-textarea ng-model="definitionData.reportTitle" ng-disabled="disabled" ng-trim="false" placeholder="{{placeholderText}}" rows="{{textAreaRows}}" maxlength="{{textAreaMaxlength}}" class="span12" id="reportTitle" ng-focus='showTooltip1=true' ng-blur='showTooltip1=false' aria-describedby="textareaID1TooltipContent1"></textarea>
+ </div>
+ </div>
+ <div class="form-row" >
+ <label for="reportSubTitle">Report Sub-Title</label>
+ <div class="field-group">
+ <textarea b2b-reset b2b-reset-textarea ng-model="definitionData.reportSubTitle" ng-disabled="disabled" ng-trim="false" placeholder="{{placeholderText}}" rows="{{textAreaRows}}" maxlength="{{textAreaMaxlength}}" class="span12" id="reportSubTitle" ng-focus='showTooltip1=true' ng-blur='showTooltip1=false' aria-describedby="textareaID1TooltipContent1"></textarea>
+ </div>
+ </div>
+ <div class="form-row">
+ <label for="oneTime" class="checkbox">
+ <input id="oneTime" type="checkbox" ng-model="definitionData.oneTimeRec" /><i class="skin"></i><span>One Time</span>
+ </label>
+ </div>
+ <div class="form-row">
+ <label for="hourly" class="checkbox">
+ <input id="hourly" type="checkbox" checked ng-model="definitionData.hourlyRec" /><i class="skin"></i><span>Hourly</span>
+ </label>
+ </div>
+ <div class="form-row">
+ <label for="daily" class="checkbox">
+ <input id="daily" type="checkbox" ng-model="definitionData.dailyRec" /><i class="skin"></i><span>Daily</span>
+ </label>
+ </div>
+ <div class="form-row">
+ <label for="dailyMF" class="checkbox">
+ <input id="dailyMF" type="checkbox" checked ng-model="definitionData.dailyMFRec" /><i class="skin"></i><span>Daily Monday - Friday</span>
+ </label>
+ </div>
+ <div class="form-row">
+ <label for="weekly" class="checkbox">
+ <input id="weekly" type="checkbox" ng-model="definitionData.weeklyRec" /><i class="skin"></i><span>Weekly</span>
+ </label>
+ </div>
+ <div class="form-row">
+ <label for="monthly" class="checkbox">
+ <input id="monthly" type="checkbox" checked ng-model="definitionData.monthlyRec" /><i class="skin"></i><span>Monthly</span>
+ </label>
+ </div>
+ <br>
+
+ <div class="form-row">
+<!-- <button class="btn btn-alt btn-small" type="button" ng-click="createDefinition()" ng-if="!isEdit">Save</button>
+ --> <button class="btn btn-alt btn-small" type="button" ng-click="updateDef()" >Save</button>
+<!-- <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
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step2.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step2.html
new file mode 100644
index 00000000..e21af0c8
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step2.html
@@ -0,0 +1,26 @@
+<h1 class="heading-page">Step 2 - Report SQL</h1>
+
+<div ng-show="showLoader" class="span loader-container">
+ <i class="icon-primary-spinner" role="img"
+ aria-label="Please wait while we load your content"></i>
+</div>
+<h2 ng-show="pageisCreating">{{pageMsg}}</h2>
+<div class="" ng-hide="showLoader">
+ <div class="form-row" >
+ <label for="textinputID-2a">Report SQL</label>
+ <div class="field-group" align="center">
+ <textarea b2b-reset b2b-reset-textarea ng-model="sqlScript.value" ng-trim="false" placeholder="{{placeholderText}}" rows="25" class="span12" id="textareaID1Tooltip1" ng-focus='showTooltip1=true' ng-blur='showTooltip1=false' aria-describedby="textareaID1TooltipContent1"></textarea>
+ </div>
+ </div>
+ <div class="form-row" align="right">
+ <button class="btn btn-alt btn-small" type="button" ng-click="testRunSql()" >Validate & Test Run SQL</button>
+ </div>
+ <div class="form-row">
+<!-- <button class="btn btn-alt btn-small" type="button" ng-click="previous()" >Previous</button>
+ --> <button class="btn btn-alt btn-small" type="button" ng-click="updateDef()" >Save</button>
+<!-- <button class="btn btn-alt btn-small" type="button" ng-click="next()" >Next</button>
+ --> </div>
+
+</div>
+
+
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step3.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step3.html
new file mode 100644
index 00000000..e1f02a1c
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step3.html
@@ -0,0 +1,34 @@
+<h1 class="heading-page">Step 3 - Report Columns</h1>
+<div ng-show="showLoader" class="span loader-container">
+ <i class="icon-primary-spinner" role="img"
+ aria-label="Please wait while we load your content"></i>
+</div>
+<div class="" ng-hide="showLoader">
+ <div class="form-row" >
+ <table class="striped">
+ <thead>
+ <tr>
+ <th>No</th>
+ <th key="id" sortable="true">ID</th>
+ <th>Display Name</th>
+ <th>Edit</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat = "rowData in colTableRowData">
+ <td>{{$index+1}}</td>
+ <td>{{rowData.id}}</td>
+ <td>{{rowData.name}}</td>
+ <td><a ng-click="openColumnPopup(rowData)" class="icon-misc-pen"></a></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+<!-- <div class="form-row">
+ <button class="btn btn-alt btn-small" type="button" ng-click="previous()" >Previous</button>
+ <button class="btn btn-alt btn-small" type="button" ng-click="next()" >Next</button>
+ </div> -->
+
+</div>
+
+
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step4.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step4.html
new file mode 100644
index 00000000..dc3be5c8
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step4.html
@@ -0,0 +1,47 @@
+<h1 class="heading-page">Step 4 - Report Form Fields</h1>
+<div ng-show="showLoader" class="span loader-container">
+ <i class="icon-primary-spinner" role="img"
+ aria-label="Please wait while we load your content"></i>
+</div>
+<div ng-hide="showLoader">
+ <div class="form-row" >
+ <h2>Report Form Fields 4</h2>
+ <table class="striped">
+ <thead>
+ <tr>
+ <th default-sort="a" sortable="true" >Order Number</th>
+ <th>Field Name</th>
+ <th>Edit</th>
+ <th>Order</th>
+ <th>Delete</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat = "rowData in formFieldData">
+ <td>{{rowData.orderSeq}}</td>
+ <td>{{rowData.name}}[{{rowData.id}}]</td>
+ <td><a ng-click="openFormFieldPopup(rowData,'edit')" class="icon-misc-pen"></a></td>
+ <td>
+ <span ng-if="!$first">
+ <a ng-click="formFieldReOrder(rowData.id, formFieldData[$index-1].id)" class="icon-controls-upPRIMARY"></a>
+ </span>
+ <span ng-if="!$last">
+ <a ng-click="formFieldReOrder(formFieldData[$index+1].id, rowData.id)" class="icon-controls-down"></a>
+ </span>
+ </td>
+ <td><a ng-click="deleteFormField(rowData)" class="icon-misc-trash"></a></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div align="right">
+ <button class="btn btn-alt btn-small" type="button" ng-click="addFormField()">Add</button>
+ </div>
+<!-- <div class="form-row">
+ <button class="btn btn-alt btn-small" type="button" ng-click="previous()" >Previous</button>
+ <button class="btn btn-alt btn-small" type="button" ng-click="next()" >Next</button>
+ </div> -->
+
+</div>
+
+
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step5.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step5.html
new file mode 100644
index 00000000..13278029
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step5.html
@@ -0,0 +1,172 @@
+<style>
+#stepView table tbody td {
+ border: none;
+}
+
+#stepView table tbody tr {
+ border: none;
+}
+
+.noTableBorder table tbody td {
+ border: none;
+}
+
+.noTableBorder table tbody tr {
+ border: none;
+}
+</style>
+<h1 class="heading-page">Step 5 - Report Security</h1>
+
+<div ng-show="showLoader" class="span loader-container">
+ <i class="icon-primary-spinner" role="img"
+ aria-label="Please wait while we load your content"></i>
+</div>
+<div class="" ng-hide="showLoader">
+ <div class="form-row">
+ <div id="stepViewSecurity">
+ <div class="noTableBorder">
+ <table class="striped">
+ <tbody>
+ <tr>
+ <td>Created By: {{reportSecurityInfo.createdUser}}</td>
+ <td>Created Date: {{reportSecurityInfo.createdDate}}</td>
+ <tr />
+ <tr>
+ <td>Last Updated By: {{reportSecurityInfo.updateUser}}</td>
+ <td>Last Updated: {{reportSecurityInfo.updatedDate}}</td>
+ <tr />
+ <tr>
+ <td>Report Owner: <select name="reportOwner" b2b-dropdown
+ ng-model="reportSecurityInfo.ownerId">
+ <option b2b-dropdown-list option-repeat="d in reportOwnerList"
+ value="{{d.id}}">{{d.name}}</option>
+ </select>
+
+ </td>
+ <td>Public? (All users can run the report): <select
+ name="isPublic" b2b-dropdown
+ ng-model="reportSecurityInfo.isPublic">
+ <option b2b-dropdown-list option-repeat="d in ynOptions"
+ value="{{d.value}}">{{d.text}}</option>
+ </select>
+ </td>
+ <tr />
+ </tbody>
+ </table>
+ </div>
+
+ <div style="margin-top: 20px;">
+ <h1 style="margin-bottom: 5px;">Report Users</h1>
+ <table class="striped">
+ <thead>
+ <tr>
+ <th width="10%">No</th>
+ <th width="45%">User Name</th>
+ <th width="15%">Run Access</th>
+ <th width="15%">Edit Access</th>
+ <th width="15%">Remove</th>
+ <tr />
+ </thead>
+ <tbody>
+ <tr ng-repeat="reportUser in reportSecurityUsers">
+ <td>{{$index+1}}</td>
+ <td>{{reportUser.name}}</td>
+ <td>
+ <label for="switch{{$index+1}}runAccess"
+ class="btn-switch-label"> <input type="checkbox"
+ role="switch" id="switch{{$index+1}}runAccess" b2b-switches
+ ng-model="reportUser.runAccess" ng-disabled=true aria-disabled=true aria-label="">
+ </label>
+ </td>
+ <td><label for="switch{{$index+1}}" class="btn-switch-label">
+ <input type="checkbox" role="switch" id="switch{{$index+1}}"
+ b2b-switches ng-model="reportUser.accessAllowed"
+ ng-click="toggleUserEditAccessActive(reportUser)"
+ ng-disabled=false aria-disabled=false aria-label="">
+ </label></td>
+ <td><a class="icon-misc-trash" style="font-size: 22px;"
+ ng-click="removeReportSecurityUser(reportUser)"> </a></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div>
+ <h2>Grant Access To:</h2>
+ <div>
+ <select id="reportUser" name="reportUser" b2b-dropdown
+ ng-model="addReportUserId.id" placeholder-text="Select a User">
+ <option b2b-dropdown-list option-repeat="d in reportOwnerList"
+ value="{{d.id}}">{{d.name}}</option>
+ </select>
+ </div>
+ <div>
+ <button class="btn btn-alt btn-small" type="button"
+ ng-click="addReportSecurityUser(addReportUserId.id)">Add</button>
+ </div>
+ </div>
+
+ <div style="margin-top: 20px;">
+ <h1>Report Roles</h1>
+ <table class="striped">
+ <thead>
+ <tr>
+ <th width="10%">No</th>
+ <th width="45%">Role Name</th>
+ <th width="15%">Run Access</th>
+ <th width="15%">Edit Access</th>
+ <th width="15%">Remove</th>
+ <tr />
+ </thead>
+ <tbody>
+ <tr ng-repeat="reportRole in reportSecurityRoles">
+ <td>{{$index+1}}</td>
+ <td>{{reportRole.name}}</td>
+ <td>
+ <label for="switch{{$index+1}}RoleRunAccess"
+ class="btn-switch-label"> <input type="checkbox"
+ role="switch" id="switch{{$index+1}}RoleRunAccess" b2b-switches
+ ng-model="reportRole.runAccess" ng-disabled=true aria-disabled=true aria-label="">
+ </label>
+ </td>
+ <td><label for="switch{{$index+1}}RoleEditAccess"
+ class="btn-switch-label"> <input type="checkbox"
+ role="switch" id="switch{{$index+1}}RoleEditAccess"
+ b2b-switches ng-model="reportRole.accessAllowed"
+ ng-click="toggleRoleEditAccessActive(reportRole)"
+ ng-disabled=false aria-disabled=false aria-label="">
+ </label></td>
+ <td><a class="icon-misc-trash"
+ ng-click="removeReportSecurityRole(reportRole)"
+ style="font-size: 22px;"> </a></td>
+ </tr>
+ </tbody>
+ </table>
+ <div>
+ <h2 colspan="2">Grant Access To:</h2>
+ <div colspan="2">
+ <select name="reportOwner" b2b-dropdown
+ ng-model="addReportRoleId.id" placeholder-text="Select a Role">
+ <option b2b-dropdown-list option-repeat="d in reportRoleList"
+ value="{{d.id}}">{{d.name}}</option>
+ </select>
+ </div>
+ <div>
+ <button class="btn btn-alt btn-small" type="button"
+ ng-click="addReportSecurityRole(addReportRoleId.id)">Add</button>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <div class="form-row">
+<!-- <button class="btn btn-alt btn-small" type="button"
+ ng-click="previous()">Previous</button> -->
+ <button class="btn btn-alt btn-small" type="button"
+ ng-click="saveReportSecurityInfo()">Save</button>
+<!-- <button class="btn btn-alt btn-small" type="button" ng-click="next()">Next</button>
+ --> </div>
+
+</div>
+
+
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step6.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step6.html
new file mode 100644
index 00000000..4849190a
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step6.html
@@ -0,0 +1,34 @@
+<h1 class="heading-page">Step 6 - Report Log</h1>
+
+<div ng-show="showLoader" class="span loader-container">
+ <i class="icon-primary-spinner" role="img"
+ aria-label="Please wait while we load your content"></i>
+</div>
+<div ng-hide="showLoader">
+ <div class="form-row" >
+ <h2 for="textinputID-2a">Report Logs</h2>
+ <table class="striped" ng-cloak>
+ <thead>
+ <tr>
+ <th>No</th>
+ <th>User Name</th>
+ <th>Log Time</th>
+ <th>Action</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat = "rowData in logs">
+ <td>{{$index+1}}</td>
+ <td>{{rowData.userName}}</td>
+ <td>{{rowData.logTime}}</td>
+ <td>{{rowData.action}}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+<!-- <div class="form-row">
+ <button class="btn btn-alt btn-small" type="button" ng-click="previous()" >Previous</button>
+ <button class="btn btn-alt btn-small" type="button" ng-click="next()" >Next</button>
+ </div> -->
+
+</div> \ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step7.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step7.html
new file mode 100644
index 00000000..298cce8f
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/steps/step7.html
@@ -0,0 +1,16 @@
+<h1 class="heading-page">Step 7 - Report Run</h1>
+
+<div ng-show="showLoader" class="span loader-container">
+ <i class="icon-primary-spinner" role="img"
+ aria-label="Please wait while we load your content"></i>
+</div>
+<div class="" ng-hide="showLoader">
+ <div class="form-row" >
+ <button class="btn btn-alt btn-small" type="button" ng-click="runReport()" >Run Report</button>
+ </div>
+<!-- <div class="form-row">
+ <button class="btn btn-alt btn-small" type="button" ng-click="previous()" >Previous</button>
+ </div> -->
+</div>
+
+
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step1.json b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step1.json
index 66562d4b..abdbd023 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step1.json
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step1.json
@@ -11,7 +11,13 @@
"name": "proj_id",
"displayName": "Project Id",
"defaultValue": ""
- },
+ },
+ {
+ "input": "text",
+ "name": "reportId",
+ "displayName": "Report ID:",
+ "defaultValue": ""
+ },
{
"input": "text",
"name": "reportName",
@@ -75,9 +81,17 @@
"defaultValue": "no",
"action": "",
"action_img": "",
- "checkboxes":[{"value":"homeSelected.value", "text":"HOME"},
- {"value":"customerSelected.value", "text":"CUSTOMER"},
- {"value":"reportsSelected.value", "text":"REPORTS"}
+ "checkboxes":[
+ {"value":"homeSelected", "text":"HOME"},
+ {"value":"customerSelected", "text":"CUSTOMER"},
+ {"value":"reportsSelected", "text":"REPORTS"},
+ {"value":"utilSelected", "text":"Utilization"},
+ {"value":"tmSelected", "text":"Tunnel Management"},
+ {"value":"trSelected", "text":"Tunnel Routing"},
+ {"value":"cmSelected", "text":"Capacity Management"},
+ {"value":"tlSelected", "text":"Traffic Loss"},
+ {"value":"smSelected", "text":"System Monitoring"},
+ {"value":"netOperateSelected", "text":"Network Operation Monitoring"}
]
},