darkstack/LaDOSE
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Modification Zarghatt

Browse Source
This commit is contained in:
Darkstack
2019-03-14 01:31:56 +01:00
parent ad07674711
commit 30ec8ae90b
9 changed files with 76 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
LaDOSE.Src/LaDOSE.Api/Controllers/GenericController.cs
View File

@@ -1,7 +1,9 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using LaDOSE.Business.Interface;
using LaDOSE.Entity;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace LaDOSE.Api.Controllers
@@ -35,5 +37,20 @@ namespace LaDOSE.Api.Controllers
return _service.GetById(id);
}
[HttpGet("{id}/delete")]
public IActionResult Delete(int id)
{
try
{
return _service.Delete((int) id) ? (IActionResult) NoContent() : NotFound();
}
catch (Exception)
{
return BadRequest();
}
}
}
}

15
LaDOSE.Src/LaDOSE.Api/Controllers/GenericControllerDTO.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using LaDOSE.Business.Interface;
using Microsoft.AspNetCore.Mvc;
@@ -33,5 +34,17 @@ namespace LaDOSE.Api.Controllers
return AutoMapper.Mapper.Map<D>(_service.GetById(id));
}
[HttpDelete("{id}")]
public IActionResult Delete(int id)
{
try
{
return _service.Delete((int)id) ? (IActionResult)NoContent() : NotFound();
}
catch (Exception)
{
return BadRequest();
}
}
}
}

34
LaDOSE.Src/LaDOSE.Api/Controllers/UsersController.cs
View File

@@ -68,24 +68,24 @@ namespace LaDOSE.Api.Controllers
}
//[AllowAnonymous]
//[HttpPost("register")]
//public IActionResult Register([FromBody]ApplicationUser userDto)
//{
// // map dto to entity
[HttpPost("register")]
public IActionResult Register([FromBody]ApplicationUser userDto)
{
// map dto to entity
// try
// {
// // save
// _userService.Create(userDto, userDto.Password);
// return Ok();
// }
// catch (Exception ex)
// {
// // return error message if there was an exception
// return BadRequest(new { message = ex.Message });
// }
//}
try
{
// save
_userService.Create(userDto, userDto.Password);
return Ok();
}
catch (Exception ex)
{
// return error message if there was an exception
return BadRequest(new { message = ex.Message });
}
}
}

10
LaDOSE.Src/LaDOSE.DesktopApp/Services/RestService.cs
View File

@@ -149,9 +149,15 @@ namespace LaDOSE.DesktopApp.Services
return restResponse.Data;
}
public GameDTO UpdateGame(GameDTO eventUpdate)
public GameDTO UpdateGame(GameDTO game)
{
return Post("Api/Game", eventUpdate);
return Post("Api/Game", game);
}
public bool DeleteGame(int gameId)
{
var restRequest = new RestRequest($"/api/Game/{gameId}", Method.DELETE);
var restResponse = Client.Execute(restRequest);
return restResponse.IsSuccessful;
}
#endregion

13
LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/GameViewModel.cs
View File

@@ -49,6 +49,7 @@ namespace LaDOSE.DesktopApp.ViewModels
{
_currentGame = value;
NotifyOfPropertyChange(()=>CurrentGame);
NotifyOfPropertyChange(() => CanDeleteGame);
}
}
@@ -60,8 +61,16 @@ namespace LaDOSE.DesktopApp.ViewModels
public void AddGame()
{
var item = new GameDTO();
this.Games.Add(item);
this.CurrentGame = item;
this.RestService.UpdateGame(item);
LoadGames();
}
public void DeleteGame()
{
this.RestService.DeleteGame(this.CurrentGame.Id);
LoadGames();
}
public bool CanDeleteGame => CurrentGame != null;
}
}

4
LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/WordPressViewModel.cs
View File

@@ -197,8 +197,8 @@ namespace LaDOSE.DesktopApp.ViewModels
var findUser = FindUser(SelectedWpEvent.Id, SelectedGame);
var findUser2 = FindUser(SelectedWpEvent.Id, SelectedGame,true);
findUser.ForEach((e) => this.Players.AddUI(e,()=>NotifyOfPropertyChange(() => this.CanGenerate)));
findUser2.ForEach((e) => this.PlayersOptions.AddUI(e,null));
findUser.OrderBy(e=>e.Name).ToList().ForEach((e) => this.Players.AddUI(e,()=>NotifyOfPropertyChange(() => this.CanGenerate)));
findUser2.OrderBy(e => e.Name).ToList().ForEach((e) => this.PlayersOptions.AddUI(e,null));
}
}

4
LaDOSE.Src/LaDOSE.DesktopApp/Views/GameView.xaml
View File

@@ -42,7 +42,9 @@
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
</Grid.RowDefinitions>
<Button Grid.Row="0" Grid.ColumnSpan="2" x:Name="AddGame">Add Games</Button>
<Button Grid.Row="0" Grid.Column="0" x:Name="AddGame">Add Game</Button>
<Button Grid.Row="0" Grid.Column="1" x:Name="DeleteGame">Delete Game</Button>
<Label Grid.Row="1" Grid.Column="0">Id</Label>
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Path=CurrentGame.Id,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" IsReadOnly="True"></TextBox>

2
LaDOSE.Src/LaDOSE.DesktopApp/Views/WordPressView.xaml
View File

@@ -45,7 +45,7 @@
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="2*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<ListView Grid.Column="0" ItemsSource="{Binding ElementName=EventsList,Path=SelectedItem.WpBookings}"
<ListView Grid.Column="0" ItemsSource="{Binding ElementName=EventsList,Path=SelectedItem.WpBookings}"
x:Name="BookingList" IsTextSearchEnabled="True" TextSearch.TextPath="WpUser.Name" Margin="2" KeyUp="Copy">
<ListView.ItemTemplate>
<DataTemplate>

2
LaDOSE.Src/LaDOSE.Service/Service/BaseService.cs
View File

@@ -35,6 +35,7 @@ namespace LaDOSE.Business.Service
public virtual bool Update(T entity)
{
var entityEntry = _context.Update(entity);
this._context.SaveChanges();
return _context.Entry(entityEntry).State == EntityState.Unchanged;
}
@@ -42,6 +43,7 @@ namespace LaDOSE.Business.Service
{
var find = _context.Find<T>(id);
_context.Remove(find);
this._context.SaveChanges();
return _context.Entry(find).State == EntityState.Deleted;
}