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

HU a datatables-hez

Browse Source
This commit is contained in:
ivanszabo
2025-03-19 09:59:42 +01:00
parent 2fd147bb36
commit f74922d01e
10 changed files with 78 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/WorkFlowCheck.BL/Services/UserService.cs
+4 -1
View File
@@ -38,7 +38,10 @@ namespace WorkFlowCheck.BL.Services
try
{
var user = await _dbContext.Users.Where(w => w.Id == Id).FirstOrDefaultAsync();
var user = await _dbContext.Users
.Include(i => i.UserRoles)
.ThenInclude(i => i.Role)
.Where(w => w.Id == Id).FirstOrDefaultAsync();
if (user != null)
{
retVal = _mapper.Map<UserDTO>(user);
src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointEditPage.cshtml
+6 -3
View File
@@ -32,10 +32,12 @@
</div>
</form>
</div>
<br />
<div class="card shadow p-4">
<div class="d-flex justify-content-end">
<button class="btn btn-primary float-right">Új elem hozzáadása</button>
<button class="btn btn-primary float-right new-btn" data-bs-toggle="tooltip" data-bs-placement="top" title="Új elem hozzáadása">
<i class="bi bi-plus-square"></i>
</button>
</div>
<table id="tbCheckPointsEditPage" class="table table-bordered table-hover table-sm" style="width:100%">
<thead class="table-primary">
@@ -89,7 +91,8 @@
}
],
processing:true
processing:true,
language: { url: '//cdn.datatables.net/plug-ins/2.2.2/i18n/hu.json',}
});
$('#tbCheckPointsEditPage').on('click', '.edit-btn', function ()
src/WorkFlowCheck.Web/Pages/BaseStock/CheckPoints/CheckPointsPage.cshtml
+2 -1
View File
@@ -59,7 +59,8 @@
}
],
processing:true
processing:true,
language: { url: '//cdn.datatables.net/plug-ins/2.2.2/i18n/hu.json',}
});
$('#tbCheckPointsPage').on('click', '.edit-btn', function ()
src/WorkFlowCheck.Web/Pages/BaseStock/Equipments/EquipmentsPage.cshtml
+2 -1
View File
@@ -54,7 +54,8 @@
}
],
processing:true
processing:true,
language: { url: '//cdn.datatables.net/plug-ins/2.2.2/i18n/hu.json',}
});
$('#tbEquipmentsPage').on('click', '.edit-btn', function ()
src/WorkFlowCheck.Web/Pages/BaseStock/Locations/LocationsPage.cshtml
+2 -1
View File
@@ -54,7 +54,8 @@
}
],
processing:true
processing:true,
language: { url: '//cdn.datatables.net/plug-ins/2.2.2/i18n/hu.json',}
});
$('#tbLocationsPage').on('click', '.edit-btn', function ()
src/WorkFlowCheck.Web/Pages/UserAndRole/RolePage.cshtml
+2 -1
View File
@@ -56,7 +56,8 @@
}
],
processing:true
processing:true,
language: { url: '//cdn.datatables.net/plug-ins/2.2.2/i18n/hu.json',}
});
$('#newRoleBtn').on('click', function ()
src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml
+43 -2
View File
@@ -5,10 +5,12 @@
@{
ViewData["Title"] = "Ellenőrzési pont";
var UserId = Model.UserDTO.Id;
var url = Url.Page("./UserEditPage", "LoadRoles", new { id = UserId });
var urlPost = Url.Page("./UserEditPage", "Save");
}
<h1>@ViewData["Title"]</h1>
<input type="hidden" id="UserEditUrl" value="@url" />
<input type="hidden" id="UserEditPostUrl" value="@urlPost" />
<div class="card shadow p-4">
@@ -52,10 +54,49 @@
</div>
</form>
</div>
<br></br>
<div class="card shadow p-4">
<table id="tbUserPage" class="table table-bordered table-hover table-sm" style="width:100%">
<thead class="table-primary">
<tr>
<th>ID</th>
<th>Role Name</th>
</tr>
</thead>
<tfoot class="table-light">
<tr>
<th>ID</th>
<th>Role Name</th>
</tr>
</tfoot>
</table>
</div>
@section Scripts {
<script>
console.log($('#UserEditUrl').val());
const table = new DataTable('#tbUserPage', {
ajax: {
url: $('#UserEditUrl').val(),
type: "GET",
dataSrc : "data"
},
columns: [
{ data: "id" },
{ data: "roleName" }
],
columnDefs: [
{
"targets": 0,
"visible": false
}
],
processing:true,
language: { url: '//cdn.datatables.net/plug-ins/2.2.2/i18n/hu.json',}
});
$("#saveUser").click(function () {
const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content');
var formData = getFormAsNestedObject('#UserForm');
@@ -98,7 +139,7 @@
});
$(document).ready(function () {
const $form = $("#userForm");
const $form = $("#UserForm");
$form.validate({
errorClass: "text-danger small",
src/WorkFlowCheck.Web/Pages/UserAndRole/UserEditPage.cshtml.cs
+5
View File
@@ -46,5 +46,10 @@ namespace WorkFlowCheck.Web.Pages.UserAndRole
return new JsonResult(new { success = false });
}
public async Task<JsonResult> OnGetLoadRoles(int id)
{
UserDTO = await _userService.GetUser(id);
return new JsonResult(new { data = UserDTO.RoleDTO });
}
}
}
src/WorkFlowCheck.Web/Pages/UserAndRole/UserPage.cshtml
+5 -2
View File
@@ -7,7 +7,9 @@
<div class="card shadow p-4">
<div class="d-flex justify-content-end">
<button id="newUserBtn" class="btn btn-primary float-right new-btn">Új elem hozzáadása</button>
<button id="newUserBtn" class="btn btn-primary float-right new-btn" data-bs-toggle="tooltip" data-bs-placement="top" title="Új felhasználó">
<i class="bi bi-plus-square"></i>
</button>
</div>
<table id="tbUsersPage" class="table table-bordered table-hover table-sm" style="width:100%">
<thead class="table-primary">
@@ -63,7 +65,8 @@
}
],
processing:true
processing:true,
language: { url: '//cdn.datatables.net/plug-ins/2.2.2/i18n/hu.json',}
});
$('#newUserBtn').on('click', function ()
src/WorkFlowCheck.Web/Pages/UserAndRole/UserRolePage.cshtml
+2 -1
View File
@@ -59,7 +59,8 @@
}
],
processing:true
processing:true,
language: { url: '//cdn.datatables.net/plug-ins/2.2.2/i18n/hu.json',}
});
$('#newUserRoleBtn').on('click', function ()