phuocntb/rikkei_simple_care
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix trang thai sinh vien

Browse Source
This commit is contained in:
Nguyễn Phước
2026-06-30 09:45:38 +07:00
parent 8ecc9c5664
commit e94a87cbd9
4 changed files with 450 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
server/internal/handlers/handlers_attendance.go
View File

@@ -129,14 +129,15 @@ func ApplyScheduleTemplateHandler(db *gorm.DB) fiber.Handler {
}
type attendanceRow struct {
StudentRkID int64 `json:"studentRkId"`
StudentCode string `json:"studentCode"`
FullName string `json:"fullName"`
Email string `json:"email"`
Status int `json:"status"`
StatusLabel string `json:"statusLabel"`
OnlineMinutes int `json:"onlineMinutes"`
StatusEditedByTeacher bool `json:"statusEditedByTeacher"`
StudentRkID int64 `json:"studentRkId"`
StudentCode string `json:"studentCode"`
FullName string `json:"fullName"`
Email string `json:"email"`
Status int `json:"status"`
StatusLabel string `json:"statusLabel"`
OnlineMinutes int `json:"onlineMinutes"`
StatusEditedByTeacher bool `json:"statusEditedByTeacher"`
PushedToQLDTAt *time.Time `json:"pushedToQldtAt,omitempty"`
}
func resolveScheduleForPeriod(db *gorm.DB, classRkID int64, dayOfWeek, period int) (*models.ClassSchedule, error) {
@@ -278,22 +279,38 @@ func GetClassAttendanceHandler(db *gorm.DB) fiber.Handler {
row.StatusLabel = r.StatusLabel
row.OnlineMinutes = r.OnlineMinutes
row.StatusEditedByTeacher = r.StatusEditedByTeacher
row.PushedToQLDTAt = r.PushedToQLDTAt
}
out = append(out, row)
}
sched, _ := resolveScheduleForPeriod(db, classRkID, dayOfWeek, period)
shiftInfo := fiber.Map{}
if sched != nil {
shiftInfo = fiber.Map{
"startTime": sched.StartTime,
"endTime": sched.EndTime,
"courseId": sched.CourseID,
"courseName": sched.CourseName,
"isActive": sched.IsActive,
var shiftPushedAt *time.Time
qldtDirty := false
for _, r := range results {
if r.PushedToQLDTAt != nil {
if shiftPushedAt == nil || r.PushedToQLDTAt.After(*shiftPushedAt) {
t := *r.PushedToQLDTAt
shiftPushedAt = &t
}
if r.UpdatedAt.After(*r.PushedToQLDTAt) {
qldtDirty = true
}
}
}
sched, _ := resolveScheduleForPeriod(db, classRkID, dayOfWeek, period)
shiftInfo := fiber.Map{
"pushedToQldtAt": shiftPushedAt,
"qldtDirty": qldtDirty,
}
if sched != nil {
shiftInfo["startTime"] = sched.StartTime
shiftInfo["endTime"] = sched.EndTime
shiftInfo["courseId"] = sched.CourseID
shiftInfo["courseName"] = sched.CourseName
shiftInfo["isActive"] = sched.IsActive
}
return c.JSON(fiber.Map{"data": out, "period": period, "date": date, "shift": shiftInfo})
}
}