Compare commits
4 Commits
698151baf3
...
ae14f5842e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ae14f5842e | ||
|
|
24726fc850 | ||
|
|
1605d0968b | ||
|
|
67419df015 |
@@ -38,7 +38,7 @@ export class UserComponent extends BasePageComponent implements AfterViewInit {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private sUsername = null;
|
private sUser: any = null;
|
||||||
|
|
||||||
private _bottomSheet = inject(MatBottomSheet);
|
private _bottomSheet = inject(MatBottomSheet);
|
||||||
|
|
||||||
@@ -49,9 +49,9 @@ export class UserComponent extends BasePageComponent implements AfterViewInit {
|
|||||||
this.refreshService.removeAll()
|
this.refreshService.removeAll()
|
||||||
this.refreshService.add(() => {
|
this.refreshService.add(() => {
|
||||||
this.userTable.fetchData();
|
this.userTable.fetchData();
|
||||||
if (this.sUsername != null) {
|
if (this.sUser?.username != null) {
|
||||||
this.groupTable.fetchDataByUsername(this.sUsername);
|
this.groupTable.fetchDataByUsername(this.sUser.username);
|
||||||
this.moduleTable.fetchDataByUsername(this.sUsername)
|
this.moduleTable.fetchDataByUsername(this.sUser.username)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -65,14 +65,13 @@ export class UserComponent extends BasePageComponent implements AfterViewInit {
|
|||||||
@ViewChild("moduleTable") moduleTable!: ModuleTableComponent;
|
@ViewChild("moduleTable") moduleTable!: ModuleTableComponent;
|
||||||
|
|
||||||
usersOnSelectedRows = (rows: GuiSelectedRow[]) => {
|
usersOnSelectedRows = (rows: GuiSelectedRow[]) => {
|
||||||
if (rows.length > 0) {
|
if (rows.length == 1) {
|
||||||
this.sUsername = rows[0].source.username;
|
this.sUser = rows[0].source;
|
||||||
|
this.groupTable.fetchDataByUsername(rows[0].source.username);
|
||||||
if (this.sUsername != null) {
|
this.moduleTable.fetchDataByUsername(rows[0].source.username)
|
||||||
this.groupTable.fetchDataByUsername(this.sUsername);
|
}
|
||||||
this.moduleTable.fetchDataByUsername(this.sUsername)
|
else if (rows.length == 0 && this.sUser?.username != null) {
|
||||||
this.openUpdateSheet(rows[0].source);
|
this.openUpdateSheet(this.sUser);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,5 +16,7 @@ namespace DigitalData.UserManager.Infrastructure.Contracts
|
|||||||
Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroupAndUser();
|
Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroupAndUser();
|
||||||
|
|
||||||
Task<IEnumerable<GroupOfUser>> ReadByUsernameAsync(string username);
|
Task<IEnumerable<GroupOfUser>> ReadByUsernameAsync(string username);
|
||||||
|
|
||||||
|
Task<IEnumerable<GroupOfUser>> ReadByUserIdAsync(int userId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -18,6 +18,11 @@ namespace DigitalData.UserManager.Infrastructure.Repositories
|
|||||||
return _dbSet.Where(mou => mou.GroupId == groupId);
|
return _dbSet.Where(mou => mou.GroupId == groupId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private IQueryable<GroupOfUser> ReadByUserId(int userId)
|
||||||
|
{
|
||||||
|
return _dbSet.Where(gou => gou.User!.Id == userId).Include(gou => gou.Group);
|
||||||
|
}
|
||||||
|
|
||||||
private IQueryable<GroupOfUser> ReadByUsername(string userName)
|
private IQueryable<GroupOfUser> ReadByUsername(string userName)
|
||||||
{
|
{
|
||||||
return _dbSet.Where(gou => gou.User!.Username == userName).Include(gou => gou.Group);
|
return _dbSet.Where(gou => gou.User!.Username == userName).Include(gou => gou.Group);
|
||||||
@@ -27,7 +32,7 @@ namespace DigitalData.UserManager.Infrastructure.Repositories
|
|||||||
{
|
{
|
||||||
return await _dbSet.Where(gou => gou.GroupId == groupId && gou.UserId == userId).ToListAsync();
|
return await _dbSet.Where(gou => gou.GroupId == groupId && gou.UserId == userId).ToListAsync();
|
||||||
}
|
}
|
||||||
|
//TODO: Add -Async suffix at the end of async method names
|
||||||
public async Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroup() => await _dbSet.Include(gou => gou.Group).ToListAsync();
|
public async Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroup() => await _dbSet.Include(gou => gou.Group).ToListAsync();
|
||||||
|
|
||||||
public async Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithUser() => await _dbSet.Include(gou => gou.User).ToListAsync();
|
public async Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithUser() => await _dbSet.Include(gou => gou.User).ToListAsync();
|
||||||
@@ -35,5 +40,7 @@ namespace DigitalData.UserManager.Infrastructure.Repositories
|
|||||||
public async Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroupAndUser() => await _dbSet.Include(gou => gou.Group).Include(gou => gou.User).ToListAsync();
|
public async Task<IEnumerable<GroupOfUser>> ReadAllAsyncWithGroupAndUser() => await _dbSet.Include(gou => gou.Group).Include(gou => gou.User).ToListAsync();
|
||||||
|
|
||||||
public async Task<IEnumerable<GroupOfUser>> ReadByUsernameAsync(string username) => await ReadByUsername(username).ToListAsync();
|
public async Task<IEnumerable<GroupOfUser>> ReadByUsernameAsync(string username) => await ReadByUsername(username).ToListAsync();
|
||||||
|
|
||||||
|
public async Task<IEnumerable<GroupOfUser>> ReadByUserIdAsync(int userId) => await ReadByUserId(userId).ToListAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user