Merge branch 'master' of https://gogs.carducci-dante.gov.it/karmen/core

orm/orm_test.go

@@ -289,11 +289,13 @@ func (t *testSuite) TestSaveStudent() {
 	t.Equal(uint(1), student.(*Student).ClassID)
 
 	student.(*Student).ClassID = 2
+	student.(*Student).Handicap = true
 	_, err = SaveStudent(student)
 	t.Nil(err)
 
 	if !t.Failed() {
 		student, _ = GetStudent(map[string]string{"id": "1"})
-		t.Equal(uint(2), student.(*Student).ClassID)
+		t.Equal(uint(1), student.(*Student).ClassID)
+		t.Equal(true, student.(*Student).Handicap)
 	}
 }

orm/student.go

@@ -12,9 +12,9 @@ type Student struct {
 	gorm.Model
 	Credential
 
-	Handicap bool
-	DSA      bool
-	BES      bool
+	Handicap bool `schema:"Handicap" sql:"default: false"`
+	DSA      bool `schema:"DSA" sql:"default: false"`
+	BES      bool `schema:"BES" sql:"default: false"`
 
 	TutorID uint `schema:"tutor_id"`
 	ClassID uint `schema:"class_id"`
@@ -103,6 +103,7 @@ func GetStudentsAll(args map[string]string) (interface{}, error) {
 }
 
 func SaveStudent(student interface{}) (interface{}, error) {
+
 	if err := DB().Omit("Class", "Tutor", "Teachers", "Activities").Save(student).Error; err != nil {
 		return nil, err
 	}
@@ -124,6 +125,7 @@ func UpdateStudent(args map[string]string, r *http.Request) (IDer, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	_, err = SaveStudent(student)
 	if err != nil {
 		return nil, err

templates/students_add_update.html.tpl

@@ -72,7 +72,7 @@
 
     <div class="form-group form-check">
       <input type="checkbox" name="BES" class="form-check-input" id="student_bes" {{if .Options.Get "update"}}{{if .Data.Student.BES}}checked{{end}}{{end}}>
-      <label class="form-check-label has-feedback" for="student_bes">BES (L. 104/92)</label>
+      <label class="form-check-label has-feedback" for="student_bes">BES (L. 170/10)</label>
     </div>
 
     <div class="form-group">