Merge branch 'release/NumSearchTag'

2021-10-15 10:46:20 +02:00
parent 6c3f35f64b 4dbf8a6611
commit b259a94ca8
6 changed files with 17 additions and 5 deletions
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Configuration;
 using MP.FileData.DatabaseModels;
 using MP.Prog;
 using MP.Prog.Data;
@@ -14,12 +15,19 @@ namespace MP.Prog.Components
        #region Protected Fields

        protected string _SearchTag;
-        protected string defTag = "###";
+        protected string defTag = "#";

        protected string LastSelTag = "";

        #endregion Protected Fields

+        #region Private Properties
+
+        [Inject]
+        private IConfiguration Configuration { get; set; }
+
+        #endregion Private Properties
+
        #region Protected Properties

        [Inject]
@@ -120,6 +128,7 @@ namespace MP.Prog.Components

        protected override async Task OnInitializedAsync()
        {
+            defTag = Configuration["Tags:DefaultSearch"];
            LastSelTag = SelTag;
            await ReloadAllData();
            _SearchTag = defTag;
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net5.0</TargetFramework>
    <RootNamespace>MP.Prog</RootNamespace>
-    <Version>6.14.2109.3016</Version>
+    <Version>6.14.2110.1510</Version>
  </PropertyGroup>

  <ItemGroup>
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo gestione Programmi MAPO</i>
-    <h4>Versione: 6.14.2109.3016</h4>
+    <h4>Versione: 6.14.2110.1510</h4>
    <br />
    Note di rilascio:
    <ul>
@@ -1 +1 @@
-6.14.2109.3016
+6.14.2110.1510
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.14.2109.3016</version>
+  <version>6.14.2110.1510</version>
  <url>https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Prog.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>
@@ -14,6 +14,9 @@
        //}
    },
    "AllowedHosts": "*",
+    "Tags": {
+        "DefaultSearch": "##"
+    },
    "ConnectionStrings": {
        "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;",
        "Mp.Prog": "Server=SQL2016DEV;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;",