diff --git a/MagMan.Data.Tenant/DbModels/LogMachineModel.cs b/MagMan.Data.Tenant/DbModels/LogMachineModel.cs index 15e65fc..28a796d 100644 --- a/MagMan.Data.Tenant/DbModels/LogMachineModel.cs +++ b/MagMan.Data.Tenant/DbModels/LogMachineModel.cs @@ -34,6 +34,12 @@ namespace MagMan.Data.Tenant.DbModels /// public int KeyNum { get; set; } = 0; + /// + /// Data Registrazione + /// + [Column("DtEvent")] + public DateTime DtRif { get; set; } = DateTime.Now; + #if false /// /// Codice Allarme diff --git a/MagMan.UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml b/MagMan.UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml index 43aa112..77d93fd 100644 --- a/MagMan.UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml +++ b/MagMan.UI/Areas/Identity/Pages/Account/ForgotPassword.cshtml @@ -1,26 +1,71 @@ @page @model ForgotPasswordModel @{ - ViewData["Title"] = "Forgot your password?"; + ViewData["Title"] = "Password dimenticata?"; } -

@ViewData["Title"]

-

Enter your email.

-
-
-
-
-
-
- - - -
- -
-
+ +
+

@ViewData["Title"]

+
+
+
+
+
+ EgtBeam&Wall +
+
+ Powered by +
+
+ +
+
+ EgalWare +
+
+
+
+
+
+
+
+

Inserisci email.

+
+
+
+ + + +
+
+ +
+ +
+
+
+
+
+ +
+ + @section Scripts { } diff --git a/MagMan.UI/Areas/Identity/Pages/Account/Login.cshtml b/MagMan.UI/Areas/Identity/Pages/Account/Login.cshtml index 660620d..e7ddeed 100644 --- a/MagMan.UI/Areas/Identity/Pages/Account/Login.cshtml +++ b/MagMan.UI/Areas/Identity/Pages/Account/Login.cshtml @@ -2,83 +2,78 @@ @model LoginModel @{ - ViewData["Title"] = "Log in"; + ViewData["Title"] = "MagMan"; } -
-

@ViewData["Title"]

-
-
-
-

Use a local account to log in.

-
-
-
- - - +
+

@ViewData["Title"]

+
+
+
+
+
+
+ EgtBeam&Wall
-
- - - +
+ Powered by
-
-
- -
+
+
-
- +
+ EgalWare
-
- - -
-
- @*
-
-

Use another service to log in.

-
- @{ - if ((Model.ExternalLogins?.Count ?? 0) == 0) - { -
-

- There are no external authentication services configured. See this article - about setting up this ASP.NET application to support logging in via external services. -

-
- } - else - { -
+
+
+
+
+
+
+ +

Login Utente

+
+
+
+ + + +
+
+ + + +
+
+
+ +
+
+
+ +

- @foreach (var provider in Model.ExternalLogins!) - { - - } + Password dimenticata? +

+

+ Registra nuovo utente +

+

+ Reinvia email di conferma

- } - } - -
*@ +
+
+
+ @section Scripts { diff --git a/MagMan.UI/Areas/Identity/Pages/Account/Login.cshtml.cs b/MagMan.UI/Areas/Identity/Pages/Account/Login.cshtml.cs index 7584b6d..b77be36 100644 --- a/MagMan.UI/Areas/Identity/Pages/Account/Login.cshtml.cs +++ b/MagMan.UI/Areas/Identity/Pages/Account/Login.cshtml.cs @@ -160,7 +160,7 @@ namespace MagMan.UI.Areas.Identity.Pages.Account /// intended to be used directly from your code. This API may change or be removed in /// future releases. ///
- [Display(Name = "Remember me?")] + [Display(Name = "Ricordami")] public bool RememberMe { get; set; } #endregion Public Properties diff --git a/MagMan.UI/Areas/Identity/Pages/Account/Register.cshtml b/MagMan.UI/Areas/Identity/Pages/Account/Register.cshtml index e8ff83b..1231466 100644 --- a/MagMan.UI/Areas/Identity/Pages/Account/Register.cshtml +++ b/MagMan.UI/Areas/Identity/Pages/Account/Register.cshtml @@ -1,67 +1,77 @@ @page @model RegisterModel @{ - ViewData["Title"] = "Register"; + ViewData["Title"] = "Registrazione"; } +

@ViewData["Title"]

+
-
-
-
-

Create a new account.

-
-
-
- - - + +
+
+
+
+
+ EgtBeam&Wall +
+
+ Powered by +
+
+ +
+
+ EgalWare +
-
- - - -
-
- - - -
- - -
-
-
-

Use another service to register.

-
- @{ - if ((Model.ExternalLogins?.Count ?? 0) == 0) - { -
-

- There are no external authentication services configured. See this article - about setting up this ASP.NET application to support logging in via external services. -

-
- } - else - { -
+
+
+
+
+
+ +

Nuovo Account

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+

- @foreach (var provider in Model.ExternalLogins!) - { - - } + Hai già un profilo? Clicca qui +

+

+ Password dimenticata? +

+

+ Reinvia email di conferma

- } - } - +
+
+
-
+
@section Scripts { } diff --git a/MagMan.UI/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml b/MagMan.UI/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml index ccce148..507545d 100644 --- a/MagMan.UI/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml +++ b/MagMan.UI/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml @@ -1,26 +1,72 @@ @page @model ResendEmailConfirmationModel @{ - ViewData["Title"] = "Resend email confirmation"; + ViewData["Title"] = "Reinvio email di conferma"; } -

@ViewData["Title"]

-

Enter your email.

-
-
-
-
-
-
- - - -
- -
-
+ + +
+

@ViewData["Title"]

+ + +
+
+
+
+
+ EgtBeam&Wall +
+
+ Powered by +
+
+ +
+
+ EgalWare +
+
+
+
+
+
+
+
+

Inserisci l'email

+
+
+
+ + + +
+
+ +
+ +
+
+
+
+
+ +
@section Scripts { } diff --git a/MagMan.UI/MagMan.UI.csproj b/MagMan.UI/MagMan.UI.csproj index f7d8c38..179d60f 100644 --- a/MagMan.UI/MagMan.UI.csproj +++ b/MagMan.UI/MagMan.UI.csproj @@ -2,7 +2,7 @@ net6.0 - 1.0.2404.2609 + 1.0.2404.2611 enable enable true diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 19ac91c..64a91ba 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MagMan - Wood Warehouse Management System -

Versione: 1.0.2404.2609

+

Versione: 1.0.2404.2611


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index ebeb3ac..2467de0 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2404.2609 +1.0.2404.2611 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 7743e84..d88791e 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.0.2404.2609 + 1.0.2404.2611 http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html false