user list and branca tansfer with new uc

3 files changed, 14 insertions, 40 deletions

diff --git a/server/templates/server/index.html b/server/templates/server/index.html
index 2db42e4..487ef71 100644
--- a/server/templates/server/index.html
+++ b/server/templates/server/index.html
@@ -48,7 +48,7 @@
         <div class="hide-on-med-and-down">
           <a class="waves-effect waves-light btn {{color}}" href="{% url 'ulist' %}">Utenti</a>
           <a class="waves-effect waves-light btn {{color}}" href="{% url 'ulist-table' %}">Utenti (Tabella BETA)</a>
-          <a class="waves-effect waves-light btn {{color}}" href="{% url 'uapprove' %}">Approva utente</a>
+          <a class="waves-effect waves-light btn {{color}}" href="{% url 'uapprove' %}">Trasferta utente</a>
           <a class="waves-effect waves-light btn {{color}}" href="{% url 'request' %}">Richiedi dati</a>
         </div>
 
@@ -56,7 +56,7 @@
           <a class="col s12 waves-effect waves-light btn {{color}}" href="{% url 'ulist' %}">Utenti</a>
           <br>
           <br>
-          <a class="col s12 waves-effect waves-light btn {{color}}" href="{% url 'uapprove' %}">Approva utente</a>
+          <a class="col s12 waves-effect waves-light btn {{color}}" href="{% url 'uapprove' %}">Trasferta utente</a>
           <br>
           <br>
           <a class="col s12 waves-effect waves-light btn {{color}}" href="{% url 'request' %}">Richiedi dati</a>
diff --git a/server/templates/server/user_list.html b/server/templates/server/user_list.html
index dffb8b2..22788e9 100644
--- a/server/templates/server/user_list.html
+++ b/server/templates/server/user_list.html
@@ -31,35 +31,9 @@
         {% elif "capi" in user.user|user_groups %}
           <i class="material-icons">star_border</i>
         {% endif %}
-        {{user.user.first_name}} {{user.user.last_name}}
+        {{user.first_name}} {{user.last_name}}
       </div>
       <div class="collapsible-body"><span>
-        {% if not user.user.is_staff %}
-        <div id="modal{{user.user.id}}" class="modal">
-          <div class="modal-content">
-            <h4>Attenzione</h4>
-            <p>
-              Sei sicuro di volerlere deapprovare l'utente {{user.user.first_name}} {{user.user.last_name}}?<br>
-              Una volta deapprovato l'utente non potrà più creare documenti e per essere riapprovato dovrà essere usato il codice di approvazione.
-            </p>
-          </div>
-          <div class="modal-footer">
-            <a style="color:red" href="#!" class="modal-close waves-effect waves-green btn-flat">Annulla</a>
-            <a onclick="send('d{{user.user.id}}')" class="modal-close waves-effect waves-green btn-flat">Deapprova</a>
-          </div>
-        </div>
-        <div class="hide-on-med-and-down">
-          <a class="waves-effect waves-light btn {{color}} modal-trigger" href="#modal{{user.user.id}}"><i class="material-icons left">remove_circle_outline</i>Deapprova utente</a>
-          <a class="waves-effect waves-light btn {{color}}" onclick="send('c{{user.user.id}}')"><i class="material-icons left">star_border</i>Capo/non</a>
-        </div>
-        <div style="margin-bottom: 0px;" class="hide-on-large-only row">
-          <a class="col s12 waves-effect waves-light btn {{color}} modal-trigger" href="#modal{{user.user.id}}"><i class="material-icons left">remove_circle_outline</i>Deapprova utente</a>
-          <br>
-          <br>
-          <a class="col s12 waves-effect waves-light btn {{color}}" onclick="send('c{{user.user.id}}')"><i class="material-icons left">star_border</i>Capo/non</a>
-        </div>
-        <br><br>
-        {% endif %}
         <ul class="collection">
           <li class="collection-item">
             <i class="material-icons left">confirmation_number</i>U{{user.code}}
@@ -73,11 +47,11 @@
             <div class="collapsible-body"><span>
               <div class="row">
                 <div class="input-field col l4 s12">
-                  <input disabled value="{{user.user.first_name}}" id="first_name" type="text" >
+                  <input disabled value="{{user.first_name}}" id="first_name" type="text" >
                   <label for="first_name">Nome</label>
                 </div>
                 <div class="input-field col l4 s12">
-                  <input disabled value="{{user.user.last_name}}" id="last_name" type="text" >
+                  <input disabled value="{{user.last_name}}" id="last_name" type="text" >
                   <label for="last_name">Cognome</label>
                 </div>
                 <div class="input-field col l4 s12">
@@ -85,7 +59,7 @@
                   <label for="birth_date">Data di nascita</label>
                 </div>
                 <div class="input-field col l4 s12">
-                  <input disabled value="{{ user.user|user_primary_group }}" id="branca" type="text">
+                  <input disabled value="{{ user.branca.name }}" id="branca" type="text">
                   <label for="branca">Branca</label>
                 </div>
                 <div class="input-field col l4 s12">
diff --git a/server/templates/server/user_list_table.html b/server/templates/server/user_list_table.html
index 89903a5..624fced 100644
--- a/server/templates/server/user_list_table.html
+++ b/server/templates/server/user_list_table.html
@@ -39,12 +39,12 @@
       {% for user in users %}
         {
           capo: {% if "capi" in user.user|user_groups %}true{% else %}false{% endif %},
-          username: "{{user.user.username}}",
-          name: "{{user.user.first_name}}",
-          last_name: "{{user.user.last_name}}",
+          ucode: "U{{user.code}}",
           email: "{{user.user.email}}",
+          name: "{{user.first_name}}",
+          last_name: "{{user.last_name}}",
           birth_date: "{{user.born_date}}",
-          branca: "{{ user.user|user_primary_group }}",
+          branca: "{{ user.branca }}",
           parent_name: "{{user.parent_name}}",
           avs_number: "{{user.avs_number}}",
           via: "{{user.via}}",
@@ -82,11 +82,11 @@
   var col_categories = [
     {field: "base", name: "Informazioni base", cols: 
       [
-        {title: "Capo", field: "capo", formatter:"tickCross", frozen: true},
-        {title: "Username", field: "username", frozen: true},
-        {title: "Nome", field: "name"},
-        {title: "Cognome", field: "last_name"},
+        {title: "Nome", field: "name", frozen: true},
+        {title: "Cognome", field: "last_name", frozen: true},
+        {title: "Capo", field: "capo", formatter:"tickCross"},
         {title: "Email", field: "email"},
+        {title: "Codice", field: "ucode"},
         {title: "Data di nascita", field: "birth_date"},
         {title: "Branca", field: "branca"},
       ]