Skip to content

fix: TT-141 Have the data persistent in the modal #639

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
Mar 1, 2021
Merged

fix: TT-141 Have the data persistent in the modal #639

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
9e20d6e
fix: TT-141 Have the data persistent in the modal
VanessaIniguezG Feb 20, 2021
46be8e9
feat: TT-141 Create test to validate the isEdit flag of the DetailsFi…
VanessaIniguezG Feb 23, 2021
d2fc8aa
feat: TT-141 Create flag in the TimeEntries component to control whe…
VanessaIniguezG Feb 25, 2021
8dc0d4a
fix: TT-141 Delete test lines and add in the test the method of edite…
VanessaIniguezG Feb 25, 2021
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
fix: TT-141 Have the data persistent in the modal
  • Loading branch information
@VanessaIniguezG
VanessaIniguezG committed Feb 20, 2021
commit 9e20d6e78796775e59d1acbda82bde2096e2aa5f
5 changes: 4 additions & 1 deletion 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 @@ -30,6 +30,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
keyword = 'search_field';
@Input() entryToEdit: Entry;
@Input() canMarkEntryAsWIP: boolean;
@Input() isEdit: boolean;
@Output() saveEntry = new EventEmitter<SaveEntryEvent>();
@Output() projectSelected = new EventEmitter<ProjectSelectedEvent>();
@ViewChild('closeModal') closeModal: ElementRef;
Expand Down Expand Up @@ -143,7 +144,9 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
technology: '',
});
} else {
this.cleanForm();
if (this.isEdit) {
this.cleanForm();
}
}
}

Expand Down
1 change: 1 addition & 0 deletions src/app/modules/time-entries/pages/time-entries.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ <h5 class="modal-title">{{ entryId ? 'Edit Entry' : 'New Entry' }}</h5>
<div class="modal-body">
<app-details-fields
[entryToEdit]="entry"
[isEdit]="isEdit"
(saveEntry)="saveEntry($event)"
(projectSelected)="projectSelected($event)"
[canMarkEntryAsWIP]='canMarkEntryAsWIP'
Expand Down
3 changes: 3 additions & 0 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 @@ -31,6 +31,7 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
selectedMonth: number;
selectedYear: number;
selectedMonthAsText: string;
isEdit: boolean;

constructor(private store: Store<EntryState>, private toastrService: ToastrService, private actionsSubject$: ActionsSubject) {
this.timeEntriesDataSource$ = this.store.pipe(delay(0), select(getTimeEntriesDataSource));
Expand Down Expand Up @@ -75,6 +76,7 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {

editEntry(entryId: string) {
this.entryId = entryId;
this.isEdit = true;
this.store.pipe(select(getTimeEntriesDataSource)).subscribe(ds => {
this.entry = ds.data.find((entry) => entry.id === entryId);
this.canMarkEntryAsWIP = this.isEntryRunningEqualsToEntryToEdit(this.getEntryRunning(ds.data), this.entry)
Expand Down Expand Up @@ -123,6 +125,7 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
}

projectSelected(event: ProjectSelectedEvent): void {
this.isEdit = false;
this.store.pipe(select(getTimeEntriesDataSource)).subscribe(ds => {
const dataToUse = ds.data.find(item => item.project_id === event.projectId);
if (dataToUse && this.isNewEntry()) {
Expand Down