Fix some issues with administrative forms

templates/administratives_add_update.html.tpl

@@ -52,15 +52,44 @@
       <input type="text" name="InternalTelephoneNumber" class="form-control" id="administrative_internal_telephone_number" placeholder="Numero di telefono (interno)" {{if .Options.Get "update"}} value="{{.Data.Administrative.InternalTelephoneNumber}}" {{end}}>
     </div>
 
+    <div class="form-row">
+      <div class="col">
+	<input type="email" name="AltEmail" class="form-control" id="administrative_altemail" placeholder="Email alternativa" {{if .Options.Get "update"}} value="{{.Data.Administrative.AltEmail}}" {{end}}>
+      </div>
+      <div class="col">
+	<div class="form-check">
+	  <input type="checkbox" name="Regenerate" class="form-check-input" id="administrative_regenerate" {{if .Options.Get "update"}}{{if .Data.Administrative.Regenerate}}checked{{end}}{{end}}>
+	  <label class="form-check-label has-feedback" for="administrative_regenerate">Rigenerare/inviare le credenziali</label>
+	</div>
+      </div>
+      <div class="col">
+	<div class="form-check">
+	  <input type="checkbox" name="Exclude" class="form-check-input" id="administrative_exclude" {{if .Options.Get "update"}}{{if .Data.Administrative.Exclude}}checked{{end}}{{end}}>
+	  <label class="form-check-label has-feedback" for="administrative_exclude">Escludere dalle utenze</label>
+	</div>
+      </div>
+    </div>
+    
+    <div class="form-row">
+      <div class="col">
+	<label class="control-label" for="administrative_date_from">In servizio dal</label>
+	<input type="date" name="DateFrom" class="form-control" id="administrative_date_from" {{if .Options.Get "update"}} value="{{convertDate .Data.Administrative.DateFrom}}" {{end}}>
+      </div>
+      <div class="col">
+	<label class="control-label" for="administrative_date_to">In servizio fino al</label>
+	<input type="date" name="DateTo" class="form-control" id="administrative_date_to" {{if .Options.Get "update"}} value="{{convertDate .Data.Administrative.DateTo}}" {{end}}>
+      </div>
+    </div>
+
     <div class="form-group">
-      <label class="control-label" for="office_id">Ufficio</label>
+      <label class="control-label" for="office_id">Associato all'ufficio</label>
       <select name="office_id" class="form-control selectpicker" id="office_id" placeholder="Seleziona l'ufficio" data-live-search="true" form="form_administratives_add_update" title="Seleziona l'ufficio" data-dropup-auto="false" required>
     	<option value="0"></option>
     	{{range $office := .Data.AllOffices}}
     	{{if $.Options.Get "update"}}
     	<option
-    	   value="{{$office.ID}}"
-    	   {{index $.Data.SelectedOffice $office.ID}}>{{$office.Name}}
+    	  value="{{$office.ID}}"
+    	  {{index $.Data.SelectedOffice $office.ID}}>{{$office.Name}}
     	</option>
     	{{else}}
     	<option value="{{$office.ID}}">{{$office.Name}}</option>
@@ -68,7 +97,7 @@
     	{{end}}
       </select>
     </div>
-    
+
     <div class="form-group">
       <button type="submit" class="btn btn-primary">Salva</button>
       {{if .Options.Get "update"}}

templates/administratives_show.html.tpl

@@ -55,6 +55,12 @@
       <p>Non è stato associato alcun numero di telefono all'amministrativo.</p>
       {{end}}
 
+      {{if .Data.AltEmail}}
+      <p>La mail alternativa dell'amministrativo è <a href="mailto:{{.Data.AltEmail}}">{{.Data.AltEmail}}</a>.</p>
+      {{else}}
+      <p>Non è stato associata alcuna mail alternativa.</p>
+      {{end}}
+
     </div>
   </div>
 

templates/teachers_add_update.html.tpl

@@ -46,6 +46,7 @@
     </div>
 
     <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>