Skip to content

fix: #172 Create-time-entries-manually #221

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 4 commits into from
May 12, 2020
Merged

fix: #172 Create-time-entries-manually #221

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb1a20c
fix: #172 Create-time-entries-manually
DiegoTinitana May 7, 2020
b3c016d
fix: #172 Create-time-entries-manually
DiegoTinitana May 7, 2020
26038ac
fix: #172 removing old styles
enriquezrene May 8, 2020
2dbb0f9
fix: #172 Create-time-entries-manually fix view
DiegoTinitana May 11, 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
Next Next commit
fix: #172 Create-time-entries-manually
  • Loading branch information
@DiegoTinitana
DiegoTinitana committed May 11, 2020
commit b3c016d4957924fe2e9deee8e149cfb789e3bc91
17 changes: 17 additions & 0 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 @@ -88,10 +88,17 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
ngOnChanges(): void {
if (this.entryToEdit) {
this.selectedTechnology = this.entryToEdit.technologies;
<<<<<<< HEAD
this.project = this.listProjects.find((p) => p.id === this.entryToEdit.project_id);
const activity = this.activities.find((a) => a.id === this.entryToEdit.activity_id);
this.projectName = this.project.name;
this.entryForm.setValue({
=======
const project = this.listProjects.find((p) => p.id === this.entryToEdit.project_id);
const activity = this.activities.find((a) => a.id === this.entryToEdit.activity_id);
this.entryForm.setValue({
project: project ? project.name : '',
>>>>>>> fix: #172 Create-time-entries-manually
activity: activity ? activity.name : '',
description: this.entryToEdit.description,
start_date: this.entryToEdit.start_date ? formatDate(this.entryToEdit.start_date, 'yyyy-MM-dd', 'en') : '',
Expand All @@ -102,9 +109,14 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
});
} else {
this.selectedTechnology = [];
<<<<<<< HEAD
this.project = '';
this.projectName = '';
this.entryForm.setValue({
=======
this.entryForm.setValue({
project: '',
>>>>>>> fix: #172 Create-time-entries-manually
activity: '',
description: '',
start_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
Expand Down Expand Up @@ -138,9 +150,14 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {

onSubmit() {
const activity = this.activities.find((a) => a.name === this.entryForm.value.activity);
<<<<<<< HEAD
this.project = this.projectName.id ? this.projectName : this.project;
const entry = {
project_id: this.project.id,
=======
const entry = {
project_id: this.entryForm.value.project.id,
>>>>>>> fix: #172 Create-time-entries-manually
activity_id: activity ? activity.id : null,
technologies: this.selectedTechnology,
description: this.entryForm.value.description,
Expand Down
3 changes: 1 addition & 2 deletions src/app/modules/time-entries/pages/time-entries.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ export class TimeEntriesComponent implements OnInit {
const duration: any = moment.duration(endDate.diff(startDate));
time = `${duration._data.hours} hour and ${duration._data.minutes} minutes`;
}
const date = moment(entry.start_date).format('YYYY-MM-DD');
const item = { ...entry, time, date };
const item = { ...entry, time };
return [...acc, item];
}
return [];
Expand Down