EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3833 mod_data: Fix wrong unsaved changes warning

main
Dani Palou 2022-04-05 08:26:49 +02:00
parent e6b76f705d
commit ef834b34ea
6 changed files with 63 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/addons/mod/data/classes/field-plugin-component.ts
View File

@ -32,10 +32,11 @@ export abstract class AddonModDataFieldPluginComponent implements OnInit, OnChan
@Input() error?: string; // Error when editing.
@Input() form?: FormGroup; // Form where to add the form control. Just required for edit and search modes.
@Input() searchFields?: CoreFormFields; // The search value of all fields.
@Output() gotoEntry: EventEmitter<number>; // Action to perform.
@Output() gotoEntry = new EventEmitter<number>(); // Action to perform.
// Output called when the field is initialized with a value and it didn't have one already.
@Output() onFieldInit = new EventEmitter<AddonModDataEntryFieldInitialized>();
constructor(protected fb: FormBuilder) {
this.gotoEntry = new EventEmitter();
}
/**
@ -114,3 +115,11 @@ export abstract class AddonModDataFieldPluginComponent implements OnInit, OnChan
}
}
/**
* Data for an initialized field.
*/
export type AddonModDataEntryFieldInitialized = Partial<AddonModDataEntryField> & {
fieldid: number;
content: string;
};

11
src/addons/mod/data/components/field-plugin/field-plugin.ts
View File

@ -16,6 +16,7 @@ import { Component, OnInit, OnChanges, ViewChild, Input, Output, SimpleChange, T
import { FormGroup } from '@angular/forms';
import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-component';
import { CoreFormFields } from '@singletons/form';
import { AddonModDataEntryFieldInitialized } from '../../classes/field-plugin-component';
import { AddonModDataData, AddonModDataField, AddonModDataTemplateMode } from '../../services/data';
import { AddonModDataFieldsDelegate } from '../../services/data-fields-delegate';
@ -37,7 +38,9 @@ export class AddonModDataFieldPluginComponent implements OnInit, OnChanges {
@Input() error?: string; // Error when editing.
@Input() form?: FormGroup; // Form where to add the form control. Just required for edit and search modes.
@Input() searchFields?: CoreFormFields; // The search value of all fields.
@Output() gotoEntry = new EventEmitter(); // Action to perform.
@Output() gotoEntry = new EventEmitter<number>(); // Action to perform.
// Output called when the field is initialized with a value and it didn't have one already.
@Output() onFieldInit = new EventEmitter<AddonModDataEntryFieldInitialized>();
fieldComponent?: Type<unknown>; // Component to render the plugin.
pluginData?: AddonDataFieldPluginComponentData; // Data to pass to the component.
@ -65,9 +68,10 @@ export class AddonModDataFieldPluginComponent implements OnInit, OnChanges {
value: this.value,
database: this.database,
error: this.error,
gotoEntry: this.gotoEntry,
form: this.form,
searchFields: this.searchFields,
gotoEntry: this.gotoEntry,
onFieldInit: this.onFieldInit,
};
}
} finally {
@ -99,5 +103,6 @@ export type AddonDataFieldPluginComponentData = {
error?: string; // Error when editing.
form?: FormGroup; // Form where to add the form control. Just required for edit and search modes.
searchFields?: CoreFormFields; // The search value of all fields.
gotoEntry: EventEmitter<unknown>;
gotoEntry: EventEmitter<number>;
onFieldInit: EventEmitter<AddonModDataEntryFieldInitialized>;
};

11
src/addons/mod/data/fields/date/component/date.ts
View File

@ -68,7 +68,16 @@ export class AddonModDataFieldDateComponent extends AddonModDataFieldPluginCompo
}
this.addControl('f_' + this.field.id, CoreTimeUtils.toDatetimeFormat(date.getTime()));
const seconds = Math.floor(date.getTime() / 1000);
this.addControl('f_' + this.field.id, CoreTimeUtils.toDatetimeFormat(seconds * 1000));
if (!this.searchMode && !this.value?.content) {
this.onFieldInit.emit({
fieldid: this.field.id,
content: String(seconds),
});
}
}
}

30
src/addons/mod/data/pages/edit/edit.ts
View File

@ -41,6 +41,7 @@ import {
} from '../../services/data';
import { AddonModDataHelper } from '../../services/data-helper';
import { CoreDom } from '@singletons/dom';
import { AddonModDataEntryFieldInitialized } from '../../classes/field-plugin-component';
/**
* Page that displays the view edit page.
@ -62,6 +63,7 @@ export class AddonModDataEditPage implements OnInit {
protected forceLeave = false; // To allow leaving the page without checking for changes.
protected initialSelectedGroup?: number;
protected isEditing = false;
protected originalData: AddonModDataEntryFields = {};
entry?: AddonModDataEntry;
fields: Record<number, AddonModDataField> = {};
@ -83,6 +85,7 @@ export class AddonModDataEditPage implements OnInit {
contents: AddonModDataEntryFields;
errors?: Record<number, string>;
form: FormGroup;
onFieldInit: (data: AddonModDataEntryFieldInitialized) => void;
};
errors: Record<number, string> = {};
@ -128,7 +131,7 @@ export class AddonModDataEditPage implements OnInit {
const inputData = this.editForm.value;
let changed = AddonModDataHelper.hasEditDataChanged(inputData, this.fieldsArray, this.entry.contents);
let changed = AddonModDataHelper.hasEditDataChanged(inputData, this.fieldsArray, this.originalData);
changed = changed || (!this.isEditing && this.initialSelectedGroup != this.selectedGroup);
if (changed) {
@ -162,6 +165,7 @@ export class AddonModDataEditPage implements OnInit {
const entry = await AddonModDataHelper.fetchEntry(this.database, this.fieldsArray, this.entryId || 0);
this.entry = entry.entry;
this.originalData = CoreUtils.clone(this.entry.contents);
if (this.entryId) {
// Load correct group.
@ -401,6 +405,7 @@ export class AddonModDataEditPage implements OnInit {
form: this.editForm,
database: this.database,
errors: this.errors,
onFieldInit: this.onFieldInit.bind(this),
};
let template = AddonModDataHelper.getTemplate(this.database!, AddonModDataTemplateType.ADD, this.fieldsArray);
@ -414,7 +419,7 @@ export class AddonModDataEditPage implements OnInit {
// Replace field by a generic directive.
const render = '<addon-mod-data-field-plugin [class.has-errors]="!!errors[' + field.id + ']" mode="edit" \
[field]="fields[' + field.id + ']" [value]="contents[' + field.id + ']" [form]="form" [database]="database" \
[error]="errors[' + field.id + ']"></addon-mod-data-field-plugin>';
[error]="errors[' + field.id + ']" (onFieldInit)="onFieldInit($event)"></addon-mod-data-field-plugin>';
template = template.replace(replaceRegEx, render);
// Replace the field id tag.
@ -435,6 +440,27 @@ export class AddonModDataEditPage implements OnInit {
return template;
}
/**
* A certain value has been initialized.
*
* @param data Data.
*/
onFieldInit(data: AddonModDataEntryFieldInitialized): void {
if (!this.originalData[data.fieldid]) {
this.originalData[data.fieldid] = {
id: 0,
recordid: this.entry?.id ?? 0,
fieldid: data.fieldid,
content: data.content,
content1: data.content1 ?? null,
content2: data.content2 ?? null,
content3: data.content3 ?? null,
content4: data.content4 ?? null,
files: data.files ?? [],
};
}
}
/**
* Return to the entry list (previous page) discarding temp data.
*

4
src/addons/mod/data/services/data-helper.ts
View File

@ -213,8 +213,8 @@ export class AddonModDataHelperProvider {
// Replace field by a generic directive.
const render = '<addon-mod-data-field-plugin [field]="fields[' + field.id + ']" [value]="entries[' + entry.id +
'].contents[' + field.id + ']" mode="' + mode + '" [database]="database" (gotoEntry)="gotoEntry(' + entry.id +
')"></addon-mod-data-field-plugin>';
'].contents[' + field.id + ']" mode="' + mode + '" [database]="database" (gotoEntry)="gotoEntry($event)">' +
'</addon-mod-data-field-plugin>';
template = template.replace(replaceRegex, render);
});

8
src/addons/mod/data/services/data.ts
View File

@ -1134,10 +1134,10 @@ export type AddonModDataEntryField = {
fieldid: number; // The field type of the content.
recordid: number; // The record this content belongs to.
content: string; // Contents.
content1: string; // Contents.
content2: string; // Contents.
content3: string; // Contents.
content4: string; // Contents.
content1: string | null; // Contents.
content2: string | null; // Contents.
content3: string | null; // Contents.
content4: string | null; // Contents.
files: CoreFileEntry[];
};