Merge branch 'credential_date'

renderer/renderer.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"html/template"
+	"log"
 	"mime"
 	"net/http"
 	"net/url"
@@ -11,6 +12,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"strings"
+	"time"
 
 	"github.com/gocarina/gocsv"
 	"github.com/gorilla/schema"
@@ -38,7 +40,8 @@ var (
 	Render       map[string]func(http.ResponseWriter, *http.Request, interface{}, ...url.Values)
 
 	funcMap = template.FuncMap{
-		"query": query,
+		"query":       query,
+		"convertDate": convertDate,
 	}
 
 	contentTypeToFormat = map[string]string{
@@ -96,6 +99,10 @@ func query(values ...string) template.URL {
 	return template.URL(urlValues.Encode())
 }
 
+func convertDate(t time.Time) string {
+	return fmt.Sprintf("%d-%02d-%02d", t.Year(), t.Month(), t.Day())
+}
+
 // FIXME: Not safe. We should check if it responds to the error interface instead.
 func isErrorType(data interface{}) bool {
 	return strings.Contains(strings.ToLower(reflect.TypeOf(data).String()), "error")
@@ -250,11 +257,21 @@ func Decode(dst interface{}, r *http.Request) error {
 	switch GetContentFormat(r) {
 
 	case "html":
+		var timeConverter = func(value string) reflect.Value {
+			if v, err := time.Parse("2006-01-02", value); err == nil {
+				return reflect.ValueOf(v)
+			}
+			return reflect.Value{}
+		}
+
 		if err := r.ParseForm(); err != nil {
 			return err
 		}
 
 		decoder := schema.NewDecoder()
+		decoder.RegisterConverter(time.Time{}, timeConverter)
+
+		log.Println(r.PostForm)
 		if err := decoder.Decode(dst, r.PostForm); err != nil {
 			return err
 		}

templates/classes_add_update.html.tpl

@@ -31,27 +31,27 @@
   <form id="form_classes_add_update" action="/classes/add/" method="POST" role="form" class="needs-validation">
   {{end}}  
     
-    <div class="form-group has-feedback">
+    <div class="form-group">
       <label class="control-label" for="class_name">Nome</label>
       <input type="text" name="Name" class="form-control" id="class_name" placeholder="Nome" {{if .Options.Get "update"}} value="{{.Data.Class.Name}}" {{end}} required>
     </div>
 
-    <div class="form-group has-feedback">
+    <div class="form-group">
       <label class="control-label" for="class_year">Anno</label>
       <input type="number" min="1" name="Year" class="form-control" id="class_year" placeholder="Annualità" {{if .Options.Get "update"}} value="{{.Data.Class.Year}}" {{end}} required>
     </div>
     
-    <div class="form-group has-feedback">
+    <div class="form-group">
       <label class="control-label" for="class_name">Sezione</label>
       <input type="text" name="Section" class="form-control" id="class_section" placeholder="Sezione" {{if .Options.Get "update"}} value="{{.Data.Class.Section}}" {{end}} required>
     </div>
 
-    <div class="form-group has-feedback">
+    <div class="form-group">
       <label class="control-label" for="class_field">Indirizzo</label>
       <input type="text" name="Field" class="form-control" id="class_field" placeholder="Indirizzo" {{if .Options.Get "update"}} value="{{.Data.Class.Field}}" {{end}} required>
     </div>
 
-    <div class="form-group has-feedback">
+    <div class="form-group">
       <label class="control-label" for="class_alias">Nome alternativo</label>
       <input type="text" name="Alias" class="form-control" id="class_alias" placeholder="Nome alternativo" {{if .Options.Get "update"}} value="{{.Data.Class.Alias}}" {{end}}>
     </div>

templates/departments_add_update.html.tpl

@@ -37,7 +37,7 @@
   <form id="form_departments_add_update" action="/departments/add/" method="POST" role="form" class="needs-validation">
   {{end}}
 
-    <div class="form-group has-feedback">
+    <div class="form-group">
       <label class="control-label" for="department_name">Nome</label>
       <input type="text" name="Name" class="form-control" id="department_name" placeholder="Nome" {{if .Options.Get "update"}} value="{{.Data.Department.Name}}" {{end}} required>
     </div>

templates/school_show.html.tpl

@@ -1,59 +0,0 @@
-{{ define "content" }}
-
-<div class="container">
-
-  <div class="karmen-info-header">
-    <div class="row">
-      <div class="col-md-8">
-	{{if .School.Name}}
-	<h1>{{.School.Name}}</h1>
-	{{else}}
-	<h1>Nome scuola</h1>
-	{{end}}
-      </div>
-      <div class="col-md-4">
-	<div class="btn-group float-right" role="group">
-	  <a href="/school/1/update" class="btn btn-primary">
-	    <span class="fa fa-edit" aria-hidden="true"></span>
-	    Modifica
-	  </a>
-	</div>
-      </div>
-    </div>
-  </div>
-
-  <div class="row">
-    
-    <div class="col-md-12">
-      <h2 class="karmen-relation-header">Informazioni generali</h2>
-      {{if .School.Name}}
-      <ul>
-	<li>Nome: {{.School.Name}}</li>
-	<li>Indirizzo: {{.School.Address}}</li>
-	<li>Dominio web: {{.School.Domain}}</li>
-      </ul>
-      {{else}}
-      <p>I campi relativi alla scuola non sono stati ancora compilati. Premere <a href="/school/1/update">qui</a> per farlo.</p>
-      {{end}}
-    </div>
-    
-  </div>
-
-  <div class="row">
-    
-    <div class="col-md-12">
-      <h2 class="karmen-relation-header">Base di dati</h2>
-      <p>
-	Il database contiene attualmente {{.NumOfTeachers}} docenti,
-	{{.NumOfClasses}} classi, {{.NumOfSubjects}} materie e
-	{{.NumOfActivities}} attività.
-      </p>
-
-    </div>
-    
-  </div>
-
-
-</div>    
-
-{{ end }}

templates/school_update.html.tpl

@@ -1,39 +0,0 @@
-{{ define "content" }}
-
-<div class="container">
-
-  <ol class="breadcrumb">
-    <li><a href="/school/1">Scuola</a></li>
-    <li class="active"><a href="#">Aggiorna informazioni scuola</a></li>
-  </ol>  
-
-  <h1 class="karmen-info-header">Aggiorna informazioni scuola</h1>
-  
-  <form action="/school/1/update" method="POST" role="form" class="needs-validation">
-    
-    <div class="form-group has-feedback">
-      <label class="control-label" for="school_name">Nome dell'Istituto</label>
-      <input type="text" name="name" class="form-control" id="school_name" placeholder="Nome dell'Istituto" {{if .Update}} value="{{.School.Name}}" {{end}} required>
-    </div>
-
-    <div class="form-group has-feedback">
-      <label class="control-label" for="school_domain">Dominio web</label>
-      <input type="text" name="domain" class="form-control" id="school_domain" placeholder="Dominio web" {{if .Update}} value="{{.School.Domain}}" {{end}} required>
-    </div>
-
-    <div class="form-group has-feedback">
-      <label class="control-label" for="school_address">Indirizzo</label>
-      <input type="text" name="address" class="form-control" id="school_address" placeholder="Indirizzo" {{if .Update}} value="{{.School.Address}}" {{end}} required>
-    </div>
-
-    <div class="form-group">
-      <button type="submit" class="btn btn-primary">Salva</button>
-      <a href="/school/1" class="btn btn-default">Annulla</a>
-    </div>
-    
-  </form>
-
-  
-</div>
-
-{{ end }}

templates/students_add_update.html.tpl

@@ -33,12 +33,12 @@
   <form id="form_students_add_update" action="/students/add/" method="POST" role="form" class="needs-validation">
   {{end}}
 
-    <div class="form-group has-feedback">
+    <div class="form-group">
       <label class="control-label" for="student_name">Nome</label>
       <input type="text" name="Name" class="form-control" id="student_name" placeholder="Nome" {{if .Options.Get "update"}} value="{{.Data.Student.Name}}" {{end}} required>
     </div>
 
-    <div class="form-group has-feedback">
+    <div class="form-group">
       <label class="control-label" for="student_surname">Cognome</label>
       <input type="text" name="Surname" class="form-control" id="student_surname" placeholder="Cognome" {{if .Options.Get "update"}} value="{{.Data.Student.Surname}}" {{end}} required>
     </div>

templates/subjects_add_update.html.tpl

@@ -31,7 +31,7 @@
   <form id="form_subjects_add_update" action="/subjects/add/" method="POST" role="form" class="needs-validation">
   {{end}}  
     
-    <div class="form-group has-feedback">
+    <div class="form-group">
       <label class="control-label" for="subject_name">Nome</label>
       <input type="text" name="Name" class="form-control" id="subject_name" placeholder="Nome" {{if .Options.Get "update"}} value="{{.Data.Subject.Name}}" {{end}} required>
     </div>

templates/teachers_add_update.html.tpl

@@ -30,26 +30,42 @@
   {{else}}
   <form action="/teachers/add/" method="POST" role="form" class="needs-validation">
   {{end}}  
-    <div class="form-group has-feedback">
+    <div class="form-group">
       <label class="control-label" for="teacher_name">Nome</label>
       <input type="text" name="Name" class="form-control" id="teacher_name" placeholder="Nome" {{if .Options.Get "update"}} value="{{.Data.Name}}" {{end}} required>
     </div>
     
-    <div class="form-group has-feedback">
+    <div class="form-group">
       <label class="control-label" for="teacher_surname">Cognome</label>
       <input type="text" name="Surname" class="form-control" id="teacher_surname" placeholder="Cognome" {{if .Options.Get "update"}} value="{{.Data.Surname}}" {{end}} required>
     </div>
 
-    <div class="form-group has-feedback">
+    <div class="form-group">
       <label class="control-label has-feedback" for="teacher_hours">Numero di ore</label>
       <input type="number" name="Hours" class="form-control" id="teacher_hours" {{if .Options.Get "update"}}value="{{.Data.Hours}}"{{else}}value="18"{{end}} required>
     </div>
 
-    <div class="form-group has-feedback">
-      <label class="control-label" for="teacher_altemail">Email alternativa</label>
-      <input type="email" name="AltEmail" class="form-control" id="teacher_altemail" placeholder="Email alternativa" {{if .Options.Get "update"}} value="{{.Data.AltEmail}}" {{end}}>
-      <input type="checkbox" name="Regenerate" class="form-check-input" id="teacher_regenerate" {{if .Options.Get "update"}}{{if .Data.Regenerate}}checked{{end}}{{end}}>
-      <label class="form-check-label has-feedback" for="teacher_mailsent">Rigenerare/inviare le credenziali</label>
+    <div class="form-row">
+      <div class="col">
+	<input type="email" name="AltEmail" class="form-control" id="teacher_altemail" placeholder="Email alternativa" {{if .Options.Get "update"}} value="{{.Data.AltEmail}}" {{end}}>
+      </div>
+      <div class="col">
+	<div class="form-check">
+	  <input type="checkbox" name="Regenerate" class="form-check-input" id="teacher_regenerate" {{if .Options.Get "update"}}{{if .Data.Regenerate}}checked{{end}}{{end}}>
+	  <label class="form-check-label has-feedback" for="teacher_regenerate">Rigenerare/inviare le credenziali</label>
+	</div>
+      </div>
+    </div>
+
+    <div class="form-row">
+      <div class="col">
+	<label class="control-label" for="teacher_date_from">In servizio dal</label>
+	<input type="date" name="DateFrom" class="form-control" id="teacher_date_from" {{if .Options.Get "update"}} value="{{convertDate .Data.DateFrom}}" {{end}}>
+      </div>
+      <div class="col">
+	<label class="control-label" for="teacher_date_to">In servizio fino al</label>
+	<input type="date" name="DateTo" class="form-control" id="teacher_date_to" {{if .Options.Get "update"}} value="{{convertDate .Data.DateTo}}" {{end}}>
+      </div>
     </div>
 
     <div class="form-group">