infromes y solucionado error chistoso en repoLote

2024-08-11 18:26:31 -03:00
parent 6f5a2ae4c8
commit 04268f23e5
23 changed files with 469 additions and 56 deletions
--- a/Controladora/Controladora.csproj
+++ b/Controladora/Controladora.csproj
@@ -13,6 +13,7 @@

 >>>>>>> c493033 (cosas que faltaban)
  <ItemGroup>
+    <ProjectReference Include="..\Informes\Informes.csproj" />
    <ProjectReference Include="..\Modelo\Modelo.csproj" />
    <ProjectReference Include="..\Entidades\Entidades.csproj" />
  </ItemGroup>
--- a/Controladora/ControladoraFacturas.cs
+++ b/Controladora/ControladoraFacturas.cs
@@ -27,9 +27,24 @@ namespace Controladora
            {
                bool resultado = RepositorioFactura.Instance.Add(t);
                string resultadolote = ControladoraLotes.Instance.DisminuirStock(t.MostrarDetalles());
-                return (resultado && (resultadolote == "Se Descontaron los productos")) ?
-                    $"La Factura con el ID {t.Id} se cargó correctamente" :
-                    $"Falló la carga de la Factura con el ID {t.Id}";
+
+                // Convierte ReadOnlyCollection a List
+                var detallesList = new List<DetalleFactura>(t.MostrarDetalles());
+
+                if (resultado && resultadolote == "Se Descontaron los productos")
+                {
+                    // Envía el correo electrónico si la factura se cargó correctamente y el stock se decrementó
+                    string emailResult = ControladoraInformes.Instance.EnviarEmail(
+                        "Factura Cargada",
+                        detallesList // Pasa la lista convertida
+                    );
+
+                    return $"La Factura con el ID {t.Id} se cargó correctamente. {emailResult}";
+                }
+                else
+                {
+                    return $"Falló la carga de la Factura con el ID {t.Id}";
+                }
            }
            catch (Exception ex)
            {
--- a/Controladora/ControladoraInformes.cs
+++ b/Controladora/ControladoraInformes.cs
@@ -1,4 +1,5 @@
-using Informes;
+using Entidades;
+using Informes;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -22,7 +23,14 @@ namespace Controladora
            }
            catch (IOException ex) { throw; }
        }
+        public string EnviarEmail(string titulo, List<DetalleFactura> detalles)
+        {
+            if (detalles == null || detalles.Count == 0)
+                return "La lista de detalles está vacía o es nula.";

+            // Utiliza la instancia singleton de InformeEmail para enviar el correo
+            return InformeEmail.Instance.EnviarEmailFactura(titulo, detalles);
+        }
        public ConfigEmail RecuperarConfig()
        {
            try
--- a/Controladora/ControladoraPresupuestos.cs
+++ b/Controladora/ControladoraPresupuestos.cs
@@ -8,11 +8,13 @@ namespace Controladora
    {
        public string Añadir(Presupuesto t)
        {
-            if (t == null) return "El Presupuesto es nulo fallo la carga";
+            if (t == null) return "El Presupuesto es nulo, falló la carga";
+            if (t.MostrarDetalles() == null || !t.MostrarDetalles().Any()) return "El Presupuesto no tiene productos, falló la carga";
+            if (t.Proveedor == null) return "El Proveedor es nulo, falló la carga";

-            return (RepositorioPresupuesto.Instance.Add(t)) ? 
-                $"El Presupuesto {t.Id} se cargo correctamente":
-                $"Fallo la carga del Presupuesto {t.Id}"; 
+            return RepositorioPresupuesto.Instance.Add(t) ?
+                $"El Presupuesto {t.Id} se cargó correctamente" :
+                $"Falló la carga del Presupuesto {t.Id}";
        }

        public string Eliminar(Presupuesto t)
--- a/Controladora/obj/Controladora.csproj.nuget.dgspec.json
+++ b/Controladora/obj/Controladora.csproj.nuget.dgspec.json
@@ -12,6 +12,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
    "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {}
  },
@@ -55,12 +56,15 @@
 =======
    "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj": {}
 >>>>>>> 855ce7c (AAAAAAAAAAA)
+=======
+    "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj": {}
+>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
  },
  "projects": {
-    "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj": {
+    "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj": {
      "version": "1.0.0",
      "restore": {
-        "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj",
+        "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj",
        "projectName": "Controladora",
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -69,6 +73,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
        "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
        "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
@@ -124,6 +129,11 @@
        "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
        "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\obj\\",
 >>>>>>> 855ce7c (AAAAAAAAAAA)
+=======
+        "projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj",
+        "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
+        "outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\obj\\",
+>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
        "projectStyle": "PackageReference",
        "configFilePaths": [
          "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -156,6 +166,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
              "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
                "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -244,6 +255,16 @@
              "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": {
                "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj"
 >>>>>>> 855ce7c (AAAAAAAAAAA)
+=======
+              "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
+                "projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
+              },
+              "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {
+                "projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj"
+              },
+              "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj": {
+                "projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj"
+>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
              }
            }
          }
@@ -290,6 +311,7 @@
    },
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
    "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
      "version": "1.0.0",
@@ -432,12 +454,16 @@
 =======
    "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
 >>>>>>> 855ce7c (AAAAAAAAAAA)
+=======
+    "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
+>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
      "version": "1.0.0",
      "restore": {
-        "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj",
+        "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
        "projectName": "Entidades",
-        "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj",
+        "projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
        "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
+<<<<<<< HEAD
 <<<<<<< HEAD
        "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\",
 <<<<<<< HEAD
@@ -456,6 +482,9 @@
 =======
        "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\obj\\",
 >>>>>>> 855ce7c (AAAAAAAAAAA)
+=======
+        "outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\obj\\",
+>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
        "projectStyle": "PackageReference",
        "configFilePaths": [
          "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -504,13 +533,14 @@
        }
      }
    },
-    "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": {
+    "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {
      "version": "1.0.0",
      "restore": {
-        "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj",
-        "projectName": "Modelo",
-        "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj",
+        "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
+        "projectName": "Informes",
+        "projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
        "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
+<<<<<<< HEAD
 <<<<<<< HEAD
        "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\",
 <<<<<<< HEAD
@@ -529,6 +559,9 @@
 =======
        "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\obj\\",
 >>>>>>> 855ce7c (AAAAAAAAAAA)
+=======
+        "outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\obj\\",
+>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
        "projectStyle": "PackageReference",
        "configFilePaths": [
          "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -546,6 +579,7 @@
          "net6.0": {
            "targetAlias": "net6.0",
            "projectReferences": {
+<<<<<<< HEAD
 <<<<<<< HEAD
              "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
                "projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
@@ -560,6 +594,70 @@
              "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
                "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj"
 >>>>>>> 855ce7c (AAAAAAAAAAA)
+=======
+              "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
+                "projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
+              }
+            }
+          }
+        },
+        "warningProperties": {
+          "warnAsError": [
+            "NU1605"
+          ]
+        }
+      },
+      "frameworks": {
+        "net6.0": {
+          "targetAlias": "net6.0",
+          "imports": [
+            "net461",
+            "net462",
+            "net47",
+            "net471",
+            "net472",
+            "net48",
+            "net481"
+          ],
+          "assetTargetFallback": true,
+          "warn": true,
+          "frameworkReferences": {
+            "Microsoft.NETCore.App": {
+              "privateAssets": "all"
+            }
+          },
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+        }
+      }
+    },
+    "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj": {
+      "version": "1.0.0",
+      "restore": {
+        "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj",
+        "projectName": "Modelo",
+        "projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj",
+        "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
+        "outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\obj\\",
+        "projectStyle": "PackageReference",
+        "configFilePaths": [
+          "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
+        ],
+        "originalTargetFrameworks": [
+          "net6.0"
+        ],
+        "sources": {
+          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+          "https://api.nuget.org/v3/index.json": {},
+          "https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {}
+        },
+        "frameworks": {
+          "net6.0": {
+            "targetAlias": "net6.0",
+            "projectReferences": {
+              "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
+                "projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
+>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
              }
            }
          }
--- a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt
+++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt
@@ -105,4 +105,45 @@ C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.
 C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.0\refint\Controladora.dll
 C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.0\Controladora.pdb
 C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Controladora\obj\Debug\net6.0\ref\Controladora.dll
+<<<<<<< HEAD
 >>>>>>> 855ce7c (AAAAAAAAAAA)
+=======
+C:\Users\Nacho\Desktop\FINAL\Controladora\bin\Debug\net6.0\Controladora.deps.json
+C:\Users\Nacho\Desktop\FINAL\Controladora\bin\Debug\net6.0\Controladora.dll
+C:\Users\Nacho\Desktop\FINAL\Controladora\bin\Debug\net6.0\Controladora.pdb
+C:\Users\Nacho\Desktop\FINAL\Controladora\bin\Debug\net6.0\Entidades.dll
+C:\Users\Nacho\Desktop\FINAL\Controladora\bin\Debug\net6.0\Modelo.dll
+C:\Users\Nacho\Desktop\FINAL\Controladora\bin\Debug\net6.0\Modelo.pdb
+C:\Users\Nacho\Desktop\FINAL\Controladora\bin\Debug\net6.0\Entidades.pdb
+C:\Users\Nacho\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache
+C:\Users\Nacho\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\Nacho\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache
+C:\Users\Nacho\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs
+C:\Users\Nacho\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache
+C:\Users\Nacho\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controla.1EE7A4DA.Up2Date
+C:\Users\Nacho\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.dll
+C:\Users\Nacho\Desktop\FINAL\Controladora\obj\Debug\net6.0\refint\Controladora.dll
+C:\Users\Nacho\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.pdb
+C:\Users\Nacho\Desktop\FINAL\Controladora\obj\Debug\net6.0\ref\Controladora.dll
+C:\Users\Nacho\Desktop\FINAL\Controladora\bin\Debug\net6.0\Informes.dll
+C:\Users\Nacho\Desktop\FINAL\Controladora\bin\Debug\net6.0\Informes.pdb
+C:\Users\fedpo\Desktop\FINAL\Controladora\bin\Debug\net6.0\Controladora.deps.json
+C:\Users\fedpo\Desktop\FINAL\Controladora\bin\Debug\net6.0\Controladora.dll
+C:\Users\fedpo\Desktop\FINAL\Controladora\bin\Debug\net6.0\Controladora.pdb
+C:\Users\fedpo\Desktop\FINAL\Controladora\bin\Debug\net6.0\Entidades.dll
+C:\Users\fedpo\Desktop\FINAL\Controladora\bin\Debug\net6.0\Informes.dll
+C:\Users\fedpo\Desktop\FINAL\Controladora\bin\Debug\net6.0\Modelo.dll
+C:\Users\fedpo\Desktop\FINAL\Controladora\bin\Debug\net6.0\Informes.pdb
+C:\Users\fedpo\Desktop\FINAL\Controladora\bin\Debug\net6.0\Modelo.pdb
+C:\Users\fedpo\Desktop\FINAL\Controladora\bin\Debug\net6.0\Entidades.pdb
+C:\Users\fedpo\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache
+C:\Users\fedpo\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\fedpo\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache
+C:\Users\fedpo\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs
+C:\Users\fedpo\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache
+C:\Users\fedpo\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.csproj.CopyComplete
+C:\Users\fedpo\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.dll
+C:\Users\fedpo\Desktop\FINAL\Controladora\obj\Debug\net6.0\refint\Controladora.dll
+C:\Users\fedpo\Desktop\FINAL\Controladora\obj\Debug\net6.0\Controladora.pdb
+C:\Users\fedpo\Desktop\FINAL\Controladora\obj\Debug\net6.0\ref\Controladora.dll
+>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
--- a/Controladora/obj/project.assets.json
+++ b/Controladora/obj/project.assets.json
@@ -12,6 +12,19 @@
          "bin/placeholder/Entidades.dll": {}
        }
      },
+      "Informes/1.0.0": {
+        "type": "project",
+        "framework": ".NETCoreApp,Version=v6.0",
+        "dependencies": {
+          "Entidades": "1.0.0"
+        },
+        "compile": {
+          "bin/placeholder/Informes.dll": {}
+        },
+        "runtime": {
+          "bin/placeholder/Informes.dll": {}
+        }
+      },
      "Modelo/1.0.0": {
        "type": "project",
        "framework": ".NETCoreApp,Version=v6.0",
@@ -33,6 +46,11 @@
      "path": "../Entidades/Entidades.csproj",
      "msbuildProject": "../Entidades/Entidades.csproj"
    },
+    "Informes/1.0.0": {
+      "type": "project",
+      "path": "../Informes/Informes.csproj",
+      "msbuildProject": "../Informes/Informes.csproj"
+    },
    "Modelo/1.0.0": {
      "type": "project",
      "path": "../Modelo/Modelo.csproj",
@@ -42,6 +60,7 @@
  "projectFileDependencyGroups": {
    "net6.0": [
      "Entidades >= 1.0.0",
+      "Informes >= 1.0.0",
      "Modelo >= 1.0.0"
    ]
  },
@@ -66,6 +85,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
      "projectUniqueName": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj",
      "projectName": "Controladora",
@@ -114,9 +134,13 @@
 =======
      "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj",
 >>>>>>> 855ce7c (AAAAAAAAAAA)
+=======
+      "projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj",
+>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
      "projectName": "Controladora",
-      "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj",
+      "projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj",
      "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
+<<<<<<< HEAD
 <<<<<<< HEAD
      "outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\obj\\",
 <<<<<<< HEAD
@@ -132,6 +156,9 @@
 =======
      "outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\obj\\",
 >>>>>>> 855ce7c (AAAAAAAAAAA)
+=======
+      "outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\obj\\",
+>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
      "projectStyle": "PackageReference",
      "configFilePaths": [
        "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -164,6 +191,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
            "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
              "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -252,6 +280,16 @@
            "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": {
              "projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj"
 >>>>>>> 855ce7c (AAAAAAAAAAA)
+=======
+            "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
+              "projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
+            },
+            "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {
+              "projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj"
+            },
+            "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj": {
+              "projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj"
+>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
            }
          }
        }