Fix behaviour

This commit is contained in:
Nicola Carminati
2019-12-03 12:49:02 +01:00
parent c20060f0a7
commit b16a978588
16 changed files with 78 additions and 17 deletions
@@ -1,6 +1,7 @@
using Step.Model.DatabaseModels;
using Step.Model.DTOModels;
using Step.Model.DTOModels.MaintenanceModels;
using Step.Utils;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -38,13 +39,14 @@ namespace Step.Database.Controllers
.Include("Maintainer").OrderByDescending(x => x.Date)
.ToList();
foreach (PerformedMaintenanceModel maintenance in maintList)
{
if(maintenance.ControlWord != -2)
valRet.Add(new DTOPerformModel()
{
Date = maintenance.Date,
Countervalue = maintenance.CounterValue,
Countervalue = (uint)Math.Ceiling(SupportFunctions.ConvertInUmeas(maintenance.CounterValue, maintenance.Maintenance.UnitOfMeasure.Value)),
ControlWord = maintenance.ControlWord,
User = maintenance.Maintainer != null ? maintenance.Maintainer.Username : null
});
@@ -108,7 +110,7 @@ namespace Step.Database.Controllers
//fix the maintenance number to 1 (machine Counter)
if (newMaint.Type == MAINTENANCE_TYPE.MACHINE_INTERVAL)
counter = 1;
counter = 0;
MaintenanceModel dbMaint = new MaintenanceModel()
{