Merge branch 'release/AddCompoMgmtDelete05'

2024-06-20 13:15:31 +02:00
parent 7547cc7035 795b60ee86
commit 3fd9ef8383
7 changed files with 11 additions and 21 deletions
@@ -1,6 +1,6 @@
 <body>
    <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2406.2009</h4>
+    <h4>Version: 0.9.2406.2013</h4>
    <br /> Release note:
    <ul>
        <li>
@@ -1 +1 @@
-0.9.2406.2009
+0.9.2406.2013
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2406.2009</version>
+  <version>0.9.2406.2013</version>
  <url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
  <changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
  <mandatory>false</mandatory>
@@ -929,6 +929,11 @@ namespace WebDoorCreator.Data.Controllers
                                    .Database
                                    .ExecuteSqlRaw("exec dbo.stp_ListVal_Import");

+                    // stored x pulizia folder rimaste in giro
+                    storedRes = localDbCtx
+                                    .Database
+                                    .ExecuteSqlRaw("exec dbo.stp_ListVal_FixDix");
+
                    fatto = true;
                }
                catch (Exception exc)
@@ -2467,21 +2467,6 @@ namespace WebDoorCreator.Data.Services
                            var fileContent = File.ReadAllBytes(templateFile);
                            var hash = md5.ComputeHash(fileContent);
                            var oldMD5 = BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
-#if false
-                        DoorOpTypeModel tempType = new DoorOpTypeModel()
-                        {
-                            ParentId = HwTpl.DoorOpTypId,
-                            Description = $"Template for {compoCode.Replace(" ", "_")}",
-                            OpCode = @$"{dir}\{tName[tName.Length - 1]}\{Path.GetFileName(templateFile)}",
-                            HasHw = true,
-                            IsConcrete = true,
-                            HwCode = $"{compoCode}".Replace(" ", "_"),
-                            FileDim = fi.Length,
-                            FileMD5 = oldMD5,
-                            LastMod = fi.LastWriteTime
-                        };
-                        doorOpTypesList.Add(tempType);
-#endif
                            if (values.Where(x => x.TableName == temp.TableName && x.FieldName == temp.FieldName && x.Value == temp.Value).Count() == 0 && temp.TableName != null && temp.FieldName != null && temp.Value != null)
                            {
                                values.Add(temp);
@@ -423,11 +423,11 @@ namespace WebDoorCreator.UI.Components.Hardware

            if (tempListFilesTempl!.Count != 0)
            {
-                listValuesFiles = tempListFilesTempl.Where(x => x.Value.Contains(folderName)).ToList();
+                listValuesFiles = tempListFilesTempl.Where(x => x.Value.Contains($"{folderName}\\")).ToList();
            }
            else if (tempListFilesSh!.Count != 0)
            {
-                listValuesFiles = tempListFilesSh!.Where(x => x.Value.Contains(folderName)).ToList();
+                listValuesFiles = tempListFilesSh!.Where(x => x.Value.Contains($"{folderName}\\")).ToList();
            }
            try
            {
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
-        <Version>0.9.2406.2009</Version>
+        <Version>0.9.2406.2013</Version>
    <ImplicitUsings>enable</ImplicitUsings>
    <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
  </PropertyGroup>