Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix general regression issues and implement other requested changes #105

Merged
merged 13 commits into from
Nov 17, 2021
Merged

Fix general regression issues and implement other requested changes #105

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
afd6169
changes to be seen on checkboxes in filter menu
zitrosolrac Nov 9, 2021
1818564
Changes to make the brain regions input text-based
zitrosolrac Nov 10, 2021
1b9e3d6
Changing default sort state
zitrosolrac Nov 10, 2021
bead412
Moved horizontal scrolling to the top
zitrosolrac Nov 10, 2021
7cb3906
Fix table formatting issues in /mouse and /session
zitrosolrac Nov 11, 2021
2b15de8
Merge branch 'defaultSortStateEphys' into fixTableFormattingIssue
zitrosolrac Nov 11, 2021
439ed38
Merge branch 'fixingBrainRegionFilter' into fixTableFormattingIssue
zitrosolrac Nov 11, 2021
d2d754f
Merge branch 'improveExperienceForScrolling' into fixTableFormattingI…
zitrosolrac Nov 11, 2021
5c71857
removed comments in session-list.component.ts
zitrosolrac Nov 12, 2021
0982776
Changes made to address blank Brain Regions filter
zitrosolrac Nov 15, 2021
2e94b21
Adding semicolons to end of statements
zitrosolrac Nov 15, 2021
d588574
Changes made to include Mouse Vital State toggle
zitrosolrac Nov 17, 2021
e64ae9d
Removing unnecessary comments
zitrosolrac Nov 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion backend/iblapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,11 @@ def handle_q(subpath, args, proj, fetch_args=None, **kwargs):
training_status='training_status', good_enough_for_brainwide_map='good_enough_for_brainwide_map',
keep_all_rows=True
)
subj = subject.Subject().aggr(
subject.Death().proj('death_date') * dj.U('death_date'),
# death_date='IF(death_date>0, 1, 0)',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# death_date='IF(death_date>0, 1, 0)',

death_date='IFNULL(death_date, NULL)',
keep_all_rows=True)
regions = kwargs.get('brain_regions', None)
# expected format of brain_regions = ["AB", "ABCa", "CS of TCV"]
if regions is not None and len(regions) > 0:
Expand All @@ -268,7 +273,7 @@ def handle_q(subpath, args, proj, fetch_args=None, **kwargs):
# subject.SubjectLab() * subject.SubjectUser() *
# analyses_behavior.SessionTrainingStatus()) & args & brain_restriction)

q = ((acquisition.Session() * sess_proj * psych_curve * ephys_data * subject.Subject() *
q = ((acquisition.Session() * sess_proj * psych_curve * ephys_data * subj *
subject.SubjectLab() * subject.SubjectUser() * trainingStatus) & args & brain_restriction)
q = q.proj(*proj) if proj else q
dj.conn().query("SET SESSION max_join_size={}".format('18446744073709551615'))
Expand Down
100 changes: 52 additions & 48 deletions ibl-frontend/frontend-content/src/app/mouse-list/mouse/mouse.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,56 +7,60 @@ <h5>Mouse <{{ mouse?.subject_nickname }}> Info</h5>
</div>
<div class="row mouse-info-table">
<table class="table col-lg-4 col-sm-6 col-xs-12 table-striped table-bordered table-sm">
<tr>
<th>Mouse Nickname</th>
<td>{{ mouse?.subject_nickname }}</td>
</tr>
<tr>
<th>Mouse UUID</th>
<td>{{ mouse?.subject_uuid }}</td>
</tr>
<tr>
<th>Mouse DOB</th>
<td>{{ mouse?.subject_birth_date }}</td>
</tr>
<tr>
<th>Lab</th>
<td>{{ mouse?.lab_name }}</td>
</tr>
<tr>
<th>Sex</th>
<td>{{ mouse?.sex }}</td>
</tr>
<tr>
<th>Project</th>
<td>{{ mouse?.projects }}</td>
</tr>
<tr>
<th>User</th>
<td>{{ mouse?.responsible_user }}</td>
</tr>
<tbody>
<tr>
<th>Mouse Nickname</th>
<td>{{ mouse?.subject_nickname }}</td>
</tr>
<tr>
<th>Mouse UUID</th>
<td>{{ mouse?.subject_uuid }}</td>
</tr>
<tr>
<th>Mouse DOB</th>
<td>{{ mouse?.subject_birth_date }}</td>
</tr>
<tr>
<th>Lab</th>
<td>{{ mouse?.lab_name }}</td>
</tr>
<tr>
<th>Sex</th>
<td>{{ mouse?.sex }}</td>
</tr>
<tr>
<th>Project</th>
<td>{{ mouse?.projects }}</td>
</tr>
<tr>
<th>User</th>
<td>{{ mouse?.responsible_user }}</td>
</tr>
</tbody>
</table>
<table class="table col-lg-3 col-sm-6 col-xs-12 table-striped table-bordered table-sm">
<tr>
<th>Ear Mark</th>
<td>{{ mouse?.ear_mark }}</td>
</tr>
<tr>
<th>Mouse Line</th>
<td>{{ mouse?.subject_line }}</td>
</tr>
<tr>
<th>Source</th>
<td>{{ mouse?.subject_source }}</td>
</tr>
<tr>
<th>Protocol Number</th>
<td>{{ mouse?.protocol_number }}</td>
</tr>
<tr>
<th>Description</th>
<td>{{ mouse?.subject_description }}</td>
</tr>
<tbody>
<tr>
<th>Ear Mark</th>
<td>{{ mouse?.ear_mark }}</td>
</tr>
<tr>
<th>Mouse Line</th>
<td>{{ mouse?.subject_line }}</td>
</tr>
<tr>
<th>Source</th>
<td>{{ mouse?.subject_source }}</td>
</tr>
<tr>
<th>Protocol Number</th>
<td>{{ mouse?.protocol_number }}</td>
</tr>
<tr>
<th>Description</th>
<td>{{ mouse?.subject_description }}</td>
</tr>
</tbody>
</table>
<div class="spinning-brain-container col-xs-12 col-sm-6 col-lg-4" *ngIf="mouse">
<app-spinning-brain [mouseInfo]="mouse"></app-spinning-brain>
Expand Down
8 changes: 8 additions & 0 deletions ibl-frontend/frontend-content/src/app/session-list/session-list.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,14 @@ label {
position: relative;
overflow-x: auto;
}

.flipped, .flipped .col-12
{
transform:rotateX(180deg);
-ms-transform:rotateX(180deg); /* IE 9 */
-webkit-transform:rotateX(180deg); /* Safari and Chrome */
}

td.mat-cell,
td.mat-footer-cell,
th.mat-header-cell {
Expand Down
35 changes: 31 additions & 4 deletions ibl-frontend/frontend-content/src/app/session-list/session-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,33 @@ <h4>
</mat-autocomplete>
</mat-form-field>

<div class="date-range-toggler">
<label for="isAlive">Mouse Vital Status</label>
<div>
Deceased&nbsp;<mat-slide-toggle name="isAlive" [checked]="isAlive" (change)="isAlive=!isAlive">Alive
</mat-slide-toggle>
</div>
</div>

<!-- <mat-form-field>
<label>Alive/Deceased</label>
<input matInput type="text" name="death_date" formControlName="death_date"
[matAutocomplete]="autoCompRU" (focus)="stepBackMenu($event)">
<mat-autocomplete #autoCompRU="matAutocomplete">
<mat-option *ngFor="let death_date of dropDownMenuOptions.filteredResponsibleUserOptions | async" [value]="death_date"
(click)="updateMenu()">{{ death_date }}</mat-option>
</mat-autocomplete>
</mat-form-field> -->

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<!-- <mat-form-field>
<label>Alive/Deceased</label>
<input matInput type="text" name="death_date" formControlName="death_date"
[matAutocomplete]="autoCompRU" (focus)="stepBackMenu($event)">
<mat-autocomplete #autoCompRU="matAutocomplete">
<mat-option *ngFor="let death_date of dropDownMenuOptions.filteredResponsibleUserOptions | async" [value]="death_date"
(click)="updateMenu()">{{ death_date }}</mat-option>
</mat-autocomplete>
</mat-form-field> -->

<!-- // Brain Tree Selection Area -->
<div class="brain-tree-zone">
<mat-form-field>
<label>Brain Regions</label>
<input matInput (input)="filterChanged($event.target.value.toLowerCase())">
<input matInput type="text" name="brain_regions" formControlName="brain_regions">
<mat-autocomplete #autoCompRU="matAutocomplete">
<mat-option *ngFor="let responsible_user of dropDownMenuOptions.filteredResponsibleUserOptions | async"[value]="brain_regions"
(click)="updateMenu()">{{ brain_regions }}</mat-option>
</mat-autocomplete>
</mat-form-field>
<!-- <div>Selected Brain Region:
<div class="chip-list">
Expand Down Expand Up @@ -219,7 +241,7 @@ <h4>
<button mat-raised-button class="btn btn-refresh" (click)="refreshData()">Refresh Data</button>
</div>
</div>
<!-- <div class="checkbox-filters">
<div class="checkbox-filters">
<div class="chbox-filter">
<mat-checkbox class="nplot_status_chbox" [checked]="hideMissingPlots" (change)="toggleNplotStatus()">
Only show sessions with behavior plots
Expand All @@ -235,15 +257,15 @@ <h4>
Only show sessions with ephys data
</mat-checkbox>
</div>
</div> -->
</div>
</div>
</form>

<div [class]="isLoading && initialLoad ? 'loading-icon loading initial': isLoading ? 'loading-icon loading': 'loading-icon'">
<img src="assets/images/loading_icon.gif">
<p [class]="initialLoad ? 'session-list-loading-message show' : 'session-list-loading-message'"></p>
</div>
<div class="table-container">
<div class="table-container flipped">
<div class="session-list-loading-shade"
*ngIf="isLoadingTable">
<mat-spinner *ngIf="isLoadingTable"></mat-spinner>
Expand Down Expand Up @@ -304,6 +326,11 @@ <h4>
<td mat-cell *matCellDef="let session"class="to-center"> {{session.sex}} </td>
</ng-container>

<ng-container matColumnDef="death_date">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Mouse Vital Status </th>
<td mat-cell *matCellDef="let session"class="to-center"> {{session.death_date}} </td>
</ng-container>

<ng-container matColumnDef="nplot">
<th mat-header-cell *matHeaderCellDef> Plot Availability </th>
<td mat-cell *matCellDef="let session" class="to-center"> {{session.nplot.toString() | i18nSelect: nplotMap}} </td>
Expand Down
Loading