Skip to content

fix: #428 show required fields in form #431

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 1 commit into from
Jun 25, 2020
Merged

fix: #428 show required fields in form #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/app/modules/shared/components/details-fields/details-fields.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<span class="input-group-text span-width">Project</span>
</div>
<select
[class.is-invalid]="project_id.invalid && project_id.touched"
[class.is-invalid]="project_id.invalid"
required
id="project_id"
class="custom-select"
Expand All @@ -25,7 +25,7 @@
<span class="input-group-text span-width">Activity</span>
</div>
<select
[class.is-invalid]="activity_id.invalid && activity_id.touched"
[class.is-invalid]="activity_id.invalid"
required
id="activity_id"
class="custom-select"
Expand Down Expand Up @@ -122,7 +122,7 @@
rows="3"></textarea>
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-primary" [disabled]="!entryForm.valid">Save</button>
<button type="submit" class="btn btn-primary">Save</button>
<button #closeModal type="button" class="btn btn-secondary" data-dismiss="modal">
Close
</button>
Expand Down
8 changes: 8 additions & 0 deletions src/app/modules/shared/components/details-fields/details-fields.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,14 @@ describe('DetailsFieldsComponent', () => {
expect(component).toBeTruthy();
});

it('if form is invalid then no save is emited', () => {
spyOn(component.saveEntry, 'emit');

component.onSubmit();

expect(component.saveEntry.emit).toHaveBeenCalledTimes(0);
});

[
{actionType: EntryActionTypes.CREATE_ENTRY_SUCCESS},
{actionType: EntryActionTypes.UPDATE_ENTRY_SUCCESS},
Expand Down
12 changes: 8 additions & 4 deletions src/app/modules/shared/components/details-fields/details-fields.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { EntryActionTypes } from './../../../time-clock/store/entry.actions';
import { filter } from 'rxjs/operators';
import { NumberFormatter } from './../../formatters/number.formatter';
import { Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild, } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { ActionsSubject, select, Store } from '@ngrx/store';
import { formatDate } from '@angular/common';

Expand Down Expand Up @@ -36,10 +36,11 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
goingToWorkOnThis = false;
shouldRestartEntry = false;

constructor(private formBuilder: FormBuilder, private store: Store<Merged>, private actionsSubject$: ActionsSubject) {
constructor(private formBuilder: FormBuilder, private store: Store<Merged>,
private actionsSubject$: ActionsSubject) {
this.entryForm = this.formBuilder.group({
project_id: '',
activity_id: '',
project_id: ['', Validators.required],
activity_id: ['', Validators.required],
description: '',
entry_date: '',
start_hour: '',
Expand Down Expand Up @@ -150,6 +151,9 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
}

onSubmit() {
if (this.entryForm.invalid) {
return;
}
// start&end date same for now
const entryDate = this.entryForm.value.entry_date;
const entry = {
Expand Down