diff --git a/admin/api/exercice.go b/admin/api/exercice.go index 6d698641..30b7aff6 100644 --- a/admin/api/exercice.go +++ b/admin/api/exercice.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "strings" + "time" "srs.epita.fr/fic-server/admin/sync" "srs.epita.fr/fic-server/libfic" @@ -21,6 +22,9 @@ func init() { router.PATCH("/api/exercices/:eid", apiHandler(exerciceHandler(partUpdateExercice))) router.DELETE("/api/exercices/:eid", apiHandler(exerciceHandler(deleteExercice))) + router.GET("/api/exercices/:eid/history.json", apiHandler(exerciceHandler(getExerciceHistory))) + router.DELETE("/api/exercices/:eid/history.json", apiHandler(exerciceHandler(delExerciceHistory))) + router.GET("/api/exercices/:eid/files", apiHandler(exerciceHandler(listExerciceFiles))) router.POST("/api/exercices/:eid/files", apiHandler(exerciceHandler(createExerciceFile))) router.GET("/api/exercices/:eid/files/:fid", apiHandler(exerciceFileHandler(showExerciceFile))) @@ -132,6 +136,26 @@ func showExercice(exercice fic.Exercice, body []byte) (interface{}, error) { return exercice, nil } +func getExerciceHistory(exercice fic.Exercice, body []byte) (interface{}, error) { + return exercice.GetHistory() +} + +type uploadedExerciceHistory struct { + IdTeam int64 `json:"team_id"` + Kind string + Time time.Time + Secondary *int64 +} + +func delExerciceHistory(exercice fic.Exercice, body []byte) (interface{}, error) { + var uh uploadedExerciceHistory + if err := json.Unmarshal(body, &uh); err != nil { + return nil, err + } + + return exercice.DelHistoryItem(uh.IdTeam, uh.Kind, uh.Time, uh.Secondary) +} + func deleteExercice(exercice fic.Exercice, _ []byte) (interface{}, error) { return exercice.Delete() } diff --git a/admin/static/js/app.js b/admin/static/js/app.js index 20407127..ebf32265 100644 --- a/admin/static/js/app.js +++ b/admin/static/js/app.js @@ -228,6 +228,9 @@ angular.module("FICApp") update: {method: 'PUT'} }) }) + .factory("ExerciceHistory", function($resource) { + return $resource("/api/exercices/:exerciceId/history.json", { exerciceId: '@id' }) + }) .factory("ExerciceFile", function($resource) { return $resource("/api/exercices/:exerciceId/files/:fileId", { exerciceId: '@idExercice', fileId: '@id' }, { update: {method: 'PUT'} @@ -1272,6 +1275,22 @@ angular.module("FICApp") } }) + .controller("ExerciceHistoryController", function($scope, ExerciceHistory, $routeParams, $http, $rootScope) { + $scope.history = ExerciceHistory.query({ exerciceId: $routeParams.exerciceId }); + $scope.delHistory = function(row) { + $http({ + url: "/api/exercices/" + $routeParams.exerciceId + "/history.json", + method: "DELETE", + data: row + }).then(function(response) { + $rootScope.staticFilesNeedUpdate++; + $scope.history = ExerciceHistory.query({ exerciceId: $routeParams.exerciceId }); + }, function(response) { + $rootScope.newBox('danger', 'An error occurs when removing history item: ', response.data.errmsg); + }); + } + }) + .controller("ExerciceFilesController", function($scope, ExerciceFile, $routeParams, $rootScope, $http) { $scope.files = ExerciceFile.query({ exerciceId: $routeParams.exerciceId }); diff --git a/admin/static/views/exercice.html b/admin/static/views/exercice.html index ae4fd3c8..9bfa0547 100644 --- a/admin/static/views/exercice.html +++ b/admin/static/views/exercice.html @@ -221,6 +221,35 @@ +
+

Historique

+ + + + + + + + +
+ {{ row.time | date:"mediumTime" }}
{{ row.kind }} + 		+ + {{ row.team_name }} + + + : + {{ row.secondary_title }} + {{ row.secondary_title }} + {{ row.secondary_title }} + + (coeff x{{ row.secondary }}) + : {{ row.secondary }} + + +
+
+ diff --git a/libfic/exercice_history.go b/libfic/exercice_history.go new file mode 100644 index 00000000..5e056311 --- /dev/null +++ b/libfic/exercice_history.go @@ -0,0 +1,110 @@ +package fic + +import ( + "fmt" + "time" +) + +// GetHistory aggregates all sources of events or actions for an Exercice +func (e Exercice) GetHistory() ([]map[string]interface{}, error) { + hist := make([]map[string]interface{}, 0) + + if rows, err := DBQuery(`SELECT id_team, U.name, U.color, "tries" AS kind, time, id_exercice, NULL, NULL FROM exercice_tries NATURAL JOIN teams U WHERE id_exercice = ? UNION + SELECT id_team, U.name, U.color, "solved" AS kind, time, id_exercice, coefficient, NULL FROM exercice_solved S NATURAL JOIN teams U WHERE id_exercice = ? UNION + SELECT id_team, U.name, U.color, "hint" AS kind, time, id_exercice, H.id_hint, H.title FROM team_hints T INNER JOIN exercice_hints H ON H.id_hint = T.id_hint NATURAL JOIN teams U WHERE id_exercice = ? UNION + SELECT id_team, U.name, U.color, "wchoices" AS kind, time, id_exercice, F.id_flag, F.type FROM team_wchoices W INNER JOIN exercice_flags F ON F.id_flag = W.id_flag NATURAL JOIN teams U WHERE id_exercice = ? UNION + SELECT id_team, U.name, U.color, "flag_found" AS kind, time, id_exercice, K.id_flag, K.type FROM flag_found F INNER JOIN exercice_flags K ON K.id_flag = F.id_flag NATURAL JOIN teams U WHERE id_exercice = ? UNION + SELECT id_team, U.name, U.color, "mcq_found" AS kind, time, id_exercice, Q.id_mcq, Q.title FROM mcq_found F INNER JOIN exercice_mcq Q ON Q.id_mcq = F.id_mcq NATURAL JOIN teams U WHERE id_exercice = ? + ORDER BY time DESC`, e.Id, e.Id, e.Id, e.Id, e.Id, e.Id); err != nil { + return nil, err + } else { + defer rows.Close() + + for rows.Next() { + var id_team int64 + var team_name string + var team_color uint32 + var kind string + var time time.Time + var exercice int64 + var secondary *int64 + var secondary_title *string + + if err := rows.Scan(&id_team, &team_name, &team_color, &kind, &time, &exercice, &secondary, &secondary_title); err != nil { + return nil, err + } + + h := map[string]interface{}{} + + h["team_id"] = id_team + h["team_name"] = team_name + h["team_color"] = fmt.Sprintf("#%x", team_color) + h["kind"] = kind + h["time"] = time + h["primary"] = e.Id + if secondary != nil { + h["secondary"] = secondary + h["secondary_title"] = secondary_title + } + + hist = append(hist, h) + } + } + + return hist, nil +} + +// DelHistoryItem removes from the database an entry from the history. +func (e Exercice) DelHistoryItem(tId int64, kind string, h time.Time, secondary *int64) (interface{}, error) { + if kind == "tries" { + if res, err := DBExec("DELETE FROM exercice_tries WHERE id_team = ? AND time = ? AND id_exercice = ?", tId, h, e.Id); err != nil { + return 0, err + } else if nb, err := res.RowsAffected(); err != nil { + return 0, err + } else { + return nb, err + } + } else if kind == "hint" && secondary != nil { + if res, err := DBExec("DELETE FROM team_hints WHERE id_team = ? AND time = ? AND id_hint = ?", tId, h, *secondary); err != nil { + return 0, err + } else if nb, err := res.RowsAffected(); err != nil { + return 0, err + } else { + return nb, err + } + } else if kind == "wchoices" && secondary != nil { + if res, err := DBExec("DELETE FROM team_wchoices WHERE id_team = ? AND time = ? AND id_flag = ?", tId, h, *secondary); err != nil { + return 0, err + } else if nb, err := res.RowsAffected(); err != nil { + return 0, err + } else { + return nb, err + } + } else if kind == "flag_found" && secondary != nil { + if res, err := DBExec("DELETE FROM flag_found WHERE id_team = ? AND time = ? AND id_flag = ?", tId, h, *secondary); err != nil { + return 0, err + } else if nb, err := res.RowsAffected(); err != nil { + return 0, err + } else { + return nb, err + } + } else if kind == "mcq_found" && secondary != nil { + if res, err := DBExec("DELETE FROM mcq_found WHERE id_team = ? AND time = ? AND id_mcq = ?", tId, h, *secondary); err != nil { + return 0, err + } else if nb, err := res.RowsAffected(); err != nil { + return 0, err + } else { + return nb, err + } + } else if kind == "solved" { + if res, err := DBExec("DELETE FROM exercice_solved WHERE id_team = ? AND time = ? AND id_exercice = ?", tId, h, e.Id); err != nil { + return 0, err + } else if nb, err := res.RowsAffected(); err != nil { + return 0, err + } else { + return nb, err + } + } else { + return nil, nil + } +}