Skip to content

50 improve required field look and feel #73

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

Merged
merged 2 commits into from
Apr 3, 2020
Merged

50 improve required field look and feel #73

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad6dcfa
#50 improve required field look and feel
daros10 Apr 2, 2020
5af84ac
#50 remove validation and fixed messages
daros10 Apr 2, 2020
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
Next Next commit
#50 improve required field look and feel
  • Loading branch information
@daros10
daros10 committed Apr 2, 2020
commit ad6dcfa7415804296575105a6a78b3bc8929ff68
32 changes: 27 additions & 5 deletions ...p/modules/activities-management/components/create-activity/create-activity.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,36 @@
<h1 class="card-title">Activity</h1>
<div class="form-group">
<label for="name">Name:</label>
<input class="form-control" id="name" type="text" formControlName="name" required>
<div class="alert alert-danger" *ngIf="(name.dirty || name.touched) && name.invalid && name.errors.required">
Activity name is required.</div>
<input
class="form-control"
id="name"
type="text"
formControlName="name"
[class.is-invalid]="name.invalid && name.touched"
required
/>
<div class="text-danger" *ngIf="(name.dirty || name.touched) && name.invalid && name.errors.required">
Activity name is required.
</div>
</div>

<div class="form-group">
<label for="details">Description:</label>
<textarea class="form-control" rows="3" id="description" type="text" formControlName="description"></textarea>
<textarea
class="form-control"
rows="3"
id="description"
type="text"
formControlName="description"
[class.is-invalid]="description.invalid && description.touched"
required
></textarea>
<p
class="text-danger"
*ngIf="(description.dirty || description.touched) && description.invalid && description.errors.required"
>
Details activity is required.
</p>
</div>

<div class="btn-toolbar" role="toolbar">
Expand All @@ -19,4 +41,4 @@ <h1 class="card-title">Activity</h1>
</div>
</div>
</form>
</div>
</div>
6 changes: 2 additions & 4 deletions ...app/modules/activities-management/components/create-activity/create-activity.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ import { Activity } from '../../../shared/models';
@Component({
selector: 'app-create-activity',
templateUrl: './create-activity.component.html',
styleUrls: ['./create-activity.component.scss']
styleUrls: ['./create-activity.component.scss'],
})
export class CreateActivityComponent {

activityForm: FormGroup;

@Input()
Expand All @@ -17,7 +16,7 @@ export class CreateActivityComponent {
constructor(private formBuilder: FormBuilder) {
this.activityForm = this.formBuilder.group({
name: ['', Validators.required],
description: ['']
description: ['', Validators.required],
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't if the description is required in activity. @enriquezrene can help us.

Copy link
Contributor

Choose a reason for hiding this comment

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

it is not.

Copy link
Contributor

Choose a reason for hiding this comment

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

It is not, let's remove this validation @daros10

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done @enriquezrene

});
}

Expand All @@ -35,5 +34,4 @@ export class CreateActivityComponent {
get description() {
return this.activityForm.get('description');
}

}
40 changes: 33 additions & 7 deletions src/app/modules/project-management/components/create-project/create-project.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,52 @@ <h1 class="card-title">Project</h1>

<div class="form-group">
<label for="name">Name:</label>
<input class="form-control" id="name" type="text" formControlName="name" required>
<p class="alert alert-danger" *ngIf="(name.dirty || name.touched) && name.invalid && name.errors.required">Name Project is required.</p>
<input
class="form-control"
id="name"
type="text"
formControlName="name"
[class.is-invalid]="name.invalid && name.touched"
required
/>
<p class="text-danger" *ngIf="(name.dirty || name.touched) && name.invalid && name.errors.required">
Name Project is required.
Copy link
Contributor

Choose a reason for hiding this comment

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

Project name is required.

</p>
</div>

<div class="form-group">
<label for="details">Details:</label>
<textarea class="form-control" rows="3" id="details" type="text" formControlName="details" required></textarea>
<p class="alert alert-danger" *ngIf="(details.dirty || details.touched) && details.invalid && details.errors.required">Details Project is required.</p>
<textarea
class="form-control"
rows="3"
id="details"
type="text"
formControlName="details"
[class.is-invalid]="details.invalid && details.touched"
required
></textarea>
<p class="text-danger" *ngIf="(details.dirty || details.touched) && details.invalid && details.errors.required">
Details Project is required.
Copy link
Contributor

Choose a reason for hiding this comment

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

Project details are required.

</p>
</div>

<div class="form-group">
<label for="status">Status:</label>
<select class="form-control" formControlName="status">
<option *ngFor="let status of projectStatus" [value]="status">{{status}}</option>
<option
*ngFor="let status of projectStatus"
[class.is-invalid]="status.invalid && status.touched"
[value]="status"
>{{ status }}</option
>
</select>
<p class="alert alert-danger" *ngIf="(status.dirty || status.touched) && status.invalid && status.errors.required">Status Project is required.</p>
<p class="text-danger" *ngIf="(status.dirty || status.touched) && status.invalid && status.errors.required">
Status Project is required.
Copy link
Contributor

Choose a reason for hiding this comment

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

Project status is required.

</p>
</div>

<div class="form-group form-check" [hidden]="!projectToEdit">
<input type="checkbox" class="form-check-input" id="completedProject" formControlName="completed">
<input type="checkbox" class="form-check-input" id="completedProject" formControlName="completed" />
<label class="form-check-label" for="completedProject">Completed project</label>
</div>
<div class="btn-toolbar" role="toolbar">
Expand Down