diff --git a/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.html b/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.html
index 766a3cb..07e4e99 100644
--- a/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.html
+++ b/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.html
@@ -45,8 +45,6 @@
-
-
diff --git a/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.ts b/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.ts
index 589c498..d8000fc 100644
--- a/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.ts
+++ b/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.ts
@@ -24,7 +24,6 @@ export class LayerDetailComponent implements OnInit {
displayedColumns = ['code', 'value'];
dataSource!: MatTableDataSource;
- @ViewChild(MatPaginator) paginator!: MatPaginator;
@ViewChild(MatSort) sort!: MatSort;
constructor(
@@ -41,7 +40,6 @@ export class LayerDetailComponent implements OnInit {
this.form = Layer.getForm(this.fb$);
this.document = await this.load();
this.dataSource = new MatTableDataSource(this.document.records);
- this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
this.document.fillForm(this.form);
this.form.disable();
diff --git a/Frontend/src/app/modules/layers/layer-edit/layer-edit.component.html b/Frontend/src/app/modules/layers/layer-edit/layer-edit.component.html
index c4be0c6..974269a 100644
--- a/Frontend/src/app/modules/layers/layer-edit/layer-edit.component.html
+++ b/Frontend/src/app/modules/layers/layer-edit/layer-edit.component.html
@@ -71,8 +71,6 @@
-
-
diff --git a/Frontend/src/app/modules/layers/layer-edit/layer-edit.component.ts b/Frontend/src/app/modules/layers/layer-edit/layer-edit.component.ts
index 8445f27..24896a0 100644
--- a/Frontend/src/app/modules/layers/layer-edit/layer-edit.component.ts
+++ b/Frontend/src/app/modules/layers/layer-edit/layer-edit.component.ts
@@ -24,7 +24,6 @@ export class LayerEditComponent implements OnInit {
displayedColumns = ['code', 'value', 'desc1'];
dataSource!: MatTableDataSource;
- @ViewChild(MatPaginator) paginator!: MatPaginator;
@ViewChild(MatSort) sort!: MatSort;
constructor(
@@ -57,7 +56,6 @@ export class LayerEditComponent implements OnInit {
const file = input.files[0];
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: Record) {
@@ -68,7 +66,6 @@ export class LayerEditComponent implements OnInit {
this.document = await Layer.parseGoogleSheet(id, this.http$);
this.document.fillForm(this.form);
this.dataSource = new MatTableDataSource(this.document.records);
- this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
}
}
diff --git a/Frontend/src/app/modules/layers/layers-list/layers-list.component.html b/Frontend/src/app/modules/layers/layers-list/layers-list.component.html
index a14a79c..2ad5614 100644
--- a/Frontend/src/app/modules/layers/layers-list/layers-list.component.html
+++ b/Frontend/src/app/modules/layers/layers-list/layers-list.component.html
@@ -2,11 +2,9 @@
\ No newline at end of file
diff --git a/WebAPI/Controllers/LayersController.cs b/WebAPI/Controllers/LayersController.cs
index f595dc1..e058a98 100644
--- a/WebAPI/Controllers/LayersController.cs
+++ b/WebAPI/Controllers/LayersController.cs
@@ -85,8 +85,17 @@ namespace WebAPI.Controllers
public IActionResult ParseGoogleSheet(string sheetId)
{
+ string sheetName = "KOSZTY";
+
+ Layer layer = new Layer();
+ layer.Source = "GoogleSheet";
+ layer.Number = db.Layers.Count() + 1;
var parser = new googleSheetParser(googleSheetValues);
- return Ok(parser.parse(sheetId));
+ dynamic parsedSheet = parser.parse(sheetId);
+ layer.Records = parsedSheet.records;
+ layer.Name = $"W{layer.Number}-I-{sheetName}-{parsedSheet.date}-{DateTime.Now.ToString("yyyyMMddHHmm")}";
+
+ return Ok(layer);
}
[HttpPost]
[DisableRequestSizeLimit]