Work in progress

handlers/teachers.go

@@ -12,18 +12,6 @@ import (
 	"gogs.carducci-dante.gov.it/karmen/datasource/edt"
 )
 
-var (
-	selectUniqueTeacherClasses = `
-SELECT DISTINCT classes.* FROM activities 
-INNER JOIN classes on classes.id=activities.class_id 
-WHERE teacher_id=?`
-
-	selectUniqueTeacherSubjects = `
-SELECT DISTINCT subjects.* FROM activities 
-INNER JOIN subjects on subjects.id=activities.subject_id 
-WHERE activities.teacher_id=?`
-)
-
 func teachersHandler() http.Handler {
 	fn := func(w http.ResponseWriter, r *http.Request) {
 		teachers, err := orm.GetTeachersAll()
@@ -63,7 +51,7 @@ func teachersAddHandler() http.Handler {
 			if err != nil {
 				panic(err)
 			}
-			_, err = orm.SaveTeacher(teacher)
+			_, err = orm.CreateTeacher(teacher)
 			if err != nil {
 				panic(err)
 			}
@@ -76,12 +64,11 @@ func teachersAddHandler() http.Handler {
 
 func teachersDeleteHandler() http.Handler {
 	fn := func(w http.ResponseWriter, r *http.Request) {
-		var teacher orm.Teacher
-		if err := orm.DB().First(&teacher, mux.Vars(r)["id"]).Error; err != nil {
+		teacher, err := orm.GetTeacher(mux.Vars(r)["id"])
+		if err != nil {
 			panic(err)
 		}
-
-		if err := orm.DB().Delete(&teacher).Error; err != nil {
+		if err := orm.DeleteTeacher(teacher); err != nil {
 			panic(err)
 		}
 
@@ -89,7 +76,7 @@ func teachersDeleteHandler() http.Handler {
 			RedirectUrl string `json:"redirect_url"`
 		}
 
-		data.RedirectUrl = "/teachers"
+		data.RedirectUrl = "/teachers?format=html&tpl_layout=base&tpl_content=teachers"
 
 		w.Header().Set("Content-Type", "application/json")
 		json.NewEncoder(w).Encode(data)