Skip to content

Commit 77f6920

Browse files
author
Thinh Nguyen
authored
Merge pull request #15 from mahos/master
minor restyle, add quality/adjust query for cell-listing
2 parents 2a837c6 + 4b1e3ad commit 77f6920

File tree

6 files changed

+61
-45
lines changed

6 files changed

+61
-45
lines changed

‎map-frontend/frontend-content/src/app/app.component.css‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.navigator-container {
66
width: 100%;
77
padding: 0;
8-
background-color: #f6f5fd;
8+
background-color: #f6f5fd2c;
99
}
1010

1111
.row {
@@ -31,21 +31,27 @@ a.logolink * {
3131
}
3232

3333
.title-container {
34-
margin-left: 12px;
34+
/* margin-left: 12px; */
35+
padding-left: 12px;
36+
background-color: rgb(22, 23, 24);
37+
width: 100%;
38+
position: relative;
39+
z-index: 0;
40+
margin-bottom: 20px;
3541
}
3642

3743
.title-container img {
38-
margin: 15px 0px 25px 8px;
39-
height: 51px;
44+
margin: 13px 0px 15px 8px;
45+
height: 45px;
4046
}
4147

4248
.navigator-head {
4349
/* border-left: 1.5px solid rgb(151, 151, 151); */
4450
height: 71px;
4551
}
4652
.navigator-header-title {
47-
padding: 26px 14px;
48-
color: #2f25bd;
53+
padding: 22px 14px;
54+
color: #e1e2e9; /* #5264da is the color of the logo text */
4955
font-family: 'Ubuntu', sans-serif;
5056
font-weight: 300;
5157
}

‎map-frontend/frontend-content/src/app/auth/login/login.component.css‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
.login-container {
2-
padding-top: 20px;
2+
/* padding-top: 20px; */
33
}
44

55
.login-sub-container {
6-
float: right;
6+
/* float: right; */
7+
right: 4px;
8+
top: 17px;
9+
position: absolute;
10+
z-index: 50;
711
}
812

913
.login-fail-text {

‎map-frontend/frontend-content/src/app/auth/login/login.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ <h4 *ngIf="!isLoggedIn">
1616
</form>
1717
</div>
1818
<div class="login-sub-container">
19-
<button class="btn-outline-danger btn" (click)="logOut()" *ngIf="isLoggedIn">Log Out</button>
19+
<button class="btn-outline-light btn" (click)="logOut()" *ngIf="isLoggedIn">Log Out</button>
2020
</div>
2121
<p class="login-fail-text" *ngIf="loginFail">Username/password combination is incorrect</p>
2222
</div>

‎map-frontend/frontend-content/src/app/cell-list/cell-list.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ <h5>Units</h5>
2121
<th>Unit Depth</th>
2222
<!-- <th mat-sort-header="unit_amp">Unit Amp</th> -->
2323
<th>Unit Amp</th>
24-
<!-- <th>x position</th> -->
24+
<th>Quality</th>
2525
<!-- <th>y position</th> -->
2626
</thead>
2727
<tbody>
2828
<tr *ngFor="let cl of sortedCellsByProbeIns" (click)="clusterSelectedTable(cl.unit)" [id]="cl?.unit == clickedUnitId ? 'highlighted-row' : ''" [ngStyle]="{'backgroundColor': cl?.unit == clickedUnitId ? '#e5ffec' : ''}">
2929
<!-- <tr *ngFor="let cl of cellsByProbeIns" (click)="clusterSelectedTable(cl.unit)" [ngStyle]="{'backgroundColor': cl?.unit == clickedUnitId ? '#e5ffec' : ''}"> -->
3030
<td>{{ cl.unit }}</td>
3131
<!-- <td>{{ cl.insertion_number }}</td> -->
32-
<td>{{ cl.unit_depth }}</td>
33-
<td>{{ cl.unit_amp }}</td>
34-
<!-- <td>{{ cl.unit_posx }}</td> -->
32+
<td>{{ cl.unit_depth | number: '1.0-2' }}</td>
33+
<td>{{ cl.unit_amp | number: '1.0-2' }}</td>
34+
<td>{{ cl.unit_quality}}</td>
3535
<!-- <td>{{ cl.unit_posy }}</td> -->
3636
</tr>
3737
</tbody>

‎map-frontend/frontend-content/src/app/cell-list/cell-list.component.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,15 @@ export class CellListComponent implements OnInit, OnDestroy, DoCheck {
6464
this.probeInsertions.push(probeCount + 1);
6565
probeCount++;
6666
}
67-
this.cellListService.retrieveCellList(this.sessionInfo);
67+
let cellsQuery = this.session;
68+
cellsQuery['is_all'] = 0;
69+
// this.cellListService.retrieveCellList(this.sessionInfo);
70+
this.cellListService.retrieveCellList(cellsQuery);
6871
this.cellListSubscription = this.cellListService.getCellListLoadedListener()
6972
.subscribe((cellListData) => {
7073
this.unitBehaviorLoading = false;
7174
this.unitPsthLoading = false;
72-
// console.log('logging retrieved cell list data: ', cellListData);
75+
console.log('logging retrieved cell list data: ', cellListData);
7376
if (Object.entries(cellListData).length > 0) {
7477
this.cells = cellListData;
7578
const x_data = [];

‎map-frontend/frontend-content/src/app/session-list/session-list.component.html‎

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,6 @@ <h4>
1010
<form [formGroup]="session_filter_form">
1111
<div [class]="filterExpanded ? 'filters col-12 filterExpand':'filters col-12 filterCollapse'">
1212
<div class="session-field-filters form-section">
13-
14-
<mat-form-field class="short">
15-
<label for="">Session Number</label>
16-
<input matInput type="text" name="session" formControlName="session_control" [matAutocomplete]="auto2"
17-
(focus)="stepBackMenu($event)">
18-
<mat-autocomplete #auto2="matAutocomplete">
19-
<mat-option *ngFor="let sessionId of filteredSessionOptions | async" [value]="sessionId"
20-
(click)="updateMenu()">{{ sessionId }}</mat-option>
21-
</mat-autocomplete>
22-
</mat-form-field>
23-
2413
<mat-form-field>
2514
<label>Mouse ID</label>
2615
<input matInput type="text" name="subject_id" formControlName="subject_id_control" [matAutocomplete]="autoCompSN"
@@ -31,6 +20,29 @@ <h4>
3120
</mat-autocomplete>
3221
</mat-form-field>
3322

23+
24+
25+
<mat-form-field>
26+
<label>Water Restriction</label>
27+
<input matInput type="text" name="water_restriction_number" formControlName="water_restriction_number_control"
28+
[matAutocomplete]="autoCompSL" (focus)="stepBackMenu($event)">
29+
<mat-autocomplete #autoCompSL="matAutocomplete">
30+
<mat-option *ngFor="let wrNum of filteredWaterRestrictionNumberOptions | async" [value]="wrNum"
31+
(click)="updateMenu()">
32+
{{ wrNum }}</mat-option>
33+
</mat-autocomplete>
34+
</mat-form-field>
35+
36+
<mat-form-field class="short">
37+
<label for="">Session Number</label>
38+
<input matInput type="text" name="session" formControlName="session_control" [matAutocomplete]="auto2"
39+
(focus)="stepBackMenu($event)">
40+
<mat-autocomplete #auto2="matAutocomplete">
41+
<mat-option *ngFor="let sessionId of filteredSessionOptions | async" [value]="sessionId" (click)="updateMenu()">
42+
{{ sessionId }}</mat-option>
43+
</mat-autocomplete>
44+
</mat-form-field>
45+
3446
<div class="session-date-filter">
3547
<div class="date-range-toggler">
3648
<label for="dateRangeToggler">Session Start Date</label>
@@ -69,6 +81,15 @@ <h4>
6981

7082
</div>
7183
<div class="mouse-field-filters form-section">
84+
<mat-form-field>
85+
<label>User</label>
86+
<input matInput type="text" name="username" formControlName="username_control" [matAutocomplete]="autoCompRU"
87+
(focus)="stepBackMenu($event)">
88+
<mat-autocomplete #autoCompRU="matAutocomplete">
89+
<mat-option *ngFor="let username of filteredUsernameOptions | async" [value]="username" (click)="updateMenu()">
90+
{{ username }}</mat-option>
91+
</mat-autocomplete>
92+
</mat-form-field>
7293

7394
<mat-form-field class="short">
7495
<label>Probe Count</label>
@@ -119,25 +140,7 @@ <h4>
119140
</mat-checkbox>
120141
</div>
121142
</div> -->
122-
<mat-form-field>
123-
<label>Water Restriction</label>
124-
<input matInput type="text" name="water_restriction_number" formControlName="water_restriction_number_control" [matAutocomplete]="autoCompSL"
125-
(focus)="stepBackMenu($event)">
126-
<mat-autocomplete #autoCompSL="matAutocomplete">
127-
<mat-option *ngFor="let wrNum of filteredWaterRestrictionNumberOptions | async" [value]="wrNum" (click)="updateMenu()">
128-
{{ wrNum }}</mat-option>
129-
</mat-autocomplete>
130-
</mat-form-field>
131-
<mat-form-field>
132-
<label>User</label>
133-
<input matInput type="text" name="username" formControlName="username_control" [matAutocomplete]="autoCompRU"
134-
(focus)="stepBackMenu($event)">
135-
<mat-autocomplete #autoCompRU="matAutocomplete">
136-
<mat-option *ngFor="let username of filteredUsernameOptions | async" [value]="username" (click)="updateMenu()">
137-
{{ username }}</mat-option>
138-
</mat-autocomplete>
139-
</mat-form-field>
140-
143+
141144
</div>
142145
</div>
143146
<br>

0 commit comments

Comments
 (0)