mz/DiunaBI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update names part 2

Browse Source
This commit is contained in:
Michał Zieliński
2023-01-06 11:10:58 +01:00
parent fd179d82ca
commit 0daf0c582a
30 changed files with 664 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Frontend/src/app/app-routing.module.ts
View File

@@ -19,8 +19,8 @@ const routes: Routes = [
loadChildren: () => import('./modules/dashboard/dashboard.module').then(m => m.DashboardModule)
},
{
path: 'datasets',
loadChildren: () => import('./modules/data-sets/data-sets.module').then(m => m.DataSetsModule)
path: 'layers',
loadChildren: () => import('./modules/layers/layers.module').then(m => m.LayersModule)
},
]
}

2
Frontend/src/app/main-view/main-view.component.html
View File

@@ -29,7 +29,7 @@
<mat-icon class="menu-icon">dashboard</mat-icon>
Dashboard
</a>
<a mat-list-item routerLink="./datasets">
<a mat-list-item routerLink="./layers">
<mat-icon class="menu-icon">table</mat-icon>
Zbiory danych
</a>

38
Frontend/src/app/models/dataSet.model.ts → Frontend/src/app/models/layer.model.ts
View File

@@ -3,22 +3,22 @@ import { UntypedFormBuilder, Validators, UntypedFormGroup } from '@angular/forms
import { HttpClient } from '@angular/common/http';
import { environment } from 'src/environments/environment';
import { map } from 'rxjs';
import { DataRow } from './dataRow.model copy';
import { Record } from 'src/app/models/record.model';
export class DataSet extends Base {
export class Layer extends Base {
number?: Number;
source?: string;
name?: string;
dataRows: DataRow[] = [];
records: Record[] = [];
created?: string;
constructor(data: Partial<DataSet> = {}) {
constructor(data: Partial<Layer> = {}) {
super();
Object.assign(this, data);
}
override deserialize(input: any): this {
Object.assign(this, Object.assign(this, super.deserialize(input)));
if (this.dataRows) { this.dataRows = this.dataRows.map(x => new DataRow().deserialize(x)); }
if (this.records) { this.records = this.records.map(x => new Record().deserialize(x)); }
return this;
}
override serialize() {
@@ -48,15 +48,15 @@ export class DataSet extends Base {
}
loadForm(form: UntypedFormGroup) {
for (let field of Object.keys(form.controls)) {
this[field as keyof DataSet] = form.controls[field].value;
this[field as keyof Layer] = form.controls[field].value;
}
this.createdBy = undefined;
this.modifiedBy = undefined;
}
//API Actions
static add(input: DataSet, _http: HttpClient): Promise<string> {
static add(input: Layer, _http: HttpClient): Promise<string> {
return new Promise((resolve, reject) => {
_http.post<string>(`${environment.api.url}/datasets`, { ...input.serialize(), }).subscribe({
_http.post<string>(`${environment.api.url}/layers`, { ...input.serialize(), }).subscribe({
next: (data) => resolve(data),
error: (e) => reject(e)
}
@@ -65,28 +65,28 @@ export class DataSet extends Base {
}
static getList(_http: HttpClient): any {
return new Promise((resolve, reject) => {
_http.get<DataSet[]>(`${environment.api.url}/datasets`)
.pipe(map(data => data.map(x => new DataSet().deserialize(x))))
_http.get<Layer[]>(`${environment.api.url}/layers`)
.pipe(map(data => data.map(x => new Layer().deserialize(x))))
.subscribe({
next: (data) => resolve(data),
error: (e) => reject(e)
})
});
}
static getById(id: string, _http: HttpClient): Promise<DataSet> {
static getById(id: string, _http: HttpClient): Promise<Layer> {
return new Promise((resolve, reject) => {
_http.get<DataSet>(`${environment.api.url}/datasets/${id}`).pipe(map(x => new DataSet().deserialize(x))).subscribe({
_http.get<Layer>(`${environment.api.url}/layers/${id}`).pipe(map(x => new Layer().deserialize(x))).subscribe({
next: (data) => resolve(data),
error: (e) => reject(e)
})
});
}
static parseFile(file: any, _http: HttpClient): Promise<DataRow[]> {
static parseFile(file: any, _http: HttpClient): Promise<Layer[]> {
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))))
_http.post<Layer[]>(`${environment.api.url}/layers/parseFile`, formData,
).pipe(map(data => data.map(x => new Layer().deserialize(x))))
.subscribe({
next: (data) => {
resolve(data);
@@ -95,10 +95,10 @@ export class DataSet extends Base {
})
})
}
static parseGoogleSheet(sheetId: string, _http: HttpClient): Promise<DataSet> {
static parseGoogleSheet(sheetId: string, _http: HttpClient): Promise<Layer> {
return new Promise((resolve, reject) => {
_http.get<DataSet>(`${environment.api.url}/datasets/parseGoogleSheet/${sheetId}`,
).pipe(map(data => new DataSet().deserialize(data)))
_http.get<Layer>(`${environment.api.url}/layers/parseGoogleSheet/${sheetId}`,
).pipe(map(data => new Layer().deserialize(data)))
.subscribe({
next: (data) => {
resolve(data);
@@ -109,7 +109,7 @@ export class DataSet extends Base {
}
static exportToGoogleSheet(id: string, _http: HttpClient): Promise<boolean> {
return new Promise((resolve, reject) => {
_http.get<boolean>(`${environment.api.url}/datasets/exportToGoogleSheet/${id}`,
_http.get<boolean>(`${environment.api.url}/layers/exportToGoogleSheet/${id}`,
).subscribe({
next: (data) => {
resolve(data);

4
Frontend/src/app/models/dataRow.model copy.ts → Frontend/src/app/models/record.model.ts
View File

@@ -5,7 +5,7 @@ import { environment } from 'src/environments/environment';
import { DataService } from '../services/data.service';
import { map } from 'rxjs';
export class DataRow extends Base {
export class Record extends Base {
code?: string;
value?: number;
desc1?: string;
@@ -14,7 +14,7 @@ export class DataRow extends Base {
desc4?: string;
desc5?: string;
constructor(data: Partial<DataRow> = {}) {
constructor(data: Partial<Record> = {}) {
super();
Object.assign(this, data);
}

2
Frontend/src/app/modules/dashboard/board/board.component.ts
View File

@@ -6,7 +6,7 @@ import { environment } from 'src/environments/environment';
@Component({
selector: 'b-crm-board',
selector: 'diunaBI-board',
templateUrl: './board.component.html',
styleUrls: ['./board.component.scss']
})

23
Frontend/src/app/modules/data-sets/data-set-detail/data-set-detail.component.spec.ts
View File

@@ -1,23 +0,0 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { DataSetDetailComponent } from './data-set-detail.component';
describe('DataSetDetailComponent', () => {
let component: DataSetDetailComponent;
let fixture: ComponentFixture<DataSetDetailComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ DataSetDetailComponent ]
})
.compileComponents();
fixture = TestBed.createComponent(DataSetDetailComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

23
Frontend/src/app/modules/data-sets/data-set-edit/data-set-edit.component.spec.ts
View File

@@ -1,23 +0,0 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { DataSetEditComponent } from './data-set-edit.component';
describe('DataSetEditComponent', () => {
let component: DataSetEditComponent;
let fixture: ComponentFixture<DataSetEditComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ DataSetEditComponent ]
})
.compileComponents();
fixture = TestBed.createComponent(DataSetEditComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

23
Frontend/src/app/modules/data-sets/data-sets-list/data-sets-list.component.spec.ts
View File

@@ -1,23 +0,0 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { DataSetsListComponent } from './data-sets-list.component';
describe('DataSetsListComponent', () => {
let component: DataSetsListComponent;
let fixture: ComponentFixture<DataSetsListComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ DataSetsListComponent ]
})
.compileComponents();
fixture = TestBed.createComponent(DataSetsListComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

17
Frontend/src/app/modules/data-sets/data-sets-routing.module.ts
View File

@@ -1,17 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { DataSetDetailComponent } from './data-set-detail/data-set-detail.component';
import { DataSetEditComponent } from './data-set-edit/data-set-edit.component';
import { DataSetsListComponent } from './data-sets-list/data-sets-list.component';
const routes: Routes = [
{ path: '', component: DataSetsListComponent },
{ path: 'Edit/:id', component: DataSetEditComponent },
{ path: 'Detail/:id', component: DataSetDetailComponent }
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class DataSetsRoutingModule { }

27
Frontend/src/app/modules/data-sets/data-sets.module.ts
View File

@@ -1,27 +0,0 @@
import { NgModule } from '@angular/core';
import { CommonModule, DatePipe } from '@angular/common';
import { DataSetsRoutingModule } from './data-sets-routing.module';
import { DataSetsListComponent } from './data-sets-list/data-sets-list.component';
import { MaterialModule } from 'src/app/material.module';
import { DataSetDetailComponent } from './data-set-detail/data-set-detail.component';
import { DataSetEditComponent } from './data-set-edit/data-set-edit.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@NgModule({
declarations: [
DataSetsListComponent,
DataSetDetailComponent,
DataSetEditComponent
],
imports: [
CommonModule,
DataSetsRoutingModule,
MaterialModule,
FormsModule,
ReactiveFormsModule
],
providers: [
DatePipe
]
})
export class DataSetsModule { }

0
Frontend/src/app/modules/data-sets/data-set-detail/data-set-detail.component.html → Frontend/src/app/modules/layers/layer-detail/layer-detail.component.html
View File

0
Frontend/src/app/modules/data-sets/data-set-detail/data-set-detail.component.scss → Frontend/src/app/modules/layers/layer-detail/layer-detail.component.scss
View File

32
Frontend/src/app/modules/data-sets/data-set-detail/data-set-detail.component.ts → Frontend/src/app/modules/layers/layer-detail/layer-detail.component.ts
View File

@@ -1,5 +1,4 @@
import { DataSource } from '@angular/cdk/collections';
import { DatePipe, DecimalPipe } from '@angular/common';
import { DatePipe } from '@angular/common';
import { HttpClient } from '@angular/common/http';
import { Component, ViewChild } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
@@ -8,23 +7,22 @@ import { MatSnackBar } from '@angular/material/snack-bar';
import { MatSort, MatSortable } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { Router, ActivatedRoute } from '@angular/router';
import moment from 'moment';
import { AuthService } from 'src/app/auth/auth.service';
import { DataRow } from 'src/app/models/dataRow.model copy';
import { DataSet } from 'src/app/models/dataSet.model';
import { Layer } from 'src/app/models/layer.model';
import { Record } from 'src/app/models/record.model';
@Component({
selector: 'app-data-set-detail',
templateUrl: './data-set-detail.component.html',
styleUrls: ['./data-set-detail.component.scss']
selector: 'diunaBI-layer-detail',
templateUrl: './layer-detail.component.html',
styleUrls: ['./layer-detail.component.scss']
})
export class DataSetDetailComponent {
export class LayerDetailComponent {
public form!: UntypedFormGroup;
public document!: DataSet;
public document!: Layer;
displayedColumns = ['code', 'value'];
dataSource!: MatTableDataSource<DataRow>;
dataSource!: MatTableDataSource<Record>;
@ViewChild(MatPaginator) paginator!: MatPaginator;
@ViewChild(MatSort) sort!: MatSort;
@@ -40,9 +38,9 @@ export class DataSetDetailComponent {
) { }
async ngOnInit() {
this.form = DataSet.getForm(this.fb$);
this.form = Layer.getForm(this.fb$);
this.document = await this.load();
this.dataSource = new MatTableDataSource<DataRow>(this.document.dataRows);
this.dataSource = new MatTableDataSource<Record>(this.document.records);
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
this.document.fillForm(this.form);
@@ -50,14 +48,14 @@ export class DataSetDetailComponent {
this.document.created = `${this.datePipe.transform(this.document.createdAt?.toDate(), 'short')}, ${this.document.createdBy?.userName}`;
this.dataSource.sort.sort({ id: 'code', start: 'desc' } as MatSortable);
}
private async load(): Promise<DataSet> {
return await DataSet.getById(this.route$.snapshot.paramMap.get('id') || "", this.http$);
private async load(): Promise<Layer> {
return await Layer.getById(this.route$.snapshot.paramMap.get('id') || "", this.http$);
}
trackByUid(index : number, item : DataRow) {
trackByUid(index : number, item : Record) {
return item.id;
}
async export() {
if (await DataSet.exportToGoogleSheet(this.document.id || "", this.http$)) {
if (await Layer.exportToGoogleSheet(this.document.id || "", this.http$)) {
this.snackBar.open("Plik został zapisany na dysku Google", "OK");
} else {
this.snackBar.open("Zapis się nie udał.", "OK");

0
Frontend/src/app/modules/data-sets/data-set-edit/data-set-edit.component.html → Frontend/src/app/modules/layers/layer-edit/layer-edit.component.html
View File

0
Frontend/src/app/modules/data-sets/data-set-edit/data-set-edit.component.scss → Frontend/src/app/modules/layers/layer-edit/layer-edit.component.scss
View File

33
Frontend/src/app/modules/data-sets/data-set-edit/data-set-edit.component.ts → Frontend/src/app/modules/layers/layer-edit/layer-edit.component.ts
View File

@@ -8,23 +8,22 @@ import { MatTableDataSource } from '@angular/material/table';
import { Router, ActivatedRoute } from '@angular/router';
import moment from 'moment';
import { AuthService } from 'src/app/auth/auth.service';
import { DataRow } from 'src/app/models/dataRow.model copy';
import { DataSet } from 'src/app/models/dataSet.model';
import { DataService } from 'src/app/services/data.service';
import { Layer } from 'src/app/models/layer.model';
import { Record } from 'src/app/models/record.model';
import { v4 as uuidv4 } from 'uuid';
@Component({
selector: 'app-data-set-edit',
templateUrl: './data-set-edit.component.html',
styleUrls: ['./data-set-edit.component.scss']
selector: 'diunaBI-layer-edit',
templateUrl: './layer-edit.component.html',
styleUrls: ['./layer-edit.component.scss']
})
export class DataSetEditComponent implements OnInit {
export class LayerEditComponent implements OnInit {
public form!: UntypedFormGroup;
private document!: DataSet;
private document!: Layer;
displayedColumns = ['code', 'value', 'desc1'];
dataSource!: MatTableDataSource<DataRow>;
dataSource!: MatTableDataSource<Record>;
@ViewChild(MatPaginator) paginator!: MatPaginator;
@ViewChild(MatSort) sort!: MatSort;
@@ -38,8 +37,8 @@ export class DataSetEditComponent implements OnInit {
) { }
async ngOnInit() {
this.form = DataSet.getForm(this.fb$);
this.document = new DataSet({
this.form = Layer.getForm(this.fb$);
this.document = new Layer({
id: uuidv4(), createdById: this.auth$.user.id, createdAt: moment(),
modifiedAt: moment()
})
@@ -50,24 +49,24 @@ export class DataSetEditComponent implements OnInit {
return;
}
this.document.loadForm(this.form);
const id = await DataSet.add(this.document, this.http$);
const id = await Layer.add(this.document, this.http$);
this.router$.navigate(['../../Detail', id], { relativeTo: this.route$ });
}
async onFileSelected(event: any) {
const file = event.target.files[0];
this.document.dataRows = await DataSet.parseFile(file, this.http$);
this.dataSource = new MatTableDataSource(this.document.dataRows);
this.document.records = await Layer.parseFile(file, this.http$);
this.dataSource = new MatTableDataSource(this.document.records);
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
}
trackByUid(index: number, item: DataRow) {
trackByUid(index: number, item: Record) {
return item.id;
}
async parseGoogleSheet() {
const id = this.form.get('sheetId')?.value;
this.document = await DataSet.parseGoogleSheet(id, this.http$);
this.document = await Layer.parseGoogleSheet(id, this.http$);
this.document.fillForm(this.form);
this.dataSource = new MatTableDataSource(this.document.dataRows);
this.dataSource = new MatTableDataSource(this.document.records);
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
}

0
Frontend/src/app/modules/data-sets/data-sets-list/data-sets-list.component.html → Frontend/src/app/modules/layers/layers-list/layers-list.component.html
View File

0
Frontend/src/app/modules/data-sets/data-sets-list/data-sets-list.component.scss → Frontend/src/app/modules/layers/layers-list/layers-list.component.scss
View File

20
Frontend/src/app/modules/data-sets/data-sets-list/data-sets-list.component.ts → Frontend/src/app/modules/layers/layers-list/layers-list.component.ts
View File

@@ -3,28 +3,26 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort, MatSortable } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { DataSet } from 'src/app/models/dataSet.model';
import { Layer } from 'src/app/models/layer.model';
@Component({
selector: 'app-data-sets-list',
templateUrl: './data-sets-list.component.html',
styleUrls: ['./data-sets-list.component.scss']
selector: 'diunaBI-layers-list',
templateUrl: './layers-list.component.html',
styleUrls: ['./layers-list.component.scss']
})
export class DataSetsListComponent implements OnInit {
export class LayersListComponent implements OnInit {
displayedColumns = ['number', 'name', 'source'];
dataSource!: MatTableDataSource<DataSet>;
dataSource!: MatTableDataSource<Layer>;
@ViewChild(MatPaginator) paginator!: MatPaginator;
@ViewChild(MatSort) sort!: MatSort;
constructor(
private _http: HttpClient
) {
console.log(Intl.DateTimeFormat().resolvedOptions().timeZone);
}
) { }
async ngOnInit() {
this.dataSource = new MatTableDataSource(await DataSet.getList(this._http));
this.dataSource = new MatTableDataSource(await Layer.getList(this._http));
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
this.dataSource.sort.sort({ id: 'number', start: 'desc' } as MatSortable);
@@ -34,7 +32,7 @@ export class DataSetsListComponent implements OnInit {
const filterValue = (event.target as HTMLInputElement).value;
this.dataSource.filter = filterValue.trim().toLowerCase();
}
trackByUid(index : number, item : DataSet) {
trackByUid(index : number, item : Layer) {
return item.id;
}
}

17
Frontend/src/app/modules/layers/layers-routing.module.ts Normal file
View File

@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { LayerDetailComponent } from './layer-detail/layer-detail.component';
import { LayerEditComponent } from './layer-edit/layer-edit.component';
import { LayersListComponent } from './layers-list/layers-list.component';
const routes: Routes = [
{ path: '', component: LayersListComponent },
{ path: 'Edit/:id', component: LayerEditComponent },
{ path: 'Detail/:id', component: LayerDetailComponent }
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class LayersRoutingModule { }

27
Frontend/src/app/modules/layers/layers.module.ts Normal file
View File

@@ -0,0 +1,27 @@
import { NgModule } from '@angular/core';
import { CommonModule, DatePipe } from '@angular/common';
import { MaterialModule } from 'src/app/material.module';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { LayersListComponent } from './layers-list/layers-list.component';
import { LayerEditComponent } from './layer-edit/layer-edit.component';
import { LayerDetailComponent } from './layer-detail/layer-detail.component';
import { LayersRoutingModule } from './layers-routing.module';
@NgModule({
declarations: [
LayersListComponent,
LayerEditComponent,
LayerDetailComponent
],
imports: [
CommonModule,
LayersRoutingModule,
MaterialModule,
FormsModule,
ReactiveFormsModule
],
providers: [
DatePipe
]
})
export class LayersModule { }

4
Frontend/src/environments/environment.ts
View File

@@ -5,8 +5,8 @@
export const environment = {
production: false,
api: {
//url: "http://localhost:5400/api"
url: "https://diunabi.bim-it.pl/api"
url: "http://localhost:5400/api"
//url: "https://diunabi.bim-it.pl/api"
},
google: {
clientId: "107631825312-bkfe438ehr9k9ecb2h76g802tj6advma.apps.googleusercontent.com"