Skip to content

Commit 9e20d6e

Browse files
fix: TT-141 Have the data persistent in the modal
1 parent d5773d7 commit 9e20d6e

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

src/app/modules/shared/components/details-fields/details-fields.component.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
3030
keyword = 'search_field';
3131
@Input() entryToEdit: Entry;
3232
@Input() canMarkEntryAsWIP: boolean;
33+
@Input() isEdit: boolean;
3334
@Output() saveEntry = new EventEmitter<SaveEntryEvent>();
3435
@Output() projectSelected = new EventEmitter<ProjectSelectedEvent>();
3536
@ViewChild('closeModal') closeModal: ElementRef;
@@ -143,7 +144,9 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
143144
technology: '',
144145
});
145146
} else {
146-
this.cleanForm();
147+
if (this.isEdit) {
148+
this.cleanForm();
149+
}
147150
}
148151
}
149152

src/app/modules/time-entries/pages/time-entries.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ <h5 class="modal-title">{{ entryId ? 'Edit Entry' : 'New Entry' }}</h5>
6868
<div class="modal-body">
6969
<app-details-fields
7070
[entryToEdit]="entry"
71+
[isEdit]="isEdit"
7172
(saveEntry)="saveEntry($event)"
7273
(projectSelected)="projectSelected($event)"
7374
[canMarkEntryAsWIP]='canMarkEntryAsWIP'

src/app/modules/time-entries/pages/time-entries.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
3131
selectedMonth: number;
3232
selectedYear: number;
3333
selectedMonthAsText: string;
34+
isEdit: boolean;
3435

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

7677
editEntry(entryId: string) {
7778
this.entryId = entryId;
79+
this.isEdit = true;
7880
this.store.pipe(select(getTimeEntriesDataSource)).subscribe(ds => {
7981
this.entry = ds.data.find((entry) => entry.id === entryId);
8082
this.canMarkEntryAsWIP = this.isEntryRunningEqualsToEntryToEdit(this.getEntryRunning(ds.data), this.entry)
@@ -123,6 +125,7 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
123125
}
124126

125127
projectSelected(event: ProjectSelectedEvent): void {
128+
this.isEdit = false;
126129
this.store.pipe(select(getTimeEntriesDataSource)).subscribe(ds => {
127130
const dataToUse = ds.data.find(item => item.project_id === event.projectId);
128131
if (dataToUse && this.isNewEntry()) {

0 commit comments

Comments
 (0)