Added missing changes for Release3.3.0

Added missing changes for Release3.3.0

Issue-ID: PORTAL-1025
Change-Id: Ie74e211c7954f2ecf0722ab00c3fea0c8c63047f
Signed-off-by: Sudarshan Kumar <sudarshan.kumar@att.com>

diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts
index 2ee9957..fb5f813 100644 (file)
--- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts
+++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts
@@ -5,7 +5,6 @@ import {PagesRoutingModule} from './pages-routing.module';
 import {ReactiveFormsModule, FormsModule} from '@angular/forms';
 import {HttpClientModule} from '@angular/common/http';
 import {MaterialModule} from '../material-module';
-import {InformationModalComponent} from '../modals/information-modal/information-modal.component';
 import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {MatExpansionModule} from '@angular/material/expansion';
@@ -64,7 +63,6 @@ import {RefreshComponent} from './refresh/refresh.component';
     declarations: [
         PagesComponent,
         SearchComponent,
-        InformationModalComponent,
         ConfirmationModalComponent,
         SelfComponent,
         SuccessModalComponent,
@@ -135,7 +133,7 @@ import {RefreshComponent} from './refresh/refresh.component';
         jqxChartModule,
         RdpModule
     ],
-    entryComponents: [DialogOverviewExampleDialog, InformationModalComponent, SuccessModalComponent, ErrorModalComponent, SelfComponent, ConfirmationModalComponent],
+    entryComponents: [DialogOverviewExampleDialog, SuccessModalComponent, ErrorModalComponent, SelfComponent, ConfirmationModalComponent],
     exports: [
     ],
     providers: []

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts
index ba54664..57554de 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts
@@ -20,9 +20,10 @@ import {RoleFunctionsComponent} from './role-functions/role-functions.component'
 import {RolesComponent} from './roles/roles.component';
 import {NewRoleComponent} from './roles/new-role/new-role.component'
 import { UserService } from '../shared/services/user/user.service';
+import { InformationModalComponent } from '../modals/information-modal/information-modal.component';
 
 @NgModule({
-  declarations: [AdminComponent, CacheAdminComponent, RoleFunctionsComponent, RolesComponent, NewRoleComponent],
+  declarations: [AdminComponent, CacheAdminComponent, RoleFunctionsComponent, RolesComponent, NewRoleComponent, InformationModalComponent],
     imports: [
         CommonModule,
         MenusModule,
@@ -38,7 +39,7 @@ import { UserService } from '../shared/services/user/user.service';
         MatPaginatorModule,
         MatInputModule
     ],
-    entryComponents: [NewRoleComponent],
+    entryComponents: [NewRoleComponent, InformationModalComponent],
     exports: [
     ],
     providers: [UserService]

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.scss b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.scss
index dbb5a10..365bd9c 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.scss
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/footer/footer.component.scss
@@ -15,16 +15,12 @@ $topnav-background-color: #222;
 }
 
 .footer {
-  position: fixed;
+  position: relative;
   bottom: 0;
-  // background-color: $topnav-background-color;
   width: 100%;
-  // height: 7.5em;
   z-index: 1002;
-  // bottom: 0px;
-  // right: 0px;
-  // width: 84%;
-  margin-bottom: -.5rem;
+  //margin-bottom: -0.5rem;
+  margin-top: calc(100vh - 250px);
 }
 
 .footer-logo {

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html
index c86a069..f91e882 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.html
@@ -1,5 +1,5 @@
 <div class="sidebar" [ngClass]="{'siderbar-height': showHeader, 'siderbar-height-noHeader': !showHeader}" >
-       <div class="sidebar-list" [ngClass]="{collapsed: collapsed}">
+       <div class="sidebar-list" [ngClass]="{collapsed: collapsed, 'remove-header-margin': showHeader == false}">
  
         <nav  [ngClass]="{sidebarPushRight: isActive, collapsed: collapsed}">
                
@@ -47,7 +47,7 @@
                 </div>
         </nav>
  </div>
-        <div class="toggle-button" [ngClass]="{collapsed: collapsed}" (click)="toggleCollapsed()">
+        <div class="toggle-button" [ngClass]="{collapsed: collapsed, 'toggle-button-no-header': showHeader == false }" (click)="toggleCollapsed()">
                 <!-- <i class="fa fa-angle-double-{{collapsed?'right':'left'}}"></i>&nbsp; -->
                 <i class="icon ion-md-arrow-{{collapsed?'dropright':'dropleft'}}" style="float:right"></i> 
                         <i class="icon ion-md-arrow-{{collapsed?'dropright':'dropleft'}}" style="float:right"></i>&nbsp;

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.scss b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.scss
index 02c969c..50bc1b5 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.scss
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/sidebar/sidebar.component.scss
@@ -52,7 +52,7 @@
      left: 235px;
      width: 235px;
      //height: 100%;
-     height: 76%;
+     height: 84%;
      margin-left: -235px;
      //margin-bottom: 48px;
      margin-bottom: 0px;
@@ -153,6 +153,10 @@
          }
      }
  }
+
+ .remove-header-margin{
+    top: 4.2em;
+ }
  
  .nested-menu {
      .list-group-item {
@@ -215,7 +219,7 @@
  }
  .toggle-button {
      position: fixed;
-     width: 236px;
+     width: 235px;
      cursor: pointer;
      padding: 12px;
      // bottom: 5.5em;
@@ -238,6 +242,10 @@
      -o-transition: all 0.2s ease-in-out;
      transition: all 0.2s ease-in-out;
  }
+
+ .toggle-button-no-header{
+    top: 8px;
+ }
  
  .collapsed {
      width: 60px;

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html
index bf4507f..2ae6c46 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html
@@ -4,7 +4,7 @@
        </section>
 </div>
 
-<section class="main-container" [ngClass]="{collapsed: collapedSideBar}">
+<section class="main-container" [ngClass]="{'collapsed': collapedSideBar , 'remove-header': showHeader == false }">
        <app-sidebar (collapsedEvent)="receiveCollapsed($event)"></app-sidebar>
 
        <router-outlet></router-outlet>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.scss b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.scss
index 561f493..141da81 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.scss
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.scss
@@ -52,6 +52,11 @@
     position: relative;
     overflow: hidden;
 }
+
+.remove-header{
+    margin-top: -9px;
+}
+
 .collapsed {
     margin-left: 60px;
 }

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts
index aad435f..d0094ab 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts
@@ -12,7 +12,7 @@ export class ReportListService {
 
   deleteReport(reportId : string) : Observable<any>
   {
-    return this._http.get(environment.baseUrl + "/raptor.htm?action=report.delete&c_master=" + reportId);
+    return this._http.get(environment.baseUrl + "raptor.htm?action=report.delete&c_master=" + reportId);
   }
   getAllReports():Observable<any>{
       return this._http.get(environment.baseUrl +  "raptor.htm?action=report.search.execute&r_page=0&show_all=true");