diff --git a/angular.json b/angular.json index 605a4d4..a9148cb 100644 --- a/angular.json +++ b/angular.json @@ -22,6 +22,7 @@ ], "styles": [ "src/styles.css", + "src/material.scss", "node_modules/datatables.net-dt/css/jquery.dataTables.css", "node_modules/interactiveminingv3/assets/css/interactive-mining.css", "node_modules/interactiveminingv3/assets/css/animations.css" @@ -145,4 +146,4 @@ "prefix": "app" } } -} \ No newline at end of file +} diff --git a/src/app/app.component.ts b/src/app/app.component.ts index f267c3f..8a35a1a 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -58,7 +58,6 @@ export class AppComponent implements OnInit{ localStorage.setItem('isCommunityManager', Session.isCommunityCurator() + ''); this.isPortalAdministrator = Session.isPortalAdministrator(); - /*this.isPortalAdministrator = true;*/ } this._communitiesService.updateCommunities(this.properties, this.properties.communityAPI + 'communities'); diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c108cbc..3bf655b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -30,6 +30,7 @@ import {CommunityService} from './openaireLibrary/connect/community/community.se import {SubscribeService} from './openaireLibrary/utils/subscribe/subscribe.service'; import {ConnectRIGuard} from './openaireLibrary/connect/communityGuard/connectRIGuard.guard'; import {SideBarModule} from "./openaireLibrary/sharedComponents/sidebar/sideBar.module"; +import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; @NgModule({ imports: [ @@ -42,7 +43,8 @@ import {SideBarModule} from "./openaireLibrary/sharedComponents/sidebar/sideBar. ErrorModule, AlertModalModule, SafeHtmlPipeModule, FABModule, InteractiveMiningModule, - SideBarModule + SideBarModule, + BrowserAnimationsModule ], declarations: [ AppComponent, diff --git a/src/app/pages/divhelpcontent/div-help-contents.component.html b/src/app/pages/divhelpcontent/div-help-contents.component.html index dbfb67d..08b960f 100644 --- a/src/app/pages/divhelpcontent/div-help-contents.component.html +++ b/src/app/pages/divhelpcontent/div-help-contents.component.html @@ -121,12 +121,8 @@
-
- -
-
- -
+
diff --git a/src/app/pages/divhelpcontent/div-help-contents.component.ts b/src/app/pages/divhelpcontent/div-help-contents.component.ts index e7677c2..5ee5a42 100644 --- a/src/app/pages/divhelpcontent/div-help-contents.component.ts +++ b/src/app/pages/divhelpcontent/div-help-contents.component.ts @@ -238,7 +238,6 @@ export class DivHelpContentsComponent implements OnInit { if(!Session.isLoggedIn()){ this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this.router.url} }); } else { - this.showLoading = true; this.updateErrorMessage = ""; this._helpService.toggleDivHelpContents(ids,status, this.properties.adminToolsAPIURL).subscribe( @@ -249,8 +248,6 @@ export class DivHelpContentsComponent implements OnInit { } this.countDivHelpContents(); this.applyCheck(false); - - this.showLoading = false; }, error => this.handleUpdateError('System error changing the status of the selected page content(s)', error) ); diff --git a/src/app/pages/divhelpcontent/div-help-contents.module.ts b/src/app/pages/divhelpcontent/div-help-contents.module.ts index a6cd113..95d62f1 100644 --- a/src/app/pages/divhelpcontent/div-help-contents.module.ts +++ b/src/app/pages/divhelpcontent/div-help-contents.module.ts @@ -9,12 +9,13 @@ import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.mod import {DivHelpContentsRoutingModule} from './div-help-contents-routing.module'; import {SafeHtmlPipeModule} from '../../openaireLibrary/utils/pipes/safeHTMLPipe.module'; import {DivHelpContentsComponent} from './div-help-contents.component'; +import {MatSlideToggleModule} from '@angular/material'; @NgModule({ - imports: [ - CommonModule, RouterModule, FormsModule, FABModule, SafeHtmlPipeModule, - AlertModalModule, ReactiveFormsModule, DivHelpContentsRoutingModule - ], + imports: [ + CommonModule, RouterModule, FormsModule, FABModule, SafeHtmlPipeModule, + AlertModalModule, ReactiveFormsModule, DivHelpContentsRoutingModule, MatSlideToggleModule + ], declarations: [ DivHelpContentsComponent ], diff --git a/src/app/pages/entity/entities.component.html b/src/app/pages/entity/entities.component.html index b7ad306..7172434 100644 --- a/src/app/pages/entity/entities.component.html +++ b/src/app/pages/entity/entities.component.html @@ -72,12 +72,8 @@
{{check.entity.name}}
-
- -
-
- -
+
diff --git a/src/app/pages/entity/entities.component.ts b/src/app/pages/entity/entities.component.ts index d6b5a3e..0c713e1 100644 --- a/src/app/pages/entity/entities.component.ts +++ b/src/app/pages/entity/entities.component.ts @@ -307,7 +307,6 @@ export class EntitiesComponent implements OnInit { this._router.navigate(['/user-info'], { queryParams: { 'errorCode': LoginErrorCodes.NOT_VALID, 'redirectUrl': this._router.url} }); } else { - this.showLoading = true; this.updateErrorMessage = ''; this._helpContentService.toggleEntities( this.selectedCommunityPid, this.toggleIds, this.toggleStatus, this.properties.adminToolsAPIURL).subscribe( @@ -317,7 +316,6 @@ export class EntitiesComponent implements OnInit { this.checkboxes[i].entity.isEnabled = this.toggleStatus; } this.applyCheck(false); - this.showLoading = false; }, error => this.handleUpdateError('System error changing the status of the selected entity(-ies)', error) ); diff --git a/src/app/pages/entity/entities.module.ts b/src/app/pages/entity/entities.module.ts index e6de372..f84c431 100644 --- a/src/app/pages/entity/entities.module.ts +++ b/src/app/pages/entity/entities.module.ts @@ -9,12 +9,13 @@ import {FABModule} from '../../utils/fabModule.module'; import {EntityFormComponent} from './entity-form.component'; import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module'; import {EntitiesRoutingModule} from './entities-routing.module'; +import {MatSlideToggleModule} from '@angular/material'; @NgModule({ - imports: [ - CommonModule, RouterModule, FormsModule, FABModule, - AlertModalModule, ReactiveFormsModule, EntitiesRoutingModule - ], + imports: [ + CommonModule, RouterModule, FormsModule, FABModule, + AlertModalModule, ReactiveFormsModule, EntitiesRoutingModule, MatSlideToggleModule + ], declarations: [EntitiesComponent, EntityFormComponent], providers: [IsCommunity, ConnectAdminLoginGuard], exports: [EntitiesComponent] diff --git a/src/app/pages/helpcontent/page-help-contents.component.html b/src/app/pages/helpcontent/page-help-contents.component.html index 6a27903..10c87ce 100644 --- a/src/app/pages/helpcontent/page-help-contents.component.html +++ b/src/app/pages/helpcontent/page-help-contents.component.html @@ -120,12 +120,8 @@
-
- -
-
- -
+
diff --git a/src/app/pages/helpcontent/page-help-contents.component.ts b/src/app/pages/helpcontent/page-help-contents.component.ts index 0c921c9..1651f13 100644 --- a/src/app/pages/helpcontent/page-help-contents.component.ts +++ b/src/app/pages/helpcontent/page-help-contents.component.ts @@ -252,7 +252,6 @@ export class PageHelpContentsComponent implements OnInit { if(!Session.isLoggedIn()){ this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this.router.url} }); } else { - this.showLoading = true; this.updateErrorMessage = ""; this._helpService.togglePageHelpContents(ids,status, this.properties.adminToolsAPIURL).subscribe( @@ -263,8 +262,6 @@ export class PageHelpContentsComponent implements OnInit { } this.countPageHelpContents(); this.applyCheck(false); - - this.showLoading = false; }, error => this.handleUpdateError('System error changing the status of the selected page content(s)', error) ); diff --git a/src/app/pages/helpcontent/page-help-contents.module.ts b/src/app/pages/helpcontent/page-help-contents.module.ts index f6118e1..7559a32 100644 --- a/src/app/pages/helpcontent/page-help-contents.module.ts +++ b/src/app/pages/helpcontent/page-help-contents.module.ts @@ -9,12 +9,13 @@ import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.mod import {PageHelpContentsRoutingModule} from './page-help-contents-routing.module'; import {PageHelpContentsComponent} from './page-help-contents.component'; import {SafeHtmlPipeModule} from '../../openaireLibrary/utils/pipes/safeHTMLPipe.module'; +import {MatSlideToggleModule} from '@angular/material'; @NgModule({ - imports: [ - CommonModule, RouterModule, FormsModule, FABModule, SafeHtmlPipeModule, - AlertModalModule, ReactiveFormsModule, PageHelpContentsRoutingModule - ], + imports: [ + CommonModule, RouterModule, FormsModule, FABModule, SafeHtmlPipeModule, + AlertModalModule, ReactiveFormsModule, PageHelpContentsRoutingModule, MatSlideToggleModule + ], declarations: [ PageHelpContentsComponent ], diff --git a/src/app/pages/page/pages.component.html b/src/app/pages/page/pages.component.html index 2f4ea09..f4b920a 100644 --- a/src/app/pages/page/pages.component.html +++ b/src/app/pages/page/pages.component.html @@ -86,12 +86,8 @@
{{check.page.name}}
-
- -
-
- -
+
{{check.page.type}}
diff --git a/src/app/pages/page/pages.component.ts b/src/app/pages/page/pages.component.ts index 6c993e9..d1195b6 100644 --- a/src/app/pages/page/pages.component.ts +++ b/src/app/pages/page/pages.component.ts @@ -336,7 +336,6 @@ export class PagesComponent implements OnInit { if(!Session.isLoggedIn()){ this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} }); } else { - this.showLoading = true; this.updateErrorMessage = ""; this._helpContentService.togglePages(this.selectedCommunityPid,ids,status, this.properties.adminToolsAPIURL).subscribe( @@ -346,7 +345,6 @@ export class PagesComponent implements OnInit { this.checkboxes[i].page.isEnabled=status; } this.applyCheck(false); - this.showLoading = false; }, error => this.handleUpdateError('System error changing the status of the selected page(s)', error) ); diff --git a/src/app/pages/page/pages.module.ts b/src/app/pages/page/pages.module.ts index cba3b82..8b79765 100644 --- a/src/app/pages/page/pages.module.ts +++ b/src/app/pages/page/pages.module.ts @@ -9,12 +9,13 @@ import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.mod import {PagesComponent} from './pages.component'; import {PageFormComponent} from './page-form.component'; import {PagesRoutingModule} from './pages-routing.module'; +import {MatSlideToggleModule} from '@angular/material'; @NgModule({ - imports: [ - CommonModule, RouterModule, FormsModule, FABModule, - AlertModalModule, ReactiveFormsModule, PagesRoutingModule - ], + imports: [ + CommonModule, RouterModule, FormsModule, FABModule, + AlertModalModule, ReactiveFormsModule, PagesRoutingModule, MatSlideToggleModule + ], declarations: [PagesComponent, PageFormComponent], providers: [IsCommunity, ConnectAdminLoginGuard], exports: [PagesComponent] diff --git a/src/app/pages/stats/stats.component.html b/src/app/pages/stats/stats.component.html index 8e36f9f..8a60d83 100644 --- a/src/app/pages/stats/stats.component.html +++ b/src/app/pages/stats/stats.component.html @@ -53,8 +53,224 @@

{{ entitiesMap.get(entity) }} (this entity has been deactivated)

-
- +
+
+
+
+
{{statisticsSum[entity].total|number}}
+
Total + {{ entity == 'dataset' ? 'Research Data' : entitiesMap.get(entity) }}
+
+
+ + + + + + + + + + + + + + + + + +
Show#
In Graph Analysis + +
In Overview + +
+
+
+
+
+
+
+
{{statisticsSum[entity].projects|number}}
+
Projects
+
+
+ + + + + + + + + + + + + + + + + +
Show#
In Graph Analysis + +
In Overview + +
+
+
+
+
+
+
+
{{statisticsSum[entity].open_access|number}}
+
Open + {{ entity == 'dataset' ? 'Research Data' : entitiesMap.get(entity) }}
+
+
+ + + + + + + + + + + + + + + + + +
Show#
In Graph Analysis + +
In Overview + +
+
+
+
+
+
+
+
{{statisticsSum[entity].closed_access|number}}
+
Closed + {{ entity == 'dataset' ? 'Research Data' : entitiesMap.get(entity) }}
+
+
+ + + + + + + + + + + + + + + + + +
Show#
In Graph Analysis + +
In Overview + +
+
+
+
+
+
+
+
{{statisticsSum[entity].restricted|number}}
+
Restricted + {{ entity == 'dataset' ? 'Research Data' : entitiesMap.get(entity) }}
+
+
+ + + + + + + + + + + + + + + + + +
Show#
In Graph Analysis + +
In Overview + +
+
+
+
+
+
+
+
{{statisticsSum[entity].embargo|number}}
+
Embargo + {{ entity == 'dataset' ? 'Research Data' : entitiesMap.get(entity) }}
+
+
+ + + + + + + + + + + + + + + + + +
Show#
In Graph Analysis + +
In Overview + +
+
+
+
+ +
- +
+ +
Display options
@@ -143,22 +361,18 @@ - In Monitor - - - - - + In Graph Analysis + + + - In Dashboard - - - - - + In Overview + + + @@ -186,11 +400,13 @@ chartsUrlMap[entity + 'Graph']" class="uk-grid">
- +
+ +
Display options
- +
@@ -199,22 +415,18 @@ - - + + - - + +
Show
In Monitor - - - - In Graph Analysis + +
In Dashboard - - - - In Overview + +
@@ -247,17 +459,25 @@
  • - +
    + + +
  • - +
    + +
  • - +
    + + +
@@ -276,58 +496,44 @@ - In Monitor - - - - - - - - - - - - - - - - - - - - + In Graph Analysis + + + + + + + + + + + + + - In Dashboard - - - - - - - - - - - - - - - - - - - - + In Overview + + + + + + + + + + + + + diff --git a/src/app/pages/stats/stats.component.ts b/src/app/pages/stats/stats.component.ts index 22fb307..4ac1e27 100644 --- a/src/app/pages/stats/stats.component.ts +++ b/src/app/pages/stats/stats.component.ts @@ -404,7 +404,6 @@ export class StatsComponent implements OnInit { if(!Session.isLoggedIn()){ this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} }); } else { - this.showLoading = true; this.updateErrorMessage = ""; this.contentService.postCommunityAdminStatisticsChoices( @@ -419,7 +418,6 @@ export class StatsComponent implements OnInit { error => this.handleUpdateError('The changes could not be saved', error),//console.log(error), () => { this.statisticsDisplay.entities[entity][chartsOrNumbers].map[title].showInMonitor = !this.statisticsDisplay.entities[entity][chartsOrNumbers].map[title].showInMonitor; - this.showLoading = false; } ); } @@ -429,7 +427,6 @@ export class StatsComponent implements OnInit { if(!Session.isLoggedIn()){ this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} }); } else { - this.showLoading = true; this.updateErrorMessage = ""; this.contentService.postCommunityAdminStatisticsChoices( @@ -444,7 +441,6 @@ export class StatsComponent implements OnInit { error => this.handleUpdateError('The changes could not be saved', error),//console.log(error), () => { this.statisticsDisplay.entities[entity][chartsOrNumbers].map[title].showInDashboard = !this.statisticsDisplay.entities[entity][chartsOrNumbers].map[title].showInDashboard; - this.showLoading = false; } ); } diff --git a/src/app/pages/stats/stats.module.ts b/src/app/pages/stats/stats.module.ts index 7a5e210..5214f44 100644 --- a/src/app/pages/stats/stats.module.ts +++ b/src/app/pages/stats/stats.module.ts @@ -5,10 +5,11 @@ import {IsCommunity} from '../../openaireLibrary/connect/communityGuard/isCommun import {ConnectAdminLoginGuard} from '../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard'; import {StatsComponent} from './stats.component'; import {StatsRoutingModule} from './stats-routing.module'; +import {MatSlideToggleModule} from '@angular/material'; @NgModule({ imports: [ - CommonModule, StatsRoutingModule, RouterModule + CommonModule, StatsRoutingModule, RouterModule, MatSlideToggleModule ], declarations: [StatsComponent], providers: [IsCommunity, ConnectAdminLoginGuard], diff --git a/src/assets/css/connect-custom.css b/src/assets/css/connect-custom.css index e22bcde..3eb9e3e 100644 --- a/src/assets/css/connect-custom.css +++ b/src/assets/css/connect-custom.css @@ -104,4 +104,16 @@ .communitiesImageBox{ width:284px; height:109px; /*width:107px; height:57px;*/ -} \ No newline at end of file +} + +.iframeContainer{ + overflow:hidden; + +} + +.iframeContainer iframe{ + + width:100%; + height:100%; + border:0; +} diff --git a/src/material.scss b/src/material.scss new file mode 100644 index 0000000..1957d96 --- /dev/null +++ b/src/material.scss @@ -0,0 +1,9 @@ +@import '~@angular/material/theming'; +@include mat-core(); +$my-app-primary: mat-palette($mat-blue-grey); +$my-app-accent: mat-palette($mat-green); +$my-app-warn: mat-palette($mat-deep-orange); + +$my-app-theme: mat-light-theme($my-app-primary, $my-app-accent, $my-app-warn); + +@include angular-material-theme($my-app-theme); diff --git a/src/styles.css b/src/styles.css index 90d4ee0..2537137 100644 --- a/src/styles.css +++ b/src/styles.css @@ -1 +1,3 @@ /* You can add global styles to this file, and also import other style files */ + +