Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX-2500 Properties modal refactoring #2501

Merged
merged 13 commits into from
Aug 2, 2024
29 changes: 0 additions & 29 deletions Src/WitsmlExplorer.Api/Jobs/CreateLogJob.cs

This file was deleted.

29 changes: 0 additions & 29 deletions Src/WitsmlExplorer.Api/Jobs/CreateMudLogJob.cs

This file was deleted.

33 changes: 33 additions & 0 deletions Src/WitsmlExplorer.Api/Jobs/CreateObjectOnWellboreJob.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
using System.Text.Json.Serialization;

using WitsmlExplorer.Api.Models;

namespace WitsmlExplorer.Api.Jobs
{
public record CreateObjectOnWellboreJob : Job
{
[JsonConverter(typeof(ObjectOnWellboreConverter))]
public ObjectOnWellbore Object { get; init; }
public EntityType ObjectType { get; init; }

public override string Description()
{
return $"To Create - Type: {ObjectType}, Uid: {Object.Uid}.";
}

public override string GetObjectName()
{
return Object.Name;
}

public override string GetWellboreName()
{
return Object.WellboreName;
}

public override string GetWellName()
{
return Object.WellName;
}
}
}
50 changes: 0 additions & 50 deletions Src/WitsmlExplorer.Api/Jobs/CreateRigJob.cs

This file was deleted.

29 changes: 0 additions & 29 deletions Src/WitsmlExplorer.Api/Jobs/CreateRiskJob.cs

This file was deleted.

50 changes: 0 additions & 50 deletions Src/WitsmlExplorer.Api/Jobs/CreateTrajectoryJob.cs

This file was deleted.

29 changes: 0 additions & 29 deletions Src/WitsmlExplorer.Api/Jobs/CreateWbGeometryJob.cs

This file was deleted.

7 changes: 1 addition & 6 deletions Src/WitsmlExplorer.Api/Models/JobType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,9 @@ public enum JobType
ModifyWbGeometrySection,
ModifyWell,
ModifyWellbore,
CreateLogObject,
CreateWell,
CreateWellbore,
CreateRisk,
CreateMudLog,
CreateRig,
CreateTrajectory,
CreateWbGeometry,
CreateObjectOnWellbore,
BatchModifyWell,
ImportLogData,
ReplaceComponents,
Expand Down
2 changes: 1 addition & 1 deletion Src/WitsmlExplorer.Api/Models/LogObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class LogObject : ObjectOnWellbore
public string IndexType { get; set; }
public string StartIndex { get; set; }
public string EndIndex { get; set; }
public bool ObjectGrowing { get; init; }
public bool? ObjectGrowing { get; init; }
public string ServiceCompany { get; init; }
public string RunNumber { get; init; }
public string IndexCurve { get; init; }
Expand Down
13 changes: 13 additions & 0 deletions Src/WitsmlExplorer.Api/Models/Measure/DayMeasure.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
using System.Globalization;

using Witsml.Data.Measures;

namespace WitsmlExplorer.Api.Models.Measure
{
public class DayMeasure : Measure
{
public int Value { get; init; }

public WitsmlDayMeasure ToWitsml()
{
return new()
{
Uom = Uom,
Value = Value.ToString(CultureInfo.InvariantCulture)
};
}
}
}
4 changes: 2 additions & 2 deletions Src/WitsmlExplorer.Api/Models/Wellbore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ public class Wellbore
public string WellborePurpose { get; set; }
public string WellboreParentUid { get; set; }
public string WellboreParentName { get; set; }
public string WellStatus { get; set; }
public string WellType { get; set; }
public string WellboreStatus { get; set; }
public string WellboreType { get; set; }
public bool? IsActive { get; set; }
public string DateTimeCreation { get; set; }
public string DateTimeLastChange { get; set; }
Expand Down
4 changes: 3 additions & 1 deletion Src/WitsmlExplorer.Api/Query/FluidsReportQueries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ public static WitsmlFluidsReports QueryByWellbore(string wellUid, string wellbor
DTimLastChange = "",
ItemState = "",
Comments = "",
DefaultDatum = ""
DefaultDatum = "",
SourceName = "",
ServiceCategory = ""
}
}.AsItemInWitsmlList();
}
Expand Down
2 changes: 2 additions & 0 deletions Src/WitsmlExplorer.Api/Query/RigQueries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public static WitsmlRigs GetWitsmlRig(string wellUid, string wellboreUid, string
IsOffshore = "",
Manufacturer = "",
Name = "",
NameWell = "",
NameWellbore = "",
NameContact = "",
Owner = "",
Registration = "",
Expand Down
2 changes: 2 additions & 0 deletions Src/WitsmlExplorer.Api/Query/RiskQueries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public static WitsmlRisks GetWitsmlRiskByWellbore(string wellUid, string wellbor
UidWell = wellUid,
UidWellbore = wellboreUid,
Name = "",
NameWell = "",
NameWellbore = "",
Type = "",
Category = "",
SubCategory = "",
Expand Down
Loading