@@ -187,13 +187,13 @@
[(ngModel)]="deleteChecked"
[binary]="true"
inputId="chkDelete"
- [disabled]="bulkData.toDeletes.length === 0"
+ [disabled]="importData.toDeletes.length === 0"
(click)="$event.stopPropagation()"
class="mr-2">
{{ 'bia.toDelete' | translate }}({{
- bulkData.toDeletes.length
+ importData.toDeletes.length
}})
@@ -201,12 +201,12 @@
+
-
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-bulk-form/crud-item-bulk-form.component.scss b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-import-form/crud-item-import-form.component.scss
similarity index 67%
rename from Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-bulk-form/crud-item-bulk-form.component.scss
rename to Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-import-form/crud-item-import-form.component.scss
index 81b709513..65e31b253 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-bulk-form/crud-item-bulk-form.component.scss
+++ b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-import-form/crud-item-import-form.component.scss
@@ -1,11 +1,11 @@
@import '../../../../../../../scss/bia/bia-variables';
:host ::ng-deep {
- .bia-bulk-accordion {
- .bia-bulk-tab-error .p-accordion-header-link {
+ .bia-import-accordion {
+ .bia-import-tab-error .p-accordion-header-link {
background-color: rgba($biaRed, 0.5) !important;
}
- .bia-bulk-selected .p-accordion-header-link {
+ .bia-import-selected .p-accordion-header-link {
background-color: rgba($biaGreen, 0.5) !important;
}
}
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-bulk-form/crud-item-bulk-form.component.ts b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-import-form/crud-item-import-form.component.ts
similarity index 76%
rename from Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-bulk-form/crud-item-bulk-form.component.ts
rename to Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-import-form/crud-item-import-form.component.ts
index 3433a9f75..4550a53df 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-bulk-form/crud-item-bulk-form.component.ts
+++ b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-import-form/crud-item-import-form.component.ts
@@ -21,7 +21,7 @@ import {
import { KeyValuePair } from 'src/app/shared/bia-shared/model/key-value-pair';
import { clone } from 'src/app/shared/bia-shared/utils';
import { CrudConfig } from '../../model/crud-config';
-import { BulkParam } from '../../services/crud-item-bulk.service';
+import { ImportParam } from '../../services/crud-item-import.service';
interface FormatExample {
format: string;
@@ -29,11 +29,11 @@ interface FormatExample {
}
@Component({
- selector: 'bia-crud-item-bulk-form',
- templateUrl: './crud-item-bulk-form.component.html',
- styleUrls: ['./crud-item-bulk-form.component.scss'],
+ selector: 'bia-crud-item-import-form',
+ templateUrl: './crud-item-import-form.component.html',
+ styleUrls: ['./crud-item-import-form.component.scss'],
})
-export class CrudItemBulkFormComponent {
+export class CrudItemImportFormComponent {
@ViewChild('fileUpload') fileUpload: FileUpload;
fillFormDone = false;
@@ -62,12 +62,12 @@ export class CrudItemBulkFormComponent {
this.initTableParam();
}
- protected _bulkData: any;
- get bulkData(): any {
- return this._bulkData;
+ protected _importData: any;
+ get importData(): any {
+ return this._importData;
}
- @Input() set bulkData(value: any) {
- this._bulkData = value;
+ @Input() set importData(value: any) {
+ this._importData = value;
if (this.fileUpload) {
this.fileUpload.clear();
}
@@ -83,12 +83,12 @@ export class CrudItemBulkFormComponent {
this.initDdlFormatDate();
}
- protected _bulkParam: BulkParam = {};
- get bulkParam(): BulkParam {
- return this._bulkParam;
+ protected _importParam: ImportParam = {};
+ get importParam(): ImportParam {
+ return this._importParam;
}
- @Input() set bulkParam(value: BulkParam) {
- this._bulkParam = value;
+ @Input() set importParam(value: ImportParam) {
+ this._importParam = value;
this.fillForm();
}
@@ -98,7 +98,7 @@ export class CrudItemBulkFormComponent {
@Output() save = new EventEmitter();
@Output() cancel = new EventEmitter();
@Output() fileSelected = new EventEmitter();
- @Output() changeBulkParam = new EventEmitter();
+ @Output() changeImportParam = new EventEmitter();
constructor(
public formBuilder: UntypedFormBuilder,
@@ -109,17 +109,17 @@ export class CrudItemBulkFormComponent {
protected initForm() {
this.form = this.formBuilder.group({
- useCurrentView: [this.bulkParam.useCurrentView, Validators.required],
- dateFormat: [this.bulkParam.dateFormat, Validators.required],
- timeFormat: [this.bulkParam.timeFormat, Validators.required],
+ useCurrentView: [this.importParam.useCurrentView, Validators.required],
+ dateFormat: [this.importParam.dateFormat, Validators.required],
+ timeFormat: [this.importParam.timeFormat, Validators.required],
});
}
fillForm() {
- if (this.bulkParam && this.fillFormDone !== true) {
+ if (this.importParam && this.fillFormDone !== true) {
this.form.reset();
- if (this.bulkParam) {
- this.form.patchValue({ ...this.bulkParam });
+ if (this.importParam) {
+ this.form.patchValue({ ...this.importParam });
}
this.fillFormDone = true;
}
@@ -197,7 +197,7 @@ export class CrudItemBulkFormComponent {
}
onFileSelected() {
- this._bulkData = null;
+ this._importData = null;
}
onCancel() {
@@ -208,15 +208,15 @@ export class CrudItemBulkFormComponent {
let toSaves: any[] = [];
if (this.deleteChecked === true) {
- toSaves = toSaves.concat(this.bulkData.toDeletes);
+ toSaves = toSaves.concat(this.importData.toDeletes);
}
if (this.insertChecked === true) {
- toSaves = toSaves.concat(this.bulkData.toInserts);
+ toSaves = toSaves.concat(this.importData.toInserts);
}
if (this.updateChecked === true) {
- toSaves = toSaves.concat(this.bulkData.toUpdates);
+ toSaves = toSaves.concat(this.importData.toUpdates);
}
if (toSaves.length > 0) {
@@ -235,28 +235,28 @@ export class CrudItemBulkFormComponent {
canUseDelete(): boolean {
return (
this.canDelete === true &&
- this.crudConfiguration.bulkMode?.useDelete === true
+ this.crudConfiguration.importMode?.useDelete === true
);
}
canUseInsert(): boolean {
return (
this.canAdd === true &&
- this.crudConfiguration.bulkMode?.useInsert === true
+ this.crudConfiguration.importMode?.useInsert === true
);
}
canUseUpdate(): boolean {
return (
this.canEdit === true &&
- this.crudConfiguration.bulkMode?.useUpdate === true
+ this.crudConfiguration.importMode?.useUpdate === true
);
}
onSubmit() {
if (this.form.valid) {
- this._bulkParam = this.form.value;
- this.changeBulkParam.next(this._bulkParam);
+ this._importParam = this.form.value;
+ this.changeImportParam.next(this._importParam);
}
}
}
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-table/crud-item-table.component.ts b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-table/crud-item-table.component.ts
index 1d803c600..67d1cc75e 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-table/crud-item-table.component.ts
+++ b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/components/crud-item-table/crud-item-table.component.ts
@@ -33,6 +33,9 @@ export class CrudItemTableComponent
public initForm() {
this.form = this.formBuilder.group(this.formFields());
+ if (this.configuration.formValidators) {
+ this.form.addValidators(this.configuration.formValidators);
+ }
}
protected formFields() {
const fields: { [key: string]: any } = { id: [this.element.id] };
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/crud-item-bulk.module.ts b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/crud-item-bulk.module.ts
deleted file mode 100644
index b4b2e9045..000000000
--- a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/crud-item-bulk.module.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { NgModule } from '@angular/core';
-import { SharedModule } from 'src/app/shared/shared.module';
-import { CrudItemBulkFormComponent } from './components/crud-item-bulk-form/crud-item-bulk-form.component';
-
-@NgModule({
- declarations: [CrudItemBulkFormComponent],
- imports: [SharedModule],
- exports: [CrudItemBulkFormComponent],
-})
-export class CrudItemBulkModule {}
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/crud-item-import.module.ts b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/crud-item-import.module.ts
new file mode 100644
index 000000000..448407807
--- /dev/null
+++ b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/crud-item-import.module.ts
@@ -0,0 +1,10 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from 'src/app/shared/shared.module';
+import { CrudItemImportFormComponent } from './components/crud-item-import-form/crud-item-import-form.component';
+
+@NgModule({
+ declarations: [CrudItemImportFormComponent],
+ imports: [SharedModule],
+ exports: [CrudItemImportFormComponent],
+})
+export class CrudItemImportModule {}
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/model/crud-config.ts b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/model/crud-config.ts
index 1c9bd05a3..1bb153b9a 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/model/crud-config.ts
+++ b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/model/crud-config.ts
@@ -25,11 +25,11 @@ export class CrudConfig {
fieldsConfig: BiaFieldsConfig;
defaultViewPref: BiaTableState;
optionFilter: any;
- useBulk: boolean;
+ useImport: boolean;
useCompactMode?: boolean;
useVirtualScroll = false;
useResizableColumn = false;
- bulkMode?: {
+ importMode?: {
useInsert: boolean;
useUpdate: boolean;
useDelete: boolean;
@@ -56,7 +56,7 @@ export class CrudConfig {
usePopup = true,
useOfflineMode = false,
optionFilter = undefined,
- bulkMode,
+ importMode,
useCompactMode = false,
useVirtualScroll = false,
useResizableColumn = false,
@@ -73,7 +73,7 @@ export class CrudConfig {
usePopup?: boolean;
useOfflineMode?: boolean;
optionFilter?: any;
- bulkMode?: {
+ importMode?: {
useInsert: boolean;
useUpdate: boolean;
useDelete: boolean;
@@ -94,11 +94,11 @@ export class CrudConfig {
this.usePopup = usePopup;
this.useOfflineMode = useOfflineMode;
this.optionFilter = optionFilter;
- this.bulkMode = bulkMode;
- this.useBulk =
- bulkMode?.useDelete === true ||
- bulkMode?.useInsert === true ||
- bulkMode?.useUpdate === true;
+ this.importMode = importMode;
+ this.useImport =
+ importMode?.useDelete === true ||
+ importMode?.useInsert === true ||
+ importMode?.useUpdate === true;
this.useCompactMode = useCompactMode;
this.useVirtualScroll = !!useVirtualScroll;
this.useResizableColumn = useResizableColumn;
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/services/crud-item-bulk.service.ts b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/services/crud-item-import.service.ts
similarity index 82%
rename from Angular/src/app/shared/bia-shared/feature-templates/crud-items/services/crud-item-bulk.service.ts
rename to Angular/src/app/shared/bia-shared/feature-templates/crud-items/services/crud-item-import.service.ts
index bd92bf734..11b8d8870 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/services/crud-item-bulk.service.ts
+++ b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/services/crud-item-import.service.ts
@@ -14,38 +14,38 @@ import { BiaFieldConfig, PropType } from '../../../model/bia-field-config';
import { clone, isEmpty } from '../../../utils';
import { CrudConfig } from '../model/crud-config';
-export interface BulkParam {
+export interface ImportParam {
useCurrentView: boolean;
dateFormat: string;
timeFormat: string;
}
-interface TmpBulkDataError {
+interface TmpImportDataError {
obj: T;
errors: string[];
}
-export interface BulkDataError extends BaseDto {
+export interface ImportDataError extends BaseDto {
sErrors: string | null;
}
-export interface BulkData {
+export interface ImportData {
toDeletes: T[];
toInserts: T[];
toUpdates: T[];
- errorToSaves: BulkDataError[];
+ errorToSaves: ImportDataError[];
}
@Injectable({
providedIn: 'root',
})
-export class CrudItemBulkService {
+export class CrudItemImportService {
protected form: BiaFormComponent;
- protected bulkData: BulkData;
- protected tmpBulkDataErrors: TmpBulkDataError[] = [];
+ protected importData: ImportData;
+ protected tmpImportDataErrors: TmpImportDataError[] = [];
protected crudItemService: CrudItemService;
protected crudConfig: CrudConfig;
- public bulkParam = {
+ public importParam = {
useCurrentView: false,
};
@@ -53,7 +53,7 @@ export class CrudItemBulkService {
protected translateService: TranslateService,
protected biaTranslationService: BiaTranslationService
) {
- this.initBulkParam();
+ this.initImportParam();
}
public init(
@@ -66,18 +66,18 @@ export class CrudItemBulkService {
this.form = form;
}
- public uploadCsv(file: File): Observable> {
- this.initBulkData();
+ public uploadCsv(file: File): Observable> {
+ this.initImportData();
return from(this.readFileAsText(file)).pipe(
switchMap(csv => this.parseCSV(csv))
);
}
- protected initBulkParam() {
+ protected initImportParam() {
this.biaTranslationService.currentCultureDateFormat$.subscribe(
dateFormat => {
- this.bulkParam.dateFormat = dateFormat.dateFormat;
- this.bulkParam.timeFormat = dateFormat.timeFormat;
+ this.importParam.dateFormat = dateFormat.dateFormat;
+ this.importParam.timeFormat = dateFormat.timeFormat;
}
);
}
@@ -98,7 +98,7 @@ export class CrudItemBulkService {
});
}
- protected parseCSV(csv: string): Observable> {
+ protected parseCSV(csv: string): Observable> {
const cleanedCSVData = this.cleanCSVFormat(csv);
const columnMapping = this.getColumnMapping();
@@ -114,19 +114,24 @@ export class CrudItemBulkService {
let allObjs$: Observable;
if (
- this.crudConfig.bulkMode?.useDelete === true ||
- this.crudConfig.bulkMode?.useUpdate === true
+ this.crudConfig.importMode?.useDelete === true ||
+ this.crudConfig.importMode?.useUpdate === true
) {
allObjs$ = this.crudItemService.lastLazyLoadEvent$.pipe(
map(event => {
- if (this.bulkParam.useCurrentView === true) {
- const customEvent = { ...event };
- customEvent.first = 0;
- customEvent.rows = 0;
- return customEvent;
- } else {
- return {};
+ const customEvent = { ...event };
+ customEvent.first = 0;
+ customEvent.rows = 0;
+
+ if (this.importParam.useCurrentView !== true) {
+ customEvent.filters = {};
+ customEvent.globalFilter = null;
+ if ('advancedFilter' in customEvent) {
+ customEvent.advancedFilter = null;
+ }
}
+
+ return customEvent;
}),
switchMap(event =>
this.crudItemService.dasService
@@ -138,7 +143,7 @@ export class CrudItemBulkService {
allObjs$ = of([]);
}
- return this.fillBulkData(resultData$, allObjs$);
+ return this.fillImportData(resultData$, allObjs$);
}
protected getColumnMapping() {
@@ -235,8 +240,8 @@ export class CrudItemBulkService {
const containsDash = dateString.indexOf('-') > 0;
const dateFormat = containsDash
? 'yyyy-MM-dd'
- : this.bulkParam.dateFormat;
- const timeFormat = containsDash ? 'HH:mm' : this.bulkParam.timeFormat;
+ : this.importParam.dateFormat;
+ const timeFormat = containsDash ? 'HH:mm' : this.importParam.timeFormat;
const date: Date = DateHelperService.parseDate(
dateString,
@@ -348,28 +353,28 @@ export class CrudItemBulkService {
}
}
- protected fillBulkData(
+ protected fillImportData(
csvObjs$: Observable,
oldObjs$: Observable
- ): Observable> {
+ ): Observable> {
return combineLatest([csvObjs$, oldObjs$]).pipe(
map(([csvObjs, oldObjs]) => {
// Remove objects in error.
csvObjs = csvObjs.filter(
- x => !this.tmpBulkDataErrors.map(y => y.obj).includes(x)
+ x => !this.tmpImportDataErrors.map(y => y.obj).includes(x)
);
if (
- this.crudConfig.bulkMode?.useDelete === true ||
- this.crudConfig.bulkMode?.useUpdate === true
+ this.crudConfig.importMode?.useDelete === true ||
+ this.crudConfig.importMode?.useUpdate === true
) {
oldObjs = oldObjs.filter(
- x => !this.tmpBulkDataErrors.map(y => y.obj.id).includes(x.id)
+ x => !this.tmpImportDataErrors.map(y => y.obj.id).includes(x.id)
);
for (const oldObj of oldObjs) {
// TO DELETE
- if (this.crudConfig.bulkMode?.useDelete === true) {
+ if (this.crudConfig.importMode?.useDelete === true) {
const found = csvObjs.some(csvObj => csvObj.id === oldObj.id);
if (!found) {
this.fillToDeletes(oldObj);
@@ -377,7 +382,7 @@ export class CrudItemBulkService {
}
// TO UPDATE
- if (this.crudConfig.bulkMode?.useUpdate === true) {
+ if (this.crudConfig.importMode?.useUpdate === true) {
const csvObj = csvObjs.find(csvObj => csvObj.id === oldObj.id);
if (oldObj && csvObj) {
this.fillToUpdates(oldObj, csvObj);
@@ -387,7 +392,7 @@ export class CrudItemBulkService {
}
// TO INSERTS
- if (this.crudConfig.bulkMode?.useInsert === true) {
+ if (this.crudConfig.importMode?.useInsert === true) {
for (const csvObj of csvObjs) {
if (isEmpty(csvObj.id) === true || csvObj.id === 0) {
this.fillToInserts(csvObj);
@@ -395,15 +400,17 @@ export class CrudItemBulkService {
}
}
- this.bulkData.errorToSaves = this.fillsErrors(this.tmpBulkDataErrors);
- return this.bulkData;
+ this.importData.errorToSaves = this.fillsErrors(
+ this.tmpImportDataErrors
+ );
+ return this.importData;
})
);
}
protected fillToDeletes(oldObj: T) {
oldObj.dtoState = DtoState.Deleted;
- this.bulkData.toDeletes.push(oldObj);
+ this.importData.toDeletes.push(oldObj);
}
protected fillToUpdates(oldObj: T, csvObj: T) {
@@ -433,7 +440,7 @@ export class CrudItemBulkService {
this.addErrorsToSave(csvObj, checkObject.errorMessages);
} else if (JSON.stringify(oldObj) !== JSON.stringify(newObj)) {
checkObject.element.dtoState = DtoState.Modified;
- this.bulkData.toUpdates.push(checkObject.element);
+ this.importData.toUpdates.push(checkObject.element);
}
}
@@ -445,13 +452,13 @@ export class CrudItemBulkService {
this.addErrorsToSave(csvObj, checkObject.errorMessages);
} else {
checkObject.element.dtoState = DtoState.Added;
- this.bulkData.toInserts.push(checkObject.element);
+ this.importData.toInserts.push(checkObject.element);
}
}
- protected initBulkData() {
- this.tmpBulkDataErrors = [];
- this.bulkData = >{
+ protected initImportData() {
+ this.tmpImportDataErrors = [];
+ this.importData = >{
toDeletes: [],
toInserts: [],
toUpdates: [],
@@ -460,13 +467,13 @@ export class CrudItemBulkService {
}
protected addErrorToSave(obj: T, errorMessage: string) {
- const existingErrorToSave = this.tmpBulkDataErrors.find(
+ const existingErrorToSave = this.tmpImportDataErrors.find(
entry => entry.obj === obj
);
if (existingErrorToSave) {
existingErrorToSave.errors.push(errorMessage);
} else {
- this.tmpBulkDataErrors.push({
+ this.tmpImportDataErrors.push({
obj: obj,
errors: [errorMessage],
});
@@ -474,13 +481,13 @@ export class CrudItemBulkService {
}
protected addErrorsToSave(obj: T, errorMessages: string[]) {
- const existingErrorToSave = this.tmpBulkDataErrors.find(
+ const existingErrorToSave = this.tmpImportDataErrors.find(
entry => entry.obj === obj
);
if (existingErrorToSave) {
existingErrorToSave.errors.concat(errorMessages);
} else {
- this.tmpBulkDataErrors.push({
+ this.tmpImportDataErrors.push({
obj: obj,
errors: errorMessages,
});
@@ -488,10 +495,10 @@ export class CrudItemBulkService {
}
protected fillsErrors(
- tmpBulkDataErrors: TmpBulkDataError[]
- ): BulkDataError[] {
- return tmpBulkDataErrors.map(tmp => {
- return {
+ tmpImportDataErrors: TmpImportDataError[]
+ ): ImportDataError[] {
+ return tmpImportDataErrors.map(tmp => {
+ return {
...tmp.obj,
sErrors: tmp.errors.join(', '),
};
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-item-bulk/crud-item-bulk.component.html b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-item-import/crud-item-import.component.html
similarity index 63%
rename from Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-item-bulk/crud-item-bulk.component.html
rename to Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-item-import/crud-item-import.component.html
index b0a8caad6..45e90e54d 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-item-bulk/crud-item-bulk.component.html
+++ b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-item-import/crud-item-import.component.html
@@ -1,20 +1,21 @@
-
-
+ (changeImportParam)="onChangeImportParam($event)">
+
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-item-bulk/crud-item-bulk.component.ts b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-item-import/crud-item-import.component.ts
similarity index 83%
rename from Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-item-bulk/crud-item-bulk.component.ts
rename to Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-item-import/crud-item-import.component.ts
index 7cf8004c2..19c371991 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-item-bulk/crud-item-bulk.component.ts
+++ b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-item-import/crud-item-import.component.ts
@@ -12,10 +12,10 @@ import { AuthService } from 'src/app/core/bia-core/services/auth.service';
import { BiaTranslationService } from 'src/app/core/bia-core/services/bia-translation.service';
import { BiaFormComponent } from 'src/app/shared/bia-shared/components/form/bia-form/bia-form.component';
import {
- BulkData,
- BulkParam,
- CrudItemBulkService,
-} from 'src/app/shared/bia-shared/feature-templates/crud-items/services/crud-item-bulk.service';
+ CrudItemImportService,
+ ImportData,
+ ImportParam,
+} from 'src/app/shared/bia-shared/feature-templates/crud-items/services/crud-item-import.service';
import { BaseDto } from 'src/app/shared/bia-shared/model/base-dto';
import {
BiaFieldConfig,
@@ -28,13 +28,13 @@ import { CrudItemService } from '../../services/crud-item.service';
@Component({
template: '',
})
-export abstract class CrudItemBulkComponent
+export abstract class CrudItemImportComponent
implements OnInit, AfterViewInit, OnDestroy
{
protected sub = new Subscription();
protected crudConfiguration: CrudConfig;
- protected bulkData: BulkData;
- protected crudItemBulkService: CrudItemBulkService;
+ protected importData: ImportData;
+ protected crudItemImportService: CrudItemImportService;
protected authService: AuthService;
protected biaTranslationService: BiaTranslationService;
protected router: Router;
@@ -51,9 +51,9 @@ export abstract class CrudItemBulkComponent
) {
this.router = this.injector.get(Router);
this.activatedRoute = this.injector.get(ActivatedRoute);
- this.crudItemBulkService = this.injector.get>(
- CrudItemBulkService
- );
+ this.crudItemImportService = this.injector.get<
+ CrudItemImportService
+ >(CrudItemImportService);
this.authService = this.injector.get(AuthService);
this.biaTranslationService = this.injector.get(
BiaTranslationService
@@ -71,7 +71,7 @@ export abstract class CrudItemBulkComponent
}
ngAfterViewInit() {
- this.crudItemBulkService.init(
+ this.crudItemImportService.init(
this.getForm(),
this.addColumnId(this.crudConfiguration),
this.crudItemService
@@ -106,10 +106,12 @@ export abstract class CrudItemBulkComponent
}
protected onFileSelected(file: File) {
- this.crudItemBulkService
+ this.crudItemImportService
.uploadCsv(file)
.pipe(take(1)) // auto unsubscribe
- .subscribe((bulkData: BulkData) => (this.bulkData = bulkData));
+ .subscribe(
+ (importData: ImportData) => (this.importData = importData)
+ );
}
protected onCancel() {
@@ -132,7 +134,7 @@ export abstract class CrudItemBulkComponent
return this.biaFormComponent;
}
- protected onChangeBulkParam(bulkParam: BulkParam) {
- this.crudItemBulkService.bulkParam = bulkParam;
+ protected onChangeImportParam(importParam: ImportParam) {
+ this.crudItemImportService.importParam = importParam;
}
}
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-items-index/crud-items-index.component.ts b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-items-index/crud-items-index.component.ts
index 447fc2723..0ca5ae8cb 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-items-index/crud-items-index.component.ts
+++ b/Angular/src/app/shared/bia-shared/feature-templates/crud-items/views/crud-items-index/crud-items-index.component.ts
@@ -340,8 +340,8 @@ export class CrudItemsIndexComponent
}
}
- onBulk() {
- this.router.navigate(['bulk'], { relativeTo: this.activatedRoute });
+ onImport() {
+ this.router.navigate(['import'], { relativeTo: this.activatedRoute });
}
onClickRow(crudItemId: any) {
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/members/components/member-form-edit/member-form-edit.component.html b/Angular/src/app/shared/bia-shared/feature-templates/members/components/member-form-edit/member-form-edit.component.html
index 677179cb1..f98ec165e 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/members/components/member-form-edit/member-form-edit.component.html
+++ b/Angular/src/app/shared/bia-shared/feature-templates/members/components/member-form-edit/member-form-edit.component.html
@@ -52,15 +52,17 @@
-
+
-
+
{
) {
super(formBuilder, authService, biaMessageService, translateService);
}
-
- public initForm() {
- this.form = this.formBuilder.group(this.formFields());
- this.form.addValidators([
- FieldValidator.atLeastOneFilled(['user', 'login']),
- ]);
- }
}
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/members/member.constants.ts b/Angular/src/app/shared/bia-shared/feature-templates/members/member.constants.ts
index b7c75eb13..599c2d4b1 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/members/member.constants.ts
+++ b/Angular/src/app/shared/bia-shared/feature-templates/members/member.constants.ts
@@ -13,6 +13,11 @@ export const memberCRUDConfiguration: CrudConfig =
// useViewTeamWithTypeId: TeamTypeId.Site, // use to filter view by teams => should know the type of team
usePopup: true,
useOfflineMode: false,
+ importMode: {
+ useInsert: true,
+ useUpdate: true,
+ useDelete: false,
+ },
showIcons: {
showCalcMode: true,
},
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/members/member.module.ts b/Angular/src/app/shared/bia-shared/feature-templates/members/member.module.ts
index be49e7bf4..08895c070 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/members/member.module.ts
+++ b/Angular/src/app/shared/bia-shared/feature-templates/members/member.module.ts
@@ -7,6 +7,7 @@ import { UserOptionModule } from 'src/app/domains/bia-domains/user-option/user-o
import { UserFromDirectoryModule } from 'src/app/features/bia-features/users-from-directory/user-from-directory.module';
import { CrudItemModule } from 'src/app/shared/bia-shared/feature-templates/crud-items/crud-item.module';
import { SharedModule } from 'src/app/shared/shared.module';
+import { CrudItemImportModule } from '../crud-items/crud-item-import.module';
import { MemberFormEditComponent } from './components/member-form-edit/member-form-edit.component';
import { MemberFormNewComponent } from './components/member-form-new/member-form-new.component';
import { MemberFormComponent } from './components/member-form/member-form.component';
@@ -15,6 +16,7 @@ import { memberCRUDConfiguration } from './member.constants';
import { FeatureMembersStore } from './store/member.state';
import { MembersEffects } from './store/members-effects';
import { MemberEditComponent } from './views/member-edit/member-edit.component';
+import { MemberImportComponent } from './views/member-import/member-import.component';
import { MemberItemComponent } from './views/member-item/member-item.component';
import { MemberNewComponent } from './views/member-new/member-new.component';
import { MembersIndexComponent } from './views/members-index/members-index.component';
@@ -91,10 +93,12 @@ import { MembersIndexComponent } from './views/members-index/members-index.compo
MemberEditComponent,
// [Calc] : Used only for calc it is possible to delete unsed commponent files (components/...-table)).
MemberTableComponent,
+ MemberImportComponent,
],
imports: [
SharedModule,
CrudItemModule,
+ CrudItemImportModule,
// RouterModule.forChild(ROUTES),
StoreModule.forFeature(
memberCRUDConfiguration.storeKey,
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/members/model/member.ts b/Angular/src/app/shared/bia-shared/feature-templates/members/model/member.ts
index 620ce9a4a..63c9271ef 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/members/model/member.ts
+++ b/Angular/src/app/shared/bia-shared/feature-templates/members/model/member.ts
@@ -5,6 +5,7 @@ import {
PropType,
} from 'src/app/shared/bia-shared/model/bia-field-config';
import { OptionDto } from 'src/app/shared/bia-shared/model/option-dto';
+import { FieldValidator } from '../../../validators/field.validator';
// TODO after creation of CRUD Member : adapt the model
export interface Member extends BaseDto {
@@ -25,6 +26,7 @@ export class Members {
// TODO after creation of CRUD Member : adapt the field configuration
export const memberFieldsConfiguration: BiaFieldsConfig = {
+ formValidators: [FieldValidator.atLeastOneFilled(['user', 'login'])],
columns: [
Object.assign(new BiaFieldConfig('user', 'member.user'), {
//isRequired: true,
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/members/services/member.service.ts b/Angular/src/app/shared/bia-shared/feature-templates/members/services/member.service.ts
index c282c6c21..e6f24ec78 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/members/services/member.service.ts
+++ b/Angular/src/app/shared/bia-shared/feature-templates/members/services/member.service.ts
@@ -73,6 +73,11 @@ export class MemberService extends CrudItemService {
(crudItem.teamId = this.getParentIds()[0]),
this.store.dispatch(FeatureMembersActions.create({ member: crudItem }));
}
+ public save(crudItems: Member[]) {
+ // TODO after creation of CRUD Member : map parent Key on the corresponding field
+ crudItems.map(x => (x.teamId = this.getParentIds()[0])),
+ this.store.dispatch(FeatureMembersActions.save({ members: crudItems }));
+ }
public createMulti(membersToCreate: Members) {
// TODO after creation of CRUD Member : map parent Key on the corresponding field
(membersToCreate.teamId = this.getParentIds()[0]),
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/members/store/members-actions.ts b/Angular/src/app/shared/bia-shared/feature-templates/members/store/members-actions.ts
index 16796bb0a..6919c4519 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/members/store/members-actions.ts
+++ b/Angular/src/app/shared/bia-shared/feature-templates/members/store/members-actions.ts
@@ -30,6 +30,11 @@ export namespace FeatureMembersActions {
props<{ member: Member }>()
);
+ export const save = createAction(
+ '[' + memberCRUDConfiguration.storeKey + '] Save',
+ props<{ members: Member[] }>()
+ );
+
export const remove = createAction(
'[' + memberCRUDConfiguration.storeKey + '] Remove',
props<{ id: number }>()
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/members/store/members-effects.ts b/Angular/src/app/shared/bia-shared/feature-templates/members/store/members-effects.ts
index 44462be47..8e561f85d 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/members/store/members-effects.ts
+++ b/Angular/src/app/shared/bia-shared/feature-templates/members/store/members-effects.ts
@@ -179,6 +179,43 @@ export class MembersEffects {
)
);
+ save$ = createEffect(() =>
+ this.actions$.pipe(
+ ofType(FeatureMembersActions.save),
+ map(x => x?.members),
+ concatMap(members =>
+ of(members).pipe(
+ withLatestFrom(
+ this.store.select(FeatureMembersStore.getLastLazyLoadEvent)
+ )
+ )
+ ),
+ switchMap(([members, event]) => {
+ return this.memberDas
+ .save({
+ items: members,
+ offlineMode: memberCRUDConfiguration.useOfflineMode,
+ })
+ .pipe(
+ map(() => {
+ this.biaMessageService.showUpdateSuccess();
+ if (memberCRUDConfiguration.useSignalR) {
+ return biaSuccessWaitRefreshSignalR();
+ } else {
+ return FeatureMembersActions.loadAllByPost({
+ event: event,
+ });
+ }
+ }),
+ catchError(err => {
+ this.biaMessageService.showErrorHttpResponse(err);
+ return of(FeatureMembersActions.failure({ error: err }));
+ })
+ );
+ })
+ )
+ );
+
destroy$ = createEffect(() =>
this.actions$.pipe(
ofType(FeatureMembersActions.remove),
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/members/views/member-import/member-import.component.ts b/Angular/src/app/shared/bia-shared/feature-templates/members/views/member-import/member-import.component.ts
new file mode 100644
index 000000000..6aff4ae65
--- /dev/null
+++ b/Angular/src/app/shared/bia-shared/feature-templates/members/views/member-import/member-import.component.ts
@@ -0,0 +1,36 @@
+import { Component, Injector } from '@angular/core';
+import { CrudItemImportComponent } from 'src/app/shared/bia-shared/feature-templates/crud-items/views/crud-item-import/crud-item-import.component';
+import { Permission } from 'src/app/shared/permission';
+import { memberCRUDConfiguration } from '../../member.constants';
+import { Member } from '../../model/member';
+import { MemberService } from '../../services/member.service';
+
+@Component({
+ selector: 'bia-member-import',
+ templateUrl:
+ '../../../crud-items/views/crud-item-import/crud-item-import.component.html',
+})
+export class MemberImportComponent extends CrudItemImportComponent {
+ constructor(
+ protected injector: Injector,
+ protected memberService: MemberService
+ ) {
+ super(injector, memberService);
+ this.crudConfiguration = memberCRUDConfiguration;
+ this.setPermissions();
+ }
+
+ setPermissions() {
+ this.canEdit = this.authService.hasPermission(
+ Permission.Site_Member_Update
+ );
+ this.canDelete = this.authService.hasPermission(
+ Permission.Site_Member_Delete
+ );
+ this.canAdd = this.authService.hasPermission(Permission.Site_Member_Create);
+ }
+
+ save(toSaves: Member[]): void {
+ this.memberService.save(toSaves);
+ }
+}
diff --git a/Angular/src/app/shared/bia-shared/feature-templates/members/views/members-index/members-index.component.html b/Angular/src/app/shared/bia-shared/feature-templates/members/views/members-index/members-index.component.html
index 6ba317bde..630d3a73d 100644
--- a/Angular/src/app/shared/bia-shared/feature-templates/members/views/members-index/members-index.component.html
+++ b/Angular/src/app/shared/bia-shared/feature-templates/members/views/members-index/members-index.component.html
@@ -5,9 +5,12 @@
[parentDisplayName]="(parentDisplayItemName$ | async) ?? ''"
[canAdd]="canAdd && !crudConfiguration.useCalcMode"
[canDelete]="canDelete"
+ [canImport]="canSave && crudConfiguration.useImport"
[canExportCSV]="true"
(create)="onCreate()"
(exportCSV)="onExportCSV('member.listOf')"
+ (fullExportCSV)="onExportCSV('member.listOf', true)"
+ (import)="onImport()"
(delete)="onDelete()"
[selectedElements]="selectedCrudItems"
[showTableControllerButton]="crudConfiguration.useCompactMode ?? false"
diff --git a/Angular/src/app/shared/bia-shared/features/view/components/view-form/view-form.component.html b/Angular/src/app/shared/bia-shared/features/view/components/view-form/view-form.component.html
index 0933927b1..7f08199d8 100644
--- a/Angular/src/app/shared/bia-shared/features/view/components/view-form/view-form.component.html
+++ b/Angular/src/app/shared/bia-shared/features/view/components/view-form/view-form.component.html
@@ -22,6 +22,7 @@