Production profiles tab fixes, add cost and summary tab (#790)

* Remove facilities availability from drainage strategy and topside * Remove facilities availability from tests * Add year range input to production profiles table * Set limits for table years * Add case cost tab * Remove setting created and modify date from frontend * Add case summary tab * Make tabs and case name position fixed * Hide bottom scrollbar Vertical scrollbar shows main view position * Set tab menu and case title fixed position * Use loading icon for create case when waiting for server * Add table minwidth * Fix production profiles order * Align cost tab grids * Add save functionality to cost tab * Remove number in name when copying case * Remove comented out code * Add migration files * Add cost profiles to start and end year calculation
equinor · Oct 25, 2022 · 2c255f1 · 2c255f1
1 parent 3f106ab
commit 2c255f1
Show file tree

Hide file tree

Showing 41 changed files with 3,329 additions and 311 deletions.
diff --git a/backend/api/Adapters/CaseAdapter.cs b/backend/api/Adapters/CaseAdapter.cs
@@ -24,8 +24,8 @@ public static Case Convert(CaseDto caseDto)
             DG2Date = caseDto.DG2Date,
             DG3Date = caseDto.DG3Date,
             DG4Date = caseDto.DG4Date,
-            CreateTime = caseDto.CreateTime,
-            ModifyTime = caseDto.ModifyTime,
+            CreateTime = DateTimeOffset.Now,
+            ModifyTime = DateTimeOffset.Now,
             DrainageStrategyLink = caseDto.DrainageStrategyLink,
             ExplorationLink = caseDto.ExplorationLink,
             WellProjectLink = caseDto.WellProjectLink,
@@ -39,6 +39,10 @@ public static Case Convert(CaseDto caseDto)
             GasInjectorCount = caseDto.GasInjectorCount,
             WaterInjectorCount = caseDto.WaterInjectorCount,
             FacilitiesAvailability = caseDto.FacilitiesAvailability,
+            CapexFactorFeasibilityStudies = caseDto.CapexFactorFeasibilityStudies,
+            CapexFactorFEEDStudies = caseDto.CapexFactorFEEDStudies,
+            NPV = caseDto.NPV,
+            BreakEven = caseDto.BreakEven,
             SharepointFileId = caseDto.SharepointFileId,
             SharepointFileName = caseDto.SharepointFileName,
             SharepointFileUrl = caseDto.SharepointFileUrl,
@@ -62,8 +66,7 @@ public static void ConvertExisting(Case existing, CaseDto caseDto)
         existing.DG2Date = caseDto.DG2Date;
         existing.DG3Date = caseDto.DG3Date;
         existing.DG4Date = caseDto.DG4Date;
-        existing.CreateTime = caseDto.CreateTime;
-        existing.ModifyTime = caseDto.ModifyTime;
+        existing.ModifyTime = DateTimeOffset.Now;
         existing.DrainageStrategyLink = caseDto.DrainageStrategyLink;
         existing.ExplorationLink = caseDto.ExplorationLink;
         existing.WellProjectLink = caseDto.WellProjectLink;
@@ -77,6 +80,10 @@ public static void ConvertExisting(Case existing, CaseDto caseDto)
         existing.GasInjectorCount = caseDto.GasInjectorCount;
         existing.WaterInjectorCount = caseDto.WaterInjectorCount;
         existing.FacilitiesAvailability = caseDto.FacilitiesAvailability;
+        existing.CapexFactorFeasibilityStudies = caseDto.CapexFactorFeasibilityStudies;
+        existing.CapexFactorFEEDStudies = caseDto.CapexFactorFEEDStudies;
+        existing.NPV = caseDto.NPV;
+        existing.BreakEven = caseDto.BreakEven;
         existing.SharepointFileId = caseDto.SharepointFileId;
         existing.SharepointFileName = caseDto.SharepointFileName;
     }

diff --git a/backend/api/Adapters/CaseDtoAdapter.cs b/backend/api/Adapters/CaseDtoAdapter.cs
@@ -39,6 +39,10 @@ public static CaseDto Convert(Case case_)
             GasInjectorCount = case_.GasInjectorCount,
             WaterInjectorCount = case_.WaterInjectorCount,
             FacilitiesAvailability = case_.FacilitiesAvailability,
+            CapexFactorFeasibilityStudies = case_.CapexFactorFeasibilityStudies,
+            CapexFactorFEEDStudies = case_.CapexFactorFEEDStudies,
+            NPV = case_.NPV,
+            BreakEven = case_.BreakEven,
             SharepointFileId = case_.SharepointFileId,
             SharepointFileName = case_.SharepointFileName,
             SharepointFileUrl = case_.SharepointFileUrl,

diff --git a/backend/api/Adapters/DrainageStrategyAdapter.cs b/backend/api/Adapters/DrainageStrategyAdapter.cs
@@ -103,10 +103,10 @@ private static DrainageStrategy DrainagestrategyDtoToDrainagestrategy(DrainageSt
                 ProjectId = drainageStrategyDto.ProjectId,
                 NGLYield = drainageStrategyDto.NGLYield,
                 ArtificialLift = drainageStrategyDto.ArtificialLift,
+                GasSolution = drainageStrategyDto.GasSolution,
                 ProducerCount = drainageStrategyDto.ProducerCount,
                 GasInjectorCount = drainageStrategyDto.GasInjectorCount,
                 WaterInjectorCount = drainageStrategyDto.WaterInjectorCount,
-                FacilitiesAvailability = drainageStrategyDto.FacilitiesAvailability
             };
         }
         existing.Id = drainageStrategyDto.Id;
@@ -115,10 +115,10 @@ private static DrainageStrategy DrainagestrategyDtoToDrainagestrategy(DrainageSt
         existing.ProjectId = drainageStrategyDto.ProjectId;
         existing.NGLYield = drainageStrategyDto.NGLYield;
         existing.ArtificialLift = drainageStrategyDto.ArtificialLift;
+        existing.GasSolution = drainageStrategyDto.GasSolution;
         existing.ProducerCount = drainageStrategyDto.ProducerCount;
         existing.GasInjectorCount = drainageStrategyDto.GasInjectorCount;
         existing.WaterInjectorCount = drainageStrategyDto.WaterInjectorCount;
-        existing.FacilitiesAvailability = drainageStrategyDto.FacilitiesAvailability;
 
         return existing;
     }

diff --git a/backend/api/Adapters/DrainageStrategyDtoAdapter.cs b/backend/api/Adapters/DrainageStrategyDtoAdapter.cs
@@ -15,10 +15,10 @@ public static DrainageStrategyDto Convert(DrainageStrategy drainageStrategy, Phy
             ProjectId = drainageStrategy.ProjectId,
             NGLYield = drainageStrategy.NGLYield,
             ArtificialLift = drainageStrategy.ArtificialLift,
+            GasSolution = drainageStrategy.GasSolution,
             ProducerCount = drainageStrategy.ProducerCount,
             GasInjectorCount = drainageStrategy.GasInjectorCount,
             WaterInjectorCount = drainageStrategy.WaterInjectorCount,
-            FacilitiesAvailability = drainageStrategy.FacilitiesAvailability,
             ProductionProfileOil = Convert(drainageStrategy.ProductionProfileOil, unit),
             ProductionProfileGas = Convert(drainageStrategy.ProductionProfileGas, unit),
             ProductionProfileWater = Convert(drainageStrategy.ProductionProfileWater, unit),

diff --git a/backend/api/Adapters/TopsideAdapter.cs b/backend/api/Adapters/TopsideAdapter.cs
@@ -15,7 +15,6 @@ public static Topside Convert(TopsideDto topsideDto)
             DryWeight = topsideDto.DryWeight,
             OilCapacity = topsideDto.OilCapacity,
             GasCapacity = topsideDto.GasCapacity,
-            FacilitiesAvailability = topsideDto.FacilitiesAvailability,
             ArtificialLift = topsideDto.ArtificialLift,
             Maturity = topsideDto.Maturity,
             Currency = topsideDto.Currency,
@@ -61,7 +60,6 @@ public static void ConvertExisting(Topside existing, TopsideDto topsideDto)
         existing.DryWeight = topsideDto.DryWeight;
         existing.OilCapacity = topsideDto.OilCapacity;
         existing.GasCapacity = topsideDto.GasCapacity;
-        existing.FacilitiesAvailability = topsideDto.FacilitiesAvailability;
         existing.ArtificialLift = topsideDto.ArtificialLift;
         existing.Maturity = topsideDto.Maturity;
         existing.Currency = topsideDto.Currency;

diff --git a/backend/api/Adapters/TopsideDtoAdapter.cs b/backend/api/Adapters/TopsideDtoAdapter.cs
@@ -15,7 +15,6 @@ public static TopsideDto Convert(Topside topside)
             DryWeight = topside.DryWeight,
             OilCapacity = topside.OilCapacity,
             GasCapacity = topside.GasCapacity,
-            FacilitiesAvailability = topside.FacilitiesAvailability,
             ArtificialLift = topside.ArtificialLift,
             Maturity = topside.Maturity,
             Currency = topside.Currency,

diff --git a/backend/api/Controllers/ExplorationsController.cs b/backend/api/Controllers/ExplorationsController.cs
@@ -47,4 +47,10 @@ public ProjectDto UpdateExploration([FromBody] ExplorationDto eplorationDto)
     {
         return _explorationService.UpdateExploration(eplorationDto);
     }
+
+    [HttpPut("new", Name = "NewUpdateExploration")]
+    public ExplorationDto NewUpdateExploration([FromBody] ExplorationDto eplorationDto)
+    {
+        return _explorationService.NewUpdateExploration(eplorationDto);
+    }
 }
diff --git a/backend/api/Controllers/WellProjectsController.cs b/backend/api/Controllers/WellProjectsController.cs
@@ -48,4 +48,10 @@ public ProjectDto UpdateWellProject([FromBody] WellProjectDto wellProjectDto)
     {
         return _wellProjectService.UpdateWellProject(wellProjectDto);
     }
+
+    [HttpPut("new", Name = "NewUpdateWellProject")]
+    public WellProjectDto NewUpdateWellProject([FromBody] WellProjectDto wellProjectDto)
+    {
+        return _wellProjectService.NewUpdateWellProject(wellProjectDto);
+    }
 }
diff --git a/backend/api/Dtos/CaseDto.cs b/backend/api/Dtos/CaseDto.cs
@@ -15,6 +15,10 @@ public class CaseDto
     public int GasInjectorCount { get; set; }
     public int WaterInjectorCount { get; set; }
     public double FacilitiesAvailability { get; set; }
+    public double CapexFactorFeasibilityStudies { get; set; }
+    public double CapexFactorFEEDStudies { get; set; }
+    public double NPV { get; set; }
+    public double BreakEven { get; set; }
     public DateTimeOffset DGADate { get; set; }
     public DateTimeOffset DGBDate { get; set; }
     public DateTimeOffset DGCDate { get; set; }

diff --git a/backend/api/Dtos/DrainageStrategyDto.cs b/backend/api/Dtos/DrainageStrategyDto.cs
@@ -13,6 +13,7 @@ public class DrainageStrategyDto
     public int GasInjectorCount { get; set; }
     public int WaterInjectorCount { get; set; }
     public ArtificialLift ArtificialLift { get; set; }
+    public GasSolution GasSolution { get; set; }
     public ProductionProfileOilDto? ProductionProfileOil { get; set; }
     public ProductionProfileGasDto? ProductionProfileGas { get; set; }
     public ProductionProfileWaterDto? ProductionProfileWater { get; set; }
@@ -21,7 +22,6 @@ public class DrainageStrategyDto
     public NetSalesGasDto? NetSalesGas { get; set; }
     public Co2EmissionsDto? Co2Emissions { get; set; }
     public ProductionProfileNGLDto? ProductionProfileNGL { get; set; }
-    public double FacilitiesAvailability { get; set; }
 }
 public class ProductionProfileOilDto : TimeSeriesVolumeDto
 {

diff --git a/backend/api/Dtos/TopsideDto.cs b/backend/api/Dtos/TopsideDto.cs
@@ -13,7 +13,6 @@ public class TopsideDto
     public double DryWeight { get; set; }
     public double OilCapacity { get; set; }
     public double GasCapacity { get; set; }
-    public double FacilitiesAvailability { get; set; }
     public ArtificialLift ArtificialLift { get; set; }
     public Maturity Maturity { get; set; }
     public Currency Currency { get; set; }