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

Records: float => double

Browse Source
This commit is contained in:
Michał Zieliński
2024-03-09 08:53:47 +01:00
parent f9c1a8a8ad
commit fbcb46046e
7 changed files with 58 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
WebAPI/Models/Record.cs
View File

@@ -9,38 +9,38 @@ namespace WebAPI.Models
public Guid Id { get; set; } public Guid Id { get; set; }
[Required] [Required]
public string? Code { get; set; } public string? Code { get; set; }
public float? Value1 { get; set; } public double? Value1 { get; set; }
public float? Value2 { get; set; } public double? Value2 { get; set; }
public float? Value3 { get; set; } public double? Value3 { get; set; }
public float? Value4 { get; set; } public double? Value4 { get; set; }
public float? Value5 { get; set; } public double? Value5 { get; set; }
public float? Value6 { get; set; } public double? Value6 { get; set; }
public float? Value7 { get; set; } public double? Value7 { get; set; }
public float? Value8 { get; set; } public double? Value8 { get; set; }
public float? Value9 { get; set; } public double? Value9 { get; set; }
public float? Value10 { get; set; } public double? Value10 { get; set; }
public float? Value11 { get; set; } public double? Value11 { get; set; }
public float? Value12 { get; set; } public double? Value12 { get; set; }
public float? Value13 { get; set; } public double? Value13 { get; set; }
public float? Value14 { get; set; } public double? Value14 { get; set; }
public float? Value15 { get; set; } public double? Value15 { get; set; }
public float? Value16 { get; set; } public double? Value16 { get; set; }
public float? Value17 { get; set; } public double? Value17 { get; set; }
public float? Value18 { get; set; } public double? Value18 { get; set; }
public float? Value19 { get; set; } public double? Value19 { get; set; }
public float? Value20 { get; set; } public double? Value20 { get; set; }
public float? Value21 { get; set; } public double? Value21 { get; set; }
public float? Value22 { get; set; } public double? Value22 { get; set; }
public float? Value23 { get; set; } public double? Value23 { get; set; }
public float? Value24 { get; set; } public double? Value24 { get; set; }
public float? Value25 { get; set; } public double? Value25 { get; set; }
public float? Value26 { get; set; } public double? Value26 { get; set; }
public float? Value27 { get; set; } public double? Value27 { get; set; }
public float? Value28 { get; set; } public double? Value28 { get; set; }
public float? Value29 { get; set; } public double? Value29 { get; set; }
public float? Value30 { get; set; } public double? Value30 { get; set; }
public float? Value31 { get; set; } public double? Value31 { get; set; }
public float? Value32 { get; set; } public double? Value32 { get; set; }
//Description fields //Description fields
public string? Desc1 { get; set; } public string? Desc1 { get; set; }
public string? Desc2 { get; set; } public string? Desc2 { get; set; }

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

@@ -98,12 +98,10 @@ namespace DiunaBIWebAPI.dataImporters
var data = dataRangeResponse.Values; var data = dataRangeResponse.Values;
for (int i = 0; i < data[1].Count; i++) for (int i = 0; i < data[1].Count; i++)
{ {
float value; double value;
double test;
double.TryParse(data[1][5].ToString(), CultureInfo.GetCultureInfo("pl-PL"), out test);
if ( if (
data[0][i].ToString()?.Length > 0 && data[0][i].ToString()?.Length > 0 &&
float.TryParse(data[1][i].ToString(), CultureInfo.GetCultureInfo("pl-PL"), out value)) double.TryParse(data[1][i].ToString(), CultureInfo.GetCultureInfo("pl-PL"), out value))
{ {
Record record = new Record Record record = new Record
{ {

2
WebAPI/dataParsers/csv.parser.cs
View File

@@ -31,7 +31,7 @@ namespace WebAPI.dataParsers
for (int j = 1; j < data.Count; j++) { for (int j = 1; j < data.Count; j++) {
if (data[j][0].Length > 0) if (data[j][0].Length > 0)
{ {
float value = float.Parse(data[j][i], CultureInfo.GetCultureInfo("pl-PL")); double value = double.Parse(data[j][i], CultureInfo.GetCultureInfo("pl-PL"));
if (value > 0) if (value > 0)
{ {
Record record = new Record(); Record record = new Record();

4
WebAPI/dataParsers/morskaK5.parser.cs
View File

@@ -39,11 +39,11 @@ namespace WebAPI.dataParsers
for (int i = 1; i < data[1].Count; i++) for (int i = 1; i < data[1].Count; i++)
{ {
float value; double value;
if ( if (
data[1][i].ToString()?.Length > 0 && data[1][i].ToString()?.Length > 0 &&
float.TryParse(data[2][i].ToString(), CultureInfo.GetCultureInfo("pl-PL"), out value)) double.TryParse(data[2][i].ToString(), CultureInfo.GetCultureInfo("pl-PL"), out value))
{ {
Record record = new Record(); Record record = new Record();
record.Id = Guid.NewGuid(); record.Id = Guid.NewGuid();

6
WebAPI/dataProcessors/ProcessHelper.cs
View File

@@ -5,9 +5,9 @@ namespace DiunaBIWebAPI.dataProcessors
{ {
public static class ProcessHelper public static class ProcessHelper
{ {
public static void setValue(Record record, int number, float? value) public static void setValue(Record record, int number, double? value)
{ {
value = (float)Math.Round((decimal)(value ?? 0), 2); value = (double)Math.Round((decimal)(value ?? 0), 2);
switch (number) switch (number)
{ {
case 1: case 1:
@@ -108,7 +108,7 @@ namespace DiunaBIWebAPI.dataProcessors
break; break;
} }
} }
public static float? getValue(Record record, int number) public static double? getValue(Record record, int number)
{ {
switch (number) switch (number)
{ {

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

@@ -169,7 +169,7 @@ namespace WebAPI.dataProcessors
Record? decemberRecord = december!.Records?.SingleOrDefault(x => x.Code == code); Record? decemberRecord = december!.Records?.SingleOrDefault(x => x.Code == code);
if (novemberRecord != null) if (novemberRecord != null)
{ {
float? novemberValue = ProcessHelper.getValue(novemberRecord, 32); double? novemberValue = ProcessHelper.getValue(novemberRecord, 32);
novemberValues.Add(novemberValue!.Value); novemberValues.Add(novemberValue!.Value);
} }
else else
@@ -178,7 +178,7 @@ namespace WebAPI.dataProcessors
} }
if (decemberRecord != null) if (decemberRecord != null)
{ {
float? decemberValue = ProcessHelper.getValue(decemberRecord, 32); double? decemberValue = ProcessHelper.getValue(decemberRecord, 32);
decemberValues.Add(decemberValue!.Value); decemberValues.Add(decemberValue!.Value);
} }
else else
@@ -211,7 +211,7 @@ namespace WebAPI.dataProcessors
Record? marchRecord = march!.Records?.SingleOrDefault(x => x.Code == code); Record? marchRecord = march!.Records?.SingleOrDefault(x => x.Code == code);
if (januaryRecord != null) if (januaryRecord != null)
{ {
float? januaryValue = ProcessHelper.getValue(januaryRecord, 32); double? januaryValue = ProcessHelper.getValue(januaryRecord, 32);
januaryValues.Add(januaryValue!.Value); januaryValues.Add(januaryValue!.Value);
} }
else else
@@ -220,7 +220,7 @@ namespace WebAPI.dataProcessors
} }
if (februaryRecord != null) if (februaryRecord != null)
{ {
float? februaryValue = ProcessHelper.getValue(februaryRecord, 32); double? februaryValue = ProcessHelper.getValue(februaryRecord, 32);
februaryValues.Add(februaryValue!.Value); februaryValues.Add(februaryValue!.Value);
} }
else else
@@ -229,7 +229,7 @@ namespace WebAPI.dataProcessors
} }
if (marchRecord != null) if (marchRecord != null)
{ {
float? marchValue = ProcessHelper.getValue(marchRecord, 32); double? marchValue = ProcessHelper.getValue(marchRecord, 32);
marchValues.Add(marchValue!.Value); marchValues.Add(marchValue!.Value);
} }
else else

12
WebAPI/dataProcessors/t3.SingleSource.processor.cs
View File

@@ -102,9 +102,9 @@ namespace WebAPI.dataProcessors
}; };
int lastDayInMonth = DateTime.DaysInMonth(year, month); int lastDayInMonth = DateTime.DaysInMonth(year, month);
float previousValue = 0; double previousValue = 0;
//day 1 //day 1
float firstVal = codeRecords double firstVal = codeRecords
.Where(x => x.CreatedAt.Date <= new DateTime(year, month, 1)) .Where(x => x.CreatedAt.Date <= new DateTime(year, month, 1))
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault()?.Value1 ?? 0; .FirstOrDefault()?.Value1 ?? 0;
@@ -113,7 +113,7 @@ namespace WebAPI.dataProcessors
//days 2-29/30 //days 2-29/30
for (int i=2; i<lastDayInMonth; i++) for (int i=2; i<lastDayInMonth; i++)
{ {
float? dayVal = codeRecords double? dayVal = codeRecords
.Where(x => x.CreatedAt.Day == i && x.CreatedAt.Month == month) .Where(x => x.CreatedAt.Day == i && x.CreatedAt.Month == month)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault()?.Value1; .FirstOrDefault()?.Value1;
@@ -123,13 +123,13 @@ namespace WebAPI.dataProcessors
ProcessHelper.setValue(processedRecord, i, 0); ProcessHelper.setValue(processedRecord, i, 0);
} else } else
{ {
float processedVal = (dayVal ?? 0) - previousValue; double processedVal = (dayVal ?? 0) - previousValue;
ProcessHelper.setValue(processedRecord, i, processedVal); ProcessHelper.setValue(processedRecord, i, processedVal);
previousValue = dayVal ?? 0; previousValue = dayVal ?? 0;
} }
} }
//last day //last day
float? lastVal = codeRecords double? lastVal = codeRecords
.Where(x => x.CreatedAt.Date >= new DateTime(year, month, lastDayInMonth)) .Where(x => x.CreatedAt.Date >= new DateTime(year, month, lastDayInMonth))
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault()?.Value1; .FirstOrDefault()?.Value1;
@@ -143,7 +143,7 @@ namespace WebAPI.dataProcessors
} }
// copy last value // copy last value
float? valueToCopy = codeRecords double? valueToCopy = codeRecords
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault()?.Value1; .FirstOrDefault()?.Value1;
ProcessHelper.setValue(processedRecord, 32, valueToCopy); ProcessHelper.setValue(processedRecord, 32, valueToCopy);