Merge branch 'release/Jenkins2GitLab'

Test modifica suppliers/transporters

.gitlab-ci.yml

@@ -70,6 +70,8 @@ stages:
 
 build:
   stage: build
+  tags:
+    - win
   before_script:
     - *nuget-fix
     - dotnet restore GWMS.sln
@@ -78,6 +80,8 @@ build:
 
 test:
   stage: test
+  tags:
+    - win
   only:
     - develop
   needs: ["build"]
@@ -110,6 +114,8 @@ test:
 
 installer:
   stage: installer
+  tags:
+    - win
   only:
     - develop
     - master
@@ -127,6 +133,8 @@ installer:
 
 release:
   stage: release
+  tags:
+    - win
   only:
     #- feature/Deploy_CI_CD
     # - master

GWMS.UI/GWMS.UI.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.0.2108.3116</Version>
+    <Version>1.0.2109.0211</Version>
     <UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>

GWMS.UI/Pages/GasStation.razor.cs

@@ -143,7 +143,7 @@ namespace GWMS.UI.Pages
             NavManager.NavigateTo($"GasStation/{args.BarcodeText}");
         }
 
-        private async Task reloadData()
+        private async Task ReloadAllData()
         {
             isLoading = true;
             PlantsList = null;
@@ -175,7 +175,7 @@ namespace GWMS.UI.Pages
             MessageService.ShowSearch = false;
             MessageService.PageName = "Stazione";
             MessageService.PageIcon = "fas fa-gas-pump pr-2";
-            await reloadData();
+            await ReloadAllData();
         }
 
         protected void ResetData()

GWMS.UI/Pages/Orders.razor.cs

@@ -115,8 +115,6 @@ namespace GWMS.UI.Pages
             }
         }
 
-        private bool ShowCharts { get; set; } = false;
-
         private bool ShowClosed
         {
             get
@@ -308,9 +306,6 @@ namespace GWMS.UI.Pages
         protected void Edit(OrderModel selRecord)
         {
             // rileggo dal DB il record corrente...
-#if false
-            currRecord = selRecord;
-#endif
             var pUpd = Task.Run(async () => currRecord = await DataService.OrderGetByCode(selRecord.OrderCode));
             pUpd.Wait();
         }
@@ -338,8 +333,8 @@ namespace GWMS.UI.Pages
         protected async Task ReloadAllData()
         {
             isLoading = true;
-            //PlantsList = await DataService.PlantsGetAll();
             SuppliersList = await DataService.SuppliersGetAll();
+            SelPlantId = 0;
             PlantsList = null;
             await GetClaimsData();
             // se ho un plantId valido --> altrimenti non abilitato
@@ -358,7 +353,6 @@ namespace GWMS.UI.Pages
                 PlantsList = new List<PlantDTO>();
             }
             isLoading = false;
-
             await ReloadData();
         }
 

GWMS.UI/Pages/PlantStatus.razor.cs

@@ -99,7 +99,7 @@ namespace GWMS.UI.Pages
             }
         }
 
-        private async Task reloadData()
+        private async Task ReloadAllData()
         {
             isLoading = true;
             ListRecords = null;
@@ -131,7 +131,7 @@ namespace GWMS.UI.Pages
             MessageService.PageName = "Impianti";
             MessageService.PageIcon = "fas fa-gas-pump pr-2";
             MessageService.EA_SearchUpdated += OnSeachUpdated;
-            await reloadData();
+            await ReloadAllData();
         }
 
         protected void Select(PlantDTO selRecord)
@@ -143,7 +143,7 @@ namespace GWMS.UI.Pages
         protected async Task UpdateData()
         {
             currRecord = null;
-            await reloadData();
+            await ReloadAllData();
         }
 
         #endregion Protected Methods

GWMS.UI/Pages/Suppliers.razor.cs

@@ -76,17 +76,17 @@ namespace GWMS.UI.Pages
             get
             {
                 int answ = 0;
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                 {
-                    answ = MessageService.Order_Filter.PlantId;
+                    answ = AppMService.Order_Filter.PlantId;
                 }
                 return answ;
             }
             set
             {
-                if (!MessageService.Order_Filter.PlantId.Equals(value))
+                if (!AppMService.Order_Filter.PlantId.Equals(value))
                 {
-                    MessageService.Order_Filter.PlantId = value;
+                    AppMService.Order_Filter.PlantId = value;
                     var pUpd = Task.Run(async () => await ReloadData());
                     pUpd.Wait();
                 }
@@ -98,29 +98,30 @@ namespace GWMS.UI.Pages
             get
             {
                 int answ = 0;
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                 {
-                    answ = MessageService.Order_Filter.SupplierId;
+                    answ = AppMService.Order_Filter.SupplierId;
                 }
                 return answ;
             }
             set
             {
-                if (!MessageService.Order_Filter.SupplierId.Equals(value))
+                if (!AppMService.Order_Filter.SupplierId.Equals(value))
                 {
-                    MessageService.Order_Filter.SupplierId = value;
+                    AppMService.Order_Filter.SupplierId = value;
                     var pUpd = Task.Run(async () => await ReloadData());
                     pUpd.Wait();
                 }
             }
         }
 
-        private bool ShowCharts { get; set; } = false;
-
         #endregion Private Properties
 
         #region Protected Properties
 
+        [Inject]
+        protected MessageService AppMService { get; set; }
+
         [Inject]
         protected AuthenticationStateProvider AuthenticationStateProvider { get; set; }
 
@@ -132,17 +133,17 @@ namespace GWMS.UI.Pages
             get
             {
                 DateTime answ = DateTime.Today.AddDays(1);
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                 {
-                    answ = MessageService.Order_Filter.DateEnd;
+                    answ = AppMService.Order_Filter.DateEnd;
                 }
                 return answ;
             }
             set
             {
-                if (!MessageService.Order_Filter.DateEnd.Equals(value))
+                if (!AppMService.Order_Filter.DateEnd.Equals(value))
                 {
-                    MessageService.Order_Filter.DateEnd = value;
+                    AppMService.Order_Filter.DateEnd = value;
                     var pUpd = Task.Run(async () => await ReloadData());
                     pUpd.Wait();
                 }
@@ -154,17 +155,17 @@ namespace GWMS.UI.Pages
             get
             {
                 DateTime answ = DateTime.Today.AddDays(-1);
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                 {
-                    answ = MessageService.Order_Filter.DateStart;
+                    answ = AppMService.Order_Filter.DateStart;
                 }
                 return answ;
             }
             set
             {
-                if (!MessageService.Order_Filter.DateStart.Equals(value))
+                if (!AppMService.Order_Filter.DateStart.Equals(value))
                 {
-                    MessageService.Order_Filter.DateStart = value;
+                    AppMService.Order_Filter.DateStart = value;
                     var pUpd = Task.Run(async () => await ReloadData());
                     pUpd.Wait();
                 }
@@ -174,9 +175,6 @@ namespace GWMS.UI.Pages
         [Inject]
         protected IJSRuntime JSRuntime { get; set; }
 
-        [Inject]
-        protected MessageService MessageService { get; set; }
-
         [Inject]
         protected NavigationManager NavManager { get; set; }
 
@@ -241,7 +239,7 @@ namespace GWMS.UI.Pages
         private async Task ReloadData()
         {
             isLoading = true;
-            SearchRecords = await DataService.OrdersGetFilt(MessageService.Order_Filter);
+            SearchRecords = await DataService.OrdersGetFilt(AppMService.Order_Filter);
             ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
             isLoading = false;
         }
@@ -252,7 +250,9 @@ namespace GWMS.UI.Pages
 
         protected void Edit(OrderModel selRecord)
         {
-            currRecord = selRecord;
+            // rileggo dal DB il record corrente...
+            var pUpd = Task.Run(async () => currRecord = await DataService.OrderGetByCode(selRecord.OrderCode));
+            pUpd.Wait();
         }
 
         protected void ForceReload(int newNum)
@@ -267,19 +267,21 @@ namespace GWMS.UI.Pages
 
         protected override async Task OnInitializedAsync()
         {
-            MessageService.ShowSearch = false;
+            DataService.ResetController();
-            MessageService.PageName = "Fornitore";
+            AppMService.ShowSearch = false;
-            MessageService.PageIcon = "fas fa-industry pr-2";
+            AppMService.PageName = "Fornitore";
-            MessageService.EA_SearchUpdated += OnSeachUpdated;
+            AppMService.PageIcon = "fas fa-industry pr-2";
+            AppMService.EA_SearchUpdated += OnSeachUpdated;
             await ReloadAllData();
         }
 
         protected async Task ReloadAllData()
         {
             isLoading = true;
+            PlantsList = await DataService.PlantsGetAll();
+            SelSupplierId = 0;
             SuppliersList = null;
             await GetClaimsData();
-            PlantsList = await DataService.PlantsGetAll();
             // se ho un plantId valido --> altrimenti non abilitato
             if (ClaimSupplierId == 0)
             {
@@ -310,7 +312,7 @@ namespace GWMS.UI.Pages
             currRecord = null;
             SearchRecords = null;
             ListRecords = null;
-            MessageService.Order_Filter = SelectOrderData.Init(5, 7);
+            AppMService.Order_Filter = SelectOrderData.Init(5, 7);
             await ReloadAllData();
         }
 
@@ -323,6 +325,7 @@ namespace GWMS.UI.Pages
         protected async Task UpdateData()
         {
             currRecord = null;
+            DataService.ResetController();
             await ReloadData();
         }
 
@@ -347,7 +350,7 @@ namespace GWMS.UI.Pages
 
         public void Dispose()
         {
-            MessageService.EA_SearchUpdated -= OnSeachUpdated;
+            AppMService.EA_SearchUpdated -= OnSeachUpdated;
         }
 
         public async void OnSeachUpdated()

GWMS.UI/Pages/Transporters.razor.cs

@@ -22,7 +22,6 @@ namespace GWMS.UI.Pages
         private List<OrderModel> ListRecords;
         private List<PlantDTO> PlantsList;
         private List<OrderModel> SearchRecords;
-
         private List<TransporterModel> TransportersList;
 
         #endregion Private Fields
@@ -100,18 +99,18 @@ namespace GWMS.UI.Pages
             get
             {
                 int answ = 0;
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                 {
-                    answ = MessageService.Order_Filter.PlantId;
+                    answ = AppMService.Order_Filter.PlantId;
                 }
                 return answ;
             }
             set
             {
-                if (!MessageService.Order_Filter.PlantId.Equals(value))
+                if (!AppMService.Order_Filter.PlantId.Equals(value))
                 {
                     currRecord = null;
-                    MessageService.Order_Filter.PlantId = value;
+                    AppMService.Order_Filter.PlantId = value;
                     var pUpd = Task.Run(async () => await ReloadData());
                     pUpd.Wait();
                 }
@@ -123,18 +122,18 @@ namespace GWMS.UI.Pages
             get
             {
                 int answ = 0;
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                 {
-                    answ = MessageService.Order_Filter.TransporterId;
+                    answ = AppMService.Order_Filter.TransporterId;
                 }
                 return answ;
             }
             set
             {
-                if (!MessageService.Order_Filter.TransporterId.Equals(value))
+                if (!AppMService.Order_Filter.TransporterId.Equals(value))
                 {
                     currRecord = null;
-                    MessageService.Order_Filter.TransporterId = value;
+                    AppMService.Order_Filter.TransporterId = value;
                     var pUpd = Task.Run(async () => await ReloadData());
                     pUpd.Wait();
                 }
@@ -145,6 +144,9 @@ namespace GWMS.UI.Pages
 
         #region Protected Properties
 
+        [Inject]
+        protected MessageService AppMService { get; set; }
+
         [Inject]
         protected AuthenticationStateProvider AuthenticationStateProvider { get; set; }
 
@@ -156,17 +158,17 @@ namespace GWMS.UI.Pages
             get
             {
                 DateTime answ = DateTime.Today.AddDays(1);
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                 {
-                    answ = MessageService.Order_Filter.DateEnd;
+                    answ = AppMService.Order_Filter.DateEnd;
                 }
                 return answ;
             }
             set
             {
-                if (!MessageService.Order_Filter.DateEnd.Equals(value))
+                if (!AppMService.Order_Filter.DateEnd.Equals(value))
                 {
-                    MessageService.Order_Filter.DateEnd = value;
+                    AppMService.Order_Filter.DateEnd = value;
                     var pUpd = Task.Run(async () => await ReloadData());
                     pUpd.Wait();
                 }
@@ -178,17 +180,17 @@ namespace GWMS.UI.Pages
             get
             {
                 DateTime answ = DateTime.Today.AddDays(-1);
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                 {
-                    answ = MessageService.Order_Filter.DateStart;
+                    answ = AppMService.Order_Filter.DateStart;
                 }
                 return answ;
             }
             set
             {
-                if (!MessageService.Order_Filter.DateStart.Equals(value))
+                if (!AppMService.Order_Filter.DateStart.Equals(value))
                 {
-                    MessageService.Order_Filter.DateStart = value;
+                    AppMService.Order_Filter.DateStart = value;
                     var pUpd = Task.Run(async () => await ReloadData());
                     pUpd.Wait();
                 }
@@ -198,9 +200,6 @@ namespace GWMS.UI.Pages
         [Inject]
         protected IJSRuntime JSRuntime { get; set; }
 
-        [Inject]
-        protected MessageService MessageService { get; set; }
-
         [Inject]
         protected NavigationManager NavManager { get; set; }
 
@@ -235,6 +234,7 @@ namespace GWMS.UI.Pages
         /// <returns></returns>
         private async Task GetClaimsData()
         {
+            ClaimTransporterId = -1;
             // recupero auth
             var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
             var user = authState.User;
@@ -266,9 +266,8 @@ namespace GWMS.UI.Pages
         private async Task ReloadData()
         {
             isLoading = true;
-            SearchRecords = await DataService.OrdersGetFilt(MessageService.Order_Filter);
+            SearchRecords = await DataService.OrdersGetFilt(AppMService.Order_Filter);
             ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
-            //ListRecords = SearchRecords.Where(x => x.TransporterId == TransporterIdFilt).Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
             isLoading = false;
         }
 
@@ -278,7 +277,9 @@ namespace GWMS.UI.Pages
 
         protected void Edit(OrderModel selRecord)
         {
-            currRecord = selRecord;
+            // rileggo dal DB il record corrente...
+            var pUpd = Task.Run(async () => currRecord = await DataService.OrderGetByCode(selRecord.OrderCode));
+            pUpd.Wait();
         }
 
         protected void ForceReload(int newNum)
@@ -293,12 +294,13 @@ namespace GWMS.UI.Pages
 
         protected override async Task OnInitializedAsync()
         {
+            DataService.ResetController();
             SelPlantId = 0;
             SelTranspId = 0;
-            MessageService.ShowSearch = false;
+            AppMService.ShowSearch = false;
-            MessageService.PageName = "Fornitore";
+            AppMService.PageName = "Fornitore";
-            MessageService.PageIcon = "fas fa-industry pr-2";
+            AppMService.PageIcon = "fas fa-industry pr-2";
-            MessageService.EA_SearchUpdated += OnSeachUpdated;
+            AppMService.EA_SearchUpdated += OnSeachUpdated;
             await ReloadAllData();
         }
 
@@ -306,6 +308,7 @@ namespace GWMS.UI.Pages
         {
             isLoading = true;
             PlantsList = await DataService.PlantsGetAll();
+            SelTranspId = 0;
             TransportersList = null;
             await GetClaimsData();
             // se ho un plantId valido --> altrimenti non abilitato
@@ -324,7 +327,6 @@ namespace GWMS.UI.Pages
                 PlantsList = new List<PlantDTO>();
             }
             isLoading = false;
-
             await ReloadData();
         }
 
@@ -339,7 +341,7 @@ namespace GWMS.UI.Pages
             currRecord = null;
             SearchRecords = null;
             ListRecords = null;
-            MessageService.Order_Filter = SelectOrderData.Init(5, 7);
+            AppMService.Order_Filter = SelectOrderData.Init(5, 7);
             await ReloadAllData();
         }
 
@@ -371,6 +373,7 @@ namespace GWMS.UI.Pages
         protected async Task UpdateData()
         {
             currRecord = null;
+            DataService.ResetController();
             await ReloadData();
         }
 
@@ -395,7 +398,7 @@ namespace GWMS.UI.Pages
 
         public void Dispose()
         {
-            MessageService.EA_SearchUpdated -= OnSeachUpdated;
+            AppMService.EA_SearchUpdated -= OnSeachUpdated;
         }
 
         public async void OnSeachUpdated()

GWMS.UI/Shared/NavMenu.razor

@@ -94,6 +94,12 @@
                         <span class="@hideText">Planner Consegne</span>
                     </NavLink>
                 </li>
+                <li class="nav-item px-3" title="Setup Parametri">
+                    <NavLink class="nav-link" href="Parameters">
+                        <i class="fas fa-2x fa-wrench pr-2" aria-hidden="true"></i>
+                        <span class="@hideText">Setup Parametri</span>
+                    </NavLink>
+                </li>
                 <li class="nav-item px-3" title="Admin Utenti">
                     <NavLink class="nav-link" href="UserAdmin">
                         <i class="fas fa-2x fa-users pr-2" aria-hidden="true"></i>
@@ -114,12 +120,6 @@
                     <i class="fas fa-2x fa-calendar-alt pr-2" aria-hidden="true"></i>
                     <span class="@hideText">Job Scheduler</span>
                 </NavLink>
-            </li>
-            <li class="nav-item px-3" title="Setup Parametri">
-                <NavLink class="nav-link" href="Parameters">
-                    <i class="fas fa-2x fa-wrench pr-2" aria-hidden="true"></i>
-                    <span class="@hideText">Setup Parametri</span>
-                </NavLink>
             </li>*@
     </ul>
 </div>

Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>GWMS - Gas Warehouse Management System</i>
-    <h4>Versione: 1.0.2108.3116</h4>
+    <h4>Versione: 1.0.2109.0211</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

Resources/VersNum.txt

@@ -1 +1 @@
-1.0.2108.3116
+1.0.2109.0211

Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2108.3116</version>
+  <version>1.0.2109.0211</version>
   <url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>