From ce8d077a5b61c2807720574eb3c1e1e30016f709 Mon Sep 17 00:00:00 2001
From: Andrea Lepori <alepori@student.ethz.ch>
Date: Tue, 5 Oct 2021 10:29:38 +0200
Subject: fix primary group not showing, rename of field

---
 accounts/templates/accounts/index.html         | 2 +-
 client/templates/client/index.html             | 2 +-
 server/templates/server/doc_list.html          | 4 ++--
 server/templates/server/doc_list_readonly.html | 4 ++--
 server/templates/server/download_doc.html      | 2 +-
 server/templates/server/user_list.html         | 2 +-
 server/views.py                                | 8 ++++----
 version.txt                                    | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/accounts/templates/accounts/index.html b/accounts/templates/accounts/index.html
index 1473834..0b66290 100644
--- a/accounts/templates/accounts/index.html
+++ b/accounts/templates/accounts/index.html
@@ -67,7 +67,7 @@
             </div>
             <div class="input-field col l4 s12">
               <input value="{{country}}" name="country" id="country" type="text" >
-              <label for="country">Paese</label>
+              <label for="country">Comune</label>
             </div>
             <div class="input-field col l4 s12">
               <input value="{{nationality}}" name="nationality" id="nationality" type="text" >
diff --git a/client/templates/client/index.html b/client/templates/client/index.html
index 1117cba..ae3392f 100644
--- a/client/templates/client/index.html
+++ b/client/templates/client/index.html
@@ -154,7 +154,7 @@
                       </div>
                       <div class="input-field col l4 s12">
                         <input disabled value="{{doc.personal_data.country}}" name="country" id="country" type="text" >
-                        <label for="country">Paese</label>
+                        <label for="country">Comune</label>
                       </div>
                       <div class="input-field col l4 s12">
                         <input disabled value="{{doc.personal_data.nationality}}" name="nationality" id="nationality" type="text" >
diff --git a/server/templates/server/doc_list.html b/server/templates/server/doc_list.html
index 74024e7..736fdd4 100644
--- a/server/templates/server/doc_list.html
+++ b/server/templates/server/doc_list.html
@@ -209,7 +209,7 @@
                     <label for="birth_date">Data di nascita</label>
                   </div>
                   <div class="input-field col l4 s12">
-                    <input disabled value="{{base_group}}" id="branca" type="text">
+                    <input disabled value="{{doc.user|user_primary_group}}" id="branca" type="text">
                     <label for="branca">Branca</label>
                   </div>
                   <div class="input-field col l4 s12">
@@ -230,7 +230,7 @@
                   </div>
                   <div class="input-field col l4 s12">
                     <input disabled value="{{doc.personal_data.country}}" name="country" id="country" type="text" >
-                    <label for="country">Paese</label>
+                    <label for="country">Comune</label>
                   </div>
                   <div class="input-field col l4 s12">
                     <input disabled value="{{doc.personal_data.nationality}}" name="nationality" id="nationality" type="text" >
diff --git a/server/templates/server/doc_list_readonly.html b/server/templates/server/doc_list_readonly.html
index 0ed1650..6458ecd 100644
--- a/server/templates/server/doc_list_readonly.html
+++ b/server/templates/server/doc_list_readonly.html
@@ -190,7 +190,7 @@
                     <label for="birth_date">Data di nascita</label>
                   </div>
                   <div class="input-field col l4 s12">
-                    <input disabled value="{{base_group}}" id="branca" type="text">
+                    <input disabled value="{{doc.user|user_primary_group}}" id="branca" type="text">
                     <label for="branca">Branca</label>
                   </div>
                   <div class="input-field col l4 s12">
@@ -211,7 +211,7 @@
                   </div>
                   <div class="input-field col l4 s12">
                     <input disabled value="{{doc.personal_data.country}}" name="country" id="country" type="text" >
-                    <label for="country">Paese</label>
+                    <label for="country">Comune</label>
                   </div>
                   <div class="input-field col l4 s12">
                     <input disabled value="{{doc.personal_data.nationality}}" name="nationality" id="nationality" type="text" >
diff --git a/server/templates/server/download_doc.html b/server/templates/server/download_doc.html
index cce0c26..4e48b2c 100644
--- a/server/templates/server/download_doc.html
+++ b/server/templates/server/download_doc.html
@@ -69,7 +69,7 @@
         </div>
         <div class="input-field col l4 s12">
           <input placeholder=" " value="{{doc.2.country}}" name="country" id="country" type="text" >
-          <label class="active" for="country">Paese</label>
+          <label class="active" for="country">Comune</label>
         </div>
         <div class="input-field col l4 s12">
           <input placeholder=" " value="{{doc.2.nationality}}" name="nationality" id="nationality" type="text" >
diff --git a/server/templates/server/user_list.html b/server/templates/server/user_list.html
index a14daea..6224df7 100644
--- a/server/templates/server/user_list.html
+++ b/server/templates/server/user_list.html
@@ -106,7 +106,7 @@
                 </div>
                 <div class="input-field col l4 s12">
                   <input disabled value="{{user.country}}" name="country" id="country" type="text" >
-                  <label for="country">Paese</label>
+                  <label for="country">Comune</label>
                 </div>
                 <div class="input-field col l4 s12">
                   <input disabled value="{{user.nationality}}" name="nationality" id="nationality" type="text" >
diff --git a/server/views.py b/server/views.py
index 94e6e90..8c1732a 100644
--- a/server/views.py
+++ b/server/views.py
@@ -373,7 +373,7 @@ def doctype(request):
             writer = csv.writer(response)
 
             # csv header
-            header = ["Nome", "Cognome", "Email", "Stato", "Data di compilazione", "Nome dei genitori", "Via", "CAP", "Paese", "Nazionalita", "Data di nascita", "Telefono di casa", "Telefono", "Scuola", "Anno scolastico", "Numero AVS"]
+            header = ["Nome", "Cognome", "Email", "Stato", "Data di compilazione", "Nome dei genitori", "Via", "CAP", "Comune", "Nazionalita", "Data di nascita", "Telefono di casa", "Telefono", "Scuola", "Anno scolastico", "Numero AVS"]
 
             if document_type.custom_data:
                 header += Keys.objects.filter(container=document_type).values_list("key", flat=True)
@@ -426,7 +426,7 @@ def doctype(request):
             writer = csv.writer(response)
 
             # csv header
-            header = ["Nome", "Cognome", "Email", "Stato", "Data di compilazione", "Nome dei genitori", "Via", "CAP", "Paese", "Nazionalita", "Data di nascita", "Telefono di casa", "Telefono", "Scuola", "Anno scolastico", "Numero AVS", "Contatto d'emergenza", "Parentela del contatto", "Telefono d'emergenza", "Cellulare emergenza", "Indirizzo completo emergenza", "Cassa malati", "Ass. Infortuni", "Ass. RC", "Socio REGA", "Nome del medico", "Telefono medico", "Indirizzo medico", "Malattie", "Vacinazioni", "Data antitetanica", "Allergie", "Assume medicamenti", "Medicamenti", "Informazioni particolari", "Informazioni"]
+            header = ["Nome", "Cognome", "Email", "Stato", "Data di compilazione", "Nome dei genitori", "Via", "CAP", "Comune", "Nazionalita", "Data di nascita", "Telefono di casa", "Telefono", "Scuola", "Anno scolastico", "Numero AVS", "Contatto d'emergenza", "Parentela del contatto", "Telefono d'emergenza", "Cellulare emergenza", "Indirizzo completo emergenza", "Cassa malati", "Ass. Infortuni", "Ass. RC", "Socio REGA", "Nome del medico", "Telefono medico", "Indirizzo medico", "Malattie", "Vacinazioni", "Data antitetanica", "Allergie", "Assume medicamenti", "Medicamenti", "Informazioni particolari", "Informazioni"]
 
             if document_type.custom_data:
                 header += Keys.objects.filter(container=document_type).values_list("key", flat=True)
@@ -1484,7 +1484,7 @@ def data_request(request):
             writer = csv.writer(response)
 
             # csv header
-            writer.writerow(["Codice", "Nome", "Cognome", "Email", "Nome dei genitori", "Via", "CAP", "Paese", "Nazionalita", "Data di nascita", "Telefono di casa", "Telefono", "Scuola", "Anno scolastico", "Numero AVS"])
+            writer.writerow(["Codice", "Nome", "Cognome", "Email", "Nome dei genitori", "Via", "CAP", "Comune", "Nazionalita", "Data di nascita", "Telefono di casa", "Telefono", "Scuola", "Anno scolastico", "Numero AVS"])
 
             for user in users:
                 usercode = UserCode.objects.filter(user=user)[0]
@@ -1520,7 +1520,7 @@ def data_request(request):
             writer = csv.writer(response)
 
             # csv header
-            writer.writerow(["Codice", "Nome", "Cognome", "Email", "Nome dei genitori", "Via", "CAP", "Paese", "Nazionalita", "Data di nascita", "Telefono di casa", "Telefono", "Scuola", "Anno scolastico", "Numero AVS", "Contatto d'emergenza", "Parentela del contatto", "Telefono d'emergenza", "Cellulare emergenza", "Indirizzo completo emergenza", "Cassa malati", "Ass. Infortuni", "Ass. RC", "Socio REGA", "Nome del medico", "Telefono medico", "Indirizzo medico", "Malattie", "Vacinazioni", "Data antitetanica", "Allergie", "Assume medicamenti", "Medicamenti", "Informazioni particolari", "Informazioni"])
+            writer.writerow(["Codice", "Nome", "Cognome", "Email", "Nome dei genitori", "Via", "CAP", "Comune", "Nazionalita", "Data di nascita", "Telefono di casa", "Telefono", "Scuola", "Anno scolastico", "Numero AVS", "Contatto d'emergenza", "Parentela del contatto", "Telefono d'emergenza", "Cellulare emergenza", "Indirizzo completo emergenza", "Cassa malati", "Ass. Infortuni", "Ass. RC", "Socio REGA", "Nome del medico", "Telefono medico", "Indirizzo medico", "Malattie", "Vacinazioni", "Data antitetanica", "Allergie", "Assume medicamenti", "Medicamenti", "Informazioni particolari", "Informazioni"])
 
             for user in users:
                 usercode = UserCode.objects.filter(user=user)[0]
diff --git a/version.txt b/version.txt
index 9a63e20..40347d9 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
 version=0.4
-rev=2
+rev=3
-- 
cgit v1.2.1