Login fix and rename columns in DB

This commit is contained in:
2022-12-19 18:36:57 +01:00
parent 120abcaf1d
commit db13b1ab1b
18 changed files with 480 additions and 56 deletions

View File

@@ -2,12 +2,12 @@ import { Base } from './base.model';
import { UntypedFormBuilder, Validators, UntypedFormGroup } from '@angular/forms';
import { HttpClient } from '@angular/common/http';
import { environment } from 'src/environments/environment';
import { DataService } from '../services/data.service';
import { map } from 'rxjs';
import { DataRow } from './dataRow.model copy';
export class DataSet extends Base {
number?: string;
number?: Number;
source?: string;
name?: string;
dataRows: DataRow[] = [];
@@ -22,8 +22,8 @@ export class DataSet extends Base {
static getForm(fb: UntypedFormBuilder) {
return fb.group({
id: [null],
number: ['', Validators.required],
name: ['', Validators.required],
source: ['', Validators.required],
createdAt: '',
modifiedAt: '',
createdBy: '',
@@ -84,6 +84,20 @@ export class DataSet extends Base {
})
});
}
static parseFile(file: any, _http: HttpClient): Promise<DataRow[]> {
const formData = new FormData();
formData.append(file.name, file);
return new Promise((resolve, reject) => {
_http.post<DataRow[]>(`${environment.api.url}/datasets/parseFile`, formData,
).pipe(map(data => data.map(x => new DataRow().deserialize(x))))
.subscribe({
next: (data) => {
resolve(data);
},
error: (e) => reject(e)
})
})
}
/*
static delete(id: string, _http: HttpClient): Promise<string> {
return new Promise((resolve, reject)=> {