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

Html fixes in learner data #34

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Html fixes in learner data #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf4acb0
Fixes margins for filters on learner data page
brendanconroy9 Aug 9, 2023
bb0a14b
Fixes margins for other filters
brendanconroy9 Aug 9, 2023
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
49 changes: 25 additions & 24 deletions client/src/app/learners/learner-data/learner-data.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@

<div class="wordFilter">
<form style="display: flex" [formGroup]="wordFormControl">
<mat-form-field>
<input matInput data-test="wordSearch" formControlName="word">
<mat-placeholder>Search for a Word</mat-placeholder>
</mat-form-field>
<mat-form-field>
<input matInput data-test="startsWith" formControlName="startsWith">
<mat-placeholder>Search for a Word that starts with</mat-placeholder>
</mat-form-field>
<mat-form-field>
<input matInput data-test="endsWith" formControlName="endsWith">
<mat-placeholder>Search for a Word that ends with</mat-placeholder>
</mat-form-field>
<mat-form-field>
<input matInput data-test="minWordCount" formControlName="minWordCount" type="number" min="1">
<mat-placeholder>Minimum Word Count</mat-placeholder>
</mat-form-field>
<mat-form-field>
<input matInput data-test="maxWordCount" formControlName="maxWordCount" type="number">
<mat-placeholder>Maximum Word Count</mat-placeholder>
</mat-form-field>
</form>
<form style="display: flex" [formGroup]="wordFormControl">
<mat-form-field class="form-field-spacing">
<input matInput data-test="wordSearch" formControlName="word">
<mat-placeholder>Search for a Word</mat-placeholder>
</mat-form-field>
<mat-form-field class="form-field-spacing">
<input matInput data-test="startsWith" formControlName="startsWith">
<mat-placeholder>Search for a Word that starts with</mat-placeholder>
</mat-form-field>
<mat-form-field class="form-field-spacing">
<input matInput data-test="endsWith" formControlName="endsWith">
<mat-placeholder>Search for a Word that ends with</mat-placeholder>
</mat-form-field>
<mat-form-field class="form-field-spacing">
<input matInput data-test="minWordCount" formControlName="minWordCount" type="number" min="1">
<mat-placeholder>Minimum Word Count</mat-placeholder>
</mat-form-field>
<mat-form-field class="form-field-spacing">
<input matInput data-test="maxWordCount" formControlName="maxWordCount" type="number">
<mat-placeholder>Maximum Word Count</mat-placeholder>
</mat-form-field>
</form>
</div>


<div id="wordTable" class="mat-elevation-z8">
<table mat-table [dataSource]="wordCountDataSource">

Expand Down Expand Up @@ -63,11 +64,11 @@
</div> -->

<form style="display: flex" [formGroup]="formControl">
<mat-form-field>
<mat-form-field class="form-field-spacing">
<input matInput data-test="sentenceTextField" formControlName="sentenceText">
<mat-placeholder>Text</mat-placeholder>
</mat-form-field>
<mat-form-field>
<mat-form-field class="form-field-spacing">
<input matInput data-test="time" formControlName="timeSubmitted">
<mat-placeholder>Date</mat-placeholder>
</mat-form-field>
Expand Down
4 changes: 3 additions & 1 deletion client/src/app/learners/learner-data/learner-data.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,7 @@ margin-bottom: 5%;
height: 1000px;
}


.form-field-spacing {
margin-right: 16px; /* Adjust as needed */
}