From 3e7145fc12ed8475ba10bb2a3c63004d41aa42bc Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Fri, 7 Jul 2017 07:21:10 -0400 Subject: [PORTAL-25] Role Centralization Bump EP SDK version to 1.3.0-SNAPSHOT Support Role Centralization & Common Set of Roles across All ONAP On-Boarded Applications Change-Id: Icfc1bbfddaf2c7c7176b4cf7bb7017d853c63100 Signed-off-by: Christopher Lott (cl778h) --- .../src/main/webapp/WEB-INF/conf/raptor.properties | 3 - .../webapp/WEB-INF/fusion/defs/definitions.xml | 3 + .../webapp/WEB-INF/fusion/raptor/wizard_chart.jsp | 1335 ---- .../bootstrap-3.3.7/css/bootstrap-theme.css | 587 ++ .../bootstrap-3.3.7/css/bootstrap-theme.css.map | 1 + .../bootstrap-3.3.7/css/bootstrap-theme.min.css | 6 + .../css/bootstrap-theme.min.css.map | 1 + .../external/bootstrap-3.3.7/css/bootstrap.css | 6757 ++++++++++++++++++++ .../external/bootstrap-3.3.7/css/bootstrap.css.map | 1 + .../external/bootstrap-3.3.7/css/bootstrap.min.css | 6 + .../bootstrap-3.3.7/css/bootstrap.min.css.map | 1 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes .../fonts/glyphicons-halflings-regular.svg | 288 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes .../external/bootstrap-3.3.7/js/bootstrap.js | 2377 +++++++ .../external/bootstrap-3.3.7/js/bootstrap.min.js | 7 + .../app/fusion/external/bootstrap-3.3.7/js/npm.js | 13 + .../ds2-bootstrap/b2b-bootstrap-common.css | 34 + .../scripts/DS2-controllers/admin-controller.js | 85 +- .../DS2-controllers/bootstrap-sample-controller.js | 5 + .../DS2-controllers/bootstrap-sample-route.js | 7 + .../fusion/scripts/DS2-services/adminService.js | 4 +- .../DS2-view-models/bootstrap-sample-content.html | 146 + .../DS2-view-models/bootstrap-sample-page.html | 146 + .../ds2-admin/modals/role-child-add-confirm.html | 12 +- .../modals/role-functions-child-roles-modal.html | 11 +- .../scripts/DS2-view-models/ds2-admin/role.html | 7 +- .../report-wizard-report-name-validation.html | 20 + .../ds2-reports/wz_steps/json/step1.json | 2 +- 31 files changed, 10431 insertions(+), 1434 deletions(-) delete mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_chart.jsp create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/css/bootstrap-theme.css create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/css/bootstrap-theme.css.map create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/css/bootstrap-theme.min.css create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/css/bootstrap-theme.min.css.map create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/css/bootstrap.css create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/css/bootstrap.css.map create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/css/bootstrap.min.css create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/css/bootstrap.min.css.map create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.eot create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.svg create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.ttf create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff2 create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/js/bootstrap.js create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/js/bootstrap.min.js create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/bootstrap-3.3.7/js/npm.js create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/ds2-bootstrap/b2b-bootstrap-common.css create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-controller.js create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-route.js create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-content.html create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-report-name-validation.html (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp') diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/conf/raptor.properties b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/conf/raptor.properties index d566f027..1491e4ad 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/conf/raptor.properties +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/conf/raptor.properties @@ -69,9 +69,6 @@ can_copy_on_read_only=yes ##C## Determines the no of decimals to be displayed in Totals column #max_decimals_on_totals=-1 => don't truncate, display all decimal digits max_decimals_on_totals=2 -##C## Determines which JFreeChart to use. -jfree_version=latest -#jfree_version=0.9.11 # Added this restriction so that heavily used system which contain # more than 1000 users can enable this feature not to display whole # users in the drop down menu diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/defs/definitions.xml b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/defs/definitions.xml index 2e9c8bf6..14a59ea5 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/defs/definitions.xml +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/defs/definitions.xml @@ -105,6 +105,9 @@ + + diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_chart.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_chart.jsp deleted file mode 100644 index 959adc23..00000000 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_chart.jsp +++ /dev/null @@ -1,1335 +0,0 @@ -<%-- - ================================================================================ - eCOMP Portal SDK - ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ================================================================================ - --%> -<%-- - Name: wizard_chart.jsp - Use : This JSP is invoked when chart tab is selected. This is used for creating chart configuration for the report. - - Change Log - ========== - - 12-Aug-2009 : Version 8.5 (Sundar); -
    -
  • For Line Chart Category can be configured. For this UI is added.
    • -
  • Line Chart can be displayed as 3D or 2D.
    • -
- 29-Jun-2009 : Version 8.4 (Sundar); -
    -
  • For Bar Chart Last Series/Category can be configured as Line Chart or Bar Chart. For this UI is added.
    • -
  • UI options for compare to prev year chart has been added.
    • -
- - 23-Jun-2009 : Version 8.4 (Sundar); -
    -
  • Hiding/ Unhiding parameters based on chart type is checked throughly and missing elements were added.
    • -
  • Table width is made 100% for special input parameters
    • -
- - 22-Jun-2009 : Version 8.4 (Sundar); - -
    -
  • Calendar JS and CSS were added to this page as it is used in customizable input parameters for Time Difference Chart.
    • -
  • JS method and configurable input parameters were added for Multiple Pie Chart, Bar Chart 3D, Pareto, Time Difference Chart and Multiple - Time Series Chart.
    • -
---%> -<%@page import="org.openecomp.portalsdk.analytics.model.runtime.FormField"%> -<%@page import="org.openecomp.portalsdk.analytics.model.runtime.ReportFormFields"%> -<%@page import="org.openecomp.portalsdk.analytics.model.runtime.ReportRuntime"%> -<%@page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue"%> -<%@page import="org.openecomp.portalsdk.analytics.model.DataCache"%> -<%@page import="org.openecomp.portalsdk.analytics.model.ReportHandler"%> -<%@page import="java.util.Vector"%> -<%@ page import="java.util.List" %> -<%@ page import="java.util.ArrayList" %> -<%@ page import="java.util.Iterator" %> -<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %> -<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %> -<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %> -<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %> -<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %> -<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %> -<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.Reports"%> - -<% - ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION); - WizardSequence ws = rdef.getWizardSequence(); - boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB); - boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED) || rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED_DATAMIN); - - String legendColId = null; - String valueColId = null; - - //String firstColId = null; - //String firstNumColId = null; - - List reportCols = rdef.getAllColumns(); - List chartValueCols = rdef.getChartValueColumnsList(AppConstants.CHART_ALL_COLUMNS, null); - - ArrayList unusedNumCols = new ArrayList(reportCols.size()); - int numColsCount = 0; - for(Iterator iter=reportCols.iterator(); iter.hasNext(); ) { - DataColumnType dct = (DataColumnType) iter.next(); - - if(nvl(dct.getColOnChart()).equals(AppConstants.GC_LEGEND)) - legendColId = dct.getColId(); - - if(isSQLBased||nvl(dct.getColType()).equals(AppConstants.CT_NUMBER)) { - numColsCount++; - if(nvl(dct.getColOnChart()).length()==0) //dct.getChartSeq()<0) - unusedNumCols.add(dct); - } // if - -/* if(dct.getChartSeq()>0) - valueColId = dct.getColId(); - - if(firstColId==null) - firstColId = dct.getColId(); - if(firstNumColId==null) - if(isSQLBased) - firstNumColId = dct.getColId(); - else - if(nvl(dct.getColType()).equals(AppConstants.CT_NUMBER)) - firstNumColId = dct.getColId();*/ - } // for - - String chartType = nvl(rdef.getChartType()); %> - - - - - - - - -
- - - - - - -<% if(numColsCount==0) { %> - - - - - - - -<% } else { %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<% if(chartValueCols.size()==0) { %> - - - - - -<% } else { - int count = 1; - String colIdx = ""; - for(Iterator iterV=chartValueCols.iterator(); iterV.hasNext(); count++) { - colIdx = ""; - DataColumnType dctV = (DataColumnType) iterV.next(); - colIdx = dctV.getColId(); - int colAxisIdx = 0; - boolean newChart = false; - try { - colAxisIdx = Integer.parseInt(dctV.getColOnChart()); - } catch(Exception e) {} - newChart = (dctV.isCreateInNewChart()!=null)?dctV.isCreateInNewChart().booleanValue():false; - %> - - - - - - - - -<% } // for - } // else (chartValueCols.size()==0) - if(unusedNumCols.size()>0) { %> - - - - - - -<% } // if(unusedNumCols.size()==0) - if(chartValueCols.size()>1 || rdef.hasSeriesColumn()) { %> - - - - - - - - -<% } // if(chartValueCols.size()>1) -%> - - - - - - - + - +
Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %>
No numeric columns found - chart not available
- - - - - - -
Chart Type: - - > -  Do NOT allow user to change chart type at runtime -
-
Chart Width (px): - " size="10" maxlength="4">
Chart Height (px): - " size="10" maxlength="4">
Domain Axis: -
Category: -
last Category display As Line Chart - - > -
last Category display As Bar Chart - - > -
Multi Series - 0? (AppUtils.getRequestNvlValue(request, "multiSeries").equals("Y")? " checked ":""): (rdef.isMultiSeries() ? " checked ":" checked ")) %>>Yes - 0? (AppUtils.getRequestNvlValue(request, "multiSeries").equals("N")? " checked ":""): (!rdef.isMultiSeries() ? " checked":"")) %>>No -
Range Axis: - - <% String sValue = ""; %> - -
Range Axis <%= count %>: - - <% if(count>1) { %> -   - - <% } %> -   - - <% - String chartGroupOrg = dctV.getChartGroup(); - String yAxisGroup = dctV.getYAxis(); - String chartGroup = (chartGroupOrg!=null && chartGroupOrg.length()>0 && chartGroupOrg.indexOf("|")!= -1)?chartGroupOrg.substring(0,chartGroupOrg.lastIndexOf("|")):""; - String yAxis = (yAxisGroup!=null && yAxisGroup.length()>0 && yAxisGroup.indexOf("|")!= -1)?yAxisGroup.substring(0,yAxisGroup.lastIndexOf("|")):""; - %> -
- Chart Title:"/> - YAxis:"/> -
- - 		- <% String sValue = nvl(dctV.getChartColor()); %> - - - <% if(count>1) { %> -
- > -  Create in New Chart -
- 0)?" checked":"" %>> -  Use secondary axis (Line chart only) - <% } %> -  
Add Values Column: - - - <% String sValue = ""; %> - - - -  Use secondary axis (Line chart only) -
Primary Axis Label: - -  (Multi-series Chart Only)
Secondary Axis Label: - -  (Multi-series Chart Only)
  - Note: Some chart types (like Pie) will only display Series 1 Values.
- - - - - - - - - - - - - - - - - - - Role
- + {{ roleFunction.name }}{{ role.name }}
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html index 12d8df70..e2aa188a 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html @@ -49,9 +49,10 @@
-
+ +
Manage Role Functions

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-report-name-validation.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-report-name-validation.html new file mode 100644 index 00000000..50132ecf --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-report-name-validation.html @@ -0,0 +1,20 @@ +
+
+

Warning

+
+ +
+
+
+
+
+

Please enter the missing report name.

+ + +
+
+
+
+
\ 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/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 091d47e5..66562d4b 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 @@ -15,7 +15,7 @@ { "input": "text", "name": "reportName", - "displayName": "Report Name:", + "displayName": "Report Name *:", "defaultValue": "" }, { -- cgit 1.2.3-korg