Skip to content

Mark description as required #187

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
enriquezrene merged 1 commit into from
Apr 24, 2020
Merged

Mark description as required #187

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
fix: #186 mark customer description as required and #185 fix error me… 
…ssage
  • Loading branch information
@enriquezrene
enriquezrene committed Apr 24, 2020
commit c19f4d24038367900052bcaba11e3b186be3776d
9 changes: 7 additions & 2 deletions ...tomer-management/components/customer-info/components/create-customer/create-customer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="form-group">
<div
*ngIf="showAlert && messageToShow !== ''"
[ngClass]="{'bg-secondary': messageToShow == 'Customer created successfully!' || messageToShow == 'Customer updated successfully!',
[ngClass]="{'bg-secondary': messageToShow == 'Customer created successfully!' || messageToShow == 'Customer updated successfully!',
'bg-primary': messageToShow !== 'Customer created successfully!' }"
class="alert alert-dismissible fade fade-in show text-white"
role="alert"
Expand All @@ -23,7 +23,7 @@
<span
class="badge badge-pill badge-light text-danger"
*ngIf="(customerForm.dirty || customerForm.touched) && customerForm.invalid"
>Activity name is required</span
>Customer name is required</span
>
<textarea
class="form-control form-control-sm mt-2"
Expand All @@ -32,6 +32,11 @@
formControlName="description"
placeholder="Customer description"
></textarea>
<span
class="badge badge-pill badge-light text-danger"
*ngIf="(customerForm.dirty || customerForm.touched) && customerForm.invalid"
>Customer description is required</span
>
<button type="submit" class="btn btn-sm btn-primary" [disabled]="!customerForm.valid">Save</button>
<button (click)="resetCustomerForm()" id="cancel" type="button" class="btn btn-sm btn-secondary mb-2 ml-2 mt-2">
Cancel
Expand Down
2 changes: 1 addition & 1 deletion ...ustomer-management/components/customer-info/components/create-customer/create-customer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class CreateCustomerComponent implements OnInit, OnDestroy {
constructor(private formBuilder: FormBuilder, private store: Store<CustomerState>) {
this.customerForm = this.formBuilder.group({
name: ['', Validators.required],
description: [''],
description: ['', Validators.required],
});
}

Expand Down