@*
***************** Confirm product check overlay button *****************************
***************** Continue by submitton order to erp *****************************
*@
-
@@ -409,25 +409,25 @@ else
-
+
-
-
-
-
-
diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
index 09745a0e..09693717 100644
--- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
@@ -59,12 +59,6 @@ public partial class AdvisorActivityCreatePage : IDisposable
// #############################################################
private readonly JsonSerializerOptions _options = new() { PropertyNameCaseInsensitive = true };
- private SalesItemView SelectedItem { get; set; } = new();
- private UserPreference UserPreference { get; set; } = new();
- private ActivityDto Activity { get; set; } = new();
- private CompanyDto Company { get; set; } = new();
- private EditContext? ActivityContext { get; set; }
- private bool PoFormInvalid { get; set; } = true;
private bool ShowItem { get; set; }
private string Quantity { get; set; } = "1";
private string Price { get; set; } = "0";
@@ -74,12 +68,11 @@ public partial class AdvisorActivityCreatePage : IDisposable
private bool InvalidActivity { get; set; } = true;
private bool ReportClosed { get; set; }
private bool Working { get; set; } = true;
- private UserManagerEditView SalesRep { get; set; } = new();
private DateTime SelectedDate { get; set; }
private string PromptDateConfirm { get; set; } = "";
private string ButtonText { get; set; } = "Gem besøg";
- private bool OrgWarning { get; set; }
- private const string PromptDemoForgotten = "Har du glemt demo?";
+ // private bool OrgWarning { get; set; }
+ // private const string PromptDemoForgotten = "Har du glemt demo?";
private CatalogPagedOverlay CatalogOverlay { get; set; } = new();
private ProductHistoryOverlay ProductOverlay { get; set; } = new();
private ProductPriceHistoryOverlay PriceOverlay { get; set; } = new();
@@ -88,60 +81,69 @@ public partial class AdvisorActivityCreatePage : IDisposable
private CustomerInvoiceListOverlay InvoiceListOverlay { get; set; } = new();
private CustomerInventoryListOverlay InventoryListOverlay { get; set; } = new();
private CustomerActivityListOverlay ActivityListOverlay { get; set; } = new();
+ private CompanyDto _company = new();
private bool _kanvas;
private bool _hideDeliveryAddress = true;
private InfoDrawer _infoDrawer = new();
private ActivityDrawer _activityDrawer = new();
private InventoryDrawer _inventoryDrawer = new();
private InvoiceDrawer _invoiceDrawer = new();
+ private SalesItemView _selectedItem = new();
+ private UserPreference _userPref = new();
+ private ActivityDto _activity = new();
+ private EditContext _formContext;
+ private UserManagerEditView _salesRep = new();
+ private bool _formInvalid = true;
- ///
- /// Page initialization
- ///
protected override async Task OnInitializedAsync()
{
- ActivityContext = new EditContext(Activity);
- ActivityContext.OnFieldChanged += ContextHandleFieldChanged;
- ActivityContext.OnValidationStateChanged += ContextValidationChanged;
+ _formContext = new EditContext(_activity);
+ _formContext.OnFieldChanged += ContextHandleFieldChanged!;
+ _formContext.OnValidationStateChanged += ContextValidationChanged!;
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
- // User Preferences
- UserPreference = await PreferenceService.GetProfile();
- // User Info
- SalesRep = await UserInfo.GetUserInfo();
+ _userPref = await PreferenceService.GetProfile();
+ _salesRep = await UserInfo.GetUserInfo();
- _infoDrawer = await DrawerService.GetInfoDrawerAsync(CompanyId);
- _activityDrawer = await DrawerService.GetActivityDrawerAsync(CompanyId);
- _inventoryDrawer = await DrawerService.GetInventoryDrawerAsync(CompanyId);
- _invoiceDrawer = await DrawerService.GetInvoiceDrawerAsync(CompanyId);
+ _company = await CompanyRepo.GetCompanyById(CompanyId);
- Company = _infoDrawer.Content;
+ if (!_company.Account.StartsWith("NY"))
+ {
+ _inventoryDrawer = await DrawerService.GetInventoryDrawerAsync(CompanyId, true);
+ _invoiceDrawer = await DrawerService.GetInvoiceDrawerAsync(CompanyId, true);
+ }
- if (Company.Account.StartsWith("KANVAS"))
+ _infoDrawer.Content = _company;
+ _infoDrawer.LastDateModified = DateTime.Today;
+ await DrawerService.StoreInfoDrawerAsync(CompanyId, _infoDrawer);
+
+ _activityDrawer = await DrawerService.GetActivityDrawerAsync(CompanyId, true);
+
+ if (_company.Account.StartsWith("KANVAS"))
{
_kanvas = true;
- Activity.ActivityStatusEnum = "canvas";
- Activity.ActivityTypeEnum = "canvas";
- Activity.ActivityVisitEnum = "new";
- PoFormInvalid = false;
+ _activity.ActivityStatusEnum = "canvas";
+ _activity.ActivityTypeEnum = "canvas";
+ _activity.ActivityVisitEnum = "new";
+ _formInvalid = false;
}
else
{
- if (Company.HasFolded == 1)
+ if (_company.HasFolded == 1)
{
- // Company has shut down
- Activity.OrderMessage = "BEMÆRK: CVR nummer er ophørt.";
+ // _company has shut down
+ _activity.OrderMessage = "BEMÆRK: CVR nummer er ophørt.";
}
- Activity.ActivityStatusEnum = "noSale";
+ _activity.ActivityStatusEnum = "noSale";
// decide if new or recall
- Activity.ActivityVisitEnum = Company.Account.StartsWith("NY")
+ _activity.ActivityVisitEnum = _company.Account.StartsWith("NY")
? "new"
: "recall";
- // if (string.IsNullOrWhiteSpace(Company.Segment) && SalesRep.CountryCode.ToLower() == "dk")
+ // if (string.IsNullOrWhiteSpace(_company.Segment) && _salesRep.CountryCode.ToLower() == "dk")
// {
// Toaster.ShowError("Der mangler information om Segment. Ret kunde segment, gem erp data og prøv igen.");
// // Navigator.NavigateTo($"/advisor/customers/{CompanyId}");
@@ -149,48 +151,48 @@ public partial class AdvisorActivityCreatePage : IDisposable
}
// Populate base activity information
- Activity.BcId = Company.BcId;
- Activity.CompanyId = Company.CompanyId;
- Activity.SalesRepId = SalesRep.UserId;
- Activity.SalesRep = SalesRep.SalesRep;
- Activity.CountryCode = SalesRep.CountryCode;
- Activity.Account = Company.Account;
- Activity.VatNumber = Company.VatNumber;
- Activity.Email = Company.Email;
- Activity.Phone = Company.Phone;
- Activity.Mobile = Company.Mobile;
- Activity.Name = Company.Name;
- Activity.Address1 = Company.Address1;
- Activity.Address2 = Company.Address2;
- Activity.ZipCode = Company.ZipCode;
- Activity.City = Company.City;
- Activity.DlvName = Company.Name;
- Activity.DlvAddress1 = Company.Address1;
- Activity.DlvAddress2 = Company.Address2;
- Activity.DlvZipCode = Company.ZipCode;
- Activity.DlvCity = Company.City;
- Activity.Segment = Company.Segment;
- Activity.EanNumber = Company.EanNumber;
+ _activity.Account = _company.Account;
+ _activity.Address1 = _company.Address1;
+ _activity.Address2 = _company.Address2;
+ _activity.BcId = _company.BcId;
+ _activity.City = _company.City;
+ _activity.CompanyId = _company.CompanyId;
+ _activity.CountryCode = _salesRep.CountryCode;
+ _activity.DlvCity = _company.City;
+ _activity.DlvAddress1 = _company.Address1;
+ _activity.DlvAddress2 = _company.Address2;
+ _activity.DlvName = _company.Name;
+ _activity.DlvZipCode = _company.ZipCode;
+ _activity.EanNumber = _company.EanNumber;
+ _activity.Email = _company.Email;
+ _activity.Mobile = _company.Mobile;
+ _activity.Name = _company.Name;
+ _activity.Phone = _company.Phone;
+ _activity.VatNumber = _company.VatNumber;
+ _activity.SalesRep = _salesRep.SalesRep;
+ _activity.SalesRepId = _salesRep.UserId;
+ _activity.Segment = _company.Segment;
+ _activity.ZipCode = _company.ZipCode;
/*
* debug loggin
*/
- // Logger.LogDebug("company.segment = {}", Company.Segment);
- // Logger.LogDebug("activity.segment = {}", Activity.Segment);
- // Logger.LogDebug("AdvisorActivityCreatePage => DateTime parser => {}", UserPreference.WorkDate);
+ // Logger.LogDebug("company.segment = {}", _company.Segment);
+ // Logger.LogDebug("activity.segment = {}", _activity.Segment);
+ // Logger.LogDebug("AdvisorActivityCreatePage => DateTime parser => {}", _userPref.WorkDate);
/*
* set selected date
*/
- SelectedDate = string.IsNullOrWhiteSpace(UserPreference.WorkDate)
+ SelectedDate = string.IsNullOrWhiteSpace(_userPref.WorkDate)
? DateTime.Now
- : DateTime.Parse(UserPreference.WorkDate);
+ : DateTime.Parse(_userPref.WorkDate);
// raise flag if report is closed
ReportClosed = await ReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}");
// Ask for confirmation of date
- // Logger.LogDebug("Preferences.DateConfirmed => {}", UserPreference.DateConfirmed);
- if (!UserPreference.DateConfirmed)
+ // Logger.LogDebug("Preferences.DateConfirmed => {}", _userPref.DateConfirmed);
+ if (!_userPref.DateConfirmed)
{
PromptDateConfirm = $"Aktiviteter oprettes med dato {SelectedDate.ToShortDateString()}. Er dette OK?";
WorkDateOverlay.Show();
@@ -200,38 +202,38 @@ public partial class AdvisorActivityCreatePage : IDisposable
if (DraftProvider.Draft.DraftType == "order")
{
// set dropdown selection accordingly
- if (Activity.ActivityTypeEnum != "phone")
+ if (_activity.ActivityTypeEnum != "phone")
{
- Activity.ActivityTypeEnum = "onSite";
+ _activity.ActivityTypeEnum = "onSite";
}
- Activity.ActivityStatusEnum = "order";
- PoFormInvalid = false;
+ _activity.ActivityStatusEnum = "order";
+ _formInvalid = false;
}
- if (SalesRep.CountryCode.ToLower() == "se")
+ if (_salesRep.CountryCode.ToLower() == "se")
{
await TestOrgNumber();
}
Working = false;
- StateHasChanged();
+ // StateHasChanged();
}
private async Task TestOrgNumber()
{
- var result = await OrgService.GetPersonalOrgNumber(Activity.Name);
+ var result = await OrgService.GetPersonalOrgNumber(_activity.Name);
if (!string.IsNullOrWhiteSpace(result.PersonalId))
{
// Toaster.ShowSuccess($"PersonId for {result.CompanyName} er fundet til at være {result.PersonalId}");
- Activity.VatNumber = result.PersonalId;
+ _activity.VatNumber = result.PersonalId;
}
}
///
- /// Show Activity Overlay
+ /// Show _activity Overlay
///
private void ShowActivitiesOverlay()
{
@@ -263,10 +265,10 @@ public partial class AdvisorActivityCreatePage : IDisposable
private async Task ShowProductCheckOverlay()
{
// check if new account
- if (string.IsNullOrWhiteSpace(Company.Account)
- || Company.Account.StartsWith("NY")
- || Activity.ActivityStatusEnum.ToLower() == "quote"
- || Activity.ActivityStatusEnum.ToLower() == "canvas")
+ if (string.IsNullOrWhiteSpace(_company.Account)
+ || _company.Account.StartsWith("NY")
+ || _activity.ActivityStatusEnum.ToLower() == "quote"
+ || _activity.ActivityStatusEnum.ToLower() == "canvas")
{
// proceed to create activity - as there is no product check to be done
await CreateActivity();
@@ -309,19 +311,14 @@ public partial class AdvisorActivityCreatePage : IDisposable
{
return;
}
-
- SelectedItem = await CatalogRepo.GetSalesItemId(SalesRep.CountryCode.ToLower(), sku.ItemId);
+ _selectedItem = await CatalogRepo.GetSalesItemId(_salesRep.CountryCode.ToLower(), sku.ItemId);
ShowItem = true;
Price = sku.Rate;
Quantity = sku.Quantity;
StateHasChanged();
}
-
- ///
- /// Product Price History Overlay Callback
- ///
- ///
+
private void PriceHistoryOverlayCallback(decimal price)
{
if (price == 0)
@@ -334,22 +331,15 @@ public partial class AdvisorActivityCreatePage : IDisposable
}
- ///
- /// Inventory Overlay Callback
- ///
- ///
private void InventoryOverlayCallback(DraftItem item)
{
- Activity.ActivityStatusEnum = "order";
+ _activity.ActivityStatusEnum = "order";
DraftProvider.Draft.DraftType = "order";
DraftProvider.Draft.Items.Add(item);
StateHasChanged();
}
- ///
- /// Product Check Overlay Callback
- ///
private async Task ProductCheckOverlayCallback()
{
ProductCheckOverlay.Hide();
@@ -362,33 +352,24 @@ public partial class AdvisorActivityCreatePage : IDisposable
await CreateActivity();
}
- ///
- /// Workdate Overlay Callback
- ///
+
private async Task WorkDateOverlayCallback()
{
await PreferenceService.SetDateConfirmed(true);
- Activity.ActivityDate = $"{SelectedDate:yyyy-MM-dd}";
+ _activity.ActivityDate = $"{SelectedDate:yyyy-MM-dd}";
WorkDateOverlay.Hide();
StateHasChanged();
}
-
- ///
- /// Workdate Changed Callback
- ///
- ///
+
private async Task WorkDateChangedCallback(string workDate)
{
ReportClosed = await ReportRepo.ReportExist(workDate);
SelectedDate = DateTime.Parse(workDate);
- Activity.ActivityDate = workDate;
+ _activity.ActivityDate = workDate;
}
-
- ///
- /// Create Activity
- ///
+
private async Task CreateActivity()
{
if (Working)
@@ -402,20 +383,20 @@ public partial class AdvisorActivityCreatePage : IDisposable
switch (_kanvas)
{
/*
- * validate customer address1 is required when Activity is order or quote
+ * validate customer address1 is required when _activity is order or quote
*/
- case false when string.IsNullOrWhiteSpace(Activity.Address1) && Activity.ActivityStatusEnum is "order" or "quote":
+ case false when string.IsNullOrWhiteSpace(_activity.Address1) && _activity.ActivityStatusEnum is "order" or "quote":
Toaster.ShowError("Kunde adresse er ufuldstændig.");
return;
/*
- * valid OrganisationNumber is required when Activity is order or quote
+ * valid OrganisationNumber is required when _activity is order or quote
*/
- case false when !VatUtils.ValidateFormat(Company.CountryCode, Activity.VatNumber) && Activity.ActivityStatusEnum is "order" or "quote":
+ case false when !VatUtils.ValidateFormat(_company.CountryCode, _activity.VatNumber) && _activity.ActivityStatusEnum is "order" or "quote":
Toaster.ShowError("Firma registreringsnummer er ikke korrekt.");
return;
}
- switch (Activity.ActivityStatusEnum)
+ switch (_activity.ActivityStatusEnum)
{
/*
* don't accept Draft with no Items
@@ -426,13 +407,13 @@ public partial class AdvisorActivityCreatePage : IDisposable
/*
* phone number is required if first time customer
*/
- case "order" when Company.Account.StartsWith("NY") && string.IsNullOrWhiteSpace(Activity.Phone):
+ case "order" when _company.Account.StartsWith("NY") && string.IsNullOrWhiteSpace(_activity.Phone):
Toaster.ShowError("Ved bestilling til ny kunde skal telefon nummer angives.");
return;
/*
* verify email address is a valid address
*/
- case "quote" when !Utils.IsValidEmail(Activity.Email):
+ case "quote" when !Utils.IsValidEmail(_activity.Email):
Toaster.ShowError("Ved tilbud skal en gyldig email adresse angives.");
return;
}
@@ -440,34 +421,35 @@ public partial class AdvisorActivityCreatePage : IDisposable
* set Workgin flag (prevents other actions while working)
*/
Working = true;
+ Toaster.ShowWarning("Arbejder på det... Vent venligst...");
/*
* reset local variable
*/
- SelectedItem = new SalesItemView();
+ _selectedItem = new SalesItemView();
/*
* ensure date is SelectedDate
*/
- Activity.ActivityDate = $"{SelectedDate:yyyy-MM-dd}";
+ _activity.ActivityDate = $"{SelectedDate:yyyy-MM-dd}";
/*
* Generate OurRef from activity type and user FirstName
*/
- Activity.OurRef = Activity.ActivityTypeEnum switch
+ _activity.OurRef = _activity.ActivityTypeEnum switch
{
- "phone" => $"T:{SalesRep.FirstName}",
- "onSite" => $"B:{SalesRep.FirstName}",
+ "phone" => $"T:{_salesRep.FirstName}",
+ "onSite" => $"B:{_salesRep.FirstName}",
_ => ""
};
- if (Activity.Express)
+ if (_activity.Express)
{
/*
* add `E` to indicate express
*/
- Activity.OurRef = $"E{Activity.OurRef}";
+ _activity.OurRef = $"E{_activity.OurRef}";
}
/*
* generate lines from draft
*/
- Activity.Lines = new List
();
+ _activity.Lines = new List();
var ln = 0;
if (DraftProvider.Draft.Items.Count != 0)
{
@@ -485,12 +467,12 @@ public partial class AdvisorActivityCreatePage : IDisposable
Location = item.Item.Location
})
.ToList();
- Activity.Lines = lines;
+ _activity.Lines = lines;
}
/*
* send reqeust
*/
- var result = await ActivityRepo.CreateActivity(Activity);
+ var result = await ActivityRepo.CreateActivity(_activity);
if (result.IsSuccess)
{
/*
@@ -535,16 +517,16 @@ public partial class AdvisorActivityCreatePage : IDisposable
// // return;
// // }
// // OrgWarning = true;
- // if (Company.CountryCode.ToLower() == "se"
- // && Utils.StringToDigits(Activity.VatNumber).Length < 10
- // && Activity.ActivityStatusEnum == "order")
+ // if (_company.CountryCode.ToLower() == "se"
+ // && Utils.StringToDigits(_activity.VatNumber).Length < 10
+ // && _activity.ActivityStatusEnum == "order")
// {
// // Toaster.ShowWarning("Org nummer er ufuldstændig. Skal opdateres før bestilling kan sendes.");
// // Toaster.ShowInfo("Vent mens vi soger at finde de manglende cifre ...");
- // var result = await OrgService.GetPersonalOrgNumber(Activity.Name);
+ // var result = await OrgService.GetPersonalOrgNumber(_activity.Name);
// if (!string.IsNullOrWhiteSpace(result.PersonalId))
// {
- // Activity.VatNumber = result.PersonalId;
+ // _activity.VatNumber = result.PersonalId;
// Toaster.ShowSuccess($"Org nummer for {result.CompanyName} er fundet at være {result.PersonalId}.");
// }
// }
@@ -552,24 +534,16 @@ public partial class AdvisorActivityCreatePage : IDisposable
// }
- ///
- /// Remove Current Draft
- ///
private async Task DeleteDraft()
{
await DraftProvider.DeleteDraftAsync();
- Activity.ActivityStatusEnum = "noSale";
+ _activity.ActivityStatusEnum = "noSale";
}
- ///
- /// Add Item To Draft
- ///
- ///
private async Task AddItem(SalesItemView salesItem)
{
ShowItem = false;
- // create a new cart item
var item = new DraftItem
{
Item = salesItem,
@@ -578,27 +552,19 @@ public partial class AdvisorActivityCreatePage : IDisposable
Discount = Convert.ToDecimal(Discount, CultureInfo.InvariantCulture),
Sas = Sas
};
- // reset internals to initial state
Sas = false;
Quantity = "1";
Price = "0";
Discount = "0";
- // add it to the cart
DraftProvider.Draft.Items.Add(item);
- if (Activity.ActivityStatusEnum != "quote")
+ if (_activity.ActivityStatusEnum != "quote")
{
- Activity.ActivityStatusEnum = "order";
+ _activity.ActivityStatusEnum = "order";
}
-
- // save the item using the CartStateProvider's save method
await DraftProvider.SaveChangesAsync();
}
- ///
- /// Remove Item From Draft
- ///
- ///
private async Task RemoveItem(DraftItem item)
{
// remove item
@@ -607,29 +573,22 @@ public partial class AdvisorActivityCreatePage : IDisposable
await DraftProvider.SaveChangesAsync();
if (!DraftProvider.Draft.Items.Any())
{
- Activity.ActivityStatusEnum = "noSale";
+ _activity.ActivityStatusEnum = "noSale";
}
}
- ///
- /// EditContext Field Changed Callback
- ///
- ///
- ///
- ///
private void ContextHandleFieldChanged(object sender, FieldChangedEventArgs e)
{
- Logger.LogDebug("ActivityNewPage => ContextHandleFieldChanged => ActivityStatusEnum <= '{}'",
- Activity.ActivityStatusEnum);
- DraftProvider.Draft.DraftType = Activity.ActivityStatusEnum;
- if (Activity.ActivityStatusEnum == "noSale")
+ Logger.LogDebug("ActivityNewPage => FieldChanged => ActivityStatusEnum <= '{}'", _activity.ActivityStatusEnum);
+ DraftProvider.Draft.DraftType = _activity.ActivityStatusEnum;
+ if (_activity.ActivityStatusEnum == "noSale")
{
Logger.LogDebug("ActivityNewPage => ActivityStatusEnum == 'noSale' <= remove items");
DraftProvider.Draft.Items = new List();
}
- ButtonText = Activity.ActivityStatusEnum.ToLower() switch
+ ButtonText = _activity.ActivityStatusEnum.ToLower() switch
{
"nosale" => "Gem Besøg",
"order" => "Send Bestilling",
@@ -639,19 +598,20 @@ public partial class AdvisorActivityCreatePage : IDisposable
// InvalidCanvas = InvalidActivityType;
InvalidActivity = InvalidActivityType
- || PoFormInvalid
+ || _formInvalid
|| DraftProvider.Draft.Items.Count == 0
- || (Activity.ActivityStatusEnum == "offer"
- && string.IsNullOrWhiteSpace(Activity.Email));
- if (Activity.YourRef.Length > 35
- || Activity.ReferenceNumber.Length > 20
+ || (_activity.ActivityStatusEnum == "quote"
+ && string.IsNullOrWhiteSpace(_activity.Email));
+
+ if (_activity.YourRef.Length > 35
+ || _activity.ReferenceNumber.Length > 20
|| InvalidActivity)
{
- PoFormInvalid = true;
+ _formInvalid = true;
return;
}
- PoFormInvalid = !ActivityContext.Validate();
+ _formInvalid = !_formContext.Validate();
StateHasChanged();
}
@@ -663,28 +623,28 @@ public partial class AdvisorActivityCreatePage : IDisposable
///
private void ContextValidationChanged(object sender, ValidationStateChangedEventArgs e)
{
- if (string.IsNullOrEmpty(Activity.ActivityTypeEnum) && !ReportClosed)
+ if (string.IsNullOrEmpty(_activity.ActivityTypeEnum) && !ReportClosed)
{
Toaster.ShowWarning("Aktivitet type kan ikke være tom");
- PoFormInvalid = true;
+ _formInvalid = true;
return;
}
- if (Activity.ActivityStatusEnum.ToLower() is "order" or "quote"
- && Company.CountryCode.ToLower() == "se"
- && Utils.StringToDigits(Activity.VatNumber).Length < 10)
+ if (_activity.ActivityStatusEnum.ToLower() is "order" or "quote"
+ && _company.CountryCode.ToLower() == "se"
+ && Utils.StringToDigits(_activity.VatNumber).Length < 10)
{
Toaster.ShowError("Org nummer er ufuldstændig ...");
// ShowOrgWarning();
// return;
}
- PoFormInvalid = false;
- ActivityContext.OnFieldChanged -= ContextHandleFieldChanged;
- ActivityContext.OnValidationStateChanged -= ContextValidationChanged;
- ActivityContext = new EditContext(Activity);
- ActivityContext.OnFieldChanged += ContextHandleFieldChanged;
- ActivityContext.OnValidationStateChanged += ContextValidationChanged;
+ _formInvalid = false;
+ _formContext.OnFieldChanged -= ContextHandleFieldChanged;
+ _formContext.OnValidationStateChanged -= ContextValidationChanged;
+ _formContext = new EditContext(_activity);
+ _formContext.OnFieldChanged += ContextHandleFieldChanged;
+ _formContext.OnValidationStateChanged += ContextValidationChanged;
}
@@ -694,7 +654,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
public void Dispose()
{
Interceptor.DisposeEvent();
- ActivityContext.OnFieldChanged -= ContextHandleFieldChanged;
- ActivityContext.OnValidationStateChanged -= ContextValidationChanged;
+ _formContext.OnFieldChanged -= ContextHandleFieldChanged;
+ _formContext.OnValidationStateChanged -= ContextValidationChanged;
}
}
\ No newline at end of file