diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanAntiCrashRotationDto.cs b/AsbCloudApp/Data/ProcessMaps/Functions/ProcessMapPlanAntiCrashRotationDto.cs similarity index 96% rename from AsbCloudApp/Data/ProcessMaps/ProcessMapPlanAntiCrashRotationDto.cs rename to AsbCloudApp/Data/ProcessMaps/Functions/ProcessMapPlanAntiCrashRotationDto.cs index e108dbb8..1f38e6e3 100644 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanAntiCrashRotationDto.cs +++ b/AsbCloudApp/Data/ProcessMaps/Functions/ProcessMapPlanAntiCrashRotationDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace AsbCloudApp.Data.ProcessMaps; +namespace AsbCloudApp.Data.ProcessMaps.Functions; /// /// РТК план противоаварийное вращение diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanAutoHoldTFDto.cs b/AsbCloudApp/Data/ProcessMaps/Functions/ProcessMapPlanAutoHoldTFDto.cs similarity index 93% rename from AsbCloudApp/Data/ProcessMaps/ProcessMapPlanAutoHoldTFDto.cs rename to AsbCloudApp/Data/ProcessMaps/Functions/ProcessMapPlanAutoHoldTFDto.cs index 83733093..836573c8 100644 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanAutoHoldTFDto.cs +++ b/AsbCloudApp/Data/ProcessMaps/Functions/ProcessMapPlanAutoHoldTFDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace AsbCloudApp.Data.ProcessMaps; +namespace AsbCloudApp.Data.ProcessMaps.Functions; /// /// РТК план автоудержание TF diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanLoadCapacityDto.cs b/AsbCloudApp/Data/ProcessMaps/Operations/ProcessMapPlanLoadCapacityDto.cs similarity index 96% rename from AsbCloudApp/Data/ProcessMaps/ProcessMapPlanLoadCapacityDto.cs rename to AsbCloudApp/Data/ProcessMaps/Operations/ProcessMapPlanLoadCapacityDto.cs index 55be2bb1..52972803 100644 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanLoadCapacityDto.cs +++ b/AsbCloudApp/Data/ProcessMaps/Operations/ProcessMapPlanLoadCapacityDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace AsbCloudApp.Data.ProcessMaps; +namespace AsbCloudApp.Data.ProcessMaps.Operations; /// /// РТК план выработка нагрузки diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOscillationAnglesDto.cs b/AsbCloudApp/Data/ProcessMaps/Operations/ProcessMapPlanOscillationAnglesDto.cs similarity index 97% rename from AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOscillationAnglesDto.cs rename to AsbCloudApp/Data/ProcessMaps/Operations/ProcessMapPlanOscillationAnglesDto.cs index cf930c5c..3da9631e 100644 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOscillationAnglesDto.cs +++ b/AsbCloudApp/Data/ProcessMaps/Operations/ProcessMapPlanOscillationAnglesDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace AsbCloudApp.Data.ProcessMaps; +namespace AsbCloudApp.Data.ProcessMaps.Operations; /// /// РТК план определения углов осцилляции diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanDamperDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanDamperDto.cs deleted file mode 100644 index c9022f43..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanDamperDto.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план демпфер -/// -public class ProcessMapPlanDamperDto : ProcessMapPlanBaseDto -{ - /// - /// StickSlip - /// - [Range(0.0, 1000.0, ErrorMessage = "StickSlip, должно быть в пределах от 0 до 1000")] - public double StickSlip { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")] - public string Note { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanDrillTestDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanDrillTestDto.cs deleted file mode 100644 index 1a471c5c..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanDrillTestDto.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план дрилтест -/// -public class ProcessMapPlanDrillTestDto : ProcessMapPlanBaseDto -{ - /// - /// Нагрузка минимальная, т - /// - [Range(1.0, 30.0, ErrorMessage = "Нагрузка минимальная, т., должно быть в пределах от 1 до 30")] - public double WeightOnBitMin { get; set; } - - /// - /// Количество шагов по нагрузке - /// - [Range(1, 5, ErrorMessage = "Количество шагов по нагрузке, должно быть в пределах от 1 до 5")] - public int WeightOnBitStepsCount { get; set; } - - /// - /// Минимальные обороты на ВСП, об/мин. - /// - [Range(5, 200, ErrorMessage = "Минимальные обороты на ВСП, об/мин., должно быть в пределах от 5 до 200")] - public int RpmMin { get; set; } - - /// - /// Количество шагов оборотов на ВСП, шт. - /// - [Range(1, 5, ErrorMessage = "Количество шагов оборотов на ВСП, шт., должно быть в пределах от 1 до 5")] - public int RpmStepsCount { get; set; } - - /// - /// Величина проходки шага, м. - /// - [Range(0.1, 2.0, ErrorMessage = "Величина проходки шага, м., должно быть в пределах от 0.1 до 2")] - public double LengthStep { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символа")] - public string Note { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOscillationDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOscillationDto.cs deleted file mode 100644 index 51ca2027..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOscillationDto.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план осцилляция -/// -public class ProcessMapPlanOscillationDto : ProcessMapPlanBaseDto -{ - /// - /// Оптимальный угол осцилляции, градусы - /// - [Range(0.0, 6000.0, ErrorMessage = "Оптимальный угол осцилляции, градусы, должно быть в пределах от 0 до 6000")] - public double OptimalOscillationAngle { get; set; } - - /// - /// Скорость вправо, об/мин - /// - [Range(0.0, 270.0, ErrorMessage = "Скорость вправо, об/мин, должно быть в пределах от 0 до 270")] - public double RpmRight { get; set; } - - /// - /// Скорость влево, об/мин - /// - [Range(0.0, 270.0, ErrorMessage = "Скорость влево, об/мин, должно быть в пределах от 0 до 270")] - public double RpmLeft { get; set; } - - /// - /// Ограничение момента вправо, кН*м - /// - [Range(0.0, 35.0, ErrorMessage = "Ограничение момента вправо, кН*м., должно быть в пределах от 0 до 35")] - public double TorqueMaxRight { get; set; } - - /// - /// Ограничение момента влево, кН*м - /// - [Range(0.0, 35.0, ErrorMessage = "Ограничение момента влево, кН*м., должно быть в пределах от 0 до 35")] - public double TorqueMaxLeft { get; set; } - - /// - /// Режим Авто/Руч - /// - [Range(0, 1, ErrorMessage = "Режим Авто/Руч, должен быть либо 0, либо 1")] - public int Mode { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")] - public string Note { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanPositioningOffTheBottomDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanPositioningOffTheBottomDto.cs deleted file mode 100644 index 85b821f6..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanPositioningOffTheBottomDto.cs +++ /dev/null @@ -1,88 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план позиционирования над забоем -/// -public class ProcessMapPlanPositioningOffTheBottomDto : ProcessMapPlanBaseDto -{ - /// - /// Остановка над забоем, м. - /// - [Range(0.0, 30.0, ErrorMessage = "Остановка над забоем, м., должно быть в пределах от 0 до 30")] - public double StopOffTheBottom { get; set; } - - /// - /// Максимально допустимое давление, атм. - /// - [Range(0.0, 400.0, ErrorMessage = "Максимально допустимое давление, атм., должно быть в пределах от 0 до 400")] - public double PressureMax { get; set; } - - /// - /// Перепад давления уставка, атм. - /// - [Range(0.0, 60.0, ErrorMessage = "Перепад давления уставка, атм., должно быть в пределах от 0 до 60")] - public double DifferentialPressure { get; set; } - - /// - /// Затяжка, т. - /// - [Range(0.0, 20.0, ErrorMessage = "Затяжка, т., должно быть в пределах от 0 до 20")] - public double Tight { get; set; } - - /// - /// Посадка, т. - /// - [Range(0.0, 20.0, ErrorMessage = "Посадка, т., должно быть в пределах от 0 до 20")] - public double SlackingOff { get; set; } - - /// - /// Максимально допустимый момент, кН*м. - /// - [Range(0.0, 35.0, ErrorMessage = "Максимально допустимый момент, кН*м., должно быть в пределах от 0 до 35")] - public double TorqueMax { get; set; } - - /// - /// Скорость вверх, м/ч. - /// - [Range(0.0, 999.0, ErrorMessage = "Скорость вверх, м/ч., должно быть в пределах от 0 до 999")] - public double RopUp { get; set; } - - /// - /// Скорость вниз, м/ч. - /// - [Range(0.0, 999.0, ErrorMessage = "Скорость вниз, м/ч., должно быть в пределах от 0 до 999")] - public double RopDown { get; set; } - - /// - /// Обороты вверх, об/мин. - /// - [Range(0.0, 270.0, ErrorMessage = "Обороты вверх, об/мин., должно быть в пределах от 0 до 270")] - public double RpmUp { get; set; } - - /// - /// Обороты вниз, об/мин. - /// - [Range(0.0, 270.0, ErrorMessage = "Обороты вниз, об/мин., должно быть в пределах от 0 до 270")] - public double RpmDown { get; set; } - - /// - /// Расход вверх, л/с. - /// - [Range(0.0, 100.0, ErrorMessage = "Расход вверх, л/с., должно быть в пределах от 0 до 100")] - public double FlowRateUp { get; set; } - - /// - /// Расход вниз, л/с. - /// - [Range(0.0, 100.0, ErrorMessage = "Расход вниз, л/с., должно быть в пределах от 0 до 100")] - public double FlowRateDown { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")] - public string Note { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanReamDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanReamDto.cs deleted file mode 100644 index 853a7fcd..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanReamDto.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план проработка скважины -/// -public class ProcessMapPlanReamDto : ProcessMapPlanBaseDto, IValidatableObject -{ - /// - /// Количество повторений - /// - [Required] - [Range(0, 100, ErrorMessage = "Количество повторений должно быть в пределах от 0 до 100")] - public double Repeats { get; set; } - - /// - /// Вращение при движении вверх, об/мин - /// - [Required] - [Range(0, 99999.9, ErrorMessage = "Количество вращений вверх должно быть в пределах от 0 до 99999.9")] - public double SpinUpward { get; set; } - - /// - /// Вращение при движении вниз, об/мин - /// - [Required] - [Range(0, 99999.9, ErrorMessage = "Количество вращений вниз должно быть в пределах от 0 до 99999.9")] - public double SpinDownward { get; set; } - - /// - /// Скорость подъёма, м/ч - /// - [Required] - [Range(0, 99999.9, ErrorMessage = "Скорость подъёма должна быть в пределах от 0 до 99999.9")] - public double SpeedUpward { get; set; } - - /// - /// Скорость спуска, м/ч - /// - [Required] - [Range(0, 99999.9, ErrorMessage = "Скорость спуска должна быть в пределах от 0 до 99999.9")] - public double SpeedDownward { get; set; } - - /// - /// Уставка зятяжки, т - /// - [Required] - [Range(0, 99999.9, ErrorMessage = "Значение затяжек уставки должно быть в пределах от 0 до 99999.9")] - public double SetpointDrag { get; set; } - - /// - /// Уставка посадки, т - /// - [Required] - [Range(0, 99999.9, ErrorMessage = "Значение посадки уставки должно быть в пределах от 0 до 99999.9")] - public double SetpointTight { get; set; } - - /// - /// Давление, атм - /// - [Required] - [Range(0, 99999.9, ErrorMessage = "Давление должно быть в пределах от 0 до 99999.9")] - public double Pressure { get; set; } - - /// - /// Момент, кН*м - /// - [Required] - [Range(0, 99999.9, ErrorMessage = "Крутящий момент должен быть в пределах от 0 до 99999.9")] - public double Torque { get; set; } - - /// - public override IEnumerable Validate(ValidationContext validationContext) - { - if (DepthEnd < DepthStart) - yield return new ValidationResult( - $"{nameof(DepthEnd)}:{DepthEnd:#0.0} меньше {nameof(DepthStart)}:{DepthStart:#0.0}", - new[] { nameof(DepthEnd), nameof(DepthStart) }); - } -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanReamingRotorDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanReamingRotorDto.cs deleted file mode 100644 index be9113e7..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanReamingRotorDto.cs +++ /dev/null @@ -1,209 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план проработка для ротора -/// -public class ProcessMapPlanReamingRotorDto : ProcessMapPlanBaseDto -{ - /// - /// Максимально допустимое давление, атм. - /// - [Range(0.0, 400.0, ErrorMessage = "Максимально допустимое давление, атм., должно быть в пределах от 0 до 400")] - public double PressureMax { get; set; } - - /// - /// Перепад давления уставка, атм. - /// - [Range(0.0, 60.0, ErrorMessage = "Перепад давления уставка, атм., должно быть в пределах от 0 до 60")] - public double DifferentialPressure { get; set; } - - /// - /// Затяжка, т. - /// - [Range(0.0, 20.0, ErrorMessage = "Затяжка, т., должно быть в пределах от 0 до 20")] - public double Tight { get; set; } - - /// - /// Посадка, т. - /// - [Range(0.0, 20.0, ErrorMessage = "Посадка, т., должно быть в пределах от 0 до 20")] - public double SlackingOff { get; set; } - - /// - /// Максимально допустимый момент, кН*м. - /// - [Range(0.0, 35.0, ErrorMessage = "Максимально допустимый момент, кН*м., посадка, должно быть в пределах от 0 до 35")] - public double TorqueMax { get; set; } - - /// - /// Проработка 1. Количество повторений, шт. - /// - [Range(0, 99, ErrorMessage = "Проработка 1. Количество повторений, шт., должно быть в пределах от 0 до 99")] - public int Reaming1RepetitionsCount { get; set; } - - /// - /// Проработка 1, Скорость, м/ч., Вверх - /// - [Range(0.0, 999.0, ErrorMessage = "Проработка 1, Скорость, м/ч., Вверх, должно быть в пределах от 0 до 999")] - public double Reaming1RopUp { get; set; } - - /// - /// Проработка 1, Скорость, м/ч., Вниз - /// - [Range(0.0, 999.0, ErrorMessage = "Проработка 1, Скорость, м/ч., Вниз, должно быть в пределах от 0 до 999")] - public double Reaming1RopDown { get; set; } - - /// - /// Проработка 1, Обороты, об/мин., Вверх - /// - [Range(0.0, 270.0, ErrorMessage = "Проработка 1, Обороты, об/мин., Вверх, должно быть в пределах от 0 до 270")] - public double Reaming1RpmUp { get; set; } - - /// - /// Проработка 1, Обороты, об/мин., Вниз - /// - [Range(0.0, 270.0, ErrorMessage = "Проработка 1, Обороты, об/мин., Вниз, должно быть в пределах от 0 до 270")] - public double Reaming1RpmDown { get; set; } - - /// - /// Проработка 1, Расход, л/с., Вверх - /// - [Range(0.0, 100.0, ErrorMessage = "Проработка 1, Расход, л/с., Вверх, должно быть в пределах от 0 до 100")] - public double Reaming1FlowRateUp { get; set; } - - /// - /// Проработка 1, Расход, л/с., Вниз - /// - [Range(0.0, 100.0, ErrorMessage = "Проработка 1, Расход, л/с., Вниз, должно быть в пределах от 0 до 100")] - public double Reaming1FlowRateDown { get; set; } - - /// - /// Проработка 1, Интервал проработки, м. - /// - [Range(0.0, 30.0, ErrorMessage = "Проработка 1, Интервал проработки, м., должно быть в пределах от 0 до 30")] - public double Reaming1Interval { get; set; } - - /// - /// Остановка над забоем, м. - /// - [Range(0.0, 10.0, ErrorMessage = "Остановка над забоем, м., должно быть в пределах от 0 до 10")] - public double Reaming1StopPointOffBottom { get; set; } - - /// - /// Проработка 2, Количество повторений, шт. - /// - [Range(0, 99, ErrorMessage = "Проработка 2, Количество повторений, шт., должно быть в пределах от 0 до 99")] - public int Reaming2RepetitionsCount { get; set; } - - /// - /// Проработка 2, Скорость, м/ч., Вверх - /// - [Range(0.0, 999.0, ErrorMessage = "Проработка 2, Скорость, м/ч., Вверх, должно быть в пределах от 0 до 999")] - public double Reaming2RopUp { get; set; } - - /// - /// Проработка 2, Скорость, м/ч., Вниз - /// - [Range(0.0, 999.0, ErrorMessage = "Проработка 2, Скорость, м/ч., Вниз, должно быть в пределах от 0 до 999")] - public double Reaming2RopDown { get; set; } - - /// - /// Проработка 2, Обороты, об/мин., Вверх - /// - [Range(0.0, 270.0, ErrorMessage = "Проработка 2, Обороты, об/мин., Вверх, должно быть в пределах от 0 до 270")] - public double Reaming2RpmUp { get; set; } - - /// - /// Проработка 2, Обороты, об/мин., Вниз - /// - [Range(0.0, 270.0, ErrorMessage = "Проработка 2, Обороты, об/мин., Вниз, должно быть в пределах от 0 до 270")] - public double Reaming2RpmDown { get; set; } - - /// - /// Проработка 2, Расход, л/с., Вверх - /// - [Range(0.0, 100.0, ErrorMessage = "Проработка 2, Расход, л/с., Вверх, должно быть в пределах от 0 до 100")] - public double Reaming2FlowRateUp { get; set; } - - /// - /// Проработка 2, Расход, л/с., Вниз - /// - [Range(0.0, 100.0, ErrorMessage = "Проработка 2, Расход, л/с., Вниз, должно быть в пределах от 0 до 100")] - public double Reaming2FlowRateDown { get; set; } - - /// - /// Проработка 2, Интервал проработки, м. - /// - [Range(0.0, 30.0, ErrorMessage = "Проработка 2, Интервал проработки, м., должно быть в пределах от 0 до 30")] - public double Reaming2Interval { get; set; } - - /// - /// Остановка над забоем, м. - /// - [Range(0.0, 10.0, ErrorMessage = "Остановка над забоем, м., должно быть в пределах от 0 до 10")] - public double Reaming2StopPointOffBottom { get; set; } - - /// - /// Проработка 3, Количество повторений, шт. - /// - [Range(0, 99, ErrorMessage = "Проработка 3, Количество повторений, шт., должно быть в пределах от 0 до 99")] - public double Reaming3RepetitionsCount { get; set; } - - /// - /// Проработка 3, Скорость, м/ч., Вверх - /// - [Range(0.0, 999.0, ErrorMessage = "Проработка 3, Скорость, м/ч., Вверх, должно быть в пределах от 0 до 999")] - public double Reaming3RopUp { get; set; } - - /// - /// Проработка 3, Скорость, м/ч., Вниз - /// - [Range(0.0, 999.0, ErrorMessage = "Проработка 3, Скорость, м/ч., Вниз, должно быть в пределах от 0 до 999")] - public double Reaming3RopDown { get; set; } - - /// - /// Проработка 3, Обороты, об/мин., Вверх - /// - [Range(0.0, 270.0, ErrorMessage = "Проработка 3, Обороты, об/мин., Вверх, должно быть в пределах от 0 до 270")] - public double Reaming3RpmUp { get; set; } - - /// - /// Проработка 3, Обороты, об/мин., Вниз - /// - [Range(0.0, 270.0, ErrorMessage = "Проработка 3, Обороты, об/мин., Вниз, должно быть в пределах от 0 до 270")] - public double Reaming3RpmDown { get; set; } - - /// - /// Проработка 3, Расход, л/с., Вверх - /// - [Range(0.0, 100.0, ErrorMessage = "Проработка 3, Расход, л/с., Вверх, должно быть в пределах от 0 до 100")] - public double Reaming3FlowRateUp { get; set; } - - /// - /// Проработка 3, Расход, л/с., Вниз - /// - [Range(0.0, 100.0, ErrorMessage = "Проработка 3, Расход, л/с., Вниз, должно быть в пределах от 0 до 100")] - public double Reaming3FlowRateDown { get; set; } - - /// - /// Проработка 3, Интервал проработки, м. - /// - [Range(0.0, 30.0, ErrorMessage = "Проработка 3, Интервал проработки, м., должно быть в пределах от 0 до 30")] - public double Reaming3Interval { get; set; } - - /// - /// Остановка над забоем, м. - /// - [Range(0.0, 10.0, ErrorMessage = "Остановка над забоем, м., должно быть в пределах от 0 до 10")] - public double Reaming3StopPointOffBottom { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")] - public string Note { get; set; } = string.Empty; - - -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanReamingSlideDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanReamingSlideDto.cs deleted file mode 100644 index c35fddb8..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanReamingSlideDto.cs +++ /dev/null @@ -1,209 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план проработка для слайда -/// -public class ProcessMapPlanReamingSlideDto : ProcessMapPlanBaseDto -{ - /// - /// Максимально допустимое давление, атм - /// - [Range(0.0, 400.0, ErrorMessage = "Максимально допустимое давление, атм., должно быть в пределах от 0 до 400")] - public double PressureMax { get; set; } - - /// - /// Перепад давления уставка, атм - /// - [Range(0.0, 60.0, ErrorMessage = "Перепад давления уставка, атм., должно быть в пределах от 0 до 60")] - public double DifferentialPressure { get; set; } - - /// - /// Затяжка - /// - [Range(0.0, 20.0, ErrorMessage = "Затяжка, должно быть в пределах от 0 до 20")] - public double Tight { get; set; } - - /// - /// Посадка - /// - [Range(0.0, 20.0, ErrorMessage = "Посадка, должно быть в пределах от 0 до 20")] - public double SlackingOff { get; set; } - - /// - /// Максимально допустимый момент, кН*м. - /// - [Range(0.0, 35.0, ErrorMessage = "Максимально допустимый момент, кН*м., должно быть в пределах от 0 до 35")] - public double TorqueMax { get; set; } - - /// - /// Проработка 1, Количество повторений, шт. - /// - [Range(0.0, 99.0, ErrorMessage = "Проработка 1, Количество повторений, шт., должно быть в пределах от 0 до 99")] - public double Reaming1RepetitionsCount { get; set; } - - /// - /// Проработка 1, Скорость, м/ч., Вверх - /// - [Range(0.0, 999.0, ErrorMessage = "Проработка 1, Скорость, м/ч., Вверх, должно быть в пределах от 0 до 999")] - public double Reaming1RopUp { get; set; } - - /// - /// Проработка 1, Скорость, м/ч., Вниз - /// - [Range(0.0, 999.0, ErrorMessage = "Проработка 1, Скорость, м/ч., Вниз, должно быть в пределах от 0 до 999")] - public double Reaming1RopDown { get; set; } - - /// - /// Проработка 1, Обороты, об/мин., Вверх - /// - [Range(0.0, 270.0, ErrorMessage = "Проработка 1, Обороты, об/мин., Вверх, должно быть в пределах от 0 до 270")] - public double Reaming1RpmUp { get; set; } - - /// - /// Проработка 1, Обороты, об/мин., Вниз - /// - [Range(0.0, 270.0, ErrorMessage = "Проработка 1, Обороты, об/мин., Вниз, должно быть в пределах от 0 до 270")] - public double Reaming1RpmDown { get; set; } - - /// - /// Проработка 1, Расход, л/с., Вверх - /// - [Range(0.0, 100.0, ErrorMessage = "Проработка 1, Расход, л/с., Вверх, должно быть в пределах от 0 до 100")] - public double Reaming1FlowRateUp { get; set; } - - /// - /// Проработка 1, Расход, л/с., Вниз - /// - [Range(0.0, 100.0, ErrorMessage = "Проработка 1, Расход, л/с., Вниз, должно быть в пределах от 0 до 100")] - public double Reaming1FlowRateDown { get; set; } - - /// - /// Проработка 1, Интервал проработки, м. - /// - [Range(0.0, 30.0, ErrorMessage = "Проработка 1, Интервал проработки, м., должно быть в пределах от 0 до 30")] - public double Reaming1Interval { get; set; } - - /// - /// Остановка над забоем, м. - /// - [Range(0.0, 10.0, ErrorMessage = "Остановка над забоем, м., должно быть в пределах от 0 до 10")] - public double Reaming1StopPointOffBottom { get; set; } - - /// - /// Проработка 2, Количество повторений, шт. - /// - [Range(0.0, 99.0, ErrorMessage = "Проработка 2, Количество повторений, шт., должно быть в пределах от 0 до 99")] - public double Reaming2RepetitionsCount { get; set; } - - /// - /// Проработка 2, Скорость, м/ч., Вверх - /// - [Range(0.0, 999.0, ErrorMessage = "Проработка 2, Скорость, м/ч., Вверх, должно быть в пределах от 0 до 999")] - public double Reaming2RopUp { get; set; } - - /// - /// Проработка 2, Скорость, м/ч., Вниз - /// - [Range(0.0, 999.0, ErrorMessage = "Проработка 2, Скорость, м/ч., Вниз, должно быть в пределах от 0 до 999")] - public double Reaming2RopDown { get; set; } - - /// - /// Проработка 2, Обороты, об/мин., Вверх - /// - [Range(0.0, 270.0, ErrorMessage = "Проработка 2, Обороты, об/мин., Вверх, должно быть в пределах от 0 до 270")] - public double Reaming2RpmUp { get; set; } - - /// - /// Проработка 2, Обороты, об/мин., Вниз - /// - [Range(0.0, 270.0, ErrorMessage = "Проработка 2, Обороты, об/мин., Вниз, должно быть в пределах от 0 до 270")] - public double Reaming2RpmDown { get; set; } - - /// - /// Проработка 2, Расход, л/с., Вверх - /// - [Range(0.0, 100.0, ErrorMessage = "Проработка 2, Расход, л/с., Вверх, должно быть в пределах от 0 до 100")] - public double Reaming2FlowRateUp { get; set; } - - /// - /// Проработка 2, Расход, л/с., Вниз - /// - [Range(0.0, 100.0, ErrorMessage = "Проработка 2, Расход, л/с., Вниз, должно быть в пределах от 0 до 100")] - public double Reaming2FlowRateDown { get; set; } - - /// - /// Проработка 2, Интервал проработки, м. - /// - [Range(0.0, 30.0, ErrorMessage = "Проработка 2, Интервал проработки, м., должно быть в пределах от 0 до 30")] - public double Reaming2Interval { get; set; } - - /// - /// Остановка над забоем, м. - /// - [Range(0.0, 10.0, ErrorMessage = "Остановка над забоем, м., должно быть в пределах от 0 до 10")] - public double Reaming2StopPointOffBottom { get; set; } - - /// - /// Проработка 3, Количество повторений, шт. - /// - [Range(0.0, 99.0, ErrorMessage = "Проработка 3, Количество повторений, шт., должно быть в пределах от 0 до 99")] - public double Reaming3RepetitionsCount { get; set; } - - /// - /// Проработка 3, Скорость, м/ч., Вверх - /// - [Range(0.0, 999.0, ErrorMessage = "Проработка 3, Скорость, м/ч., Вверх, должно быть в пределах от 0 до 999")] - public double Reaming3RopUp { get; set; } - - /// - /// Проработка 3, Скорость, м/ч., Вниз - /// - [Range(0.0, 999.0, ErrorMessage = "Проработка 3, Скорость, м/ч., Вниз, должно быть в пределах от 0 до 999")] - public double Reaming3RopDown { get; set; } - - /// - /// Проработка 3, Обороты, об/мин., Вверх - /// - [Range(0.0, 270.0, ErrorMessage = "Проработка 3, Обороты, об/мин., Вверх, должно быть в пределах от 0 до 270")] - public double Reaming3RpmUp { get; set; } - - /// - /// Проработка 3, Обороты, об/мин., Вниз - /// - [Range(0.0, 270.0, ErrorMessage = "Проработка 3, Обороты, об/мин., Вниз, должно быть в пределах от 0 до 270")] - public double Reaming3RpmDown { get; set; } - - /// - /// Проработка 3, Расход, л/с., Вверх - /// - [Range(0.0, 100.0, ErrorMessage = "Проработка 3, Расход, л/с., Вверх, должно быть в пределах от 0 до 100")] - public double Reaming3FlowRateUp { get; set; } - - /// - /// Проработка 3, Расход, л/с., Вниз - /// - [Range(0.0, 100.0, ErrorMessage = "Проработка 3, Расход, л/с., Вниз, должно быть в пределах от 0 до 100")] - public double Reaming3FlowRateDown { get; set; } - - /// - /// Проработка 3, Интервал проработки, м. - /// - [Range(0.0, 30.0, ErrorMessage = "Проработка 3, Интервал проработки, м., должно быть в пределах от 0 до 30")] - public double Reaming3Interval { get; set; } - - /// - /// Остановка над забоем, м. - /// - [Range(0.0, 10.0, ErrorMessage = "Остановка над забоем, м., должно быть в пределах от 0 до 10")] - public double Reaming3StopPointOffBottom { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")] - public string Note { get; set; } = string.Empty; - - -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanRecordingStaticMeasurementDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanRecordingStaticMeasurementDto.cs deleted file mode 100644 index f3f4b692..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanRecordingStaticMeasurementDto.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план записи статического замера -/// -public class ProcessMapPlanRecordingStaticMeasurementDto : ProcessMapPlanBaseDto -{ - /// - /// Время записи замера, сек - /// - [Range(0.0, 1800.0, ErrorMessage = "Время записи замера, сек., должно быть в пределах от 0 до 1800")] - public double MeasurementRecordingTime { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, не должно превышать 1024 символов")] - public string Note { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanRotorDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanRotorDto.cs deleted file mode 100644 index 8adf60d8..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanRotorDto.cs +++ /dev/null @@ -1,88 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план бурение скважины в роторе -/// -public class ProcessMapPlanRotorDto : ProcessMapPlanBaseDto -{ - /// - /// Максимально допустимая скорость, м/ч - /// - [Range(0, 800.0, ErrorMessage = "Максимально допустимая скорость, м/ч., должно быть в пределах от 0 до 800.0")] - public double RopMax { get; set; } - - /// - /// Максимально допустимое давление, атм - /// - [Range(0.0, 400.0, ErrorMessage = "Максимально допустимое давление, атм., должно быть в пределах от 0 до 400.0")] - public double PressureMax { get; set; } - - /// - /// Перепад давления, атм. Уставка - /// - [Range(0.0, 60.0, ErrorMessage = "Перепад давления, атм., уставка, должно быть в пределах от 0 до 60.0")] - public double DifferentialPressure { get; set; } - - /// - /// Перепад давления, атм. Ограничение - /// - [Range(0.0, 60.0, ErrorMessage = "Перепад давления, атм., ограничение, должно быть в пределах от 0 до 60.0")] - public double DifferentialPressureMax { get; set; } - - /// - /// Нагрузка, т. Уставка - /// - [Range(0.0, 99.0, ErrorMessage = "Нагрузка, т., уставка, должно быть в пределах от 0 до 99.0")] - public double WeightOnBit { get; set; } - - /// - /// Нагрузка, т. Ограничение - /// - [Range(0.0, 99.0, ErrorMessage = "Нагрузка, т., ограничение, должно быть в пределах от 0 до 99.0")] - public double WeightOnBitMax { get; set; } - - /// - /// Момент на ВСП, кН*м. Уставка - /// - [Range(0.0, 35.0, ErrorMessage = "Момент на ВСП, кН*м., уставка, должно быть в пределах от 0 до 35.0")] - public double TopDriveTorque { get; set; } - - /// - /// Момент на ВСП, кН*м. Ограничение - /// - [Range(0.0, 35.0, ErrorMessage = "Момент на ВСП, кН*м., ограничение, должно быть в пределах от 0 до 35.0")] - public double TopDriveTorqueMax { get; set; } - - /// - /// Обороты на ВСП, об/мин. Уставка - /// - [Range(0.0, 270.0, ErrorMessage = "Обороты на ВСП, об/мин., уставка, должно быть в пределах от 0 до 270.0")] - public double Rpm { get; set; } - - /// - /// Обороты на ВСП, об/мин. Ограничение - /// - [Range(0.0, 270.0, ErrorMessage = "Обороты на ВСП, об/мин., ограничение, должно быть в пределах от 0 до 270.0")] - public double RpmMax { get; set; } - - /// - /// Расход л/с. Уставка - /// - [Range(0.0, 100.0, ErrorMessage = "Расход л/с., уставка, должно быть в пределах от 0 до 100.0")] - public double FlowRate { get; set; } - - /// - /// Расход л/с. Ограничение - /// - [Range(0.0, 100.0, ErrorMessage = "Расход л/с., ограничение, должно быть в пределах от 0 до 100.0")] - public double FlowRateMax { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, не должно превышать 1024 символов")] - public string Note { get; set; } = string.Empty; - -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanRotorLoweringBitDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanRotorLoweringBitDto.cs deleted file mode 100644 index 9d8da53d..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanRotorLoweringBitDto.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план подход к забою в роторе -/// -public class ProcessMapPlanRotorLoweringBitDto : ProcessMapPlanBaseDto -{ - /// - /// Максимально допустимое давление, атм. - /// - [Range(0.0, 400.0, ErrorMessage = "Максимально допустимое давление, атм., должно быть в пределах от 0 до 400")] - public double PressureMax { get; set; } - - /// - /// Перепад давления уставка, атм. - /// - [Range(0.0, 60.0, ErrorMessage = "Перепад давления уставка, атм., должно быть в пределах от 0 до 60")] - public double DifferentialPressure { get; set; } - - /// - /// Посадка, т. - /// - [Range(0.0, 20.0, ErrorMessage = "Посадка, т., должно быть в пределах от 0 до 20")] - public double SlackingOff { get; set; } - - /// - /// Максимально допустимый момент, кН*м. - /// - [Range(0.0, 35.0, ErrorMessage = "Максимально допустимый момент, кН*м., должно быть в пределах от 0 до 35")] - public double TorqueMax { get; set; } - - /// - /// Скорость вниз, м/ч. - /// - [Range(0.0, 999.0, ErrorMessage = "Скорость вниз, м/ч., должно быть в пределах от 0 до 999")] - public double RopDown { get; set; } - - /// - /// Обороты вниз, об/мин. - /// - [Range(0.0, 270.0, ErrorMessage = "Обороты вниз, об/мин., должно быть в пределах от 0 до 270")] - public double RpmDown { get; set; } - - /// - /// Расход вниз, л/с. - /// - [Range(0.0, 100.0, ErrorMessage = "Расход вниз, л/с., должно быть в пределах от 0 до 100")] - public double FlowRateDown { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")] - public string Note { get; set; } = string.Empty; - - -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanShockTestDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanShockTestDto.cs deleted file mode 100644 index ada3f844..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanShockTestDto.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план shocktest -/// -public class ProcessMapPlanShockTestDto : ProcessMapPlanBaseDto -{ - /// - /// StickSlip - /// - [Range(0.0, 1000.0, ErrorMessage = "StickSlip, должно быть в пределах от 0 до 1000")] - public double StickSlip { get; set; } - - /// - /// Whirl - /// - [Range(0.0, 1000.0, ErrorMessage = "Whirl, должно быть в пределах от 0 до 1000")] - public double Whirl { get; set; } - - /// - /// Осевые вибрации - /// - [Range(0.0, 1000.0, ErrorMessage = "Осевые вибрации, должно быть в пределах от 0 до 1000")] - public double AxialVibrations { get; set; } - - /// - /// Комбинированные вибрации - /// - [Range(0.0, 1000.0, ErrorMessage = "Комбинированные вибрации, должно быть в пределах от 0 до 1000")] - public double CombinedVibrations { get; set; } - - /// - /// Нагрузка минимальная, т - /// - [Range(0.0, 30.0, ErrorMessage = "Комбинированные вибрации, должно быть в пределах от 1 до 30")] - public double WeightOnBitMin { get; set; } - - /// - /// Минимальные обороты на ВСП, об/мин. - /// - [Range(5, 200, ErrorMessage = "Минимальные обороты на ВСП, об/мин., должно быть в пределах от 5 до 200")] - public double RpmMin { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")] - public string Note { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanSlideDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanSlideDto.cs deleted file mode 100644 index 4a0c4098..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanSlideDto.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план бурение скважины в слайде -/// -public class ProcessMapPlanSlideDto : ProcessMapPlanBaseDto -{ - /// - /// Максимально допустимая скорость, м/ч - /// - [Range(0, 800, ErrorMessage = "Максимально допустимая скорость, м/ч., должно быть в пределах от 0 до 800")] - public double RopMax { get; set; } - - /// - /// Максимально допустимое давление, атм - /// - [Range(0, 400, ErrorMessage = "Максимально допустимое давление, атм., должно быть в пределах от 0 до 400")] - public double PressureMax { get; set; } - - /// - /// Перепад давления уставка, атм - /// - [Range(0, 60, ErrorMessage = "Перепад давления уставка, атм., должно быть в пределах от 0 до 60")] - public double DifferentialPressure { get; set; } - - /// - /// Перепад давления ограничение, атм - /// - [Range(0, 60, ErrorMessage = "Перепад давления ограничение, атм., должно быть в пределах от 0 до 60")] - public double DifferentialPressureMax { get; set; } - - /// - /// Нагрузка уставка, т - /// - [Range(0, 99, ErrorMessage = "Нагрузка уставка, т., должно быть в пределах от 0 до 99")] - public double WeightOnBit { get; set; } - - /// - /// Нагрузка ограничение, т - /// - [Range(0, 99, ErrorMessage = "Нагрузка ограничение, т., должно быть в пределах от 0 до 99")] - public double WeightOnBitMax { get; set; } - - /// - /// Расход уставка л/с - /// - [Range(0, 100, ErrorMessage = "Расход уставка л/с., должно быть в пределах от 0 до 100")] - public double FlowRate { get; set; } - - /// - /// Расход ограничение л/с - /// - [Range(0, 100, ErrorMessage = "Расход ограничение л/с., должно быть в пределах от 0 до 100")] - public double FlowRateMax { get; set; } - - /// - /// Расчётная пружина, градус - /// - [Range(0, 9999, ErrorMessage = "Расчётная пружина, градус, должно быть в пределах от 0 до 9999")] - public double Spring { get; set; } - - /// - /// Складывание инструмента, м - /// - [Range(0, 9999, ErrorMessage = "Складывание инструмента, м., должно быть в пределах от 0 до 9999")] - public double Buckling { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, не должно превышать 1024 символов")] - public string Note { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanStaticMeasurementOutputDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanStaticMeasurementOutputDto.cs deleted file mode 100644 index d64366c0..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanStaticMeasurementOutputDto.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план выход статического замера -/// -public class ProcessMapPlanStaticMeasurementOutputDto : ProcessMapPlanBaseDto -{ - /// - /// Время ожидания выхода сигнала с ТМС, сек. - /// - [Range(0.0, 1800.0, ErrorMessage = "Время ожидания выхода сигнала с ТМС, сек., должно быть в пределах от 0 до 1800")] - public double SignalWaitingTime { get; set; } -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanSwitchingOffThePumpDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanSwitchingOffThePumpDto.cs deleted file mode 100644 index 81000490..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanSwitchingOffThePumpDto.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план выключение насоса -/// -public class ProcessMapPlanSwitchingOffThePumpDto : ProcessMapPlanBaseDto -{ - /// - /// Продолжительность, сек. - /// - [Range(0.0, 1800.0, ErrorMessage = "Продолжительность, сек., должно быть в пределах от 0 до 1800")] - public double Duration { get; set; } - - /// - /// Лимит остаточного давления, атм. - /// - [Range(0.0, 100.0, ErrorMessage = "Лимит остаточного давления, атм., должно быть в пределах от 0 до 100")] - public double ResidualPressureLimit { get; set; } -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanSwitchingToTheModeDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanSwitchingToTheModeDto.cs deleted file mode 100644 index 930c8475..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanSwitchingToTheModeDto.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план выход на плановый расход -/// -public class ProcessMapPlanSwitchingToTheModeDto : ProcessMapPlanBaseDto -{ - /// - /// Время выхода буровых насосов на плановый расход, сек. - /// - [Range(0.0, 3600.0, ErrorMessage = "Время выхода буровых насосов на плановый расход, сек., должно быть в пределах от 0 до 3600")] - public double RampTime { get; set; } - - /// - /// Расход, л/с - /// - [Range(0.0, 100.0, ErrorMessage = "Расход, л/с., должно быть в пределах от 0 до 100")] - public double FlowRate { get; set; } - - /// - /// Максимально допустимое давление, атм. - /// - [Range(0.0, 400.0, ErrorMessage = "Максимально допустимое давление, атм., должно быть в пределах от 0 до 400")] - public double PressureMax { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")] - public string Note { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanTFOrientationDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanTFOrientationDto.cs deleted file mode 100644 index 24ab00da..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanTFOrientationDto.cs +++ /dev/null @@ -1,93 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план выставление -/// -public class ProcessMapPlanTFOrientationDto : ProcessMapPlanBaseDto -{ - /// - /// Задание TF, град. - /// - [Range(0.0, 360.0, ErrorMessage = "Задание TF, град., должно быть в пределах от 0 до 360")] - public double TFSetpoint { get; set; } - - /// - /// Пружина, град. - /// - [Range(0.0, 10000.0, ErrorMessage = "Пружина, град., должно быть в пределах от 0 до 10000")] - public double Spring { get; set; } - - /// - /// Максимальное давление, атм. - /// - [Range(0.0, 400.0, ErrorMessage = "Максимальное давление, атм., должно быть в пределах от 0 до 400")] - public double PressureMax { get; set; } - - /// - /// Перепад давления, атм. - /// - [Range(0.0, 60.0, ErrorMessage = "Перепад давления, атм., должно быть в пределах от 0 до 60")] - public double DifferentialPressure { get; set; } - - /// - /// Затяжка, т. - /// - [Range(0.0, 20.0, ErrorMessage = "Затяжка, т., должно быть в пределах от 0 до 20")] - public double Tight { get; set; } - - /// - /// Посадка, т. - /// - [Range(0.0, 20.0, ErrorMessage = "Посадка, т., должно быть в пределах от 0 до 20")] - public double SlackingOff { get; set; } - - /// - /// Максимально допустимый момент, кН*м. - /// - [Range(0.0, 35.0, ErrorMessage = "Максимально допустимый момент, кН*м., должно быть в пределах от 0 до 35")] - public double TorqueMax { get; set; } - - /// - /// Количество расхаживаний, шт. - /// - [Range(0.0, 99.0, ErrorMessage = "Количество расхаживаний, шт., должно быть в пределах от 0 до 99")] - public int RepetitionsCount { get; set; } - - /// - /// Скорость вверх, м/ч. - /// - [Range(0.0, 999.0, ErrorMessage = "Скорость вверх, м/ч., должно быть в пределах от 0 до 999")] - public double RopUp { get; set; } - - /// - /// Скорость вниз, м/ч. - /// - [Range(0.0, 999.0, ErrorMessage = "Скорость вниз, м/ч., должно быть в пределах от 0 до 999")] - public double RopDown { get; set; } - - /// - /// Расход вверх, л/с. - /// - [Range(0.0, 100.0, ErrorMessage = "Расход вверх, л/с., должно быть в пределах от 0 до 100")] - public double FlowRateUp { get; set; } - - /// - /// Расход вниз, л/с. - /// - [Range(0.0, 100.0, ErrorMessage = "Расход вниз, л/с., должно быть в пределах от 0 до 100")] - public double FlowRateDown { get; set; } - - /// - /// Интервал расхаживания, м. - /// - [Range(0.0, 30.0, ErrorMessage = "Интервал расхаживания, м., должно быть в пределах от 0 до 30")] - public double Interval { get; set; } - - /// - /// Остановка над забоем, м. - /// - [Range(0.0, 10.0, ErrorMessage = "Остановка над забоем, м., должно быть в пределах от 0 до 10")] - public double StopPointOffBottom { get; set; } -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanUpdatingNoloadParametersDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanUpdatingNoloadParametersDto.cs deleted file mode 100644 index 5d05f594..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanUpdatingNoloadParametersDto.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план обновление холостого хода -/// -public class ProcessMapPlanUpdatingNoloadParametersDto : ProcessMapPlanBaseDto -{ - /// - /// СПУСК ОК Да/Нет - /// - public bool IdDeclineSocketColumn { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")] - public string Note { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/RotorRpmAccelerationDto.cs b/AsbCloudApp/Data/ProcessMaps/RotorRpmAccelerationDto.cs deleted file mode 100644 index 893bdccf..00000000 --- a/AsbCloudApp/Data/ProcessMaps/RotorRpmAccelerationDto.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план выход на обороты перед ротором -/// -public class RotorRpmAccelerationDto : ProcessMapPlanBaseDto -{ - /// - /// Зенитный угол, градусы - /// - [Range(0.0, 100.0, ErrorMessage = "Зенитный угол, градусы, должно быть в пределах от 0 до 100")] - public double ZenithAngle { get; set; } - - /// - /// Складывание, м - /// - [Range(0.0, 20.0, ErrorMessage = "Складывание, м., должно быть в пределах от 0 до 20")] - public double Buckling { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")] - public string Note { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index 5c2bc261..92dc12de 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -4,9 +4,10 @@ using System.Threading; using System.Threading.Tasks; using AsbCloudDb.Model.DailyReports; using AsbCloudDb.Model.Manuals; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudDb.Model.WellSections; using AsbCloudDb.Model.Trajectory; +using AsbCloudDb.Model.ProcessMapPlan.Functions; +using AsbCloudDb.Model.ProcessMapPlan.Operations; namespace AsbCloudDb.Model { diff --git a/AsbCloudDb/Model/IAsbCloudDbContext.cs b/AsbCloudDb/Model/IAsbCloudDbContext.cs index 6444ba00..a6a12765 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -8,9 +8,10 @@ using System.Threading; using System.Threading.Tasks; using AsbCloudDb.Model.DailyReports; using AsbCloudDb.Model.Manuals; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudDb.Model.WellSections; using AsbCloudDb.Model.Trajectory; +using AsbCloudDb.Model.ProcessMapPlan.Functions; +using AsbCloudDb.Model.ProcessMapPlan.Operations; namespace AsbCloudDb.Model { diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanAntiCrashRotation.cs b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanAntiCrashRotation.cs similarity index 95% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanAntiCrashRotation.cs rename to AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanAntiCrashRotation.cs index c27903ef..2edc1178 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanAntiCrashRotation.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanAntiCrashRotation.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Functions; [Table("t_process_map_plan_anti_crash_rotation"), Comment("Противоаварийное вращение")] public class ProcessMapPlanAntiCrashRotation : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanAutoHoldTF.cs b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanAutoHoldTF.cs similarity index 93% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanAutoHoldTF.cs rename to AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanAutoHoldTF.cs index 2144743e..0f0c5f59 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanAutoHoldTF.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanAutoHoldTF.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Functions; [Table("t_process_map_plan_auto_hold_tf"), Comment("Автоудержание TF")] public class ProcessMapPlanAutoHoldTF : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanDamper.cs b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanDamper.cs similarity index 92% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanDamper.cs rename to AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanDamper.cs index 11f9547f..3aac9f5b 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanDamper.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanDamper.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Functions; [Table("t_process_map_plan_functions_damper"), Comment("Демпфер")] public class ProcessMapPlanDamper : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanDrillTest.cs b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanDrillTest.cs similarity index 96% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanDrillTest.cs rename to AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanDrillTest.cs index 487c8a9c..2cd80bb9 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanDrillTest.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanDrillTest.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Functions; [Table("t_process_map_plan_drilltest"), Comment("DrillTest")] public class ProcessMapPlanDrillTest : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOscillation.cs b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanOscillation.cs similarity index 96% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOscillation.cs rename to AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanOscillation.cs index f11a11f3..81d583a6 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOscillation.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanOscillation.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Functions; [Table("t_process_map_plan_oscillation"), Comment("Осцилляция")] public class ProcessMapPlanOscillation : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanShockTest.cs b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanShockTest.cs similarity index 96% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanShockTest.cs rename to AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanShockTest.cs index 14a107ad..6c3e96bd 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanShockTest.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanShockTest.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Functions; [Table("t_process_map_shock_test"), Comment("ShockTest")] public class ProcessMapPlanShockTest : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanStaticMeasurementOutput.cs b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanStaticMeasurementOutput.cs similarity index 92% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanStaticMeasurementOutput.cs rename to AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanStaticMeasurementOutput.cs index aebd1171..3ab6fabc 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanStaticMeasurementOutput.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanStaticMeasurementOutput.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Functions; [Table("t_process_map_plan_static_measurement_output"), Comment("Выход статического замера")] public class ProcessMapPlanStaticMeasurementOutput : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParameters.cs b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanUpdatingNoloadParameters.cs similarity index 93% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParameters.cs rename to AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanUpdatingNoloadParameters.cs index 3be496df..4ab45fee 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParameters.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Functions/ProcessMapPlanUpdatingNoloadParameters.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Functions; [Table("t_process_map_plan_updating_noload_parameters"), Comment("Обновление холостого хода")] public class ProcessMapPlanUpdatingNoloadParameters : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanLoadCapacity.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacity.cs similarity index 95% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanLoadCapacity.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacity.cs index c7f8712e..b26ae7cb 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanLoadCapacity.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacity.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_load_capacity"), Comment("РТК выработка нагрузки")] public class ProcessMapPlanLoadCapacity : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOscillationAngles.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanOscillationAngles.cs similarity index 96% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOscillationAngles.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanOscillationAngles.cs index 2fd5248f..fc919ff2 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOscillationAngles.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanOscillationAngles.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_operation_oscillation_angels"), Comment("Определение углов осцилляции")] public class ProcessMapPlanOscillationAngles : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanPositioningOffTheBottom.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottom.cs similarity index 97% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanPositioningOffTheBottom.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottom.cs index 0d1cecf3..f7b98337 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanPositioningOffTheBottom.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottom.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_positioning_off_the_bottom"), Comment("Позиционирование над забоем")] public class ProcessMapPlanPositioningOffTheBottom : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanReam.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanReam.cs similarity index 96% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanReam.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanReam.cs index 05659bfa..930775b1 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanReam.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanReam.cs @@ -2,7 +2,7 @@ using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_ream"), Comment("РТК проработка скважины")] public class ProcessMapPlanReam : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanReamingRotor.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanReamingRotor.cs similarity index 99% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanReamingRotor.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanReamingRotor.cs index f1d69ff0..0183a09c 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanReamingRotor.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanReamingRotor.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_operation_reaming_rotor"), Comment("РТК проработка ротор")] public class ProcessMapPlanReamingRotor : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanReamingSlide.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanReamingSlide.cs similarity index 99% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanReamingSlide.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanReamingSlide.cs index 5ca53949..32ddb3b3 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanReamingSlide.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanReamingSlide.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_reaming_slide"), Comment("РТК проработка слайд")] public class ProcessMapPlanReamingSlide : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRecordingStaticMeasurement.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRecordingStaticMeasurement.cs similarity index 93% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRecordingStaticMeasurement.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRecordingStaticMeasurement.cs index c865ee36..5360457b 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRecordingStaticMeasurement.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRecordingStaticMeasurement.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_recording_static_measurement"), Comment("Запись статического замера")] public class ProcessMapPlanRecordingStaticMeasurement : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRotor.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRotor.cs similarity index 94% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRotor.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRotor.cs index e2e09f4a..5d6203e0 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRotor.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRotor.cs @@ -3,18 +3,18 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_rotor"), Comment("РТК план бурение ротор")] public class ProcessMapPlanRotor : ProcessMapPlanBase { [Column("rop_max"), Comment("Максимально допустимая скорость, м/ч")] [Range(0, 800.0)] - [Required] + [Required] public double RopMax { get; set; } [Column("pressure_max"), Comment("Максимально допустимое давление, атм")] - [Range(0.0, 400.0)] + [Range(0.0, 400.0)] [Required] public double PressureLimitMax { get; set; } @@ -73,5 +73,5 @@ public class ProcessMapPlanRotor : ProcessMapPlanBase public string Note { get; set; } = string.Empty; [ForeignKey(nameof(IdPrevious))] - public virtual ProcessMapPlanRotor? Previous { get; set; } + public virtual ProcessMapPlanRotor? Previous { get; set; } } \ No newline at end of file diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRotorLoweringBit.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRotorLoweringBit.cs similarity index 97% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRotorLoweringBit.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRotorLoweringBit.cs index a87a1ac3..ff24fb5e 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRotorLoweringBit.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRotorLoweringBit.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_rotor_lowering_bit"), Comment("РТК подход к забою в роторе")] public class ProcessMapPlanRotorLoweringBit : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRotorRpmAcceleration.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAcceleration.cs similarity index 94% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRotorRpmAcceleration.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAcceleration.cs index 856fc3b8..fde0d0c4 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRotorRpmAcceleration.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAcceleration.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_rotor_rpm_acceleration"), Comment("Выход на обороты перед ротором")] public class ProcessMapPlanRotorRpmAcceleration : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSlide.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanSlide.cs similarity index 95% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSlide.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanSlide.cs index 8c4d39c5..883ff97c 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSlide.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanSlide.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_slide"), Comment("РТК план бурение слайд")] public class ProcessMapPlanSlide : ProcessMapPlanBase @@ -62,5 +62,5 @@ public class ProcessMapPlanSlide : ProcessMapPlanBase public string Note { get; set; } = string.Empty; [ForeignKey(nameof(IdPrevious))] - public virtual ProcessMapPlanSlide? Previous { get; set; } + public virtual ProcessMapPlanSlide? Previous { get; set; } } \ No newline at end of file diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSlideLoweringBit.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanSlideLoweringBit.cs similarity index 96% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSlideLoweringBit.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanSlideLoweringBit.cs index 60a4ef73..9e4a6324 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSlideLoweringBit.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanSlideLoweringBit.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_slide_lowering_bit"), Comment("РТК подход к забою в слайде")] public class ProcessMapPlanSlideLoweringBit : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSwitchingOffThePump.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanSwitchingOffThePump.cs similarity index 93% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSwitchingOffThePump.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanSwitchingOffThePump.cs index 724603dd..4a142c49 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSwitchingOffThePump.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanSwitchingOffThePump.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_operation_switching_off_the_pump"), Comment("Выключение насоса")] public class ProcessMapPlanSwitchingOffThePump : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSwitchingToTheMode.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanSwitchingToTheMode.cs similarity index 95% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSwitchingToTheMode.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanSwitchingToTheMode.cs index 94baf32a..6ea265ea 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSwitchingToTheMode.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanSwitchingToTheMode.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_switching_to_the_mode"), Comment("Выход на плановый расход")] public class ProcessMapPlanSwitchingToTheMode : ProcessMapPlanBase diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanTFOrientation.cs b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanTFOrientation.cs similarity index 98% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanTFOrientation.cs rename to AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanTFOrientation.cs index 0af96346..12c8b523 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanTFOrientation.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/Operations/ProcessMapPlanTFOrientation.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using AsbCloudDb.Model.ProcessMapPlan; using Microsoft.EntityFrameworkCore; -namespace AsbCloudDb.Model.ProcessMaps; +namespace AsbCloudDb.Model.ProcessMapPlan.Operations; [Table("t_process_map_plan_tf_orientation"), Comment("Выставление")] public class ProcessMapPlanTFOrientation : ProcessMapPlanBase diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index 0aeb85a3..61374520 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -4,6 +4,8 @@ using AsbCloudApp.Data.DetectedOperation; using AsbCloudApp.Data.DrillTestReport; using AsbCloudApp.Data.Manuals; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Data.SAUB; using AsbCloudApp.Data.Subsystems; using AsbCloudApp.Data.Trajectory; @@ -17,7 +19,8 @@ using AsbCloudDb.Model; using AsbCloudDb.Model.DailyReports.Blocks.TimeBalance; using AsbCloudDb.Model.Manuals; using AsbCloudDb.Model.ProcessMapPlan; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Functions; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudDb.Model.Trajectory; using AsbCloudDb.Model.WellSections; using AsbCloudInfrastructure.Background; diff --git a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanReamTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanReamTemplate.cs index 5c454d7b..b9e118a5 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanReamTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanReamTemplate.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanRotorTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanRotorTemplate.cs index aa011afd..85b3cba7 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanRotorTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanRotorTemplate.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSlideTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSlideTemplate.cs index da50e04c..9a6a8107 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSlideTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSlideTemplate.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanAntiCrashRotationExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanAntiCrashRotationExportService.cs index fa784e16..d87c40e0 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanAntiCrashRotationExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanAntiCrashRotationExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanAutoHoldTFExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanAutoHoldTFExportService.cs index deb14626..84567d4f 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanAutoHoldTFExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanAutoHoldTFExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDamperExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDamperExportService.cs index cf9f9b35..9feaf815 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDamperExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDamperExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDrillTestExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDrillTestExportService.cs index 27d70979..6a8a9555 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDrillTestExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDrillTestExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanLoadCapacityExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanLoadCapacityExportService.cs index 53534abb..ae4fa8ac 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanLoadCapacityExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanLoadCapacityExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOscillationAnglesExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOscillationAnglesExportService.cs index 221491e6..c70779ff 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOscillationAnglesExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOscillationAnglesExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOscillationExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOscillationExportService.cs index 5e6f4ce4..a9488a7e 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOscillationExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOscillationExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanPositioningOffTheBottomExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanPositioningOffTheBottomExportService.cs index 20f7fd92..1da78da4 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanPositioningOffTheBottomExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanPositioningOffTheBottomExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamExportService.cs index c6b8495e..a08a3dc4 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamingRotorExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamingRotorExportService.cs index c72404c4..352e6df0 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamingRotorExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamingRotorExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamingSlideExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamingSlideExportService.cs index a30d8f47..f556cb65 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamingSlideExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamingSlideExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRecordingStaticMeasurementExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRecordingStaticMeasurementExportService.cs index baa26db4..5f9471eb 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRecordingStaticMeasurementExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRecordingStaticMeasurementExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorExportService.cs index ce6560d6..e16620ef 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorLoweringBitExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorLoweringBitExportService.cs index 28e09717..b0ae30f2 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorLoweringBitExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorLoweringBitExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorRpmAccelerationExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorRpmAccelerationExportService.cs index 2f9e8644..11927880 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorRpmAccelerationExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorRpmAccelerationExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanShockTestExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanShockTestExportService.cs index 9a4157f1..6035a610 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanShockTestExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanShockTestExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSlideExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSlideExportService.cs index c6c2fdfe..0d263beb 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSlideExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSlideExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSlideLoweringBitExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSlideLoweringBitExportService.cs index b7a75c3e..d2b763b7 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSlideLoweringBitExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSlideLoweringBitExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanStaticMeasurementOutputExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanStaticMeasurementOutputExportService.cs index 62c021ca..f41d2a81 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanStaticMeasurementOutputExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanStaticMeasurementOutputExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSwitchingOffThePumpExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSwitchingOffThePumpExportService.cs index 252a9587..e1ae6e19 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSwitchingOffThePumpExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSwitchingOffThePumpExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSwitchingToTheModeExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSwitchingToTheModeExportService.cs index a44c1dfe..ba0461fb 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSwitchingToTheModeExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSwitchingToTheModeExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanTFOrientationExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanTFOrientationExportService.cs index 0c210d02..495437c1 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanTFOrientationExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanTFOrientationExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanUpdatingNoloadParametersExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanUpdatingNoloadParametersExportService.cs index 1d30dfb3..566ffae9 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanUpdatingNoloadParametersExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanUpdatingNoloadParametersExportService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Requests.ExportOptions; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanAntiCrashRotationParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanAntiCrashRotationParser.cs index 15cf7486..007ae2c5 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanAntiCrashRotationParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanAntiCrashRotationParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanAutoHoldTFParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanAutoHoldTFParser.cs index bae893a6..2c502f33 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanAutoHoldTFParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanAutoHoldTFParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDamperParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDamperParser.cs index c3add6de..38ac7bad 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDamperParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDamperParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDrillTestParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDrillTestParser.cs index dff5e67f..cf42b3ac 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDrillTestParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDrillTestParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanLoadCapacityParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanLoadCapacityParser.cs index da88b090..ccd2e8f1 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanLoadCapacityParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanLoadCapacityParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOscillationAnglesParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOscillationAnglesParser.cs index 8fd7fead..213f4105 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOscillationAnglesParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOscillationAnglesParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOscillationParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOscillationParser.cs index f243053f..3233c825 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOscillationParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOscillationParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanPositioningOffTheBottomParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanPositioningOffTheBottomParser.cs index 919cd035..1d006985 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanPositioningOffTheBottomParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanPositioningOffTheBottomParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanReamParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanReamParser.cs index 7bfaa880..13882b53 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanReamParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanReamParser.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanReamingRotorParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanReamingRotorParser.cs index b68b2e0e..452daf3a 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanReamingRotorParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanReamingRotorParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanReamingSlideParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanReamingSlideParser.cs index 8a420d45..c3c61415 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanReamingSlideParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanReamingSlideParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRecordingStaticMeasurementParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRecordingStaticMeasurementParser.cs index 3e88edd1..a1a0f027 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRecordingStaticMeasurementParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRecordingStaticMeasurementParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorLoweringBitParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorLoweringBitParser.cs index 32443cb4..a2eb33cc 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorLoweringBitParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorLoweringBitParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorParser.cs index 1ce44dc9..cca67fc9 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorRpmAccelerationParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorRpmAccelerationParser.cs index 3a7bbbc9..82667797 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorRpmAccelerationParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorRpmAccelerationParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanShockTestParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanShockTestParser.cs index f3890ff5..b1494be4 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanShockTestParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanShockTestParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSlideLoweringBitParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSlideLoweringBitParser.cs index 2eefebbf..373e98cc 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSlideLoweringBitParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSlideLoweringBitParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSlideParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSlideParser.cs index 296070f3..a10c1652 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSlideParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSlideParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanStaticMeasurementOutputParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanStaticMeasurementOutputParser.cs index cd7b7d00..61de9970 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanStaticMeasurementOutputParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanStaticMeasurementOutputParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSwitchingOffThePumpParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSwitchingOffThePumpParser.cs index 7272810c..1ae5abf0 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSwitchingOffThePumpParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSwitchingOffThePumpParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSwitchingToTheModeParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSwitchingToTheModeParser.cs index f301a892..76990a07 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSwitchingToTheModeParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSwitchingToTheModeParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanTFOrientationParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanTFOrientationParser.cs index 54025674..8358ce19 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanTFOrientationParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanTFOrientationParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanUpdatingNoloadParametersParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanUpdatingNoloadParametersParser.cs index 1ba6f743..e5453b6a 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanUpdatingNoloadParametersParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanUpdatingNoloadParametersParser.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; diff --git a/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs b/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs index 4e1ef71d..f6e2e8ab 100644 --- a/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs @@ -1,5 +1,6 @@ using AsbCloudApp.Data; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Data.ProcessMaps.Report; using AsbCloudApp.Data.WellOperation; using AsbCloudApp.Exceptions; diff --git a/AsbCloudInfrastructure/Services/WellInfoService.cs b/AsbCloudInfrastructure/Services/WellInfoService.cs index 899e3ab5..1db7a2a1 100644 --- a/AsbCloudInfrastructure/Services/WellInfoService.cs +++ b/AsbCloudInfrastructure/Services/WellInfoService.cs @@ -1,5 +1,6 @@ using AsbCloudApp.Data; using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Data.SAUB; using AsbCloudApp.Data.WITS; using AsbCloudApp.IntegrationEvents; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacityControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacityControllerTest.cs index bbd353f2..bf1c6766 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacityControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanLoadCapacityControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Operations; +using AsbCloudApp.Data.ProcessMaps.Operations; namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottomControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottomControllerTest.cs index 84d4b6b1..2bbff2f5 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottomControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottomControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Operations; +using AsbCloudApp.Data.ProcessMaps.Operations; namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingRotorControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingRotorControllerTest.cs index 1e2f1c66..6acd2a1c 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingRotorControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingRotorControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Operations; +using AsbCloudApp.Data.ProcessMaps.Operations; namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingSlideControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingSlideControllerTest.cs index fa18b50d..40216e41 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingSlideControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanReamingSlideControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Operations; +using AsbCloudApp.Data.ProcessMaps.Operations; namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRecordingStaticMeasurementControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRecordingStaticMeasurementControllerTest.cs index a40ce381..dc5fb7d4 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRecordingStaticMeasurementControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRecordingStaticMeasurementControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Operations; +using AsbCloudApp.Data.ProcessMaps.Operations; namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAccelerationControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAccelerationControllerTest.cs index cc43a2f0..20ae09c9 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAccelerationControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAccelerationControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Operations; +using AsbCloudApp.Data.ProcessMaps.Operations; namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSwitchingToTheModeControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSwitchingToTheModeControllerTest.cs index fc9108ce..7c665a54 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSwitchingToTheModeControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSwitchingToTheModeControllerTest.cs @@ -1,5 +1,5 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudWebApi.IntegrationTests; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using Microsoft.EntityFrameworkCore; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanTFOrientationControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanTFOrientationControllerTest.cs index c5514d71..6b379f3d 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanTFOrientationControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanTFOrientationControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Operations; +using AsbCloudApp.Data.ProcessMaps.Operations; namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAntiCrashRotationControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAntiCrashRotationControllerTest.cs index 4b7b79d1..cb01881b 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAntiCrashRotationControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAntiCrashRotationControllerTest.cs @@ -1,5 +1,5 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; +using AsbCloudDb.Model.ProcessMapPlan.Functions; using AsbCloudWebApi.IntegrationTests; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using Microsoft.EntityFrameworkCore; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAutoHoldTFControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAutoHoldTFControllerTest.cs index 392c99e3..ec1eb6d7 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAutoHoldTFControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanAutoHoldTFControllerTest.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Functions; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDamperControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDamperControllerTest.cs index 16b3755f..64a6193a 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDamperControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDamperControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Functions; +using AsbCloudApp.Data.ProcessMaps.Functions; namespace AsbCloudWebApi.Controllers.ProcessMaps; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDrillTestControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDrillTestControllerTest.cs index e6817953..df61b16f 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDrillTestControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDrillTestControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Functions; +using AsbCloudApp.Data.ProcessMaps.Functions; namespace AsbCloudWebApi.Controllers.ProcessMaps; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationAnglesControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationAnglesControllerTest.cs index 7e136671..7c47f57c 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationAnglesControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationAnglesControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Operations; +using AsbCloudApp.Data.ProcessMaps.Operations; namespace AsbCloudWebApi.Controllers.ProcessMaps; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationControllerTest.cs index d9413b12..5dc42899 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Functions; +using AsbCloudApp.Data.ProcessMaps.Functions; namespace AsbCloudWebApi.Controllers.ProcessMaps; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanRotorControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanRotorControllerTest.cs index 788d43aa..0863bd6b 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanRotorControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanRotorControllerTest.cs @@ -1,12 +1,12 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using DocumentFormat.OpenXml.Drawing.Charts; using Mapster; using Microsoft.EntityFrameworkCore; using Xunit; namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; -public class ProcessMapPlanRotorControllerTest : ProcessMapPlanBaseControllerTest +public class ProcessMapPlanRotorControllerTest : ProcessMapPlanBaseControllerTest { private readonly ProcessMapPlanRotorDto dto = new ProcessMapPlanRotorDto() { diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanShockTestControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanShockTestControllerTest.cs index 32969202..333755f2 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanShockTestControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanShockTestControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Functions; +using AsbCloudApp.Data.ProcessMaps.Functions; namespace AsbCloudWebApi.Controllers.ProcessMaps; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSlideControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSlideControllerTest.cs index e91ea5fc..d33a1392 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSlideControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSlideControllerTest.cs @@ -1,5 +1,5 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using Mapster; using Microsoft.EntityFrameworkCore; using Xunit; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanStaticMeasurementOutputControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanStaticMeasurementOutputControllerTest.cs index 01323043..961c4e00 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanStaticMeasurementOutputControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanStaticMeasurementOutputControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Functions; +using AsbCloudApp.Data.ProcessMaps.Functions; namespace AsbCloudWebApi.Controllers.ProcessMaps; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSwitchingOffThePumpControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSwitchingOffThePumpControllerTest.cs index 71ec142a..c84772f9 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSwitchingOffThePumpControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSwitchingOffThePumpControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Operations; +using AsbCloudApp.Data.ProcessMaps.Operations; namespace AsbCloudWebApi.Controllers.ProcessMaps; diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs index 9850539d..d7104b92 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs @@ -1,14 +1,14 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; +using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan; using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; +using AsbCloudDb.Model.ProcessMapPlan.Functions; +using AsbCloudApp.Data.ProcessMaps.Functions; namespace AsbCloudWebApi.Controllers.ProcessMaps; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanAntiCrashRotationController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanAntiCrashRotationController.cs index 28a79b9d..5278589b 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanAntiCrashRotationController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanAntiCrashRotationController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Functions; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanAutoHoldTFController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanAutoHoldTFController.cs index eba1f7f1..645d016b 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanAutoHoldTFController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanAutoHoldTFController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Functions; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanDamperController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanDamperController.cs index 146007c4..0ae7430a 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanDamperController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanDamperController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Functions; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanDrillTestController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanDrillTestController.cs index a858a858..70ecaa23 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanDrillTestController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanDrillTestController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Functions; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanOscillationController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanOscillationController.cs index bd443fdd..c16f5d16 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanOscillationController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanOscillationController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Functions; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanShockTestController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanShockTestController.cs index 04665ffb..748f5ad6 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanShockTestController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanShockTestController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Functions; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanStaticMeasurementOutputController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanStaticMeasurementOutputController.cs index 1051a45d..95984016 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanStaticMeasurementOutputController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanStaticMeasurementOutputController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Functions; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanUpdatingNoloadParametersController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanUpdatingNoloadParametersController.cs index 8e57b51e..3c8bb70b 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanUpdatingNoloadParametersController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Functions/ProcessMapPlanUpdatingNoloadParametersController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Functions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Functions; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanLoadCapacityController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanLoadCapacityController.cs index 7e813ef4..58b2bc3c 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanLoadCapacityController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanLoadCapacityController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanOscillationAnglesController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanOscillationAnglesController.cs index 517234c9..7b74ad70 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanOscillationAnglesController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanOscillationAnglesController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanPositioningOffTheBottomController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanPositioningOffTheBottomController.cs index 30264156..df24f26b 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanPositioningOffTheBottomController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanPositioningOffTheBottomController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanReamController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamController.cs similarity index 85% rename from AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanReamController.cs rename to AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamController.cs index 2e9aeedf..1fc1bc22 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanReamController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamController.cs @@ -1,12 +1,12 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -namespace AsbCloudWebApi.Controllers.ProcessMaps; +namespace AsbCloudWebApi.Controllers.ProcessMaps.Operations; /// /// РТК план проработка diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamingRotorController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamingRotorController.cs index c445c7aa..610a815d 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamingRotorController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamingRotorController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamingSlideController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamingSlideController.cs index d440b854..049c4dbe 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamingSlideController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamingSlideController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRecordingStaticMeasurementController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRecordingStaticMeasurementController.cs index 98c8b0ee..ba857d80 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRecordingStaticMeasurementController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRecordingStaticMeasurementController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanRotorController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorController.cs similarity index 85% rename from AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanRotorController.cs rename to AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorController.cs index f437820d..e661009c 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanRotorController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorController.cs @@ -1,12 +1,12 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -namespace AsbCloudWebApi.Controllers.ProcessMaps; +namespace AsbCloudWebApi.Controllers.ProcessMaps.Operations; /// /// РТК план бурения (ротор) diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorLoweringBitController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorLoweringBitController.cs index d7a4ed32..670ba243 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorLoweringBitController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorLoweringBitController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorRpmAccelerationController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorRpmAccelerationController.cs index 23bb6c09..3d95708f 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorRpmAccelerationController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorRpmAccelerationController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSlideController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSlideController.cs index 312181ef..7511277f 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSlideController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSlideController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSlideLoweringBitController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSlideLoweringBitController.cs index 88674f71..b8f82d7c 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSlideLoweringBitController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSlideLoweringBitController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSwitchingOffThePumpController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSwitchingOffThePumpController.cs index c6407531..8350cb89 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSwitchingOffThePumpController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSwitchingOffThePumpController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSwitchingToTheModeController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSwitchingToTheModeController.cs index 8bc88b53..d749513d 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSwitchingToTheModeController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSwitchingToTheModeController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanTFOrientationController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanTFOrientationController.cs index 1359a663..45605c8c 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanTFOrientationController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanTFOrientationController.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Data.ProcessMaps.Operations; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; +using AsbCloudDb.Model.ProcessMapPlan.Operations; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser;