[Monitor Dashboard|Trunk]

Search pages:
	update the custom filter: add name, organization custom filter is set to not hidden
Update filter icon css


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59104 d315682c-612b-4755-9ff5-7f18f6832af3

src/app/app.component.ts

@@ -231,7 +231,7 @@ export class AppComponent implements OnInit, OnDestroy {
       // https://beta.explore.openaire.eu/search/find/research-outcomes?f0=q&fv0=&resultbestaccessright=%22Open%20Access%22&community=%22mes%7C%7CEuropean%20Marine%20Science%22&qf=true
       return { "community":encodeURIComponent("\"" + this.stakeholder.index_id + "||"+this.stakeholder.index_name + "\"" )};
     }else if(this.stakeholder.type == "organization"){
-      return { "relorganizationid":encodeURIComponent("\"" + this.stakeholder.index_id + "\"" )};
+      return { "cf":true};
     }
   }
 }

src/app/monitor/monitor.component.html

@@ -154,7 +154,7 @@
      [class.switcher_active]="filterToggle">
     <div id="style_switcher_toggle" (click)="filterToggle= !filterToggle">
       <i class="  uk-text-muted">
-        <svg style="margin-top: 6px;" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24"
+        <svg style="margin-top: 8px;" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24"
              viewBox="0 0 24 24"
              fill="white" width="24px" height="24px">
           <g>

src/app/monitor/monitor.component.ts

@@ -52,7 +52,6 @@ export class MonitorComponent implements OnInit, OnDestroy {
   periodFilter:RangeFilter = { title: "Period",  filterId: "year", originalFilterIdFrom: null, originalFilterIdTo: null, selectedFromValue: null, selectedToValue: null, selectedFromAndToValues: ""};
   privateStakeholder = false;
   public keyword: FormControl;
-  public someRange: number[] = [3, 7];
   constructor(
     private route: ActivatedRoute,
     private _router: Router,
@@ -100,7 +99,7 @@ export class MonitorComponent implements OnInit, OnDestroy {
               this.periodFilter.selectedFromValue = (params['year'] && params['year'].indexOf("range")==0)?params['year'].split("range")[1].split(":")[0]:"";
               this.periodFilter.selectedToValue = (params['year'] && params['year'].indexOf("range")==0)?params['year'].split("range")[1].split(":")[1]:"";
               this.validateYearRange(false);
-              if (this.stakeholder) {
+              if (this.stakeholder && !this.privateStakeholder) {
                 this.setIndicators();
               }
             });

src/app/search/searchPages/advanced/searchResearchResults.component.ts

@@ -30,14 +30,14 @@ export class MonitorAdvancedSearchResearchResultsComponent {
           if (stakeholder) {
             if (stakeholder.type === "funder") {
               let value = stakeholder.index_id;
-              this.customFilter = new SearchCustomFilter("Funder", "relfunderid", value, "");
+              this.customFilter = new SearchCustomFilter("Funder", "relfunderid", value,  stakeholder.name);
               this.customFilter.isHiddenFilter = false;
             } else if (stakeholder.type === "organization") {
               let value = stakeholder.index_id;
-              this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
+              this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, stakeholder.name);
               this.customFilter.isHiddenFilter = false;
             } else if (stakeholder.type === "ri") {
-              this.customFilter = new SearchCustomFilter("Community", "communityId", stakeholder.index_id, "");
+              this.customFilter = new SearchCustomFilter("Community", "communityId", stakeholder.index_id,  stakeholder.name);
               this.customFilter.isHiddenFilter = false;
             }
             this.initialized = true;

src/app/search/searchPages/simple/searchResearchResults.component.ts

@@ -30,14 +30,14 @@ export class MonitorSearchResearchResultsComponent {
           if (stakeholder) {
             if (stakeholder.type === "funder") {
               let value = stakeholder.index_id;
-              this.customFilter = new SearchCustomFilter("Funder", "relfunderid", value, "");
+              this.customFilter = new SearchCustomFilter("Funder", "relfunderid", value, stakeholder.name);
               this.customFilter.isHiddenFilter = false;
             } else if (stakeholder.type === "organization") {
               let value = stakeholder.index_id;
-              this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
+              this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value,  stakeholder.name);
-              this.customFilter.isHiddenFilter = true;
+              this.customFilter.isHiddenFilter = false;
             } else if (stakeholder.type === "ri") {
-              this.customFilter = new SearchCustomFilter("Community", "communityId", stakeholder.index_id, "");
+              this.customFilter = new SearchCustomFilter("Community", "communityId", stakeholder.index_id, stakeholder.name);
               this.customFilter.isHiddenFilter = false;
             }
             this.initialized = true;

src/assets/theme-assets/dashboard-custom.css

@@ -548,8 +548,8 @@ body.dashboard {
 
 .dashboard .md-card {
   background: #FFFFFF no-repeat padding-box;
-  box-shadow: 1px 10px 12px #00000026;
+ /* box-shadow: 1px 10px 12px #00000026;
-  border: 1px solid #E0E0E0;
+  border: 1px solid #E0E0E0;*/
   border-radius: 5px;
   opacity: 1;
 }
@@ -576,3 +576,8 @@ body.dashboard {
 .selectedFilterLabel .material-icons{
   color: var(--portal-main-contrast) !important;
 }
+
+#style_switcher_toggle{
+  left: -36px !important;
+  width: 36px !important;
+}