fede/Final_Das
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

infromes y solucionado error chistoso en repoLote

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:26:31 -03:00
parent 6f5a2ae4c8
commit 04268f23e5
23 changed files with 469 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Controladora/Controladora.csproj
View File

@@ -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>

21
Controladora/ControladoraFacturas.cs
View File

@@ -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)
{

10
Controladora/ControladoraInformes.cs
View File

@@ -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

10
Controladora/ControladoraPresupuestos.cs
View File

@@ -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)

114
Controladora/obj/Controladora.csproj.nuget.dgspec.json
View File

@@ -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)
}
}
}

41
Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt
View File

@@ -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)

40
Controladora/obj/project.assets.json
View File

@@ -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)
}
}
}

2
Entidades/Presupuesto.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
namespace Entidades
{

14
Entidades/obj/Entidades.csproj.nuget.dgspec.json
View File

@@ -12,6 +12,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {}
},
@@ -55,12 +56,15 @@
=======
"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)
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"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",
<<<<<<< HEAD
<<<<<<< HEAD
@@ -69,6 +73,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.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\\Entidades\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"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",

10
Entidades/obj/project.assets.json
View File

@@ -28,6 +28,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
"projectName": "Entidades",
@@ -76,9 +77,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"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
@@ -94,6 +99,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",

2
Informes/InformeEmail.cs
View File

@@ -14,7 +14,7 @@ namespace Informes
public bool Informar { get; set; }
private static InformeEmail instance = new();
private static InformeEmail instance = new();
public static InformeEmail Instance
{
get { return instance; }

4
Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig
View File

@@ -11,6 +11,7 @@ build_property.RootNamespace = Informes
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Informes\
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actua2l\Final actual\Informes\
@@ -21,3 +22,6 @@ build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Informes\
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
build_property.ProjectDir = C:\Users\fedpo\Desktop\FINAL\Informes\
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)

BIN
Informes/obj/Debug/net6.0/Informes.assets.cache
View File

Binary file not shown.

4
Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache
View File

@@ -1,6 +1,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
3fd66116ceaea5e07433507fe6494c4f357d71a3a526da0eea8f6d1df7fb86c5
=======
100fa21bf2f76b06ab70964d65200e354f5837e3
@@ -11,3 +12,6 @@ b8f7575a0ad69c743b6dc87a6ac87340793ee335
=======
ad77f22dc36643a40b80d001672cc4f6dc648e45
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
7a00a3a89d0542129fe5c35914e3e539b4b44f09
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)

33
Informes/obj/Debug/net6.0/Informes.csproj.FileListAbsolute.txt
View File

@@ -93,4 +93,37 @@ C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\In
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\refint\Informes.dll
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.pdb
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\ref\Informes.dll
<<<<<<< HEAD
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
C:\Users\Nacho\Desktop\FINAL\Informes\bin\Debug\net6.0\Informes.deps.json
C:\Users\Nacho\Desktop\FINAL\Informes\bin\Debug\net6.0\Informes.dll
C:\Users\Nacho\Desktop\FINAL\Informes\bin\Debug\net6.0\Informes.pdb
C:\Users\Nacho\Desktop\FINAL\Informes\bin\Debug\net6.0\Entidades.dll
C:\Users\Nacho\Desktop\FINAL\Informes\bin\Debug\net6.0\Entidades.pdb
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.csproj.AssemblyReference.cache
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.GeneratedMSBuildEditorConfig.editorconfig
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.AssemblyInfoInputs.cache
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.AssemblyInfo.cs
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.csproj.CoreCompileInputs.cache
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.csproj.Up2Date
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.dll
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\refint\Informes.dll
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.pdb
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\ref\Informes.dll
C:\Users\fedpo\Desktop\FINAL\Informes\bin\Debug\net6.0\Informes.deps.json
C:\Users\fedpo\Desktop\FINAL\Informes\bin\Debug\net6.0\Informes.dll
C:\Users\fedpo\Desktop\FINAL\Informes\bin\Debug\net6.0\Informes.pdb
C:\Users\fedpo\Desktop\FINAL\Informes\bin\Debug\net6.0\Entidades.dll
C:\Users\fedpo\Desktop\FINAL\Informes\bin\Debug\net6.0\Entidades.pdb
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.csproj.AssemblyReference.cache
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.GeneratedMSBuildEditorConfig.editorconfig
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.AssemblyInfoInputs.cache
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.AssemblyInfo.cs
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.csproj.CoreCompileInputs.cache
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.csproj.CopyComplete
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.dll
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\refint\Informes.dll
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.pdb
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\ref\Informes.dll
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)

27
Informes/obj/Informes.csproj.nuget.dgspec.json
View File

@@ -1,16 +1,17 @@
{
"format": 1,
"restore": {
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": {}
"C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {}
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"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
@@ -32,6 +33,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",
@@ -80,13 +84,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\",
<<<<<<< HEAD
@@ -105,6 +110,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\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",
@@ -122,6 +130,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"
@@ -136,6 +145,10 @@
"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"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}

13
Informes/obj/project.assets.json
View File

@@ -32,10 +32,11 @@
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\",
<<<<<<< HEAD
@@ -51,6 +52,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\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",
@@ -68,6 +72,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"
@@ -82,6 +87,10 @@
"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"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}

6
Informes/obj/project.nuget.cache
View File

@@ -2,6 +2,7 @@
"version": 2,
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==",
"success": true,
@@ -21,6 +22,11 @@
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"dgSpecHash": "2CEPFq1aFcIXpBNXKJ0FYOgrgWTNW9/4khhso/sBmLj3P4gKEyjLHCUpPCPGpCybn7OaowLBWRaR35Uqo6RHKQ==",
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"expectedPackageFiles": [],
"logs": []
}

8
Modelo/RepositorioLote.cs
View File

@@ -90,16 +90,22 @@ namespace Modelo
cantidad -= elementoAdisminuir.Cantidad;
if (cantidad >= 0)
if (cantidad > 0)
{
elementoAdisminuir.Cantidad = 0;
elementoAdisminuir.Habilitado = false;
}
else if(cantidad == 0){
elementoAdisminuir.Cantidad = 0;
elementoAdisminuir.Habilitado = false;
ret = true;
}
else
{
elementoAdisminuir.Cantidad = -cantidad;
ret = true;
}
}
return ret;
}

31
Modelo/obj/Modelo.csproj.nuget.dgspec.json
View File

@@ -12,6 +12,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {}
},
@@ -55,12 +56,15 @@
=======
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": {}
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj": {}
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"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",
<<<<<<< HEAD
<<<<<<< HEAD
@@ -69,6 +73,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.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\\Entidades\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"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",
@@ -215,6 +225,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": {
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
@@ -241,9 +252,12 @@
=======
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": {
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj": {
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj",
"projectName": "Modelo",
<<<<<<< HEAD
<<<<<<< HEAD
@@ -252,6 +266,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
@@ -304,6 +319,11 @@
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -336,6 +356,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -387,6 +408,10 @@
"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"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}

15
Modelo/obj/project.assets.json
View File

@@ -47,6 +47,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj",
"projectName": "Modelo",
@@ -95,9 +96,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\",
<<<<<<< HEAD
@@ -113,6 +118,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -145,6 +153,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -196,6 +205,10 @@
"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"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}

94
Vista/obj/Vista.csproj.nuget.dgspec.json
View File

@@ -12,6 +12,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {}
},
@@ -55,15 +56,19 @@
=======
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj": {}
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\Vista.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",
"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
@@ -85,6 +90,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",
@@ -102,9 +110,10 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"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"
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
},
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj"
@@ -122,6 +131,13 @@
"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\\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)
}
}
}
@@ -155,13 +171,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"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
@@ -180,6 +197,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",
@@ -228,13 +248,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\",
<<<<<<< HEAD
@@ -253,6 +274,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\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",
@@ -270,6 +294,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"
@@ -284,6 +309,10 @@
"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"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}
@@ -317,7 +346,7 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
@@ -327,6 +356,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
"projectName": "Vista",
@@ -364,9 +394,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\",
<<<<<<< HEAD
@@ -513,6 +547,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -531,6 +568,7 @@
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
@@ -542,6 +580,10 @@
"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"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}
@@ -576,6 +618,7 @@
}
},
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj": {
"version": "1.0.0",
@@ -591,18 +634,25 @@
=======
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj": {
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\Vista.csproj": {
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\Vista.csproj",
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\obj\\",
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -852,6 +902,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
@@ -909,13 +960,18 @@
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
},
"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"
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
},
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj"
@@ -949,6 +1005,10 @@
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}

25
Vista/obj/project.assets.json
View File

@@ -5447,6 +5447,7 @@
"framework": ".NETCoreApp,Version=v6.0",
"dependencies": {
"Entidades": "1.0.0",
"Informes": "1.0.0",
"Modelo": "1.0.0"
},
"compile": {
@@ -13579,6 +13580,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
"projectName": "Vista",
@@ -13627,9 +13629,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\Vista.csproj",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\obj\\",
<<<<<<< HEAD
@@ -13645,6 +13651,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -13677,6 +13686,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
@@ -13739,13 +13749,18 @@
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
},
"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"
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
},
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj"
@@ -13779,6 +13794,10 @@
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}