-
\ No newline at end of file
diff --git a/ibl-frontend/frontend-content/src/app/plots/view-sample-plots/sample-plot/sample-plot.component.ts b/ibl-frontend/frontend-content/src/app/plots/view-sample-plots/sample-plot/sample-plot.component.ts
index e3502dc3..6b2996de 100644
--- a/ibl-frontend/frontend-content/src/app/plots/view-sample-plots/sample-plot/sample-plot.component.ts
+++ b/ibl-frontend/frontend-content/src/app/plots/view-sample-plots/sample-plot/sample-plot.component.ts
@@ -18,7 +18,7 @@ export class SamplePlotComponent implements OnInit, OnChanges, OnDestroy {
private plotsSubscription: Subscription;
- @ViewChild('samplePlot') el: ElementRef;
+ @ViewChild('samplePlot', {static: true}) el: ElementRef;
constructor(public plotsService: PlotsService, @Inject(ViewSamplePlotsComponent) public VSPComp: ViewSamplePlotsComponent) {}
ngOnInit() {
diff --git a/ibl-frontend/frontend-content/src/app/plots/view-sample-plots/view-sample-plots.component.ts b/ibl-frontend/frontend-content/src/app/plots/view-sample-plots/view-sample-plots.component.ts
index 27790562..5dd08493 100644
--- a/ibl-frontend/frontend-content/src/app/plots/view-sample-plots/view-sample-plots.component.ts
+++ b/ibl-frontend/frontend-content/src/app/plots/view-sample-plots/view-sample-plots.component.ts
@@ -26,10 +26,10 @@ export class ViewSamplePlotsComponent implements OnInit, OnDestroy {
private somePostSubscription: Subscription;
- @ViewChild('samplePlot2') el: ElementRef;
- @ViewChild('samplePlot_psych') el2: ElementRef;
+ @ViewChild('samplePlot2', {static: true}) el: ElementRef;
+ @ViewChild('samplePlot_psych', {static: true}) el2: ElementRef;
- @ViewChild(PlotMenuToggleComponent) PMTComp: PlotMenuToggleComponent;
+ @ViewChild('PlotMenuToggleComponent', {static: true}) PMTComp: PlotMenuToggleComponent;
@Input() selectedPlotChange: PlotMenuToggleComponent;
constructor(public plotsService: PlotsService) { }
diff --git a/ibl-frontend/frontend-content/src/app/session-list/all-sessions.service.ts b/ibl-frontend/frontend-content/src/app/session-list/all-sessions.service.ts
index 167183d8..c90d911f 100644
--- a/ibl-frontend/frontend-content/src/app/session-list/all-sessions.service.ts
+++ b/ibl-frontend/frontend-content/src/app/session-list/all-sessions.service.ts
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
-import { Subject } from 'rxjs';
+import { Subject, Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
import { environment } from '../../environments/environment';
@@ -7,6 +7,30 @@ import { environment } from '../../environments/environment';
const BACKEND_API_URL = environment.backend_url;
+export interface SessionRecord {
+ mouse_id: number;
+ session_date: string;
+ session_lab: string;
+ subject_nickname: string;
+ subject_birth_date: string;
+ session_start_time: string;
+ task_protocol: string;
+ subject_line: string;
+ responsible_user: string;
+ session_uuid: string;
+ sex: string;
+ subject_uuid: string;
+ nplot: string;
+ nprobe: string;
+ session_project: string;
+ good4bmap: string;
+}
+
+interface SessionApi {
+ records: SessionRecord[];
+ records_count: number;
+}
+
@Injectable({
providedIn: 'root'
})
@@ -36,6 +60,11 @@ export class AllSessionsService {
return this.http.post(BACKEND_API_URL + '/sessions/', sessionFilters, { responseType: 'json'})
}
+ getSessions(body: Object): ObservableUser Guide
- +User Guide
+
+
+
List of Sessions
@@ -31,6 +32,15 @@
+
+
+
+
+
+
+
@@ -153,7 +163,7 @@
-
-
- Selected Brain Region:
+
+ // This is the tree node template for leaf nodes
-
+ // use a disabled button to provide padding for tree leaf
{{node.display}}
-
+ // This is the tree node template for expandable nodes
@@ -193,24 +203,24 @@
-
+ -->
@@ -193,24 +203,24 @@
+ -
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
-
-
+
- - Loading time for the sessions may take a while depending on your internet connection. We appreciate your patience as we load the full list of sessions. -
+
-
+
-();
@@ -240,7 +251,6 @@ export class SessionListComponent implements OnInit, OnDestroy {
}
}
}
-
// Check storage to see if there is anything there
// Check for paginator
if (this.filterStoreService.sessionPaginator) {
@@ -280,7 +290,7 @@ export class SessionListComponent implements OnInit, OnDestroy {
}
else {
// Else fetch from database
- await this.fetchSessions();
+ // await this.fetchSessions();
this.initialLoad = false;
}
@@ -297,7 +307,7 @@ export class SessionListComponent implements OnInit, OnDestroy {
// Create Menu, Update table view and set loading to false
this.createMenu(this.restrictedSessions);
- this.updateTableView(this.restrictedSessions);
+ //this.updateTableView(this.restrictedSessions);
this.isLoading = false;
if (this.filterStoreService.sessionPaginator) {
@@ -319,6 +329,83 @@ export class SessionListComponent implements OnInit, OnDestroy {
this.buildLookup();
})
}
+
+ ngAfterViewInit() {
+ this.isLoading = false;
+ this.sessionService = new AllSessionsService(this._httpClient);
+ // If the user changes the sort order, reset back to the first page.
+ this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0);
+ let newObject = {};
+ merge(this.sort.sortChange, this.paginator.page)
+ .pipe(
+ startWith({}),
+ switchMap(() => {
+ this.isLoadingTable = true;
+ if(this.sort.direction == ''){
+ this.sort.active = 'session_start_time';
+ this.sort.direction = 'desc'
+ }
+ let filter = Object.assign({}, this.session_filter_form.getRawValue());
+ let newFilter = JSON.stringify(filter)
+
+ for (const [key, value] of Object.entries(filter)) {
+ if(key == 'sex'){
+ if(value[0] == true){
+ newObject[key] = 'F'
+ //female
+ continue
+ }
+ else if (value[1] == true){
+ newObject[key] = 'M'
+ //male
+ continue
+ }
+ else if (value[2] == true){
+ newObject[key] = 'U'
+ //undefined
+ continue
+ }
+ else{
+ continue
+ }
+ }
+ if(key == 'session_range_filter'){
+ for( const [key2, val] of Object.entries(value)){
+ if(val !== null){
+ newObject[key2] = val
+ }
+ continue
+ }
+ }
+ if(value !== null){
+ newObject[key] = value
+ }
+ }
+ this.isLoadingResults = true;
+
+ newObject["__page"] = this.paginator.pageIndex + 1;
+ newObject["__limit"] = this.paginator.pageSize;
+ newObject["__order"] = this.sort.active + ' ' + this.sort.direction
+ return this.sessionService!.getSessions(
+ newObject)
+ .pipe(catchError(() => observableOf(null)));
+ }),
+ map(sessionRecords => {
+ this.isLoadingTable = false;
+ // Flip flag to show that loading has finished.
+ this.isLoadingResults = false;
+
+ if (sessionRecords === null) {
+ return [];
+ }
+ // Only refresh the result length if there is new data. In case of rate
+ // limit errors, we do not want to reset the paginator to zero, as that
+ // would prevent users from re-triggering requests.
+ this.sessionRecordLength = sessionRecords.records_count;
+ return sessionRecords.records;
+ })
+ ).subscribe(sessionRecords => this.sessionRecords = sessionRecords);
+ }
ngOnDestroy() {
// Store paginator, sort, buttons, and sessions
@@ -362,6 +449,7 @@ export class SessionListComponent implements OnInit, OnDestroy {
filters['__order'] = 'session_start_time DESC';
this.allSessions = await this.allSessionsService.fetchSessions(filters).toPromise();
+ this.allSessions = this.allSessions['records'];
}
setDropDownFormOptions(dropDownMenuOptionKey, formControl: AbstractControl, key: string) {
@@ -394,56 +482,62 @@ export class SessionListComponent implements OnInit, OnDestroy {
this.uniqueValuesForEachAttribute[key] = new Set();
})
- // Loop through each tuple
- restrictedSessions.forEach(tuple => {
- keys.forEach(key => {
- if (tuple[key] !== null && !this.uniqueValuesForEachAttribute[key].has(tuple[key])) {
- // Add it to the uniqueValuesForColumns if it doesn't already exist in there
- this.uniqueValuesForEachAttribute[key].add(tuple[key])
- }
- })
- });
-
- // Deal with specific case for
- this.patchSexMaterial(Sex.FEMALE, this.uniqueValuesForEachAttribute['sex'].has('F'));
- this.patchSexMaterial(Sex.MALE, this.uniqueValuesForEachAttribute['sex'].has('M'));
- this.patchSexMaterial(Sex.UNDEFINED, this.uniqueValuesForEachAttribute['sex'].has('U'));
-
- // This is for selected or not for sex, don't know why this is here blame Maho
this.uniqueValuesForEachAttribute['sex'] = {
F: false,
M: false,
U: false
}
- // Deal with figureing out the range of dates
- const sessionSeconds = [];
- this.uniqueValuesForEachAttribute['session_start_time'].forEach(date => {
- sessionSeconds.push(new Date(date).getTime());
- });
-
- this.sessionMinDate = new Date(Math.min(...sessionSeconds));
- this.sessionMaxDate = new Date(Math.max(...sessionSeconds));
-
- // Figure out what dates are valid and assign it to this.sessionDateFilter for the material table to highlight those date
- this.sessionDateFilter = (date: Date): boolean => {
- let sessionDates = [];
- this.uniqueValuesForEachAttribute['session_start_time'].forEach(date => {
- sessionDates.push(date.toString().substring(0, 10)); // Split it at T and only take the first half
- });
-
- // filter out dates without any session
- return sessionDates.includes(date.toISOString().substring(0, 10));
- };
-
- // Figure out what dates for the mouse Birthday Filter are valid and assign it to this.sessionDateFilter for the material table to highlight those date
- this.miceBirthdayFilter = (calendarDate: Date): boolean => {
- let birthDates = [];
- this.uniqueValuesForEachAttribute['subject_birth_date'].forEach(date => {
- birthDates.push(date);
- });
- return birthDates.includes(calendarDate.toISOString().substring(0, 10));
- };
+ // Loop through each tuple
+ // restrictedSessions.forEach(tuple => {
+ // keys.forEach(key => {
+ // if (tuple[key] !== null && !this.uniqueValuesForEachAttribute[key].has(tuple[key])) {
+ // // Add it to the uniqueValuesForColumns if it doesn't already exist in there
+ // this.uniqueValuesForEachAttribute[key].add(tuple[key])
+ // }
+ // })
+ // });
+
+ // // Deal with specific case for
+ // this.patchSexMaterial(Sex.FEMALE, this.uniqueValuesForEachAttribute['sex'].has('F'));
+ // this.patchSexMaterial(Sex.MALE, this.uniqueValuesForEachAttribute['sex'].has('M'));
+ // this.patchSexMaterial(Sex.UNDEFINED, this.uniqueValuesForEachAttribute['sex'].has('U'));
+
+ // // This is for selected or not for sex, don't know why this is here blame Maho
+ // this.uniqueValuesForEachAttribute['sex'] = {
+ // F: false,
+ // M: false,
+ // U: false
+ // }
+
+ // // Deal with figureing out the range of dates
+ // const sessionSeconds = [];
+ // this.uniqueValuesForEachAttribute['session_start_time'].forEach(date => {
+ // sessionSeconds.push(new Date(date).getTime());
+ // });
+
+ // this.sessionMinDate = new Date(Math.min(...sessionSeconds));
+ // this.sessionMaxDate = new Date(Math.max(...sessionSeconds));
+
+ // // Figure out what dates are valid and assign it to this.sessionDateFilter for the material table to highlight those date
+ // this.sessionDateFilter = (date: Date): boolean => {
+ // let sessionDates = [];
+ // this.uniqueValuesForEachAttribute['session_start_time'].forEach(date => {
+ // sessionDates.push(date.toString().substring(0, 10)); // Split it at T and only take the first half
+ // });
+
+ // // filter out dates without any session
+ // return sessionDates.includes(date.toISOString().substring(0, 10));
+ // };
+
+ // // Figure out what dates for the mouse Birthday Filter are valid and assign it to this.sessionDateFilter for the material table to highlight those date
+ // this.miceBirthdayFilter = (calendarDate: Date): boolean => {
+ // let birthDates = [];
+ // this.uniqueValuesForEachAttribute['subject_birth_date'].forEach(date => {
+ // birthDates.push(date);
+ // });
+ // return birthDates.includes(calendarDate.toISOString().substring(0, 10));
+ // };
// Set material from drop down
this.setDropDownFormOptions('filteredSessionLabOptions', this.session_filter_form.controls.session_lab, 'session_lab');
@@ -554,7 +648,7 @@ export class SessionListComponent implements OnInit, OnDestroy {
const requestFilter = {};
let requestJSONstring = '';
- filterList.forEach(filter => {
+ filterList.forEach((filter: Array) => {
// filter is [["session_lab", "somelab"], ["subject_nickname", null]...]
const filterKey = filter[0].split('')[0]; // filter[0] is control name like 'session_lab'
if (filter[1] && filterKey !== focusedField) {
@@ -792,8 +886,10 @@ export class SessionListComponent implements OnInit, OnDestroy {
this.restrictedSessions = await this.applyFilter();
this.createMenu(this.restrictedSessions);
- await this.updateTableView(this.restrictedSessions);
+ //await this.updateTableView(this.restrictedSessions);
this.isLoading = false;
+ this.paginator.pageIndex = 0;
+ this.ngAfterViewInit();
}
/**
@@ -801,65 +897,69 @@ export class SessionListComponent implements OnInit, OnDestroy {
* @returns
*/
async applyFilter(focusFieldKey?: string) {
- if (!this.allSessions) {
- return [];
- }
-
- // Hide certain checkboxes
- this.hideMissingPlots = false;
- this.hideMissingEphys = false;
- this.hideNG4BrainMap = false;
- this.hideNotReady4Delay = false;
-
- let tupleToRestrict = this.allSessions // By default this should be all sessions
-
- // Check if there is a brain region request, if so override the tupleToRestrict reference
- const brainRegionRequest = this.requested_BR;
- if (brainRegionRequest.length !== 0) {
- // BrainRegionRequest is not empty, thus query the backend for it
- let requestFilter = {}
- let BR_JSONstring = '';
- if (brainRegionRequest.length > 0) {
- BR_JSONstring = '';
- brainRegionRequest.filter(function(selection, index) {
- if (index > 0) {
- BR_JSONstring += `, "${selection}"`
- } else {
- BR_JSONstring += `"${selection}"`
- }
- })
- BR_JSONstring = '[' + BR_JSONstring + ']'
- }
-
- // Add it it to the requestFilter object
- if (brainRegionRequest.length > 0) {
- requestFilter['__json_kwargs'] = '{ "brain_regions": ' + BR_JSONstring + '}';
- }
-
- // Add the default sorting for the api request
- requestFilter['__order'] = 'session_start_time DESC';
-
- // Query back end
- tupleToRestrict = await this.allSessionsService.fetchSessions(requestFilter).toPromise();
- }
-
- // Filter based on what the user requested
- let restrictionObjectFromForm = this.session_filter_form.getRawValue();
-
- // if user is focusing on a specific field, then remove the currently focused field's restriction value from menu creation
- if (focusFieldKey) {
- restrictionObjectFromForm[focusFieldKey] = null;
- }
-
- // Iterate through the tuples and restrict accordingly
- // This is kind of stupid cause it doesn't check if the restrictionObjectFromForm even have a valid restriction
- let restrictedSessions = [];
- for (let tuple of tupleToRestrict) {
- if (this.doesTupleMatchRestriction(tuple, restrictionObjectFromForm)) {
- restrictedSessions.push(tuple);
- }
- }
- return restrictedSessions;
+ return [];
+ // if (!this.allSessions) {
+ // return [];
+ // }
+
+ // // Hide certain checkboxes
+ // this.hideMissingPlots = false;
+ // this.hideMissingEphys = false;
+ // this.hideNG4BrainMap = false;
+ // this.hideNotReady4Delay = false;
+
+ // let tupleToRestrict = this.allSessions // By default this should be all sessions
+
+ // // Check if there is a brain region request, if so override the tupleToRestrict reference
+ // const brainRegionRequest = this.requested_BR;
+ // if (brainRegionRequest.length !== 0) {
+ // // BrainRegionRequest is not empty, thus query the backend for it
+ // let requestFilter = {}
+ // let BR_JSONstring = '';
+ // if (brainRegionRequest.length > 0) {
+ // BR_JSONstring = '';
+ // brainRegionRequest.filter(function(selection, index) {
+ // if (index > 0) {
+ // BR_JSONstring += `, "${selection}"`
+ // } else {
+ // BR_JSONstring += `"${selection}"`
+ // }
+ // })
+ // BR_JSONstring = '[' + BR_JSONstring + ']'
+ // }
+
+ // // Add it it to the requestFilter object
+ // if (brainRegionRequest.length > 0) {
+ // requestFilter['__json_kwargs'] = '{ "brain_regions": ' + BR_JSONstring + '}';
+ // }
+
+ // // Add the default sorting for the api request
+ // requestFilter['__order'] = 'session_start_time DESC';
+
+ // console.log(requestFilter)
+
+ // // Query back end
+ // tupleToRestrict = await this.allSessionsService.fetchSessions(requestFilter).toPromise();
+ // }
+
+ // // Filter based on what the user requested
+ // let restrictionObjectFromForm = this.session_filter_form.getRawValue();
+
+ // // if user is focusing on a specific field, then remove the currently focused field's restriction value from menu creation
+ // if (focusFieldKey) {
+ // restrictionObjectFromForm[focusFieldKey] = null;
+ // }
+
+ // // Iterate through the tuples and restrict accordingly
+ // // This is kind of stupid cause it doesn't check if the restrictionObjectFromForm even have a valid restriction
+ // let restrictedSessions = [];
+ // for (let tuple of tupleToRestrict) {
+ // if (this.doesTupleMatchRestriction(tuple, restrictionObjectFromForm)) {
+ // restrictedSessions.push(tuple);
+ // }
+ // }
+ // console.log(restrictedSessions)
+ // return restrictedSessions;
}
/**
@@ -868,10 +968,11 @@ export class SessionListComponent implements OnInit, OnDestroy {
async refreshData() {
this.isLoading = true;
this.filterStoreService.refreshSessionTableState();
- await this.fetchSessions();
+ // await this.fetchSessions();
this.restrictedSessions = await this.applyFilter();
this.createMenu(this.restrictedSessions);
- await this.updateTableView(this.restrictedSessions);
+ //await this.updateTableView(this.restrictedSessions);
+ this.ngAfterViewInit();
this.isLoading = false;
}
@@ -880,36 +981,38 @@ export class SessionListComponent implements OnInit, OnDestroy {
*/
async handleResetFilterButtonPress() {
this.isLoading = true;
- for (const control in this.session_filter_form.controls) {
- const toReset = {}
+ // for (const control in this.session_filter_form.controls) {
+ // const toReset = {}
- if (control === 'session_range_filter') {
- toReset[control] = { 'session_range_start': null, 'session_range_end': null}
+ // if (control === 'session_range_filter') {
+ // toReset[control] = { 'session_range_start': null, 'session_range_end': null}
- } else if (control === 'sex') {
- toReset[control] = [false, false, false];
- for (const index in this.session_filter_form.get(control)['controls']) {
- this.session_filter_form.get(control).get([index]).enable();
- }
- } else {
- toReset[control] = null;
- }
- this.session_filter_form.patchValue(toReset);
- }
+ // } else if (control === 'sex') {
+ // toReset[control] = [false, false, false];
+ // for (const index in this.session_filter_form.get(control)['controls']) {
+ // this.session_filter_form.get(control).get([index]).enable();
+ // }
+ // } else {
+ // toReset[control] = null;
+ // }
+ // this.session_filter_form.patchValue(toReset);
+ // }
+
+ // this.route.queryParams.subscribe(async param => {
+ // if (Object.keys(param).length > 0) {
+ // // Clear all URL params, and do a fresh fetch
+ // this.router.navigate(
+ // [],
+ // {
+ // relativeTo: this.route,
+ // queryParams: null
+ // });
+ // }
+ // })
+
+ //all of the above code can just be done with this.session_filter_form.reset()
+ this.session_filter_form.reset()
- this.route.queryParams.subscribe(async param => {
- if (Object.keys(param).length > 0) {
- // Clear all URL params, and do a fresh fetch
- this.router.navigate(
- [],
- {
- relativeTo: this.route,
- queryParams: null
- });
- }
- })
-
- // clear the filter in storage before applying filter
this.filterStoreService.clearSessionFilter();
this.restrictedSessions = await this.applyFilter();
@@ -919,13 +1022,14 @@ export class SessionListComponent implements OnInit, OnDestroy {
this.paginator.pageIndex = 0;
this.paginator.pageSize = 25;
// the below is to remove the arrow UI that doesn't go away after this.sort.active = ''
- this.sort.sortables.forEach(sortItem => {
- this.sort.sort(sortItem);
- });
- this.sort.active = '';
+ // this.sort.sortables.forEach(sortItem => {
+ // this.sort.sort(sortItem);
+ // });
+ // this.sort.active = '';
- await this.updateTableView(this.restrictedSessions);
+ //await this.updateTableView(this.restrictedSessions);
this.isLoading = false;
+ this.ngAfterViewInit();
return;
}
diff --git a/ibl-frontend/frontend-content/src/app/session-list/session/session-psych-plot/session-psych-plot.component.html b/ibl-frontend/frontend-content/src/app/session-list/session/session-psych-plot/session-psych-plot.component.html
index 90739a4f..8d81686b 100644
--- a/ibl-frontend/frontend-content/src/app/session-list/session/session-psych-plot/session-psych-plot.component.html
+++ b/ibl-frontend/frontend-content/src/app/session-list/session/session-psych-plot/session-psych-plot.component.html
@@ -2,7 +2,7 @@
= new EventEmitter();
constructor(public sessionPlotsService: SessionPlotsService) { }
- @ViewChild('session_psych_plot') el: ElementRef;
+ @ViewChild('session_psych_plot', {static: true}) el: ElementRef;
@HostListener('window:resize', ['$event.target']) onresize(event) {
this.newScreenWidth = event.innerWidth;
// console.log('screensize change: ', this.newScreenWidth);
diff --git a/ibl-frontend/frontend-content/src/app/session-list/session/session-rtc-plot/session-rtc-plot.component.html b/ibl-frontend/frontend-content/src/app/session-list/session/session-rtc-plot/session-rtc-plot.component.html
index 6b905243..7369e7e9 100644
--- a/ibl-frontend/frontend-content/src/app/session-list/session/session-rtc-plot/session-rtc-plot.component.html
+++ b/ibl-frontend/frontend-content/src/app/session-list/session/session-rtc-plot/session-rtc-plot.component.html
@@ -1,7 +1,7 @@
-![]()
+![]()
diff --git a/ibl-frontend/frontend-content/src/app/session-list/session/session-rtc-plot/session-rtc-plot.component.ts b/ibl-frontend/frontend-content/src/app/session-list/session/session-rtc-plot/session-rtc-plot.component.ts
index dcb472ab..2895b4dd 100644
--- a/ibl-frontend/frontend-content/src/app/session-list/session/session-rtc-plot/session-rtc-plot.component.ts
+++ b/ibl-frontend/frontend-content/src/app/session-list/session/session-rtc-plot/session-rtc-plot.component.ts
@@ -102,7 +102,7 @@ export class SessionRTCPlotComponent implements OnInit, OnDestroy {
@Output() openSRTCplot: EventEmitter = new EventEmitter();
constructor(public sessionPlotsService: SessionPlotsService) { }
- @ViewChild('session_RTC_plot') el: ElementRef;
+ @ViewChild('session_RTC_plot', {static: true}) el: ElementRef;
@HostListener('window:resize', ['$event.target']) onresize(event) {
this.newScreenWidth = event.innerWidth;
// console.log('screensize change: ', this.newScreenWidth);
diff --git a/ibl-frontend/frontend-content/src/app/session-list/session/session-rttn-plot/session-rttn-plot.component.html b/ibl-frontend/frontend-content/src/app/session-list/session/session-rttn-plot/session-rttn-plot.component.html
index 7941a6a8..225adec7 100644
--- a/ibl-frontend/frontend-content/src/app/session-list/session/session-rttn-plot/session-rttn-plot.component.html
+++ b/ibl-frontend/frontend-content/src/app/session-list/session/session-rttn-plot/session-rttn-plot.component.html
@@ -1,7 +1,7 @@
-![]()
+![]()
diff --git a/ibl-frontend/frontend-content/src/app/session-list/session/session-rttn-plot/session-rttn-plot.component.ts b/ibl-frontend/frontend-content/src/app/session-list/session/session-rttn-plot/session-rttn-plot.component.ts
index 15f02c13..118c6bde 100644
--- a/ibl-frontend/frontend-content/src/app/session-list/session/session-rttn-plot/session-rttn-plot.component.ts
+++ b/ibl-frontend/frontend-content/src/app/session-list/session/session-rttn-plot/session-rttn-plot.component.ts
@@ -99,7 +99,7 @@ export class SessionRTTNPlotComponent implements OnInit, OnDestroy {
@Output() openSRTTNplot: EventEmitter = new EventEmitter();
constructor(public sessionPlotsService: SessionPlotsService) { }
- @ViewChild('session_RTTN_plot') el: ElementRef;
+ @ViewChild('session_RTTN_plot', {static: true}) el: ElementRef;
@HostListener('window:resize', ['$event.target']) onresize(event) {
this.newScreenWidth = event.innerWidth;
// console.log('screensize change: ', this.newScreenWidth);
diff --git a/ibl-frontend/frontend-content/src/environments/environment.ts b/ibl-frontend/frontend-content/src/environments/environment.ts
index ab9baa1f..3ca14dfd 100644
--- a/ibl-frontend/frontend-content/src/environments/environment.ts
+++ b/ibl-frontend/frontend-content/src/environments/environment.ts
@@ -21,4 +21,4 @@ export const environment = {
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
-// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
+// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.
diff --git a/ibl-frontend/frontend-content/src/index.html b/ibl-frontend/frontend-content/src/index.html
index 26a1977c..f4e521c9 100644
--- a/ibl-frontend/frontend-content/src/index.html
+++ b/ibl-frontend/frontend-content/src/index.html
@@ -8,7 +8,6 @@
-
| Lab | @@ -334,7 +345,9 @@
|---|
- ![]()
+ ![]()
plot loading...
diff --git a/ibl-frontend/frontend-content/src/app/session-list/session/session-psych-plot/session-psych-plot.component.ts b/ibl-frontend/frontend-content/src/app/session-list/session/session-psych-plot/session-psych-plot.component.ts index 7ed0f2e9..5e538a4f 100644 --- a/ibl-frontend/frontend-content/src/app/session-list/session/session-psych-plot/session-psych-plot.component.ts +++ b/ibl-frontend/frontend-content/src/app/session-list/session/session-psych-plot/session-psych-plot.component.ts @@ -117,7 +117,7 @@ export class SessionPsychPlotComponent implements OnInit, OnDestroy { @Output() psychCurveFitPars: EventEmitterplot loading...
plot loading...