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

cambios nacho

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:24:34 -03:00
parent 3beec95408
commit b62fa7b021
52 changed files with 745 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Controladora/bin/Debug/net6.0/Controladora.dll
View File

Binary file not shown.

BIN
Controladora/bin/Debug/net6.0/Controladora.pdb
View File

Binary file not shown.

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

@@ -5,6 +5,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {}
},
@@ -31,15 +32,19 @@
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj": {}
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {}
>>>>>>> 3925b59 (cambios nacho)
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
"projectName": "Controladora",
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
@@ -60,8 +65,11 @@
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
>>>>>>> 3925b59 (cambios nacho)
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -87,6 +95,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -128,6 +137,13 @@
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj"
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
},
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj"
>>>>>>> 3925b59 (cambios nacho)
}
}
}
@@ -307,14 +323,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -363,14 +379,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -388,8 +404,8 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
}
}
}

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

@@ -14,6 +14,7 @@ build_property.RootNamespace = Controladora
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Controladora/
=======
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Controladora\
@@ -35,3 +36,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Controladora\
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Controladora\
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Controladora\
>>>>>>> 3925b59 (cambios nacho)

2
Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache
View File

@@ -1 +1 @@
a7a9c23e29aac78d8fc99e5e2578c73ffe3d4cba
07cbdde4e47ec2d3a6db548797ff84a15aa08946633217fe5ed64773b3cc8491

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

@@ -15,3 +15,20 @@ C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0
C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll
C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb
C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll
C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Controladora.deps.json
C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Controladora.dll
C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Controladora.pdb
C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Entidades.dll
C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Modelo.dll
C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Modelo.pdb
C:\Users\Nacho\Desktop\Final actual\Controladora\bin\Debug\net6.0\Entidades.pdb
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controla.1EE7A4DA.Up2Date
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.dll
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.pdb
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll

BIN
Controladora/obj/Debug/net6.0/Controladora.dll
View File

Binary file not shown.

BIN
Controladora/obj/Debug/net6.0/Controladora.pdb
View File

Binary file not shown.

BIN
Controladora/obj/Debug/net6.0/ref/Controladora.dll
View File

Binary file not shown.

BIN
Controladora/obj/Debug/net6.0/refint/Controladora.dll
View File

Binary file not shown.

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

@@ -59,6 +59,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj",
"projectName": "Controladora",
@@ -90,10 +91,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
>>>>>>> 3925b59 (cambios nacho)
"projectName": "Controladora",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -119,6 +123,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -160,6 +165,13 @@
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj"
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
},
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj"
>>>>>>> 3925b59 (cambios nacho)
}
}
}

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

@@ -4,6 +4,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "Vs+HTdq8Gqw56GHRk+ivU0JJ/5n6ghHJP2CKgIV+gDHL9rO3WgHHPoz0OWJjyozNRvnYskqZVibjHcSALkg9JQ==",
"success": true,
@@ -615,8 +616,11 @@
=======
"dgSpecHash": "AVYTA+Cdyhg6wCEQPUiY9Zgnvl4qcFZo9nD09bdg1F+72oerfmmuZj274FC2KL/pXGSF1iqxwV37ZtH0RMkuXw==",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"dgSpecHash": "r6yZkn7vz8/vk90IKpsbux5MO0+aB5kxgPItYHl5ZJHIUAUs/bsNzJEgYyHcVZOte6JF54JInW9sHlpZnQcQMQ==",
>>>>>>> 3925b59 (cambios nacho)
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj",
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
"expectedPackageFiles": [],
>>>>>>> c493033 (cosas que faltaban)
"logs": []

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

@@ -13,6 +13,7 @@ build_property.RootNamespace = Entidades
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Entidades/
=======
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Entidades\
@@ -31,3 +32,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Entidades\
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Entidades\
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Entidades\
>>>>>>> 3925b59 (cambios nacho)

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

@@ -5,6 +5,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {}
},
@@ -31,15 +32,19 @@
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {}
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {}
>>>>>>> 3925b59 (cambios nacho)
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
@@ -60,8 +65,11 @@
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
>>>>>>> 3925b59 (cambios nacho)
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",

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

@@ -21,6 +21,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
"projectName": "Entidades",
@@ -52,10 +53,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
>>>>>>> 3925b59 (cambios nacho)
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",

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

@@ -4,6 +4,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "LSnXGupX+sIU3VjCECy137T1ThKtECGacQq+4Cfd3SDyYEpIcp26yf15qIysqN2+1Fwti7c13f3fBKmUt8i0Og==",
"success": true,
@@ -26,8 +27,11 @@
=======
"dgSpecHash": "xYCKCMKm+oXscuoQamJhNB9nRxekBQBuz6IDgUB/8WpDnH3Ts7NVTClR8NJpQF10id2fDRpsOygcKaFzlcHs+w==",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"dgSpecHash": "vCw9TkU23iJeVGdgwKLwcggjjvRCnx4IVmqtdUC1cx6S4CwC+/lso1ry576JGcrpGs6Tvfs4jnEYWVDgrNS9aA==",
>>>>>>> 3925b59 (cambios nacho)
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"expectedPackageFiles": [],
>>>>>>> 8ad9dc6 (faltan controladoras)
"logs": []

BIN
Informes/bin/Debug/net6.0/Entidades.dll
View File

Binary file not shown.

BIN
Informes/bin/Debug/net6.0/Entidades.pdb
View File

Binary file not shown.

BIN
Informes/bin/Debug/net6.0/Informes.dll
View File

Binary file not shown.

BIN
Informes/bin/Debug/net6.0/Informes.pdb
View File

Binary file not shown.

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

@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Informes
build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Informes\
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Informes\

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

Binary file not shown.

BIN
Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache
View File

Binary file not shown.

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

@@ -1 +1 @@
59ca0345c28b4ca3e61ae3f6ff36103ebf42ff8f
3fd66116ceaea5e07433507fe6494c4f357d71a3a526da0eea8f6d1df7fb86c5

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

@@ -13,3 +13,18 @@ C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\Inf
C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\refint\Informes.dll
C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\Informes.pdb
C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\ref\Informes.dll
C:\Users\Nacho\Desktop\Final actual\Informes\bin\Debug\net6.0\Informes.deps.json
C:\Users\Nacho\Desktop\Final actual\Informes\bin\Debug\net6.0\Informes.dll
C:\Users\Nacho\Desktop\Final actual\Informes\bin\Debug\net6.0\Informes.pdb
C:\Users\Nacho\Desktop\Final actual\Informes\bin\Debug\net6.0\Entidades.dll
C:\Users\Nacho\Desktop\Final actual\Informes\bin\Debug\net6.0\Entidades.pdb
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.csproj.AssemblyReference.cache
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.GeneratedMSBuildEditorConfig.editorconfig
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.AssemblyInfoInputs.cache
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.AssemblyInfo.cs
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.csproj.CoreCompileInputs.cache
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.csproj.Up2Date
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.dll
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\refint\Informes.dll
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.pdb
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\ref\Informes.dll

0
Informes/obj/Debug/net6.0/Informes.csproj.Up2Date Normal file
View File

BIN
Informes/obj/Debug/net6.0/Informes.dll
View File

Binary file not shown.

BIN
Informes/obj/Debug/net6.0/Informes.pdb
View File

Binary file not shown.

BIN
Informes/obj/Debug/net6.0/ref/Informes.dll
View File

Binary file not shown.

BIN
Informes/obj/Debug/net6.0/refint/Informes.dll
View File

Binary file not shown.

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

@@ -1,17 +1,17 @@
{
"format": 1,
"restore": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": {}
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": {}
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -60,14 +60,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -85,8 +85,8 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
}
}
}

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

@@ -32,11 +32,11 @@
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -54,8 +54,8 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
}
}
}

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

@@ -1,8 +1,8 @@
{
"version": 2,
"dgSpecHash": "INVcMeeXX3RoJw93Ye8x1Z2zKXKisJfXRKwLszX9TOBmcSCPTpBbhbgBcrnpGdxF2t/KPFVRZ2CzsnGvpyudOQ==",
"dgSpecHash": "wSRUDPAOADbuzfBaccmKkWkxTPKcGjNIB8Bpaz2yc1b+hR10rBbeJ6qupMQnFD6UaiKUQHlyxseEoFUSlbM17A==",
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj",
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj",
"expectedPackageFiles": [],
"logs": []
}

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

@@ -13,6 +13,7 @@ build_property.RootNamespace = Modelo
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Modelo/
=======
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Modelo\
@@ -31,3 +32,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Modelo\
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Modelo\
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Modelo\
>>>>>>> 3925b59 (cambios nacho)

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

@@ -5,6 +5,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {}
},
@@ -31,15 +32,19 @@
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": {}
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": {}
>>>>>>> 3925b59 (cambios nacho)
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
@@ -60,8 +65,11 @@
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
>>>>>>> 3925b59 (cambios nacho)
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -146,6 +154,7 @@
}
},
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": {
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
@@ -155,12 +164,16 @@
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": {
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": {
>>>>>>> 3925b59 (cambios nacho)
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
"projectName": "Modelo",
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
@@ -181,8 +194,11 @@
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
>>>>>>> 3925b59 (cambios nacho)
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -208,6 +224,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -231,6 +248,10 @@
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj"
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
>>>>>>> 3925b59 (cambios nacho)
}
}
}

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

@@ -40,6 +40,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj",
"projectName": "Modelo",
@@ -71,10 +72,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
>>>>>>> 3925b59 (cambios nacho)
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -100,6 +104,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -123,6 +128,10 @@
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj"
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
>>>>>>> 3925b59 (cambios nacho)
}
}
}

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

@@ -4,6 +4,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "druJUlWKmOp0ZDp0BX75o9Fs1GyoqoIkTLLMStpqDmZBEy8hoSreNrR/4qjyFeX2PbXxwtpQp0hY2GY2ewsTOQ==",
"success": true,
@@ -26,8 +27,11 @@
=======
"dgSpecHash": "fmo2HUMoIdls9H8hGKaMGhIa7cJfQvw6whWqbWRluFrLP21caNqa5sNL0+c6k3hgxAvgJ8kJuQlkGFoq8UfLog==",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"dgSpecHash": "gEY07P7prGCYVR0m9ujCWDU4VIm7roMDseNKc2YK6GTpNG+hy+RKyuu6ewyYVPxE4rRuW4p/7q2JBw4Oa4TZHw==",
>>>>>>> 3925b59 (cambios nacho)
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj",
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
"expectedPackageFiles": [],
>>>>>>> 8ad9dc6 (faltan controladoras)
"logs": []

45
Vista/FrmModProducto.Designer.cs generated Normal file
View File

@@ -0,0 +1,45 @@
namespace Vista
{
partial class FrmModProducto
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
SuspendLayout();
//
// FrmModProducto
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(527, 271);
Name = "FrmModProducto";
Text = "Form1";
ResumeLayout(false);
}
#endregion
}
}

20
Vista/FrmModProducto.cs Normal file
View File

@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Vista
{
public partial class FrmModProducto : Form
{
public FrmModProducto()
{
InitializeComponent();
}
}
}

120
Vista/FrmModProducto.resx Normal file
View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<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="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

93
Vista/FrmProducto.cs
View File

@@ -16,6 +16,8 @@ namespace Vista
public partial class FrmProducto : Form
{
private Producto nuevoproducto = new Producto();
private Producto _producto;
private bool _esModificacion;
public FrmProducto()
{
@@ -24,11 +26,35 @@ namespace Vista
CargarTabla();
}
public FrmProducto(Producto producto = null, bool esModificacion = false)
{
InitializeComponent();
_producto = producto ?? new Producto();
_esModificacion = esModificacion;
CargarCategorias();
CargarTabla();
InicializarFormulario();
}
private void InicializarFormulario()
{
if (_esModificacion && _producto != null)
{
numericUpDown1.Value = _producto.Id;
numericUpDown1.Enabled = false;
textBox1.Text = _producto.Nombre;
numericUpDown2.Value = (decimal)_producto.Precio;
checkBox1.Checked = _producto.Habilitado;
comboBox1.SelectedValue = _producto.Categoria.Id;
dgvProveedorAñadido.DataSource = _producto.ListarProveedores();
}
}
private void CargarTabla()
{
dgvProveedor.DataSource = null;
dgvProveedor.DataSource = ControladoraProveedores.Instance.Listar();
}
private void CargarCategorias()
{
// Obtener la lista de categorías desde la controladora
@@ -42,6 +68,23 @@ namespace Vista
comboBox1.DataSource = categorias;
}
private void CargarDatosProducto()
{
if (_producto != null)
{
numericUpDown1.Value = _producto.Id;
textBox1.Text = _producto.Nombre;
numericUpDown2.Value = Convert.ToDecimal(_producto.Precio);
checkBox1.Checked = _producto.Habilitado;
comboBox1.SelectedItem = _producto.Categoria;
if (_esModificacion)
{
numericUpDown1.Enabled = false; // Bloquear el ID
}
}
}
private bool ValidarDatos()
{
string devolucion = "";
@@ -63,7 +106,7 @@ namespace Vista
}
// Validar ID (Si es necesario)
if (ControladoraProductos.Instance.Listar().Any(p => p.Id == (int)numericUpDown1.Value))
if (!_esModificacion && ControladoraProductos.Instance.Listar().Any(p => p.Id == (int)numericUpDown1.Value))
{
devolucion += "Ya existe un producto con el mismo ID.\n";
}
@@ -89,16 +132,21 @@ namespace Vista
{
if (ValidarDatos())
{
_producto.Nombre = textBox1.Text;
_producto.Precio = (double)numericUpDown2.Value;
_producto.Habilitado = checkBox1.Checked;
_producto.Categoria = (Categoria)comboBox1.SelectedItem;
nuevoproducto.Id = (int)numericUpDown1.Value;
nuevoproducto.Nombre = textBox1.Text;
nuevoproducto.Precio = (double)numericUpDown2.Value;
nuevoproducto.Habilitado = checkBox1.Checked;
nuevoproducto.Categoria = (Categoria)comboBox1.SelectedItem;
// Agregar el producto usando la controladora
string mensaje = ControladoraProductos.Instance.Añadir(nuevoproducto);
string mensaje;
if (_esModificacion)
{
mensaje = ControladoraProductos.Instance.Modificar(_producto);
}
else
{
_producto.Id = (int)numericUpDown1.Value;
mensaje = ControladoraProductos.Instance.Añadir(_producto);
}
MessageBox.Show(mensaje, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information);
Close();
@@ -113,7 +161,6 @@ namespace Vista
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
// Puedes usar este método para manejar cambios en el ComboBox si es necesario
// No es necesario mantener una variable separada para la categoría seleccionada
}
private void btnaddProveedor_Click(object sender, EventArgs e)
@@ -125,19 +172,20 @@ namespace Vista
foreach (DataGridViewRow selectedRow in dgvProveedor.SelectedRows)
{
Proveedor proveedor = (Proveedor)selectedRow.DataBoundItem;
nuevoproducto.AñadirProveedor(proveedor);
_producto.AñadirProveedor(proveedor);
dgvProveedorAñadido.DataSource = null;
dgvProveedorAñadido.DataSource = nuevoproducto.ListarProveedores();
dgvProveedorAñadido.DataSource = _producto.ListarProveedores();
}
}
else
{
MessageBox.Show("Por favor, selecciona una fila para eliminar Proveedor del producto.");
MessageBox.Show("Por favor, selecciona una fila para añadir Proveedor al producto.");
}
}
catch (Exception) { throw; }
catch (Exception ex)
{
MessageBox.Show($"Error al añadir proveedor: {ex.Message}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void btnrmProveedor_Click(object sender, EventArgs e)
@@ -146,12 +194,12 @@ namespace Vista
{
if (dgvProveedorAñadido.SelectedRows.Count > 0)
{
foreach (DataGridViewRow selectedRow in dgvProveedor.SelectedRows)
foreach (DataGridViewRow selectedRow in dgvProveedorAñadido.SelectedRows)
{
Proveedor proveedor = (Proveedor)selectedRow.DataBoundItem;
dgvProveedorAñadido.Rows.Remove(selectedRow);
Proveedor proveedoreliminar = nuevoproducto.ListarProveedores().First(x => x.Cuit == proveedor.Cuit);
nuevoproducto.EliminarProveedor(proveedoreliminar);
Proveedor proveedoreliminar = _producto.ListarProveedores().FirstOrDefault(x => x.Cuit == proveedor.Cuit);
_producto.EliminarProveedor(proveedoreliminar);
}
}
else
@@ -159,7 +207,10 @@ namespace Vista
MessageBox.Show("Por favor, selecciona una fila para eliminar Proveedor del producto.");
}
}
catch (Exception) { throw; }
catch (Exception ex)
{
MessageBox.Show($"Error al eliminar proveedor: {ex.Message}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
}

45
Vista/FrmProductoMod.Designer.cs generated Normal file
View File

@@ -0,0 +1,45 @@
namespace Vista
{
partial class FrmProductoMod
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
SuspendLayout();
//
// FrmProductoMod
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(654, 299);
Name = "FrmProductoMod";
Text = "Form1";
ResumeLayout(false);
}
#endregion
}
}

20
Vista/FrmProductoMod.cs Normal file
View File

@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Vista
{
public partial class FrmProductoMod : Form
{
public FrmProductoMod()
{
InitializeComponent();
}
}
}

120
Vista/FrmProductoMod.resx Normal file
View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<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="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

16
Vista/FrmProductos.Designer.cs generated
View File

@@ -29,6 +29,7 @@
private void InitializeComponent()
{
groupBox1 = new GroupBox();
button2 = new Button();
label3 = new Label();
dgvProveedores = new DataGridView();
label2 = new Label();
@@ -46,6 +47,7 @@
//
// groupBox1
//
groupBox1.Controls.Add(button2);
groupBox1.Controls.Add(label3);
groupBox1.Controls.Add(dgvProveedores);
groupBox1.Controls.Add(label2);
@@ -58,6 +60,16 @@
groupBox1.TabIndex = 5;
groupBox1.TabStop = false;
//
// button2
//
button2.Location = new Point(87, 263);
button2.Name = "button2";
button2.Size = new Size(75, 23);
button2.TabIndex = 11;
button2.Text = "Modificar";
button2.UseVisualStyleBackColor = true;
button2.Click += button2_Click;
//
// label3
//
label3.AutoSize = true;
@@ -73,6 +85,7 @@
dgvProveedores.Location = new Point(473, 22);
dgvProveedores.Name = "dgvProveedores";
dgvProveedores.RowTemplate.Height = 25;
dgvProveedores.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dgvProveedores.Size = new Size(240, 235);
dgvProveedores.TabIndex = 9;
//
@@ -110,7 +123,7 @@
//
// BtnEliminar
//
BtnEliminar.Location = new Point(87, 263);
BtnEliminar.Location = new Point(168, 263);
BtnEliminar.Name = "BtnEliminar";
BtnEliminar.Size = new Size(75, 23);
BtnEliminar.TabIndex = 2;
@@ -182,5 +195,6 @@
private Label label1;
private DataGridView dgvProveedores;
private Label label3;
private Button button2;
}
}

24
Vista/FrmProductos.cs
View File

@@ -136,7 +136,7 @@ namespace Vista
try
{
// Obtén el ID del producto desde la columna "colId"
int id = Convert.ToInt32(fila.Cells["colId"].Value);
int id = Convert.ToInt32(fila.Cells["Id"].Value);
// Busca el producto con el ID correspondiente
var producto = ControladoraProductos.Instance.Listar().FirstOrDefault(p => p.Id == id);
@@ -176,6 +176,28 @@ namespace Vista
dgvProveedores.DataSource = ControladoraProductos.Instance.ListarProveedores(producto);
}
}
private void button2_Click(object sender, EventArgs e)
{
if (dgvProductos.SelectedRows.Count < 1)
{
MessageBox.Show("Seleccione una línea para modificar");
return;
}
Producto producto = new Producto()
{
Id = Convert.ToInt32(dgvProductos.SelectedRows[0].Cells["Id"].Value),
Nombre = dgvProductos.SelectedRows[0].Cells["Nombre"].Value.ToString(),
Precio = Convert.ToInt32(dgvProductos.SelectedRows[0].Cells["Precio"].Value),
Habilitado = Convert.ToBoolean(dgvProductos.SelectedRows[0].Cells["Habilitado"].Value),
Categoria = ControladoraCategorias.Instance.Listar().FirstOrDefault(c => c.Descripcion == dgvProductos.SelectedRows[0].Cells["Categoria"].Value.ToString())
};
var formModificar = new FrmProducto(producto, true);
formModificar.ShowDialog();
ActualizarGrilla();
}
}
}

2
Vista/FrmProductos.resx
View File

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

6
Vista/Vista.csproj.user
View File

@@ -8,6 +8,12 @@
<Compile Update="AddProducto.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="FrmProductoMod.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="FrmModProducto.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="FrmCliente.cs">
<SubType>Form</SubType>
</Compile>

4
Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig
View File

@@ -14,6 +14,7 @@ build_property.RootNamespace = Vista
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Vista/
=======
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Vista\
@@ -35,3 +36,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Vista\
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Vista\
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Vista\
>>>>>>> 3925b59 (cambios nacho)

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

@@ -5,6 +5,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {}
},
@@ -31,16 +32,19 @@
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj": {}
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj": {}
>>>>>>> 3925b59 (cambios nacho)
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
"projectName": "Controladora",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -58,11 +62,11 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
},
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj"
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj"
}
}
}
@@ -96,14 +100,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -152,14 +156,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -177,8 +181,8 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
}
}
}
@@ -212,11 +216,12 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
"projectName": "Vista",
@@ -239,10 +244,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
>>>>>>> 3925b59 (cambios nacho)
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -465,6 +473,7 @@
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -476,6 +485,10 @@
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj"
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
>>>>>>> 3925b59 (cambios nacho)
}
}
}
@@ -520,6 +533,7 @@
}
},
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {
"version": "1.0.0",
@@ -534,18 +548,25 @@
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj": {
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj": {
>>>>>>> 3925b59 (cambios nacho)
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\obj\\",
>>>>>>> c493033 (cosas que faltaban)
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\obj\\",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\obj\\",
>>>>>>> 3925b59 (cambios nacho)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
@@ -562,6 +583,7 @@
"targetAlias": "net6.0-windows",
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
@@ -598,6 +620,16 @@
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj"
>>>>>>> 5479db7 (terminado form de config)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj"
},
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
},
"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"
>>>>>>> 3925b59 (cambios nacho)
}
}
}

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

@@ -13572,6 +13572,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
"projectName": "Vista",
@@ -13603,10 +13604,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
>>>>>>> 3925b59 (cambios nacho)
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -13632,6 +13636,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
@@ -13673,6 +13678,16 @@
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj"
>>>>>>> 5479db7 (terminado form de config)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj"
},
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
},
"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"
>>>>>>> 3925b59 (cambios nacho)
}
}
}

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

@@ -5,6 +5,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "NrgVcMaE+xOpA8UnmFhQwGflGRDAICnz8EffGQ+5vJrqniVecS26UDqJMYcJ2SmlijA3PT49NDmcrKADdBbkcQ==",
"success": true,
@@ -621,8 +622,11 @@
=======
"dgSpecHash": "HaKkXKrDu+gimYBODDKQ5E1ZL1m4YoG9CrkcmpZyBjOtEmifQPEVkmmKOyOtFgPNaLHFACDybW6TDfmls/Ua8g==",
>>>>>>> 5479db7 (terminado form de config)
=======
"dgSpecHash": "9xoX6uTcIEHTfvrkxbiNwJryG4RwhPq70t4kNMVhRSGHltn2QOmFl8cQl5qjiBimTD2Zuo2MWeKOifxctKIbdg==",
>>>>>>> 3925b59 (cambios nacho)
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj",
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
"expectedPackageFiles": [],
>>>>>>> c493033 (cosas que faltaban)
"logs": []