aggiornamento tasti 'ritorno/indietro'

azienda/templates/azienda.editAzienda.html

@@ -100,8 +100,8 @@
     </div>
     <br>
     <div class="btn-group">
-      <input type='submit' class="btn btn-secondary" value='Aggiorna' {% if admin.sola_lettura %} disabled {% endif %}>
-      <input type='submit' class="btn btn-primary" name="ritorna" value="Ritorna">
+      <input type='submit' class="btn btn-primary" value='Aggiorna' {% if admin.sola_lettura %} disabled {% endif %}>
+      <input type='submit' class="btn btn-primary" name="indietro" value="Indietro">
     </div>
   </form>
 

azienda/templates/azienda.editSede.html

@@ -1,16 +1,15 @@
 {% extends 'base.html' %}
 
 {% block top %}
-    <div class='form-outline mb-3 text-center btn-primary h3'>
-           {{ HeaderTitle }}
-    </div>
-    <div class='form-outline mb-3 text-center btn-primary h3'>
-           Amministratore: {{ admin.username }} 
-    </div>
+  <div class='form-outline mb-3 text-center btn-primary h3'>
+     {{ HeaderTitle }}
+  </div>
+  <div class='form-outline mb-3 text-center btn-primary h3'>
+     Amministratore: {{ admin.username }} 
+  </div>
 {% endblock %}
 
 {% block body %}
-
   <!-- errori form sede -->
   {% if sede.errors %}
     {{ sede.errors }}
@@ -43,7 +42,6 @@
      <label for="info">Info</label>
       <input type='text' class='form-control form-control-lg' name='info' id='info' value='{{ sede.info.value }}' {% if admin.sola_lettura %}readonly{% endif %}>
     </div>
-
     <br>
     <div class="card">
       <div class="card-header">
@@ -97,11 +95,13 @@
     </div>
 
     <br>
+
     <div class="btn-group">
-      <input type='submit' class="btn btn-secondary" value='Aggiorna' {% if admin.sola_lettura %} disable {% endif %}>
-      <input type='submit' class="btn btn-primary" name="ritorna" value="Ritorna">
+      <input type='submit' class="btn btn-primary" value='Aggiorna' {% if admin.sola_lettura %} disable {% endif %}>
+      <input type='submit' class="btn btn-primary" name="indietro" value="Indietro">
     </div>
 
   </form>
+</div>
+{% endblock %}
 
-</div>{% endblock %>

azienda/views.py

@@ -54,8 +54,8 @@ def welcome(request):
 
   if request.method=="POST":
     print(request.POST)
-    if 'ritorna' in request.POST:
-      print('premuto tast ritorno,logout')
+    if 'indietro' in request.POST:
+      print('premuto tast indietro,logout')
       return HttpResponseRedirect(reverse("login:start"))
 
     if "sceltaazienda" in request.POST:
@@ -187,7 +187,7 @@ def editAzienda(request):
     except Azienda.DoesNotExist as dnf:
         print(dnf)
 
-  if 'Ritorna' in request.POST:
+  if 'indietro' in request.POST:
     return HttpResponseRedirect(reverse('azienda:welcome'))
 
   if request.method == "POST":
@@ -266,7 +266,7 @@ def editSede(request):
       sede.cambiopassword = sede.azienda.cambiopassword
       sede.forzanuovapassword = sede.azienda.forzanuovapassword
 
-  if 'Ritorna' in request.POST:
+  if 'indietro' in request.POST:
     return HttpResponseRedirect(reverse('azienda:welcome'))
 
   if request.method == "POST":

comunicazione/templates/comunicazione.welcome.html

@@ -23,7 +23,7 @@
   </table>
   <div>
     <button type='submit' class='btn btn-primary' name='Nuovo' value=''>Nuovo</button>
-    <input type='submit' class="btn btn-primary" name="Ritorna" value="Ritorna">
+    <input type='submit' class="btn btn-primary" name="indietro" value="Indietro">
   </div>
 </form>
 {% endblock %}

comunicazione/views.py

@@ -207,7 +207,7 @@ def welcome(request):
     print('Richiesta effettuata')
     print(request.POST)
 
-    if 'Ritorna' in request.POST:
+    if 'indietro' in request.POST:
       return HttpResponseRedirect(reverse("azienda:welcome"))
 
     if 'Nuovo' in request.POST:
@@ -255,7 +255,7 @@ def edit(request):
 
   if request.method == 'POST':
     print('richiesta effettuata')
-    if 'Ritorna' in request.POST:
+    if 'indietro' in request.POST:
       return HttpResponseRedirect(reverse("comunicazione:welcome"))
 
     fd = formComunicazione(request.POST)

documento/templates/documento.welcome.html

@@ -42,9 +42,9 @@
   	    <div><br></div>
 
   	    <div class='form-group form-inline'>
-	      <input type='submit' class="btn btn-primary" name='Ritorna' value='Ritorna'>
 	      <input type='submit' class="btn btn-primary" value='Carica Nuovi Documenti'>
               <button type='button' class='btn btn-primary' data-bs-toggle='modal' data-bs-target='#ConfirmDocumentDeleteModal'>Elimina Vecchi Documenti</button></td>
+	      <input type='submit' class="btn btn-primary" name='indietro' value='Indietro'>
             </div>
           </form>
         </div>
@@ -101,7 +101,7 @@
                </div>
                <div class="modal-footer">
                  <button type="submit" name="DeleteOldDocuments" value='{{ documento.id }}' class="btn btn-primary">Elimina Vecchi Documenti</button>
-                 <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Chiudi</button>
+                 <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Chiudi</button>
 	       </div>
 	     </form>
            </div>

documento/templates/documento.welcome.lista.html

@@ -21,7 +21,7 @@
           <td> {{ documento.descrizione }} </td>
           <td> {{ documento.dataupload | date:'d/m/Y' }} </td>
           {% if admin.edit_documento %}
-            <td><button type='button' class='btn btn-secondary' data-bs-toggle='modal' data-bs-target='#ConfirmDeleteModal{{ documento.id }}' value='{{ documento.id }}'>Elimina</button></td>
+            <td><button type='button' class='btn btn-primary' data-bs-toggle='modal' data-bs-target='#ConfirmDeleteModal{{ documento.id }}' value='{{ documento.id }}'>Elimina</button></td>
           {% endif %}
         </tr>
         {% if admin.edit_documento %}
@@ -43,7 +43,7 @@
                   <form name='ConfirmDeleteModal' method='POST'>
                     {% csrf_token %}
                     <button type="submit" name="DeleteDocument" value='{{ documento.id }}' class="btn btn-primary">Cancella Documento</button>
-                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Chiudi/Annulla</button>
+                    <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Chiudi/Annulla</button>
                   </form>
                 </div>
               </div>

documento/views.py

@@ -77,7 +77,7 @@ def welcome(request,utente=None):
 
   if request.method == 'POST':
 
-    if 'Ritorna' in request.POST:
+    if 'indietro' in request.POST:
       print("AziendaId",request.session['AziendaId'])
       print("AdminId",request.session['AdminId'])
       return HttpResponseRedirect(reverse("azienda:welcome"))

login/templates/login.html

@@ -13,7 +13,7 @@
     </div>
     <div class='form-outline mb-3 text-center'>
       <button type='submit' class='btn btn-primary btn-block btn-lg mb-3 active'>Login</button>
-      <button type='reset' class='btn btn-secondary btn-block btn-lg mb-3'>Annulla</button>
+      <button type='reset' class='btn btn-primary btn-block btn-lg mb-3'>Annulla</button>
     </div>
    </form>
       <div class="form-outline mb-3 text-center">

login/templates/updatePassword.html

@@ -15,7 +15,7 @@
     </div>
     <div class='form-outline mb-3 text-center'>
       <button type='submit' class='btn btn-primary btn-block btn-lg mb-3 active'>Richiesta Aggiornamento Password/Pin</button>
-      <button type='reset' class='btn btn-secondary btn-block btn-lg mb-3'>Annulla</button>
+      <button type='reset' class='btn btn-primary btn-block btn-lg mb-3'>Annulla</button>
     </div>
    </form>
   </div>

static/templates/base.html

@@ -60,7 +60,7 @@
         {% csrf_token %}
         <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
         <button class="btn btn-outline-success" type="submit">Search</button>
-        <button class="btn btn-outline-success" name='ritorna' type="submit">Logout</button>
+        <button class="btn btn-outline-success" name='indietro' type="submit">Logout</button>
       </form>
     </div>
   </div>

utente/forms.py

@@ -106,5 +106,5 @@ class formUpdatePasswordLogin(forms.Form):
 class formCancellaUtente(forms.Form):
   def __init__(self,*args,**kwargs):
     forms.Form.__init__(self,*args,**kwargs)
-    self.fields['ConfermaCancellazioneUtente'] = forms.BooleanField(required=False)
+    self.fields['ConfermaCancellazioneUtente'] = forms.BooleanField(required=False,initial=False)
 

utente/templates/utente.conferma.cancellazione.html

@@ -21,8 +21,8 @@ id='ConfermaCancellazioneUTente'>
 
   <br>
   <div class="btn-group">
-    <input type='submit' class="btn btn-secondary" value='Conferma'>
-    <input type='submit' class="btn btn-primary" name="ritorna" value="Annulla">
+    <input type='submit' class="btn btn-primary" value='Conferma'>
+    <input type='submit' class="btn btn-primary" name="indietro" value="Annulla">
   </div>
   </form>
 

utente/templates/utente.download.html

@@ -91,8 +91,8 @@
       </div>
 
       <div>
-        <input type='submit' class="btn btn-secondary" name='aggiorna' value='Aggiorna'/>
-        <input type='submit' class="btn btn-primary" name="ritorna" value="Logout">
+        <input type='submit' class="btn btn-primary" name='aggiorna' value='Aggiorna'/>
+        <input type='submit' class="btn btn-primary" name="indietro" value="Logout">
       </div>
     </form>
   </div>

utente/templates/utente.edit.password.html

@@ -56,8 +56,8 @@
       <Label class="form-check-label" for='CancellaUtente'>Cancella Questo record!</label>
     </div>
 
-    <input type='submit' class="btn btn-secondary" value='Aggiorna'>
-    <input type='submit' class="btn btn-primary" name="ritorna" value="Ritorna">
+    <input type='submit' class="btn btn-primary" value='Aggiorna'>
+    <input type='submit' class="btn btn-primary" name="indietro" value="Annulla">
   </form>
 
 </div>

utente/templates/utente.edit.password.login.html

@@ -36,7 +36,7 @@
 
     <div class='form-outline mb-3 text-center'>
       <button type='submit' class='btn btn-primary btn-block btn-lg mb-3 active'>Aggiorna</button>
-      <button type='reset' class='btn btn-secondary btn-block btn-lg mb-3'>Annulla</button>
+      <button type='reset' class='btn btn-primary btn-block btn-lg mb-3'>Annulla</button>
     </div>
    </form>
   </div>

utente/templates/utente.edit.password.primologin.html

@@ -40,7 +40,7 @@
 
     <div class='form-outline mb-3 text-center'>
       <button type='submit' class='btn btn-primary btn-block btn-lg mb-3 active'>Aggiorna</button>
-      <button type='reset' class='btn btn-secondary btn-block btn-lg mb-3'>Annulla</button>
+      <button type='reset' class='btn btn-primary btn-block btn-lg mb-3'>Annulla</button>
     </div>
    </form>
   </div>

utente/templates/utente.edit.profile.html

@@ -102,8 +102,8 @@
     <br>
 
     <div class="btn-group">
-      <input type='submit' class="btn btn-secondary" value='Aggiorna'>
-      <input type='submit' class="btn btn-primary" name="ritorna" value="Ritorna">
+      <input type='submit' class="btn btn-primary" value='Aggiorna'>
+      <input type='submit' class="btn btn-primary" name="indietro" value="Indietro">
     </div>
   </form>
 

utente/templates/utente.welcome.html

@@ -4,12 +4,12 @@
   <form name="inputUtente" method="POST">
   <div class='form-control'>
     {% if admin.edit_utente %}
-      <input type='submit' class="btn btn-secondary" name='scelta' value='Nuovo Dipendente' {% if admin.crea_utente %} disable {% endif %}>
+      <input type='submit' class="btn btn-primary" name='scelta' value='Nuovo Dipendente' {% if admin.crea_utente %} disable {% endif %}>
     {% endif %}
     {% if admin.edit_documento %}
-      <input type='submit' class="btn btn-secondary" name='CaricamentiMultipli' value='Caricamenti Multipli' {% if admin.crea_documento %} disable {% endif %}>
+      <input type='submit' class="btn btn-primary" name='CaricamentiMultipli' value='Caricamenti Multipli' {% if admin.crea_documento %} disable {% endif %}>
     {% endif %}
-     <input type='submit' class="btn btn-primary" name="ritorna" value="Ritorna">
+    <input type='submit' class="btn btn-primary" name="indietro" value="Indietro">
   </div>
 
   {% csrf_token %}

utente/views.py

@@ -52,7 +52,7 @@ def welcome(request):
       print("Richiesto Caricamento Documenti")
       return HttpResponseRedirect(reverse("documento:welcome"))
 
-    if 'ritorna' in request.POST:
+    if 'indietro' in request.POST:
       return HttpResponseRedirect(reverse("azienda:welcome"))
 
     if data['admin'].crea_utente:
@@ -146,7 +146,7 @@ def edit(request):
   
   if request.method == 'POST':
 
-    if "ritorna" in request.POST:
+    if "indietro" in request.POST:
       return HttpResponseRedirect(reverse("utente:welcome"))    
     print('request.method x edit utente')
 
@@ -275,7 +275,7 @@ def download(request):
 
   if request.method == 'POST':
     print('qualcosa è stato richiesto')
-    if 'ritorna' in request.POST:
+    if 'indietro' in request.POST:
       return HttpResponseRedirect(reverse('login:start'))
 
     pinmail = formPinMail(request.POST)
@@ -529,6 +529,10 @@ def cancellautente(request):
 
   if request.method == 'POST':
     cu = formCancellaUtente(request.POST)
+
+    if 'indietro' in request.POST:
+      return  HttpResponseRedirect(reverse("utente:welcome"))   
+
     if cu.is_valid() and cu.cleaned_data.get('ConfermaCancellazioneUtente'):
 
       #  tutto ok,