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

fixes

Browse Source
This commit is contained in:
fedpo
2024-08-12 12:39:30 -03:00
parent d11016fe50
commit 01d975c47f
6 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Controladora/Controladora.csproj
View File

@@ -1,26 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<<<<<<< HEAD
=======
>>>>>>> c493033 (cosas que faltaban)
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Informes\Informes.csproj" /> <ProjectReference Include="..\Informes\Informes.csproj" />
<ProjectReference Include="..\Modelo\Modelo.csproj" /> <ProjectReference Include="..\Modelo\Modelo.csproj" />
<ProjectReference Include="..\Entidades\Entidades.csproj" /> <ProjectReference Include="..\Entidades\Entidades.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="Emailer" Version="1.0.0" />
<PackageReference Include="webhookSharp" Version="1.0.0" />
</ItemGroup>
</Project> </Project>

7
Controladora/ControladoraOrdenesDeCompra.cs
View File

@@ -19,7 +19,7 @@ namespace Controladora
$"Fallo la carga del OrdenDeCompra {t.Id}"; $"Fallo la carga del OrdenDeCompra {t.Id}";
} }
<<<<<<< HEAD
private bool ProductoCheck(ReadOnlyCollection<DetalleOrdenDeCompra> ldetalles) private bool ProductoCheck(ReadOnlyCollection<DetalleOrdenDeCompra> ldetalles)
{ {
bool ret = false; bool ret = false;
@@ -32,10 +32,9 @@ namespace Controladora
}); });
return ret; return ret;
} }
override public string Eliminar(OrdenDeCompra t)
=======
public string Eliminar(OrdenDeCompra t) public string Eliminar(OrdenDeCompra t)
>>>>>>> 675d86f (refactor: Cambiada la estructura de las controladoras)
{ {
if (t == null) return "El OrdenDeCompra es nulo fallo la carga"; if (t == null) return "El OrdenDeCompra es nulo fallo la carga";
if (t.Id < 0) return "El Id esta mal cargado"; if (t.Id < 0) return "El Id esta mal cargado";

2
Entidades/Entidades.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>

2
Informes/Informes.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>

2
Modelo/Modelo.csproj
View File

@@ -5,7 +5,7 @@
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>

4
Vista/Vista.csproj
View File

@@ -7,7 +7,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework> <TargetFramework>net8.0-windows</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
@@ -20,4 +20,4 @@
<ProjectReference Include="..\Informes\Informes.csproj" /> <ProjectReference Include="..\Informes\Informes.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>