R1 fixes
This commit is contained in:
Michał Zieliski
@@ -170,8 +170,8 @@ namespace WebAPI.dataProcessors
|
||||
public void updateReport()
|
||||
{
|
||||
string sheetId = "1pph-XowjlK5CIaCEV_A5buK4ceJ0Z0YoUlDI4VMkhhA";
|
||||
string sheetName = "Raport_AB-AA_Eksport";
|
||||
SpreadsheetsResource.ValuesResource.GetRequest request = googleSheetValues.Get(sheetId, "D4:EX4");
|
||||
string sheetName = "Raport_R1_Eksport";
|
||||
SpreadsheetsResource.ValuesResource.GetRequest request = googleSheetValues.Get(sheetId, "C4:EX4");
|
||||
var response = request.Execute();
|
||||
|
||||
Layer? R1 = db.Layers
|
||||
@@ -179,7 +179,7 @@ namespace WebAPI.dataProcessors
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
|
||||
int startRow = 16;
|
||||
int startRow = 6;
|
||||
|
||||
var codesRow = response.Values[0];
|
||||
for (int i = 1; i <= DateTime.UtcNow.Month; i++)
|
||||
@@ -203,7 +203,7 @@ namespace WebAPI.dataProcessors
|
||||
{
|
||||
Values = new List<IList<object>> { values }
|
||||
};
|
||||
SpreadsheetsResource.ValuesResource.UpdateRequest update = googleSheetValues.Update(ValueRange, sheetId, $"{sheetName}!D{row}:XZ{row}");
|
||||
SpreadsheetsResource.ValuesResource.UpdateRequest update = googleSheetValues.Update(ValueRange, sheetId, $"{sheetName}!C{row}:XZ{row}");
|
||||
update.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
|
||||
update.Execute();
|
||||
}
|
||||
@@ -227,7 +227,7 @@ namespace WebAPI.dataProcessors
|
||||
{
|
||||
Values = new List<IList<object>> { valuesSum }
|
||||
};
|
||||
SpreadsheetsResource.ValuesResource.UpdateRequest updateSum = googleSheetValues.Update(ValueRangeSum, sheetId, $"{sheetName}!D{rowSum}:XZ{rowSum}");
|
||||
SpreadsheetsResource.ValuesResource.UpdateRequest updateSum = googleSheetValues.Update(ValueRangeSum, sheetId, $"{sheetName}!C{rowSum}:XZ{rowSum}");
|
||||
updateSum.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
|
||||
updateSum.Execute();
|
||||
}
|
||||
|
||||
@@ -28,10 +28,10 @@ namespace WebAPI.dataProcessors
|
||||
int year = int.Parse(processWorker!.Records?.SingleOrDefault(x => x.Code == "Year")?.Desc1!);
|
||||
|
||||
Layer? processedLayer = db.Layers
|
||||
.Where(x => x.ParentId == processWorker!.Id
|
||||
&& !x.IsDeleted)
|
||||
.OrderByDescending(x => x.CreatedAt)
|
||||
.FirstOrDefault();
|
||||
.Where(x => x.ParentId == processWorker!.Id
|
||||
&& !x.IsDeleted)
|
||||
.OrderByDescending(x => x.CreatedAt)
|
||||
.FirstOrDefault();
|
||||
|
||||
bool isNew = false;
|
||||
if (processedLayer == null)
|
||||
@@ -63,9 +63,9 @@ namespace WebAPI.dataProcessors
|
||||
for (int i = 1; i < 13; i++)
|
||||
{
|
||||
Layer? dataSource = db.Layers.Where(x =>
|
||||
x.Type == LayerType.processed
|
||||
&& !x.IsDeleted
|
||||
&& x.Name != null && x.Name.Contains($"{year}/{i}-AB-T3"))
|
||||
x.Type == LayerType.processed
|
||||
&& !x.IsDeleted
|
||||
&& x.Name != null && x.Name.Contains($"{year}/{i}-AB-T3"))
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
if (dataSource != null)
|
||||
@@ -96,6 +96,7 @@ namespace WebAPI.dataProcessors
|
||||
ProcessHelper.setValue(processedRecord, i,
|
||||
codeRecords.Sum(x => ProcessHelper.getValue(x, i)));
|
||||
}
|
||||
|
||||
newRecords.Add(processedRecord);
|
||||
}
|
||||
|
||||
@@ -107,259 +108,9 @@ namespace WebAPI.dataProcessors
|
||||
{
|
||||
db.Layers.Update(processedLayer);
|
||||
}
|
||||
|
||||
controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
|
||||
db.SaveChanges();
|
||||
updateReport();
|
||||
}
|
||||
|
||||
public void updateReport()
|
||||
{
|
||||
string sheetId = "1pph-XowjlK5CIaCEV_A5buK4ceJ0Z0YoUlDI4VMkhhA";
|
||||
string sheetName = "Raport_AB-AA_Eksport";
|
||||
SpreadsheetsResource.ValuesResource.GetRequest request = googleSheetValues.Get(sheetId, "D4:EX4");
|
||||
var response = request.Execute();
|
||||
|
||||
Layer? january = db.Layers
|
||||
.Where(x => x.Number == 572)
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
|
||||
Layer? february = db.Layers
|
||||
.Where(x => x.Number == 742)
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
|
||||
Layer? march = db.Layers
|
||||
.Where(x => x.Number == 822)
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
|
||||
Layer? april = db.Layers
|
||||
.Where(x => x.Number == 1018)
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
|
||||
Layer? may = db.Layers
|
||||
.Where(x => x.Number == 1172)
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
|
||||
Layer? sum = db.Layers
|
||||
.Where(x => x.Number == 955)
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
|
||||
//AA
|
||||
Layer? januaryAA = db.Layers
|
||||
.Where(x => x.Number == 568)
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
|
||||
Layer? februaryAA = db.Layers
|
||||
.Where(x => x.Number == 741)
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
|
||||
Layer? marchAA = db.Layers
|
||||
.Where(x => x.Number == 813)
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
|
||||
Layer? aprilAA = db.Layers
|
||||
.Where(x => x.Number == 1017)
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
|
||||
Layer? mayAA = db.Layers
|
||||
.Where(x => x.Number == 1171)
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
|
||||
Layer? sumAA = db.Layers
|
||||
.Where(x => x.Number == 570)
|
||||
.Include(x => x.Records)
|
||||
.FirstOrDefault();
|
||||
|
||||
List<object> januaryValues = new List<object>();
|
||||
List<object> februaryValues = new List<object>();
|
||||
List<object> marchValues = new List<object>();
|
||||
List<object> aprilValues = new List<object>();
|
||||
List<object> mayValues = new List<object>();
|
||||
List<object> sumValues = new List<object>();
|
||||
|
||||
var codesRow = response.Values[0];
|
||||
foreach (string code in codesRow)
|
||||
{
|
||||
Record? januaryRecord = january!.Records?.SingleOrDefault(x => x.Code == code);
|
||||
Record? februaryRecord = february!.Records?.SingleOrDefault(x => x.Code == code);
|
||||
Record? marchRecord = march!.Records?.SingleOrDefault(x => x.Code == code);
|
||||
Record? aprilRecord = april!.Records?.SingleOrDefault(x => x.Code == code);
|
||||
Record? mayRecord = may!.Records?.SingleOrDefault(x => x.Code == code);
|
||||
Record? sumRecord = sum!.Records?.SingleOrDefault(x => x.Code == code);
|
||||
|
||||
if (januaryRecord != null)
|
||||
{
|
||||
double? januaryValue = ProcessHelper.getValue(januaryRecord, 32);
|
||||
januaryValues.Add(januaryValue!.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
januaryRecord = januaryAA!.Records?.SingleOrDefault(x => x.Code == code);
|
||||
if (januaryRecord != null)
|
||||
{
|
||||
double? januaryValue = ProcessHelper.getValue(januaryRecord, 32);
|
||||
januaryValues.Add(januaryValue!.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
januaryValues.Add("");
|
||||
}
|
||||
}
|
||||
|
||||
if (februaryRecord != null)
|
||||
{
|
||||
double? februaryValue = ProcessHelper.getValue(februaryRecord, 32);
|
||||
februaryValues.Add(februaryValue!.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
februaryRecord = februaryAA!.Records?.SingleOrDefault(x => x.Code == code);
|
||||
if (februaryRecord != null)
|
||||
{
|
||||
double? februaryValue = ProcessHelper.getValue(februaryRecord, 32);
|
||||
februaryValues.Add(februaryValue!.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
februaryValues.Add("");
|
||||
}
|
||||
}
|
||||
|
||||
if (marchRecord != null)
|
||||
{
|
||||
double? marchValue = ProcessHelper.getValue(marchRecord, 32);
|
||||
marchValues.Add(marchValue!.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
marchRecord = marchAA!.Records?.SingleOrDefault(x => x.Code == code);
|
||||
if (marchRecord != null)
|
||||
{
|
||||
double? marchValue = ProcessHelper.getValue(marchRecord, 32);
|
||||
marchValues.Add(marchValue!.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
marchValues.Add("");
|
||||
}
|
||||
}
|
||||
|
||||
if (aprilRecord != null)
|
||||
{
|
||||
double? aprilValue = ProcessHelper.getValue(aprilRecord, 32);
|
||||
aprilValues.Add(aprilValue!.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
aprilRecord = aprilAA!.Records?.SingleOrDefault(x => x.Code == code);
|
||||
if (aprilRecord != null)
|
||||
{
|
||||
double? aprilValue = ProcessHelper.getValue(aprilRecord, 32);
|
||||
aprilValues.Add(aprilValue!.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
aprilValues.Add("");
|
||||
}
|
||||
}
|
||||
|
||||
if (mayRecord != null)
|
||||
{
|
||||
double? mayValue = ProcessHelper.getValue(mayRecord, 32);
|
||||
mayValues.Add(mayValue!.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
mayRecord = mayAA!.Records?.SingleOrDefault(x => x.Code == code);
|
||||
if (mayRecord != null)
|
||||
{
|
||||
double? mayValue = ProcessHelper.getValue(mayRecord, 32);
|
||||
mayValues.Add(mayValue!.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
mayValues.Add("");
|
||||
}
|
||||
}
|
||||
|
||||
if (sumRecord != null)
|
||||
{
|
||||
double? sumValue = ProcessHelper.getValue(sumRecord, 32);
|
||||
sumValues.Add(sumValue!.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
sumRecord = sumAA!.Records?.SingleOrDefault(x => x.Code == code);
|
||||
if (sumRecord != null)
|
||||
{
|
||||
double? sumValue = ProcessHelper.getValue(sumRecord, 32);
|
||||
sumValues.Add(sumValue!.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
sumValues.Add("");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ValueRange januaryValueRange = new ValueRange
|
||||
{
|
||||
Values = new List<IList<object>> { januaryValues }
|
||||
};
|
||||
SpreadsheetsResource.ValuesResource.UpdateRequest updateJanuary = googleSheetValues.Update(januaryValueRange, sheetId, $"{sheetName}!D7:EX7");
|
||||
updateJanuary.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
|
||||
updateJanuary.Execute();
|
||||
|
||||
ValueRange februaryValueRange = new ValueRange
|
||||
{
|
||||
Values = new List<IList<object>> { februaryValues }
|
||||
};
|
||||
SpreadsheetsResource.ValuesResource.UpdateRequest updateFebruary = googleSheetValues.Update(februaryValueRange, sheetId, $"{sheetName}!D8:EX8");
|
||||
updateFebruary.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
|
||||
updateFebruary.Execute();
|
||||
|
||||
ValueRange marchValueRange = new ValueRange
|
||||
{
|
||||
Values = new List<IList<object>> { marchValues }
|
||||
};
|
||||
SpreadsheetsResource.ValuesResource.UpdateRequest updateMarch = googleSheetValues.Update(marchValueRange, sheetId, $"{sheetName}!D9:EX9");
|
||||
updateMarch.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
|
||||
updateMarch.Execute();
|
||||
|
||||
ValueRange aprilValueRange = new ValueRange
|
||||
{
|
||||
Values = new List<IList<object>> { aprilValues }
|
||||
};
|
||||
SpreadsheetsResource.ValuesResource.UpdateRequest updateApril = googleSheetValues.Update(aprilValueRange, sheetId, $"{sheetName}!D10:EX10");
|
||||
updateApril.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
|
||||
updateApril.Execute();
|
||||
|
||||
ValueRange mayValueRange = new ValueRange
|
||||
{
|
||||
Values = new List<IList<object>> { mayValues }
|
||||
};
|
||||
SpreadsheetsResource.ValuesResource.UpdateRequest updateMay = googleSheetValues.Update(mayValueRange, sheetId, $"{sheetName}!D11:EX11");
|
||||
updateMay.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
|
||||
updateMay.Execute();
|
||||
|
||||
ValueRange sumValueRange = new ValueRange
|
||||
{
|
||||
Values = new List<IList<object>> { sumValues }
|
||||
};
|
||||
SpreadsheetsResource.ValuesResource.UpdateRequest updateSum = googleSheetValues.Update(sumValueRange, sheetId, $"{sheetName}!D13:XZ13");
|
||||
updateSum.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
|
||||
|
||||
updateSum.Execute();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user