añadida ¿Reactividad? a que se elija entre percedero o no
This commit is contained in:
@@ -50,5 +50,15 @@ namespace Controladora
|
||||
|
||||
}
|
||||
|
||||
public Producto? MostrarPorId(Producto producto)
|
||||
{
|
||||
if (producto == null) return null;
|
||||
if (producto.Id < 0) return null;
|
||||
var lista = RepositorioProductos.Instance.Listar();
|
||||
if (lista.Any(x=> x.Id == producto.Id)){
|
||||
return lista.First(x => x.Id == producto.Id);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
"format": 1,
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
@@ -13,19 +12,6 @@
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\obj\\",
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj",
|
||||
"projectName": "Controladora",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -43,19 +29,11 @@
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
|
||||
},
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj"
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
},
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj"
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -89,7 +67,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
@@ -98,16 +75,6 @@
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\",
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"projectName": "Entidades",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -156,7 +123,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
@@ -165,16 +131,6 @@
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\",
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj",
|
||||
"projectName": "Modelo",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -192,13 +148,8 @@
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,3 +49,20 @@ C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\bin\Debug\net6.0\Controladora.deps.json
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\bin\Debug\net6.0\Controladora.dll
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\bin\Debug\net6.0\Controladora.pdb
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\bin\Debug\net6.0\Entidades.dll
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\bin\Debug\net6.0\Modelo.dll
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\bin\Debug\net6.0\Modelo.pdb
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\bin\Debug\net6.0\Entidades.pdb
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CopyComplete
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.dll
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.pdb
|
||||
C:\Users\fedpo\Desktop\Final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll
|
||||
|
||||
@@ -51,19 +51,11 @@
|
||||
"project": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj",
|
||||
"projectName": "Controladora",
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\obj\\",
|
||||
=======
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj",
|
||||
"projectName": "Controladora",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -81,19 +73,11 @@
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
|
||||
},
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj"
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
},
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj"
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
"format": 1,
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
@@ -13,19 +12,6 @@
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\",
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"projectName": "Entidades",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
|
||||
@@ -13,19 +13,11 @@
|
||||
"project": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"projectName": "Entidades",
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\",
|
||||
=======
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"projectName": "Entidades",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
|
||||
BIN
Informes/bin/Debug/net6.0/Entidades.dll
Normal file
BIN
Informes/bin/Debug/net6.0/Entidades.dll
Normal file
Binary file not shown.
BIN
Informes/bin/Debug/net6.0/Entidades.pdb
Normal file
BIN
Informes/bin/Debug/net6.0/Entidades.pdb
Normal file
Binary file not shown.
36
Informes/bin/Debug/net6.0/Informes.deps.json
Normal file
36
Informes/bin/Debug/net6.0/Informes.deps.json
Normal file
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"runtimeTarget": {
|
||||
"name": ".NETCoreApp,Version=v6.0",
|
||||
"signature": ""
|
||||
},
|
||||
"compilationOptions": {},
|
||||
"targets": {
|
||||
".NETCoreApp,Version=v6.0": {
|
||||
"Informes/1.0.0": {
|
||||
"dependencies": {
|
||||
"Entidades": "1.0.0"
|
||||
},
|
||||
"runtime": {
|
||||
"Informes.dll": {}
|
||||
}
|
||||
},
|
||||
"Entidades/1.0.0": {
|
||||
"runtime": {
|
||||
"Entidades.dll": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"libraries": {
|
||||
"Informes/1.0.0": {
|
||||
"type": "project",
|
||||
"serviceable": false,
|
||||
"sha512": ""
|
||||
},
|
||||
"Entidades/1.0.0": {
|
||||
"type": "project",
|
||||
"serviceable": false,
|
||||
"sha512": ""
|
||||
}
|
||||
}
|
||||
}
|
||||
BIN
Informes/bin/Debug/net6.0/Informes.dll
Normal file
BIN
Informes/bin/Debug/net6.0/Informes.dll
Normal file
Binary file not shown.
BIN
Informes/bin/Debug/net6.0/Informes.pdb
Normal file
BIN
Informes/bin/Debug/net6.0/Informes.pdb
Normal file
Binary file not shown.
23
Informes/obj/Debug/net6.0/Informes.AssemblyInfo.cs
Normal file
23
Informes/obj/Debug/net6.0/Informes.AssemblyInfo.cs
Normal file
@@ -0,0 +1,23 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:4.0.30319.42000
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: System.Reflection.AssemblyCompanyAttribute("Informes")]
|
||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("Informes")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("Informes")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
// Generated by the MSBuild WriteCodeFragment class.
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
55f9793ce92bee586e65f5b38a3a7676261de34c
|
||||
@@ -0,0 +1,11 @@
|
||||
is_global = true
|
||||
build_property.TargetFramework = net6.0
|
||||
build_property.TargetPlatformMinVersion =
|
||||
build_property.UsingMicrosoftNETSdkWeb =
|
||||
build_property.ProjectTypeGuids =
|
||||
build_property.InvariantGlobalization =
|
||||
build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = Informes
|
||||
build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Informes\
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
100fa21bf2f76b06ab70964d65200e354f5837e3
|
||||
@@ -43,3 +43,18 @@ C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\Informes.dll
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\refint\Informes.dll
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\Informes.pdb
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\ref\Informes.dll
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\bin\Debug\net6.0\Informes.deps.json
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\bin\Debug\net6.0\Informes.dll
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\bin\Debug\net6.0\Informes.pdb
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\bin\Debug\net6.0\Entidades.dll
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\bin\Debug\net6.0\Entidades.pdb
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.csproj.AssemblyReference.cache
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.GeneratedMSBuildEditorConfig.editorconfig
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.AssemblyInfoInputs.cache
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.AssemblyInfo.cs
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.csproj.CoreCompileInputs.cache
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.csproj.CopyComplete
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.dll
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\obj\Debug\net6.0\refint\Informes.dll
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.pdb
|
||||
C:\Users\fedpo\Desktop\Final actual\Informes\obj\Debug\net6.0\ref\Informes.dll
|
||||
|
||||
BIN
Informes/obj/Debug/net6.0/Informes.dll
Normal file
BIN
Informes/obj/Debug/net6.0/Informes.dll
Normal file
Binary file not shown.
BIN
Informes/obj/Debug/net6.0/Informes.pdb
Normal file
BIN
Informes/obj/Debug/net6.0/Informes.pdb
Normal file
Binary file not shown.
BIN
Informes/obj/Debug/net6.0/ref/Informes.dll
Normal file
BIN
Informes/obj/Debug/net6.0/ref/Informes.dll
Normal file
Binary file not shown.
BIN
Informes/obj/Debug/net6.0/refint/Informes.dll
Normal file
BIN
Informes/obj/Debug/net6.0/refint/Informes.dll
Normal file
Binary file not shown.
@@ -1,7 +1,6 @@
|
||||
{
|
||||
"format": 1,
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
@@ -13,19 +12,6 @@
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\",
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"projectName": "Entidades",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -74,7 +60,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
@@ -83,16 +68,6 @@
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\",
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
|
||||
"projectName": "Informes",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -110,13 +85,8 @@
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,19 +32,11 @@
|
||||
"project": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
|
||||
"projectName": "Informes",
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\",
|
||||
=======
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
|
||||
"projectName": "Informes",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -62,13 +54,8 @@
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
8
Informes/obj/project.nuget.cache
Normal file
8
Informes/obj/project.nuget.cache
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"version": 2,
|
||||
"dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==",
|
||||
"success": true,
|
||||
"projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
|
||||
"expectedPackageFiles": [],
|
||||
"logs": []
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
"format": 1,
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
@@ -13,19 +12,6 @@
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\",
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"projectName": "Entidades",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -74,7 +60,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
@@ -83,16 +68,6 @@
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\",
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj",
|
||||
"projectName": "Modelo",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -110,13 +85,8 @@
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,19 +32,11 @@
|
||||
"project": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj",
|
||||
"projectName": "Modelo",
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\",
|
||||
=======
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj",
|
||||
"projectName": "Modelo",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -62,13 +54,8 @@
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
102
Vista/FrmProductos.Designer.cs
generated
102
Vista/FrmProductos.Designer.cs
generated
@@ -36,19 +36,19 @@
|
||||
dgvProductos = new DataGridView();
|
||||
BtnAdd = new Button();
|
||||
BtnEliminar = new Button();
|
||||
button1 = new Button();
|
||||
btnCrearCategoria = new Button();
|
||||
dgvCategorias = new DataGridView();
|
||||
label1 = new Label();
|
||||
dataGridView1 = new DataGridView();
|
||||
dataGridView2 = new DataGridView();
|
||||
dgvPercedero = new DataGridView();
|
||||
dgvNoPercedero = new DataGridView();
|
||||
label4 = new Label();
|
||||
label5 = new Label();
|
||||
groupBox1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)dgvProveedores).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)dgvProductos).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)dgvCategorias).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)dataGridView2).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)dgvPercedero).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)dgvNoPercedero).BeginInit();
|
||||
SuspendLayout();
|
||||
//
|
||||
// groupBox1
|
||||
@@ -62,7 +62,7 @@
|
||||
groupBox1.Controls.Add(BtnEliminar);
|
||||
groupBox1.Location = new Point(12, 0);
|
||||
groupBox1.Name = "groupBox1";
|
||||
groupBox1.Size = new Size(746, 305);
|
||||
groupBox1.Size = new Size(939, 305);
|
||||
groupBox1.TabIndex = 5;
|
||||
groupBox1.TabStop = false;
|
||||
//
|
||||
@@ -79,7 +79,7 @@
|
||||
// label3
|
||||
//
|
||||
label3.AutoSize = true;
|
||||
label3.Location = new Point(473, 9);
|
||||
label3.Location = new Point(613, 9);
|
||||
label3.Name = "label3";
|
||||
label3.Size = new Size(72, 15);
|
||||
label3.TabIndex = 10;
|
||||
@@ -88,11 +88,11 @@
|
||||
// dgvProveedores
|
||||
//
|
||||
dgvProveedores.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dgvProveedores.Location = new Point(473, 22);
|
||||
dgvProveedores.Location = new Point(613, 22);
|
||||
dgvProveedores.Name = "dgvProveedores";
|
||||
dgvProveedores.RowTemplate.Height = 25;
|
||||
dgvProveedores.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
|
||||
dgvProveedores.Size = new Size(240, 235);
|
||||
dgvProveedores.Size = new Size(280, 235);
|
||||
dgvProveedores.TabIndex = 9;
|
||||
//
|
||||
// label2
|
||||
@@ -113,7 +113,7 @@
|
||||
dgvProductos.Name = "dgvProductos";
|
||||
dgvProductos.RowTemplate.Height = 25;
|
||||
dgvProductos.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
|
||||
dgvProductos.Size = new Size(461, 235);
|
||||
dgvProductos.Size = new Size(591, 235);
|
||||
dgvProductos.TabIndex = 3;
|
||||
dgvProductos.CellClick += dgvProductos_CellClick;
|
||||
//
|
||||
@@ -137,22 +137,22 @@
|
||||
BtnEliminar.UseVisualStyleBackColor = true;
|
||||
BtnEliminar.Click += BtnEliminar_Click;
|
||||
//
|
||||
// button1
|
||||
// btnCrearCategoria
|
||||
//
|
||||
button1.Location = new Point(794, 263);
|
||||
button1.Name = "button1";
|
||||
button1.Size = new Size(128, 23);
|
||||
button1.TabIndex = 4;
|
||||
button1.Text = "Crear Categoria";
|
||||
button1.UseVisualStyleBackColor = true;
|
||||
button1.Click += button1_Click;
|
||||
btnCrearCategoria.Location = new Point(966, 263);
|
||||
btnCrearCategoria.Name = "btnCrearCategoria";
|
||||
btnCrearCategoria.Size = new Size(128, 23);
|
||||
btnCrearCategoria.TabIndex = 4;
|
||||
btnCrearCategoria.Text = "Crear Categoria";
|
||||
btnCrearCategoria.UseVisualStyleBackColor = true;
|
||||
btnCrearCategoria.Click += btnCrearCategoria_Click;
|
||||
//
|
||||
// dgvCategorias
|
||||
//
|
||||
dgvCategorias.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
|
||||
dgvCategorias.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dgvCategorias.EditMode = DataGridViewEditMode.EditProgrammatically;
|
||||
dgvCategorias.Location = new Point(794, 22);
|
||||
dgvCategorias.Location = new Point(966, 22);
|
||||
dgvCategorias.Name = "dgvCategorias";
|
||||
dgvCategorias.RowTemplate.Height = 25;
|
||||
dgvCategorias.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
|
||||
@@ -162,38 +162,44 @@
|
||||
// label1
|
||||
//
|
||||
label1.AutoSize = true;
|
||||
label1.Location = new Point(797, 4);
|
||||
label1.Location = new Point(969, 4);
|
||||
label1.Name = "label1";
|
||||
label1.Size = new Size(63, 15);
|
||||
label1.TabIndex = 7;
|
||||
label1.Text = "Categorias";
|
||||
//
|
||||
// dataGridView1
|
||||
// dgvPercedero
|
||||
//
|
||||
dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
|
||||
dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dataGridView1.Location = new Point(18, 341);
|
||||
dataGridView1.Name = "dataGridView1";
|
||||
dataGridView1.RowTemplate.Height = 25;
|
||||
dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
|
||||
dataGridView1.Size = new Size(439, 245);
|
||||
dataGridView1.TabIndex = 8;
|
||||
dataGridView1.CellContentClick += dataGridView1_CellContentClick;
|
||||
dgvPercedero.AllowUserToAddRows = false;
|
||||
dgvPercedero.AllowUserToDeleteRows = false;
|
||||
dgvPercedero.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
|
||||
dgvPercedero.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dgvPercedero.EditMode = DataGridViewEditMode.EditProgrammatically;
|
||||
dgvPercedero.Location = new Point(18, 341);
|
||||
dgvPercedero.Name = "dgvPercedero";
|
||||
dgvPercedero.RowTemplate.Height = 25;
|
||||
dgvPercedero.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
|
||||
dgvPercedero.Size = new Size(439, 245);
|
||||
dgvPercedero.TabIndex = 8;
|
||||
//
|
||||
// dataGridView2
|
||||
// dgvNoPercedero
|
||||
//
|
||||
dataGridView2.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
|
||||
dataGridView2.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dataGridView2.Location = new Point(587, 341);
|
||||
dataGridView2.Name = "dataGridView2";
|
||||
dataGridView2.RowTemplate.Height = 25;
|
||||
dataGridView2.Size = new Size(420, 245);
|
||||
dataGridView2.TabIndex = 9;
|
||||
dgvNoPercedero.AllowUserToAddRows = false;
|
||||
dgvNoPercedero.AllowUserToDeleteRows = false;
|
||||
dgvNoPercedero.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
|
||||
dgvNoPercedero.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dgvNoPercedero.EditMode = DataGridViewEditMode.EditProgrammatically;
|
||||
dgvNoPercedero.Location = new Point(485, 341);
|
||||
dgvNoPercedero.Name = "dgvNoPercedero";
|
||||
dgvNoPercedero.RowTemplate.Height = 25;
|
||||
dgvNoPercedero.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
|
||||
dgvNoPercedero.Size = new Size(420, 245);
|
||||
dgvNoPercedero.TabIndex = 9;
|
||||
//
|
||||
// label4
|
||||
//
|
||||
label4.AutoSize = true;
|
||||
label4.Location = new Point(587, 323);
|
||||
label4.Location = new Point(485, 323);
|
||||
label4.Name = "label4";
|
||||
label4.Size = new Size(143, 15);
|
||||
label4.TabIndex = 12;
|
||||
@@ -212,13 +218,13 @@
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(1088, 589);
|
||||
ClientSize = new Size(1237, 589);
|
||||
Controls.Add(label5);
|
||||
Controls.Add(label4);
|
||||
Controls.Add(dataGridView2);
|
||||
Controls.Add(dataGridView1);
|
||||
Controls.Add(dgvNoPercedero);
|
||||
Controls.Add(dgvPercedero);
|
||||
Controls.Add(label1);
|
||||
Controls.Add(button1);
|
||||
Controls.Add(btnCrearCategoria);
|
||||
Controls.Add(dgvCategorias);
|
||||
Controls.Add(groupBox1);
|
||||
Name = "FrmProductos";
|
||||
@@ -229,8 +235,8 @@
|
||||
((System.ComponentModel.ISupportInitialize)dgvProveedores).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)dgvProductos).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)dgvCategorias).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)dataGridView2).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)dgvPercedero).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)dgvNoPercedero).EndInit();
|
||||
ResumeLayout(false);
|
||||
PerformLayout();
|
||||
}
|
||||
@@ -241,15 +247,15 @@
|
||||
private DataGridView dgvProductos;
|
||||
private Button BtnAdd;
|
||||
private Button BtnEliminar;
|
||||
private Button button1;
|
||||
private Button btnCrearCategoria;
|
||||
private DataGridView dgvCategorias;
|
||||
private Label label2;
|
||||
private Label label1;
|
||||
private DataGridView dgvProveedores;
|
||||
private Label label3;
|
||||
private Button btnModificar;
|
||||
private DataGridView dataGridView1;
|
||||
private DataGridView dataGridView2;
|
||||
private DataGridView dgvPercedero;
|
||||
private DataGridView dgvNoPercedero;
|
||||
private Label label4;
|
||||
private Label label5;
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ namespace Vista
|
||||
}
|
||||
private void ConfigurarDataGridViewNoPerecedero()
|
||||
{
|
||||
dataGridView2.AutoGenerateColumns = false;
|
||||
dgvNoPercedero.AutoGenerateColumns = false;
|
||||
|
||||
// Crear una columna para el nombre
|
||||
var colNombre = new DataGridViewTextBoxColumn
|
||||
@@ -51,15 +51,15 @@ namespace Vista
|
||||
};
|
||||
|
||||
// Limpiar columnas existentes
|
||||
dataGridView2.Columns.Clear();
|
||||
dgvNoPercedero.Columns.Clear();
|
||||
|
||||
// Agregar las columnas al DataGridView
|
||||
dataGridView2.Columns.Add(colNombre);
|
||||
dataGridView2.Columns.Add(colTipoDeEnvase);
|
||||
dgvNoPercedero.Columns.Add(colNombre);
|
||||
dgvNoPercedero.Columns.Add(colTipoDeEnvase);
|
||||
}
|
||||
private void ConfigurarDataGridViewPerecedero()
|
||||
{
|
||||
dataGridView1.AutoGenerateColumns = false;
|
||||
dgvPercedero.AutoGenerateColumns = false;
|
||||
|
||||
// Crear una columna para el nombre
|
||||
var colNombre = new DataGridViewTextBoxColumn
|
||||
@@ -89,12 +89,12 @@ namespace Vista
|
||||
};
|
||||
|
||||
// Limpiar columnas existentes
|
||||
dataGridView1.Columns.Clear();
|
||||
dgvPercedero.Columns.Clear();
|
||||
|
||||
// Agregar las columnas al DataGridView
|
||||
dataGridView1.Columns.Add(colNombre);
|
||||
dataGridView1.Columns.Add(colMesesHastaConsumoPreferente);
|
||||
dataGridView1.Columns.Add(colMesesHastaVencimiento);
|
||||
dgvPercedero.Columns.Add(colNombre);
|
||||
dgvPercedero.Columns.Add(colMesesHastaConsumoPreferente);
|
||||
dgvPercedero.Columns.Add(colMesesHastaVencimiento);
|
||||
}
|
||||
private void ConfigurarDataGridView()
|
||||
{
|
||||
@@ -137,12 +137,21 @@ namespace Vista
|
||||
Name = "Categoria"
|
||||
};
|
||||
|
||||
var colPercedero = new DataGridViewTextBoxColumn
|
||||
{
|
||||
DataPropertyName = "EsPerecedero",
|
||||
HeaderText = "EsPerecedero",
|
||||
Name = "EsPerecedero"
|
||||
};
|
||||
|
||||
|
||||
// Agregar las columnas al DataGridView
|
||||
dgvProductos.Columns.Add(colId);
|
||||
dgvProductos.Columns.Add(colNombre);
|
||||
dgvProductos.Columns.Add(colPrecio);
|
||||
dgvProductos.Columns.Add(colHabilitado);
|
||||
dgvProductos.Columns.Add(colCategoria);
|
||||
dgvProductos.Columns.Add(colPercedero);
|
||||
}
|
||||
|
||||
private void ActualizarGrilla()
|
||||
@@ -153,10 +162,9 @@ namespace Vista
|
||||
// Filtra los productos perecederos y no perecederos
|
||||
var productosPerecederos = todosLosProductos.OfType<ProductoPercedero>().ToList();
|
||||
var productosNoPerecederos = todosLosProductos.OfType<ProductoNoPercedero>().ToList();
|
||||
dataGridView1.DataSource = null; // Limpiar la fuente de datos
|
||||
dataGridView1.DataSource = productosPerecederos;
|
||||
dataGridView2.DataSource = null; // Limpiar la fuente de datos
|
||||
dataGridView2.DataSource = productosNoPerecederos;
|
||||
dgvPercedero.DataSource = null; // Limpiar la fuente de datos
|
||||
dgvNoPercedero.DataSource = null; // Limpiar la fuente de datos
|
||||
|
||||
|
||||
dgvProductos.DataSource = null;
|
||||
dgvCategorias.DataSource = null;
|
||||
@@ -171,7 +179,8 @@ namespace Vista
|
||||
p.Nombre,
|
||||
p.Precio,
|
||||
p.Habilitado,
|
||||
CategoriaDescripcion = p.Categoria != null ? p.Categoria.Descripcion : string.Empty
|
||||
CategoriaDescripcion = p.Categoria != null ? p.Categoria.Descripcion : string.Empty,
|
||||
p.EsPerecedero
|
||||
})
|
||||
.ToList();
|
||||
|
||||
@@ -185,15 +194,6 @@ namespace Vista
|
||||
ActualizarGrilla();
|
||||
}
|
||||
|
||||
private void button1_Click(object sender, EventArgs e)
|
||||
{
|
||||
var form = new AddCategoria();
|
||||
form.ShowDialog();
|
||||
ActualizarGrilla();
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void BtnEliminar_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (dgvProductos.SelectedRows.Count == 0)
|
||||
@@ -234,11 +234,38 @@ namespace Vista
|
||||
ActualizarGrilla();
|
||||
}
|
||||
|
||||
public void ActualizarGrillaGeneralizaciones()
|
||||
{
|
||||
dgvNoPercedero.DataSource = null;
|
||||
dgvPercedero.DataSource = null;
|
||||
|
||||
var selectedRow = dgvProductos.SelectedRows[0];
|
||||
var Producto = new Entidades.Producto
|
||||
{
|
||||
Id = Convert.ToInt32(selectedRow.Cells["Id"].Value)
|
||||
};
|
||||
bool esPercedero = Convert.ToBoolean(selectedRow.Cells["EsPerecedero"].Value);
|
||||
if(esPercedero)
|
||||
{
|
||||
ProductoPercedero prod = (ProductoPercedero)ControladoraProductos.Instance.MostrarPorId(Producto);
|
||||
if (prod == null) return;
|
||||
|
||||
dgvPercedero.DataSource = new List<ProductoPercedero>{ prod };
|
||||
}
|
||||
else
|
||||
{
|
||||
ProductoNoPercedero prod = (ProductoNoPercedero)ControladoraProductos.Instance.MostrarPorId(Producto);
|
||||
if (prod == null) return;
|
||||
|
||||
dgvNoPercedero.DataSource = new List<ProductoNoPercedero> { prod };
|
||||
}
|
||||
}
|
||||
|
||||
private void dgvProductos_CellClick(object sender, DataGridViewCellEventArgs e)
|
||||
{
|
||||
if (dgvProductos.SelectedRows.Count == 0) return;
|
||||
ActualizarGrillaProveedores();
|
||||
ActualizarGrillaGeneralizaciones();
|
||||
}
|
||||
|
||||
private void btnModificar_Click(object sender, EventArgs e)
|
||||
@@ -279,9 +306,11 @@ namespace Vista
|
||||
}
|
||||
}
|
||||
|
||||
private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
|
||||
private void btnCrearCategoria_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
var form = new AddCategoria();
|
||||
form.ShowDialog();
|
||||
ActualizarGrilla();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
|
||||
@@ -75,7 +75,8 @@ namespace Vista
|
||||
Habilitado = true,
|
||||
Nombre = "Pantalones Vaqueros",
|
||||
Precio = 2000.2,
|
||||
TipoDeEnvase = EnvaseTipo.NoTiene
|
||||
TipoDeEnvase = EnvaseTipo.NoTiene,
|
||||
EsPerecedero = false
|
||||
};
|
||||
producto.A<EFBFBD>adirProveedor(proveedor);
|
||||
ControladoraProductos.Instance.A<EFBFBD>adir(producto);
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
"format": 1,
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
@@ -13,19 +12,6 @@
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\obj\\",
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj",
|
||||
"projectName": "Controladora",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -43,19 +29,11 @@
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
|
||||
},
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj"
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
},
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj"
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -89,7 +67,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
@@ -98,16 +75,6 @@
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\",
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"projectName": "Entidades",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -156,7 +123,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
@@ -165,16 +131,6 @@
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\",
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
|
||||
"projectName": "Informes",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -192,13 +148,8 @@
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -232,7 +183,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
@@ -241,16 +191,6 @@
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\",
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj",
|
||||
"projectName": "Modelo",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -268,13 +208,8 @@
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -308,7 +243,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
@@ -317,16 +251,6 @@
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\obj\\",
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj",
|
||||
"projectName": "Vista",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -344,7 +268,6 @@
|
||||
"net6.0-windows7.0": {
|
||||
"targetAlias": "net6.0-windows",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj"
|
||||
},
|
||||
@@ -353,16 +276,6 @@
|
||||
},
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj"
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj"
|
||||
},
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
},
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj"
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,19 +89,11 @@
|
||||
"project": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj",
|
||||
"projectName": "Vista",
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\obj\\",
|
||||
=======
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj",
|
||||
"projectName": "Vista",
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj",
|
||||
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\obj\\",
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -119,7 +111,6 @@
|
||||
"net6.0-windows7.0": {
|
||||
"targetAlias": "net6.0-windows",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj"
|
||||
},
|
||||
@@ -128,16 +119,6 @@
|
||||
},
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj"
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj"
|
||||
},
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
},
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj"
|
||||
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user