Parcourir la source

Fix bugs related to DateFrom, DateTo

Andrea Fazzi il y a 6 ans
Parent
commit
f033c8ed53
2 fichiers modifiés avec 13 ajouts et 2 suppressions
  1. 2 2
      orm/credential.go
  2. 11 0
      orm/teacher.go

+ 2 - 2
orm/credential.go

@@ -19,8 +19,8 @@ type Credential struct {
 	PlainPassword   string
 	PlainPassword   string
 	Email           string `csv:"email"`
 	Email           string `csv:"email"`
 	AltEmail        string
 	AltEmail        string
-	DateFrom        *time.Time
-	DateTo          *time.Time
+	DateFrom        time.Time
+	DateTo          time.Time
 	TelephoneNumber string
 	TelephoneNumber string
 
 
 	Regenerate bool `schema:"Regenerate" sql:"default: false"`
 	Regenerate bool `schema:"Regenerate" sql:"default: false"`

+ 11 - 0
orm/teacher.go

@@ -3,6 +3,7 @@ package orm
 import (
 import (
 	"fmt"
 	"fmt"
 	"net/http"
 	"net/http"
+	"time"
 
 
 	"github.com/jinzhu/gorm"
 	"github.com/jinzhu/gorm"
 	"gogs.carducci-dante.gov.it/karmen/core/renderer"
 	"gogs.carducci-dante.gov.it/karmen/core/renderer"
@@ -132,6 +133,16 @@ func UpdateTeacher(args map[string]string, r *http.Request) (IDer, error) {
 	// FIXME: Should not be hard set.
 	// FIXME: Should not be hard set.
 	teacher.(*Teacher).Regenerate = false
 	teacher.(*Teacher).Regenerate = false
 
 
+	if len(args["DateFrom"]) == 0 {
+		// FIXME: Should not be hard set.
+		teacher.(*Teacher).DateFrom = time.Time{}
+	}
+
+	if len(args["DateTo"]) == 0 {
+		// FIXME: Should not be hard set.
+		teacher.(*Teacher).DateTo = time.Time{}
+	}
+
 	err = renderer.Decode(teacher, r)
 	err = renderer.Decode(teacher, r)
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err