branch changing
This commit is contained in:
-65
@@ -470,71 +470,6 @@
|
||||
|
||||
private Boolean CheckBatteryAndLifeTime(EOLProgressModel eolModel, CordonelRequirements requirements)
|
||||
{
|
||||
// Check battery load in percent and compare with requirements for limits for drained battery load
|
||||
// For the alternative calculation based quiescent current and production supplement this will be used.
|
||||
// Build message for required versus calculated life time
|
||||
//ProductionStatus.QuiescentCurrent_uA = ProductionRequirements.QuiescentCurrent_uA;
|
||||
//ProductionStatus.EstimatedProductionBatteryLoadPercent =
|
||||
// ProductionRequirements.EstimatedProductionBatteryLoadPercent;
|
||||
|
||||
//var threshold = ProductionStatus.AlternativeRequiredBatteryLoadPercent ??
|
||||
// ProductionRequirements.MaxDrainedBatteryLoadPercentShipping;
|
||||
|
||||
//var alternativeCalculation = ProductionStatus.AlternativeRequiredBatteryLoadPercent == null ? "" :
|
||||
// $"({Resources.StrMsgAlternativeDrainedBatteryCalculation})";
|
||||
|
||||
//var batteryLoad = $"{Resources.StrMsgDrainedBatteryAtEol}: " +
|
||||
// // Actual calculated battery load based on readings from meter
|
||||
// $"{ProductionStatus.DrainedBatteryLoadPercent:F2} %" +
|
||||
// $" - {Resources.StrMsgRequirementLimtDrainedBatteryAtEol}: " +
|
||||
// // Required battery load from standard or special requirement
|
||||
// $"{threshold:F2} % {alternativeCalculation}";
|
||||
|
||||
//eolModel.ProductionStatusDrainedBatteryLoad = ProductionStatus.DrainedBatteryLoadPercent;
|
||||
|
||||
//if (ProductionStatus.AlternativeRequiredBatteryLoadPercent != null &&
|
||||
// ProductionStatus.DrainedBatteryLoadPercent >
|
||||
// ProductionStatus.AlternativeRequiredBatteryLoadPercent)
|
||||
//{
|
||||
// // errorMsg = $"{Resources.StrErrorMsg}: {batteryLoad}";
|
||||
// eolModel.ProductionStatusBatteryLoadChecked = EOLStatus.FAIL;
|
||||
|
||||
// return false; // ExitWithErrorAndUserWindow(errorMsg);
|
||||
//}
|
||||
|
||||
//if (ProductionStatus.DrainedBatteryLoadPercent >
|
||||
// ProductionRequirements.MaxDrainedBatteryLoadPercentShipping)
|
||||
//{
|
||||
// // errorMsg = $"{Resources.StrErrorMsg}: {batteryLoad}";
|
||||
// eolModel.ProductionStatusBatteryLoadChecked = EOLStatus.FAIL;
|
||||
|
||||
// return false; // ExitWithErrorAndUserWindow(errorMsg);
|
||||
//}
|
||||
//eolModel.ProductionStatusBatteryLoadChecked = EOLStatus.OK;
|
||||
//// SuccessMsgDispatcher($"{Resources.StrSuccessMsg}: {batteryLoad}");
|
||||
|
||||
//// Build message for required versus calculated life time
|
||||
//var lifeTime = $"{Resources.StrMsgRemainingLifeTimeAtEol}: " +
|
||||
// // Actual calculated life time based on readings from meter
|
||||
// $"{ProductionStatus.RemainingLifeTimeYears:F2} " +
|
||||
// $"{Resources.StrMsgYears}" +
|
||||
// $" - {Resources.StrMsgRequiredLifeTimeAtEol}: " +
|
||||
// // Required life time from special or standard requirement
|
||||
// $"{ProductionRequirements.RequiredLifeTimeYearsShipping:F2} " +
|
||||
// $"{Resources.StrMsgYears}";
|
||||
//// Check required years for shipping
|
||||
//// EolProgress.ProductionStatusRemainingLifeTime = ProductionStatus.RemainingLifeTimeYears;
|
||||
|
||||
//if (ProductionStatus.RemainingLifeTimeYears < ProductionRequirements.RequiredLifeTimeYearsShipping)
|
||||
//{
|
||||
// // errorMsg = $"{Resources.StrErrorMsg}: {lifeTime}";
|
||||
// eolModel.ProductionStatusRemainingLifeTimeChecked = EOLStatus.FAIL;
|
||||
|
||||
// return false; // ExitWithErrorAndUserWindow(errorMsg);
|
||||
//}
|
||||
|
||||
//// SuccessMsgDispatcher($"{Resources.StrSuccessMsg}: {lifeTime}");
|
||||
//eolModel.ProductionStatusRemainingLifeTimeChecked = EOLStatus.OK;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user