Skip to content

228 table component on customer list #272

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 6 commits into from
May 21, 2020
Merged

228 table component on customer list #272

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
196df11
fix: #228 table-component
macrisguncay May 18, 2020
028a5c6
test: #228 Improving readability on unit test report
May 19, 2020
b061fc4
style: #228 Removing some warnings on console when running unit tests
May 19, 2020
91e60fd
feat: #228 Adding angular datatables to customer list component
May 19, 2020
7d76f69
test: #228 Improving test coverage and adding jquery to test environment
May 20, 2020
5e17dc8
test: #228 Improving test coverage and adding jquery to test environment
May 20, 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
Prev Previous commit
test: #228 Improving test coverage and adding jquery to test environment
  • Loading branch information
Juan Gabriel Guzman committed May 21, 2020
commit 5e17dc8b761032827f10f54842aa5156b8dcb1e5
9 changes: 4 additions & 5 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 @@ -22,8 +22,6 @@ import * as projectActions from '../../../customer-management/components/project
import {EntryState} from '../../../time-clock/store/entry.reducer';
import * as entryActions from '../../../time-clock/store/entry.actions';
import {getUpdateError, getCreateError} from 'src/app/modules/time-clock/store/entry.selectors';
// import $ from 'jquery';
// import 'bootstrap';
type Merged = TechnologyState & ProjectState & ActivityState & EntryState;

@Component({
Expand Down Expand Up @@ -57,7 +55,6 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
uri: '',
technology: '',
});
// $('[data-toggle="tooltip"]').tooltip();
}

ngOnInit(): void {
Expand Down Expand Up @@ -150,10 +147,12 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
get end_hour() {
return this.entryForm.get('end_hour');
}

/* istanbul ignore next */
closeEntryModal() {
this.close();
this.closeModal.nativeElement.click();
if (this.closeModal.nativeElement) {
this.closeModal.nativeElement.click();
}
}

close() {
Expand Down