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

Before refactor

Browse Source
This commit is contained in:
Michał Zieliński
2024-03-08 15:56:35 +01:00
parent 7dbc81a3df
commit f9c1a8a8ad
8 changed files with 95 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
WebAPI/Controllers/LayersController.cs
View File

@@ -152,6 +152,7 @@ namespace WebAPI.Controllers
.Where(x =>
x.Records!.Any(x => x.Code == "Type" && x.Desc1 == "ImportWorker") &&
x.Records!.Any(x => x.Code == "IsEnabled" && x.Desc1 == "True")
&& x.Number == 539
)
.OrderBy(x => x.CreatedAt)
.ToList();
@@ -184,7 +185,7 @@ namespace WebAPI.Controllers
}
var startDateParsed = DateTime.ParseExact(startDate!, "yyyy.MM.dd", null);
var endDateParsed = DateTime.ParseExact(endDate!, "yyyy.MM.dd", null);
if (startDateParsed.Date <= DateTime.UtcNow.Date && endDateParsed.Date >= DateTime.UtcNow.Date)
if (startDateParsed.Date <= DateTime.UtcNow.Date && endDateParsed.Date >= DateTime.UtcNow.Date || true)
{
MorskaImporter importer = new MorskaImporter(db, googleSheetValues, this);
importer.import(importWorker);
@@ -259,6 +260,7 @@ namespace WebAPI.Controllers
x.Records!.Any(x => x.Code == "Type" && x.Desc1 == "ProcessWorker") &&
x.Records!.Any(x => x.Code == "IsEnabled" && x.Desc1 == "True") &&
x.Records!.Any(x => x.Code == "ProcessType" && x.Desc1 == type)
&& x.Number == 800
)
.OrderBy(x => x.CreatedAt)
.ToList();
@@ -279,7 +281,7 @@ namespace WebAPI.Controllers
{
try
{
ProcessLayer(processWorker);
ProcessLayer(processWorker, true);
}
catch (Exception e)
{

64
WebAPI/Models/Record.cs
View File

@@ -1,15 +1,15 @@
using System.ComponentModel.DataAnnotations;
namespace WebAPI.Models
{
public class Record
{
#region Properties
[Key]
public Guid Id { get; set; }
[Required]
public string? Code { get; set; }
public float? Value1 { get; set; }
using System.ComponentModel.DataAnnotations;
namespace WebAPI.Models
{
public class Record
{
#region Properties
[Key]
public Guid Id { get; set; }
[Required]
public string? Code { get; set; }
public float? Value1 { get; set; }
public float? Value2 { get; set; }
public float? Value3 { get; set; }
public float? Value4 { get; set; }
@@ -42,23 +42,23 @@ namespace WebAPI.Models
public float? Value31 { get; set; }
public float? Value32 { get; set; }
//Description fields
public string? Desc1 { get; set; }
public string? Desc2 { get; set; }
public string? Desc3 { get; set; }
public string? Desc4 { get; set; }
public string? Desc5 { get; set; }
public DateTime CreatedAt { get; set; }
public DateTime ModifiedAt { get; set; }
public bool IsDeleted { get; set; }
#endregion
#region Relations
[Required]
public Guid CreatedById { get; set; }
public User? CreatedBy { get; set; }
[Required]
public Guid ModifiedById { get; set; }
public User? ModifiedBy { get; set; }
public Guid LayerId { get; set; }
#endregion
}
}
public string? Desc1 { get; set; }
public string? Desc2 { get; set; }
public string? Desc3 { get; set; }
public string? Desc4 { get; set; }
public string? Desc5 { get; set; }
public DateTime CreatedAt { get; set; }
public DateTime ModifiedAt { get; set; }
public bool IsDeleted { get; set; }
#endregion
#region Relations
[Required]
public Guid CreatedById { get; set; }
public User? CreatedBy { get; set; }
[Required]
public Guid ModifiedById { get; set; }
public User? ModifiedBy { get; set; }
public Guid LayerId { get; set; }
#endregion
}
}

8
WebAPI/dataImporters/morska.importer.cs
View File

@@ -99,6 +99,8 @@ namespace DiunaBIWebAPI.dataImporters
for (int i = 0; i < data[1].Count; i++)
{
float value;
double test;
double.TryParse(data[1][5].ToString(), CultureInfo.GetCultureInfo("pl-PL"), out test);
if (
data[0][i].ToString()?.Length > 0 &&
float.TryParse(data[1][i].ToString(), CultureInfo.GetCultureInfo("pl-PL"), out value))
@@ -115,9 +117,9 @@ namespace DiunaBIWebAPI.dataImporters
};
}
db.Layers.Add(layer);
controller.SaveRecords(layer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
db.SaveChanges();
//db.Layers.Add(layer);
//controller.SaveRecords(layer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
//db.SaveChanges();
}
}
}

2
WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodes.processor.cs
View File

@@ -258,7 +258,7 @@ namespace WebAPI.dataProcessors
{
Values = new List<IList<object>> { marchValues }
};
SpreadsheetsResource.ValuesResource.UpdateRequest updateMarch = googleSheetValues.Update(marchValueRange, sheetId, $"{sheetName}!C14:CH1");
SpreadsheetsResource.ValuesResource.UpdateRequest updateMarch = googleSheetValues.Update(marchValueRange, sheetId, $"{sheetName}!C14:CH14");
updateMarch.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateMarch.Execute();
}