summaryrefslogtreecommitdiffstats
path: root/portal-FE-os
diff options
context:
space:
mode:
Diffstat (limited to 'portal-FE-os')
-rw-r--r--portal-FE-os/pom.xml53
-rw-r--r--portal-FE-os/src/app/pages/pages-routing.module.ts2
-rw-r--r--portal-FE-os/src/app/pages/pages.module.ts10
3 files changed, 58 insertions, 7 deletions
diff --git a/portal-FE-os/pom.xml b/portal-FE-os/pom.xml
index 7f6a02ff..a306c15e 100644
--- a/portal-FE-os/pom.xml
+++ b/portal-FE-os/pom.xml
@@ -64,7 +64,7 @@
<version>${epsdk.version}</version>
<type>war</type>
<overWrite>false</overWrite>
- <includes>ngapp/src/app/pages/analytics/**</includes>
+ <includes>ngapp/src/app/pages/analytics/**, ngapp/src/app/report-run/**, ngapp/src/app/modals/error-modal/**, ngapp/src/app/shared/services/cache.service.ts</includes>
<outputDirectory>${basedir}/</outputDirectory>
</artifactItem>
</artifactItems>
@@ -99,6 +99,57 @@
</configuration>
</execution>
+ <execution>
+ <id>copy-report-run</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/src/app/pages/</outputDirectory>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/ngapp/src/app/report-run</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy-error-modal</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/src/app/modals/</outputDirectory>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/ngapp/src/app/modals</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy-cache-service</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/src/app/shared/services/</outputDirectory>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/ngapp/src/app/shared/services</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
</executions>
</plugin>
diff --git a/portal-FE-os/src/app/pages/pages-routing.module.ts b/portal-FE-os/src/app/pages/pages-routing.module.ts
index ea1d8b5b..5e59cf30 100644
--- a/portal-FE-os/src/app/pages/pages-routing.module.ts
+++ b/portal-FE-os/src/app/pages/pages-routing.module.ts
@@ -57,7 +57,7 @@ import { RoleFunctionsComponent } from './role/role-functions/role-functions.com
import { NotificationHistoryComponent } from './notification-history/notification-history.component';
import { GetAccessComponent } from './get-access/get-access.component';
import { HeaderTabsWrapperComponent } from './analytics/Report_List/header-tabs-wrapper-component/header-tabs-wrapper.component';
-import { RunReportFormFieldsComponent } from './analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component';
+import { RunReportFormFieldsComponent } from './run/run-report-form-fields/run-report-form-fields.component';
import { DisplayAreaComponent } from './analytics/Report_List/display-area/display-area.component';
import { ReportComponent } from './analytics/Report_List/Report/report.component';
diff --git a/portal-FE-os/src/app/pages/pages.module.ts b/portal-FE-os/src/app/pages/pages.module.ts
index a921257f..9d1a7597 100644
--- a/portal-FE-os/src/app/pages/pages.module.ts
+++ b/portal-FE-os/src/app/pages/pages.module.ts
@@ -100,7 +100,7 @@ import { InformationTooltipComponent } from './information-tooltip/information-t
import { UserDetailsFormComponent } from './users/user-details-form/user-details-form.component';
import { MatTooltipModule } from '@angular/material';
import { HeaderTabsWrapperComponent } from './analytics/Report_List/header-tabs-wrapper-component/header-tabs-wrapper.component';
-import { RunReportFormFieldsComponent } from './analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component';
+import { RunReportFormFieldsComponent } from './run/run-report-form-fields/run-report-form-fields.component';
import { DisplayAreaComponent } from './analytics/Report_List/display-area/display-area.component';
import { HeaderTabsComponent } from './analytics/Report_List/header-tabs-component/header-tabs.component';
import { MatTableModule, MatPaginatorModule, MatSortModule, MatTabsModule, MatButtonToggleModule, MatExpansionModule, MatFormFieldModule, MatGridListModule, MatCardModule, MatMenuModule, MatButtonModule } from '@angular/material';
@@ -111,7 +111,7 @@ import { FormFieldsComponent } from './analytics/Report_List/Report/form-fields/
import { ChartWizardComponent } from './analytics/Report_List/Report/chart-wizard/chart-wizard.component';
import { SecurityComponent } from './analytics/Report_List/Report/security/security.component';
import { LogComponent } from './analytics/Report_List/Report/log/log.component';
-import { RunComponent } from './analytics/Report_List/Report/run/run.component';
+import { RunComponent } from './run/run.component';
import { DefinitionSaveDialogComponent } from './analytics/Report_List/Report/definition/definition-save-dialog/definition-save-dialog.component';
import { SQLSaveChangesDialogComponent } from './analytics/Report_List/Report/sql/sql-save-changes-dialog/sql-save-changes-dialog.component';
import { SQLValidateChangesDialogComponent } from './analytics/Report_List/Report/sql/sql-validate-changes-dialog/sql-validate-changes-dialog.component';
@@ -120,14 +120,14 @@ import { SQLValidateErrorDialogComponent } from './analytics/Report_List/Report/
import { ReportComponent } from './analytics/Report_List/Report/report.component';
import { DashboardReportGridComponent } from './analytics/Report_List/Report/definition/dashboard-report-grid/dashboard-report-grid.component';
import { DataChartComponent } from './analytics/Report_List/Report/definition/dashboard-report-grid/data-chart/data-chart.component';
-import { RunDashboardReportComponent } from './analytics/Report_List/Report/run/run-report/run-dashboard-report/run-dashboard-report.component';
+import { RunDashboardReportComponent } from './run/run-report/run-dashboard-report/run-dashboard-report.component';
import { EditDrillDownLinkComponent } from './analytics/Report_List/Report/columns/columns-edit-component/edit-drill-down-link/edit-drill-down-link.component';
import { FormFieldsAddEditComponent } from './analytics/Report_List/Report/form-fields/form-fields-add-edit/form-fields-add-edit.component';
-import { RunReportResultSetComponent } from './analytics/Report_List/Report/run/run-report-result-set/run-report-result-set.component';
+import { RunReportResultSetComponent } from './run/run-report-result-set/run-report-result-set.component';
import { ColumnListComponent } from './analytics/Report_List/Report/columns/column-list/column-list.component';
import { ColumnsEditComponent } from './analytics/Report_List/Report/columns/columns-edit-component/columns-edit.component';
import { ReportListComponent } from './analytics/Report_List/report-list.component';
-import { RunReportComponent } from './analytics/Report_List/Report/run/run-report/run-report.component';
+import { RunReportComponent } from './run/run-report/run-report.component';
@NgModule({