ivanszabo/WorkFlowCheck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Továbbfejlesztés

Browse Source
This commit is contained in:
ivanszabo
2025-04-04 12:42:47 +02:00
parent de8b95eda1
commit 5b1f7fb642
15 changed files with 1130 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointEditPage.cshtml
+38 -37
View File
@@ -135,43 +135,44 @@
formData.CheckPointDTO.CheckListTemplateRowDTO = [];
formData.CheckPointDTO.IsEnabled = $('#CheckPointDTO_IsEnabled').is(':checked');
$.ajax({
url: $('#checkPointEditPostUrl').val(),
type: 'POST',
headers: {
'X-CSRF-TOKEN': csrfToken,
'Content-Type': 'application/json'
},
data: JSON.stringify(formData.CheckPointDTO),
success: function (response) {
if (response.success)
{
showMessageModal({
title: 'Figyelmem!',
message: 'Sikeres mentés.',
okText: 'Értettem'
});
}
else
{
showMessageModal({
title: 'Figyelmem, HIBA!',
message: 'Sikertelen mentés.',
okText: 'Értettem'
});
}
},
error: function (xhr, status, error) {
// Hiba esetén
console.error("Hiba: ", error);
showMessageModal({
title: 'Hiba!',
message: 'A mentés NEM sikerült!',
okText: 'Értettem'
});
}
});
saveEntity(csrfToken, formData.CheckPointDTO, $('#checkPointEditPostUrl').val());
// $.ajax({
// url: $('#checkPointEditPostUrl').val(),
// type: 'POST',
// headers: {
// 'X-CSRF-TOKEN': csrfToken,
// 'Content-Type': 'application/json'
// },
// data: JSON.stringify(formData.CheckPointDTO),
// success: function (response) {
// if (response.success)
// {
// showMessageModal({
// title: 'Figyelmem!',
// message: 'Sikeres mentés.',
// okText: 'Értettem'
// });
// }
// else
// {
// showMessageModal({
// title: 'Figyelmem, HIBA!',
// message: 'Sikertelen mentés.',
// okText: 'Értettem'
// });
// }
// },
// error: function (xhr, status, error) {
// console.error("Hiba: ", error);
// showMessageModal({
// title: 'Hiba!',
// message: 'A mentés NEM sikerült!',
// okText: 'Értettem'
// });
// }
// });
});
src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentEditPage.cshtml
+1 -25
View File
@@ -44,31 +44,7 @@
if ($form.valid())
{
$.ajax({
url: $('#EquipmentEditPostUrl').val(),
type: 'POST',
headers: {
'X-CSRF-TOKEN': csrfToken,
'Content-Type': 'application/json'
},
data: JSON.stringify(formData.EquipmentDTO),
success: function (response) {
showMessageModal({
title: 'Figyelmem!',
message: 'Sikeres mentés.',
okText: 'Értettem'
});
},
error: function (xhr, status, error) {
// Hiba esetén
console.error("Hiba: ", error);
showMessageModal({
title: 'Hiba!',
message: 'A mentés NEM sikerült!',
okText: 'Értettem'
});
}
});
saveEntity(csrfToken, formData.EquipmentDTO, $('#EquipmentEditPostUrl').val());
} else
{
$form[0].reportValidity();
src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentsPage.cshtml
+1 -11
View File
@@ -77,17 +77,7 @@
$('#tbEquipmentsPage').on('click', '.delete-btn', function ()
{
const row = table.row($(this).closest('tr')).data();
console.log(row);
showConfirmModal({
title: 'Törlés megerősítése',
message: 'Biztosan törölni szeretnéd ezt az elemet?',
okText: 'Törlés',
cancelText: 'Mégsem'
}).then(function(result) {
if(result === 'ok') {
console.log('Törlés végrehajtva');
}
});
deleteEntity(table, '/BaseStock/Equipments/EquipmentPage?handler=DeleteLocation', row.id);
});
</script>
}
src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentsPage.cshtml.cs
+5
View File
@@ -23,5 +23,10 @@ namespace WorkFlowCheck.Web.Pages.BaseStock.Equipments
var results = await _baseStockService.GetAllEquipments();
return new JsonResult(new { data = results });
}
public async Task<JsonResult> OnGetDeleteEquipment(int id)
{
var isSuccess = await _baseStockService.DeleteEquipment(id);
return new JsonResult(new { result = isSuccess });
}
}
}
src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationEditPage.cshtml
+1 -38
View File
@@ -35,46 +35,9 @@
var formData = getFormAsNestedObject('#LocationForm');
const $form = $('#LocationForm');
console.log(formData.Location);
if ($form.valid())
{
$.ajax({
url: $('#LocationEditPostUrl').val(),
type: 'POST',
headers: {
'X-CSRF-TOKEN': csrfToken,
'Content-Type': 'application/json'
},
data: JSON.stringify(formData.LocationDTO),
success: function (response) {
if (response.success)
{
showMessageModal({
title: 'Figyelmem!',
message: 'Sikeres mentés.',
okText: 'Értettem'
});
}
else
{
showMessageModal({
title: 'Figyelmem, HIBA!',
message: 'Sikertelen mentés.',
okText: 'Értettem'
});
}
},
error: function (xhr, status, error) {
// Hiba esetén
console.error("Hiba: ", error);
showMessageModal({
title: 'Hiba!',
message: 'A mentés NEM sikerült!',
okText: 'Értettem'
});
}
});
saveEntity(csrfToken, formData.LocationDTO, $('#LocationEditPostUrl').val());
} else
{
$form[0].reportValidity();
src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationsPage.cshtml
+2 -39
View File
@@ -73,46 +73,9 @@
$('#tbLocationsPage').on('click', '.delete-btn', function ()
{
const row = table.row($(this).closest('tr')).data();
showConfirmModal({
title: 'Törlés megerősítése',
message: 'Biztosan törölni szeretnéd ezt az elemet?',
okText: 'Törlés',
cancelText: 'Mégsem'
}).then(function(result) {
if(result === 'ok') {
$.ajax({
url: '/BaseStock/Locations/LocationsPage?handler=DeleteLocation',
type: 'GET',
data: { id: row.id },
success: function (data) {
console.log(data);
if (data) {
showMessageModal({
title: 'Információ',
message: 'A törlés sikerült!',
okText: 'Értettem'
});
var row = table.row($(this).closest('tr')).data();
table.ajax.reload();
} else {
showMessageModal({
title: 'Hiba!',
message: 'A törlés NEM sikerült!',
okText: 'Értettem'
});
}
},
error: function (xhr, status, error) {
showMessageModal({
title: 'Hiba!',
message: 'A törlés NEM sikerült!',
okText: 'Értettem'
});
}
});
}
});
deleteEntity(table, '/BaseStock/Locations/LocationsPage?handler=DeleteLocation', row.id);
});
</script>
}
src/WorkFlowCheck.Web/Services/BaseStockService.cs
+42
View File
@@ -165,6 +165,48 @@ namespace WorkFlowCheck.Web.Services
}
return retVal;
}
public async Task<bool> DeleteEquipment(int id)
{
string endpoint = $"{_httpClient.BaseAddress}api/Sync/DeleteEquipment/{id}";
var retVal = false;
try
{
var response = await _httpClient.GetFromJsonAsync<ApiResponseDTO<bool>>(endpoint);
if (response != null)
{
if (response.IsSuccess)
{
return response.Data;
}
}
}
catch (Exception ex)
{
Log.Error(ex.Message);
}
return retVal;
}
public async Task<bool> DeleteCheckPoint(int id)
{
string endpoint = $"{_httpClient.BaseAddress}api/Sync/DeleteCheckPoint/{id}";
var retVal = false;
try
{
var response = await _httpClient.GetFromJsonAsync<ApiResponseDTO<bool>>(endpoint);
if (response != null)
{
if (response.IsSuccess)
{
return response.Data;
}
}
}
catch (Exception ex)
{
Log.Error(ex.Message);
}
return retVal;
}
public async Task<ApiResponseDTO<CheckPointDTO>> UpdateCheckPoint(CheckPointDTO checkPointDTO)
{
src/WorkFlowCheck.Web/Services/Interfaces/IBaseStockService.cs
+2 -1
View File
@@ -7,12 +7,13 @@ namespace WorkFlowCheck.Web.Services.Interfaces
{
Task<CheckPointDTO> GetCheckPoint(int id);
//Task<bool> DeleteCheckpoint(int id);
Task<bool> DeleteCheckpoint(int id);
Task<List<CheckPointDTO>> GetAllCheckPoints();
Task<ApiResponseDTO<CheckPointDTO>> UpdateCheckPoint(CheckPointDTO checkPointDTO);
Task<EquipmentDTO> GetEquipment(int id);
Task<bool> EquipmentLocation(int id);
Task<List<EquipmentDTO>> GetAllEquipments();
Task<ApiResponseDTO<EquipmentDTO>> UpdateEquipment(EquipmentDTO equipmentDTO);
src/WorkFlowCheck.Web/wwwroot/js/site.js
+83 -7
View File
@@ -128,13 +128,13 @@ function renderActionButtonsforCheckListHeader(data, rowId) {
}
function renderCheckStatus(data) {
//Open = 0,
//InProgress = 1,
//Blocked = 2,
//Storno = 3,
//Sent = 4,
//Signed = 5,
//Closed = 6
//Open = 0,
//InProgress = 1,
//Blocked = 2,
//Storno = 3,
//Sent = 4,
//Signed = 5,
//Closed = 6
switch (data) {
case 0:
return 'Nyitott';
@@ -222,3 +222,79 @@ function renderAnswerPhoto(data, row) {
}
return `<div class="text-center">${data}</div></div>`;
}
//Törlési funkció adatbázisnál
function deleteEntity(table, url, entityid) {
showConfirmModal({
title: 'Törlés megerősítése',
message: 'Biztosan törölni szeretnéd ezt az elemet?',
okText: 'Törlés',
cancelText: 'Mégsem'
}).then(function (result) {
if (result === 'ok') {
$.ajax({
url: url,
type: 'GET',
data: { id: entityid },
success: function (data) {
if (data) {
showMessageModal({
title: 'Információ',
message: 'A törlés sikerült!',
okText: 'Értettem'
});
table.ajax.reload();
} else {
showMessageModal({
title: 'Hiba!',
message: 'A törlés NEM sikerült!',
okText: 'Értettem'
});
}
},
error: function (xhr, status, error) {
showMessageModal({
title: 'Hiba!',
message: 'A törlés NEM sikerült!',
okText: 'Értettem'
});
}
});
}
});
}
function saveEntity(csrfToken, data, url) {
$.ajax({
url: url,
type: 'POST',
headers: {
'X-CSRF-TOKEN': csrfToken,
'Content-Type': 'application/json'
},
data: JSON.stringify(data),
success: function (response) {
if (response.success) {
showMessageModal({
title: 'Figyelmem!',
message: 'Sikeres mentés.',
okText: 'Értettem'
});
}
else {
showMessageModal({
title: 'Figyelmem, HIBA!',
message: 'Sikertelen mentés.',
okText: 'Értettem'
});
}
},
error: function (xhr, status, error) {
console.error("Hiba: ", error);
showMessageModal({
title: 'Hiba!',
message: 'A mentés NEM sikerült!',
okText: 'Értettem'
});
}
});
}