diff --git a/MP-TAB-SERV/Components/TcHistoryFilter.razor.cs b/MP-TAB-SERV/Components/TcHistoryFilter.razor.cs index 0ca6a0b6..21383560 100644 --- a/MP-TAB-SERV/Components/TcHistoryFilter.razor.cs +++ b/MP-TAB-SERV/Components/TcHistoryFilter.razor.cs @@ -132,13 +132,14 @@ namespace MP_TAB_SERV.Components { if (!ListArtDisabled) { - Log.Debug("GetArticoli"); + Log.Debug("START GetArticoli"); var rawData = await CtrDataServ.ArticoliGetSearch(10000, "*", searchVal); // trasformo! if (rawData != null) { ListArticoliAll = rawData.ToDictionary(x => x.CodArticolo, x => $"{x.CodArticolo} | {x.DescArticolo} | {x.Disegno}"); } + Log.Debug("END GetArticoli"); } } diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index 69f63cf8..d89e269e 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -25,6 +25,12 @@ + + + + + + diff --git a/MP-TAB-SERV/Pages/TCHistory.razor.cs b/MP-TAB-SERV/Pages/TCHistory.razor.cs index 0a684d99..22490daa 100644 --- a/MP-TAB-SERV/Pages/TCHistory.razor.cs +++ b/MP-TAB-SERV/Pages/TCHistory.razor.cs @@ -1,22 +1,5 @@ -using global::System; -using global::System.Collections.Generic; -using global::System.Linq; -using global::System.Threading.Tasks; using global::Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; -using Microsoft.JSInterop; -using MP_TAB_SERV; -using MP_TAB_SERV.Shared; -using MP_TAB_SERV.Components; -using MP.Data; using MP.Data.DatabaseModels; -using MP.Data.DTO; using MP.Data.Services; using NLog; @@ -24,8 +7,27 @@ namespace MP_TAB_SERV.Pages { public partial class TCHistory { - [Parameter] - public int MatrOpr { get; set; } = 0; + #region Protected Fields + + protected string BaseAddr = ""; + + protected string CodArt = ""; + + protected string IdxMacc = "*"; + + protected bool isLoading = false; + + protected int NumRecPage = 5; + + protected int PageNum = 1; + + protected int SearchMinChar = 3; + + protected int TotalCount = 0; + + #endregion Protected Fields + + #region Protected Properties [Inject] protected IConfiguration config { get; set; } = null!; @@ -33,23 +35,61 @@ namespace MP_TAB_SERV.Pages [Inject] protected OrderDataSrv CtrDataServ { get; set; } = null!; - protected int SearchMinChar = 3; - protected string CodArt = ""; - protected string IdxMacc = "*"; - protected string BaseAddr = ""; - protected bool isLoading = false; - protected int NumRecPage = 5; - protected int TotalCount = 0; - protected int PageNum = 1; protected List ListComplete { get; set; } = new List(); + protected List ListODL { get; set; } = new List(); + protected int MatrOpr + { + get => MServ.MatrOpr; + } + + [Inject] + protected MessageService MServ { get; set; } = null!; + + #endregion Protected Properties + + #region Protected Methods + protected override async Task OnInitializedAsync() { BaseAddr = config.GetValue("OptConf:BaseAddr") ?? ""; await ReloadData(); } + protected async Task ReloadData() + { + isLoading = true; + if (!string.IsNullOrEmpty(CodArt)) + { + try + { + ListComplete = await CtrDataServ.ListODLFilt(CodArt, IdxMacc); + TotalCount = ListComplete.Count; + // esegue paginazione + UpdateTable(); + } + catch (Exception exc) + { + Log.Error($"Error on dataload{Environment.NewLine}{exc}"); + } + } + + isLoading = false; + } + + protected void SaveNumRec(int newNum) + { + NumRecPage = newNum; + UpdateTable(); + } + + protected void SavePage(int newNum) + { + PageNum = newNum; + UpdateTable(); + } + protected async Task SelCodArt(string newCodArt) { CodArt = newCodArt; @@ -62,38 +102,6 @@ namespace MP_TAB_SERV.Pages await ReloadData(); } - protected async Task ReloadData() - { - isLoading = true; - if (!string.IsNullOrEmpty(CodArt)) - { - try - { -#if false - string ApiUrl = $"{BaseAddr}api/ODL/GetODL?CodArt={CodArt}&IdxMacchina={IdxMacc}"; - var rawData = await Http.GetFromJsonAsync>(ApiUrl); - if (rawData != null) - { - ListComplete = rawData; - TotalCount = ListComplete.Count; - // esegue paginazione - UpdateTable(); - } -#endif - ListComplete= await CtrDataServ.ListODLFilt(CodArt, IdxMacc); - TotalCount = ListComplete.Count; - // esegue paginazione - UpdateTable(); - } - catch (Exception exc) - { - Log.Error($"Error on dataload{Environment.NewLine}{exc}"); - } - } - - isLoading = false; - } - protected void UpdateTable() { // esegue paginazione @@ -107,18 +115,12 @@ namespace MP_TAB_SERV.Pages } } - protected void SavePage(int newNum) - { - PageNum = newNum; - UpdateTable(); - } + #endregion Protected Methods - protected void SaveNumRec(int newNum) - { - NumRecPage = newNum; - UpdateTable(); - } + #region Private Fields private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); + + #endregion Private Fields } } \ No newline at end of file diff --git a/MP-TAB-SERV/Pages/_Layout.cshtml b/MP-TAB-SERV/Pages/_Layout.cshtml index 8b5fd24a..0fcdec14 100644 --- a/MP-TAB-SERV/Pages/_Layout.cshtml +++ b/MP-TAB-SERV/Pages/_Layout.cshtml @@ -11,7 +11,8 @@ - + + diff --git a/MP-TAB-SERV/compilerconfig.json b/MP-TAB-SERV/compilerconfig.json index 18edd0fb..5610f4c9 100644 --- a/MP-TAB-SERV/compilerconfig.json +++ b/MP-TAB-SERV/compilerconfig.json @@ -2,5 +2,13 @@ { "outputFile": "Components/MachineBlock.razor.css", "inputFile": "Components/MachineBlock.razor.less" + }, + { + "outputFile": "wwwroot/css/site.css", + "inputFile": "wwwroot/css/site.less" + }, + { + "outputFile": "wwwroot/css/font.css", + "inputFile": "wwwroot/css/font.less" } ] \ No newline at end of file diff --git a/MP-TAB-SERV/wwwroot/css/font.css b/MP-TAB-SERV/wwwroot/css/font.css new file mode 100644 index 00000000..89f25331 --- /dev/null +++ b/MP-TAB-SERV/wwwroot/css/font.css @@ -0,0 +1,42 @@ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: url('fonts/OpenSans.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans Condensed'; + font-style: normal; + font-weight: 300; + src: url('fonts/OpenSansCondensed.woff') format('woff'); +} +/* lato-regular - latin */ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + src: url('../fonts/lato-v17-latin-regular.eot'); + /* IE9 Compat Modes */ + src: local(''), url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/lato-v17-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/lato-v17-latin-regular.woff') format('woff'), /* Modern Browsers */ url('../fonts/lato-v17-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg'); + /* Legacy iOS */ +} +/* roboto-regular - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: url('../fonts/roboto-v27-latin-regular.eot'); + /* IE9 Compat Modes */ + src: local(''), url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/roboto-v27-latin-regular.woff') format('woff'), /* Modern Browsers */ url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg'); + /* Legacy iOS */ +} +/* roboto-condensed-regular - latin */ +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 400; + src: url('../fonts/roboto-condensed-v19-latin-regular.eot'); + /* IE9 Compat Modes */ + src: local(''), url('../fonts/roboto-condensed-v19-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/roboto-condensed-v19-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/roboto-condensed-v19-latin-regular.woff') format('woff'), /* Modern Browsers */ url('../fonts/roboto-condensed-v19-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/roboto-condensed-v19-latin-regular.svg#RobotoCondensed') format('svg'); + /* Legacy iOS */ +} \ No newline at end of file diff --git a/MP-TAB-SERV/wwwroot/css/font.less b/MP-TAB-SERV/wwwroot/css/font.less new file mode 100644 index 00000000..a432a5af --- /dev/null +++ b/MP-TAB-SERV/wwwroot/css/font.less @@ -0,0 +1,50 @@ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: url('fonts/OpenSans.woff') format('woff'); +} + +@font-face { + font-family: 'Open Sans Condensed'; + font-style: normal; + font-weight: 300; + src: url('fonts/OpenSansCondensed.woff') format('woff'); +} + +/* lato-regular - latin */ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + src: url('../fonts/lato-v17-latin-regular.eot'); /* IE9 Compat Modes */ + src: local(''), url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/lato-v17-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/lato-v17-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('../fonts/lato-v17-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg'); /* Legacy iOS */ +} +/* roboto-regular - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: url('../fonts/roboto-v27-latin-regular.eot'); /* IE9 Compat Modes */ + src: local(''), url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/roboto-v27-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg'); /* Legacy iOS */ +} +/* roboto-condensed-regular - latin */ +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 400; + src: url('../fonts/roboto-condensed-v19-latin-regular.eot'); /* IE9 Compat Modes */ + src: local(''), url('../fonts/roboto-condensed-v19-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/roboto-condensed-v19-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/roboto-condensed-v19-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('../fonts/roboto-condensed-v19-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/roboto-condensed-v19-latin-regular.svg#RobotoCondensed') format('svg'); /* Legacy iOS */ +} \ No newline at end of file diff --git a/MP-TAB-SERV/wwwroot/css/font.min.css b/MP-TAB-SERV/wwwroot/css/font.min.css new file mode 100644 index 00000000..7b4dea8d --- /dev/null +++ b/MP-TAB-SERV/wwwroot/css/font.min.css @@ -0,0 +1 @@ +@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('fonts/OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('fonts/OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Lato';font-style:normal;font-weight:400;src:url('../fonts/lato-v17-latin-regular.eot?');src:local(''),url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/lato-v17-latin-regular.woff2') format('woff2'),url('../fonts/lato-v17-latin-regular.woff') format('woff'),url('../fonts/lato-v17-latin-regular.ttf') format('truetype'),url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('../fonts/roboto-v27-latin-regular.eot?');src:local(''),url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'),url('../fonts/roboto-v27-latin-regular.woff') format('woff'),url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'),url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:400;src:url('../fonts/roboto-condensed-v19-latin-regular.eot?');src:local(''),url('../fonts/roboto-condensed-v19-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/roboto-condensed-v19-latin-regular.woff2') format('woff2'),url('../fonts/roboto-condensed-v19-latin-regular.woff') format('woff'),url('../fonts/roboto-condensed-v19-latin-regular.ttf') format('truetype'),url('../fonts/roboto-condensed-v19-latin-regular.svg#RobotoCondensed') format('svg');} \ No newline at end of file diff --git a/MP-TAB-SERV/wwwroot/css/fonts/OpenSans.woff b/MP-TAB-SERV/wwwroot/css/fonts/OpenSans.woff new file mode 100644 index 00000000..55b25f86 Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/OpenSans.woff differ diff --git a/MP-TAB-SERV/wwwroot/css/fonts/OpenSansCondensed.woff b/MP-TAB-SERV/wwwroot/css/fonts/OpenSansCondensed.woff new file mode 100644 index 00000000..aedbd930 Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/OpenSansCondensed.woff differ diff --git a/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.eot b/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.eot new file mode 100644 index 00000000..c6413069 Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.eot differ diff --git a/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.svg b/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.svg new file mode 100644 index 00000000..55b43fb8 --- /dev/null +++ b/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.svg @@ -0,0 +1,435 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.ttf b/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.ttf new file mode 100644 index 00000000..3c2d417e Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.ttf differ diff --git a/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.woff b/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.woff new file mode 100644 index 00000000..189a0feb Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.woff differ diff --git a/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.woff2 b/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.woff2 new file mode 100644 index 00000000..6904b664 Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/lato-v17-latin-regular.woff2 differ diff --git a/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.eot b/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.eot new file mode 100644 index 00000000..e64b69bb Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.eot differ diff --git a/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.svg b/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.svg new file mode 100644 index 00000000..803c3b8a --- /dev/null +++ b/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.svg @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.ttf b/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.ttf new file mode 100644 index 00000000..878bdb26 Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.ttf differ diff --git a/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.woff b/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.woff new file mode 100644 index 00000000..90f54ea5 Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.woff differ diff --git a/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.woff2 b/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.woff2 new file mode 100644 index 00000000..bcbfde74 Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/roboto-condensed-v19-latin-regular.woff2 differ diff --git a/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.eot b/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.eot new file mode 100644 index 00000000..6dd5e3a0 Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.eot differ diff --git a/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.svg b/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.svg new file mode 100644 index 00000000..627f5a36 --- /dev/null +++ b/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.svg @@ -0,0 +1,308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.ttf b/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.ttf new file mode 100644 index 00000000..637971a1 Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.ttf differ diff --git a/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.woff b/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.woff new file mode 100644 index 00000000..86b38637 Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.woff differ diff --git a/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.woff2 b/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.woff2 new file mode 100644 index 00000000..ebe1795f Binary files /dev/null and b/MP-TAB-SERV/wwwroot/css/fonts/roboto-v27-latin-regular.woff2 differ diff --git a/MP-TAB-SERV/wwwroot/css/site.css b/MP-TAB-SERV/wwwroot/css/site.css index 489281e7..12513de1 100644 --- a/MP-TAB-SERV/wwwroot/css/site.css +++ b/MP-TAB-SERV/wwwroot/css/site.css @@ -1,67 +1,57 @@ -@import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); - -html, body { - /*font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;*/ - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; - background-image: linear-gradient(#444,#222); - color: #EDEDED; +@import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); +html, +body { + /*font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;*/ + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + background-image: linear-gradient(#444, #222); + color: #EDEDED; } - h1:focus { - outline: none; + outline: none; } - -a, .btn-link { - color: #0071c1; +a, +.btn-link { + color: #0071c1; } - .btn-primary { - color: #fff; - background-color: #1b6ec2; - border-color: #1861ac; + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; } - .content { - padding-top: 1.1rem; + padding-top: 1.1rem; } - .valid.modified:not([type=checkbox]) { - outline: 1px solid #26b050; + outline: 1px solid #26b050; } - .invalid { - outline: 1px solid red; + outline: 1px solid red; } - .validation-message { - color: red; + color: red; } - #blazor-error-ui { - background: lightyellow; - bottom: 0; - box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); - display: none; - left: 0; - padding: 0.6rem 1.25rem 0.7rem 1.25rem; - position: fixed; - width: 100%; - z-index: 1000; + background: lightyellow; + bottom: 0; + box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); + display: none; + left: 0; + padding: 0.6rem 1.25rem 0.7rem 1.25rem; + position: fixed; + width: 100%; + z-index: 1000; +} +#blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; } - - #blazor-error-ui .dismiss { - cursor: pointer; - position: absolute; - right: 0.75rem; - top: 0.5rem; - } - .blazor-error-boundary { - background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121; - padding: 1rem 1rem 1rem 3.7rem; - color: white; + background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121; + padding: 1rem 1rem 1rem 3.7rem; + color: white; } - - .blazor-error-boundary::after { - content: "An error has occurred." - } +.blazor-error-boundary::after { + content: "An error has occurred."; +} \ No newline at end of file diff --git a/MP-TAB-SERV/wwwroot/css/site.less b/MP-TAB-SERV/wwwroot/css/site.less new file mode 100644 index 00000000..489281e7 --- /dev/null +++ b/MP-TAB-SERV/wwwroot/css/site.less @@ -0,0 +1,67 @@ +@import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); + +html, body { + /*font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;*/ + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + background-image: linear-gradient(#444,#222); + color: #EDEDED; +} + +h1:focus { + outline: none; +} + +a, .btn-link { + color: #0071c1; +} + +.btn-primary { + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; +} + +.content { + padding-top: 1.1rem; +} + +.valid.modified:not([type=checkbox]) { + outline: 1px solid #26b050; +} + +.invalid { + outline: 1px solid red; +} + +.validation-message { + color: red; +} + +#blazor-error-ui { + background: lightyellow; + bottom: 0; + box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); + display: none; + left: 0; + padding: 0.6rem 1.25rem 0.7rem 1.25rem; + position: fixed; + width: 100%; + z-index: 1000; +} + + #blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; + } + +.blazor-error-boundary { + background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121; + padding: 1rem 1rem 1rem 3.7rem; + color: white; +} + + .blazor-error-boundary::after { + content: "An error has occurred." + } diff --git a/MP-TAB-SERV/wwwroot/css/site.min.css b/MP-TAB-SERV/wwwroot/css/site.min.css new file mode 100644 index 00000000..94a010d4 --- /dev/null +++ b/MP-TAB-SERV/wwwroot/css/site.min.css @@ -0,0 +1 @@ +@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');html,body{font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-image:linear-gradient(#444,#222);color:#ededed;}h1:focus{outline:0;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";} \ No newline at end of file diff --git a/MP.Data/Services/MessageService.cs b/MP.Data/Services/MessageService.cs index 3cb4749b..e2acba95 100644 --- a/MP.Data/Services/MessageService.cs +++ b/MP.Data/Services/MessageService.cs @@ -72,7 +72,8 @@ namespace MP.Data.Services { get { - int answ = -1; + int answ = 102; + //int answ = -1; if (_rigaOper != null) { answ = _rigaOper.MatrOpr;