SHA256
Small fixes and improvements:
- Show app version on Sidebar. - StayEntryForm - Remove unnecesary refs to components. - Fixed some result and log messages in entity services.
This commit is contained in:
@@ -21,12 +21,12 @@
|
|||||||
<MudDivider DividerType="DividerType.Middle" Class="mb-4" />
|
<MudDivider DividerType="DividerType.Middle" Class="mb-4" />
|
||||||
|
|
||||||
<MudStack Row style="@FieldMarginY">
|
<MudStack Row style="@FieldMarginY">
|
||||||
<MudDatePicker @ref="_datePickerDateIn" @bind-Date="Model.DateIn" For="@(() => Model.DateIn)"
|
<MudDatePicker @bind-Date="Model.DateIn" For="@(() => Model.DateIn)"
|
||||||
Label="@LanguageLocale.dto_StayEntry_DateIn" Clearable OpenTo="OpenTo.Date" Editable
|
Label="@LanguageLocale.dto_StayEntry_DateIn" Clearable OpenTo="OpenTo.Date" Editable
|
||||||
AutoClose="true" />
|
AutoClose="true" />
|
||||||
<MudTimePicker Time="Model.DateIn?.TimeOfDay" Label=" " Editable
|
<MudTimePicker Time="Model.DateIn?.TimeOfDay" Label=" " Editable
|
||||||
TimeChanged="@((newVal) => Model.DateIn = GetDateTimeFromDateAndTime(Model.DateIn, newVal))" />
|
TimeChanged="@((newVal) => Model.DateIn = GetDateTimeFromDateAndTime(Model.DateIn, newVal))" />
|
||||||
<MudDatePicker @ref="_datePickerDateOut" @bind-Date="Model.DateOut" For="@(() => Model.DateOut)"
|
<MudDatePicker @bind-Date="Model.DateOut" For="@(() => Model.DateOut)"
|
||||||
Label="@LanguageLocale.dto_StayEntry_DateOut" Clearable OpenTo="OpenTo.Date" Editable
|
Label="@LanguageLocale.dto_StayEntry_DateOut" Clearable OpenTo="OpenTo.Date" Editable
|
||||||
AutoClose="true" />
|
AutoClose="true" />
|
||||||
<MudTimePicker Time="Model.DateOut?.TimeOfDay" Label=" " Editable
|
<MudTimePicker Time="Model.DateOut?.TimeOfDay" Label=" " Editable
|
||||||
@@ -125,8 +125,6 @@
|
|||||||
|
|
||||||
|
|
||||||
private MudForm _form = null!;
|
private MudForm _form = null!;
|
||||||
private MudDatePicker _datePickerDateIn = null!;
|
|
||||||
private MudDatePicker _datePickerDateOut = null!;
|
|
||||||
|
|
||||||
private const string FieldMarginY = "margin-block: 0.5em";
|
private const string FieldMarginY = "margin-block: 0.5em";
|
||||||
private IEnumerable<string> PaymentMethodSet
|
private IEnumerable<string> PaymentMethodSet
|
||||||
|
|||||||
@@ -22,6 +22,10 @@
|
|||||||
</MudAppBar>
|
</MudAppBar>
|
||||||
<MudDrawer id="nav-drawer" @bind-Open="_drawerOpen" ClipMode="DrawerClipMode.Docked" Elevation="2">
|
<MudDrawer id="nav-drawer" @bind-Open="_drawerOpen" ClipMode="DrawerClipMode.Docked" Elevation="2">
|
||||||
<NavMenu />
|
<NavMenu />
|
||||||
|
<MudSpacer />
|
||||||
|
<MudText Typo="Typo.caption" Class="mx-2" GutterBottom>
|
||||||
|
@AppSettings.AppName - @AppSettings.AppVersion
|
||||||
|
</MudText>
|
||||||
</MudDrawer>
|
</MudDrawer>
|
||||||
<MudMainContent Class="pt-16 pa-4">
|
<MudMainContent Class="pt-16 pa-4">
|
||||||
@Body
|
@Body
|
||||||
|
|||||||
@@ -33,4 +33,5 @@ public class GuestDocument : BaseEntity
|
|||||||
|
|
||||||
|
|
||||||
public override string GetFullKey() => $"{Id}-{Version}";
|
public override string GetFullKey() => $"{Id}-{Version}";
|
||||||
|
public string FullDocument => $"{DocumentType}-{DocumentNum}";
|
||||||
}
|
}
|
||||||
@@ -56,7 +56,7 @@ public class StayEntryEntityService(
|
|||||||
if (isInOtherStay)
|
if (isInOtherStay)
|
||||||
{
|
{
|
||||||
string period = $"{dbStay.DateIn}-{dbStay.DateOut}";
|
string period = $"{dbStay.DateIn}-{dbStay.DateOut}";
|
||||||
return Result.FailWithContext(ResultCode.GuestCurrentlyInStay, dbGuest.GetFullKey(), period);
|
return Result.FailWithContext(ResultCode.GuestCurrentlyInStay, dbGuest.FullDocument, period);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Add dbGuest to dbStay.
|
//Add dbGuest to dbStay.
|
||||||
|
|||||||
@@ -46,12 +46,14 @@ public class StayExportFileEntityService(
|
|||||||
await dbContext.AddAsync(dbItem);
|
await dbContext.AddAsync(dbItem);
|
||||||
await dbContext.SaveChangesAsync();
|
await dbContext.SaveChangesAsync();
|
||||||
|
|
||||||
logger.LogInformation("StayExportFileService - CreateStayExportAsync: GuestDocument Created: '{id}'", dbItem.GetFullKey());
|
logger.LogInformation(
|
||||||
|
"StayExportFileService - CreateStayExportAsync: StayExport Created (ID: '{id}') with result: '{result}'",
|
||||||
|
dbItem.GetFullKey(), dbItem.ExportResult);
|
||||||
return Result.Ok();
|
return Result.Ok();
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
logger.LogError(ex, "StayExportFileService - CreateStayExportAsync: Error creating GuestDocument");
|
logger.LogError(ex, "StayExportFileService - CreateStayExportAsync: Error creating StayExport");
|
||||||
return Result.FailUnknownError();
|
return Result.FailUnknownError();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -83,7 +85,7 @@ public class StayExportFileEntityService(
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
logger.LogError(ex, "StayExportFileService - DeleteStayExportAsync: Error creating GuestDocument");
|
logger.LogError(ex, "StayExportFileService - DeleteStayExportAsync: Error deleting StayExport");
|
||||||
return Result.FailUnknownError();
|
return Result.FailUnknownError();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user