sozsoft/erp-platform
1
0
Fork 0
Code Issues 6 Pull requests Projects 3 Releases Packages Wiki Activity Actions

classroom isActive Participant hataları

Browse source
This commit is contained in:
Sedat Öztürk 2025-08-30 15:33:12 +03:00
parent 08f5d11f28
commit ab45389299
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
api/src/Kurs.Platform.Application/Classroom/ClassroomAppService.cs
View file

@ -192,7 +192,10 @@ public class ClassroomAppService : PlatformAppService, IClassroomAppService
throw new InvalidOperationException("Class not found");
}
var classroomSettings = JsonSerializer.Deserialize<ClassroomSettingsDto>(classSession.SettingsJson);
var classroomSettings = string.IsNullOrWhiteSpace(classSession.SettingsJson)
? new ClassroomSettingsDto() // default ayarlar
: JsonSerializer.Deserialize<ClassroomSettingsDto>(classSession.SettingsJson);
if (classSession.ParticipantCount >= classSession.MaxParticipants)
{

10
api/src/Kurs.Platform.HttpApi.Host/Classroom/ClassroomHub.cs
View file

@ -42,7 +42,7 @@ public class ClassroomHub : Hub
}
[HubMethodName("JoinClass")]
public async Task JoinClassAsync(Guid sessionId, Guid userId, string userName, bool isTeacher)
public async Task JoinClassAsync(Guid sessionId, Guid userId, string userName, bool isTeacher, bool isActive)
{
var classroom = await _classSessionRepository.GetAsync(sessionId);
if (classroom == null)
@ -51,7 +51,9 @@ public class ClassroomHub : Hub
return;
}
var classroomSettings = JsonSerializer.Deserialize<ClassroomSettingsDto>(classroom.SettingsJson);
var classroomSettings = string.IsNullOrWhiteSpace(classroom.SettingsJson)
? new ClassroomSettingsDto() // default ayarlar
: JsonSerializer.Deserialize<ClassroomSettingsDto>(classroom.SettingsJson);
var participant = await _participantRepository.FirstOrDefaultAsync(
x => x.SessionId == sessionId && x.UserId == userId
@ -68,7 +70,7 @@ public class ClassroomHub : Hub
classroomSettings.DefaultMicrophoneState == "muted",
classroomSettings.DefaultCameraState == "off",
false,
true
isActive
);
participant.UpdateConnectionId(Context.ConnectionId);
await _participantRepository.InsertAsync(participant, autoSave: true);
@ -150,7 +152,7 @@ public class ClassroomHub : Hub
x => x.SessionId == sessionId && x.UserId == userId
);
if (participant == null)
if (participant != null)
{
participant.IsActive = false;
await _participantRepository.UpdateAsync(participant, autoSave: true);

5
ui/src/services/classroom/signalr.ts
View file

@ -110,16 +110,17 @@ export class SignalRService {
userId: string,
userName: string,
isTeacher: boolean,
isActive: boolean
): Promise<void> {
if (!this.isConnected) {
console.log('Error starting SignalR connection join class for', userName)
return
}
console.log('Joining class session:', sessionId, 'as', userName, 'isTeacher:', isTeacher)
console.log('Joining class session:', sessionId, 'as', userName, 'isTeacher:', isTeacher, 'isActive:', isActive)
try {
await this.connection.invoke('JoinClass', sessionId, userId, userName, isTeacher)
await this.connection.invoke('JoinClass', sessionId, userId, userName, isTeacher, isActive)
} catch (error) {
console.error('Error joining class:', error)
}

8
ui/src/views/classroom/ClassList.tsx
View file

@ -189,14 +189,6 @@ const ClassList: React.FC = () => {
}
}
// const canJoinClass = (actualStartTime: string) => {
// const actualed = new Date(actualStartTime)
// const now = new Date()
// const tenMinutesBefore = new Date(actualed.getTime() - 10 * 60 * 1000) //10 dakika öncesine kadar
// const twoHoursAfter = new Date(actualed.getTime() + 2 * 60 * 60 * 1000) // 2 saat sonrasına kadar
// return now >= tenMinutesBefore && now <= twoHoursAfter
// }
const widgets = () => {
return {
totalCount: classList.length,

2
ui/src/views/classroom/RoomDetail.tsx
View file

@ -404,6 +404,7 @@ const RoomDetail: React.FC = () => {
user.id,
user.name,
user.role === 'teacher',
true
)
} catch (error) {
console.error('Failed to initialize services:', error)
@ -646,6 +647,7 @@ const RoomDetail: React.FC = () => {
studentId,
randomName,
false, // öğrenci
true // aktif
)
}