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.

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

Conversation

zitrosolrac
Copy link

@zitrosolrac zitrosolrac commented Nov 11, 2021

Fix #77

Before
image
image
After
Screen Shot 2021-11-12 at 11 20 33 AM
Screen Shot 2021-11-12 at 10 44 33 AM

Fix #98

Before
Screen Shot 2021-11-12 at 9 47 18 AM
After
Screen Shot 2021-11-12 at 9 46 00 AM

Fix #97

Screen Shot 2021-11-12 at 10 46 26 AM

Fix #81

Screen Shot 2021-11-12 at 10 46 59 AM

Fix #82

Screen Shot 2021-11-12 at 10 47 16 AM

Fix #96

Screen Shot 2021-11-17 at 2 00 49 PM

Copy link
Contributor

@guzman-raphael guzman-raphael left a comment

Choose a reason for hiding this comment

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

@zitrosolrac Awesome contributions! Really nice to see you getting the hang of this, Carlos. Excellent work. 💪

Points raised here are quite minor so we should be ready for a merge soon. The main one is regarding a small bug in unsetting the Brain Regions filter.

We can likely merge it in our next tagup and start planning for the next deploy cycle.

@@ -375,6 +391,10 @@ export class SessionListComponent implements OnInit, OnDestroy {
continue
}
}
if(key == 'brain_regions' && value !== null){
Copy link
Contributor

Choose a reason for hiding this comment

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

There appears to be a small bug related to 'unsetting' the brain filter after use. For instance, when I apply HPF as a filter, it appropriately restricts to 2 records but when I simply empty the text box, it shows 0 results.

Copy link
Author

Choose a reason for hiding this comment

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

This been address in the latest commit!

@zitrosolrac zitrosolrac linked an issue Nov 17, 2021 that may be closed by this pull request
Copy link
Contributor

@guzman-raphael guzman-raphael left a comment

Choose a reason for hiding this comment

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

@zitrosolrac This looks great man! 😎

Just need to remove some unnecessary comments and we should be ready to merge. 👍

@@ -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)',

Comment on lines 165 to 175

<!-- <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> -->

@guzman-raphael guzman-raphael merged commit 29cd8b9 into datajoint-company:public2021 Nov 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment