attivato ordinamento documenti

documento/templates/documento.welcome.lista.html

@@ -15,14 +15,17 @@
 	<th scope='col' style='white-space: nowrap; width: 1%;'>Dipendente&nbsp;
 		                                                <button name='uteDW' type="submit" class="btn btn-outline-primary btn-sm">&#x2193;</button>
                                 	                        <button name='uteUP' type="submit" class="btn btn-outline-primary btn-sm">&#x2191;</button></th>
-	<th scope='col'>Sede</th>
+	<th scope='col' style='white-space: nowrap; width: 1%;'>Sede&nbsp;
+                                                                <button name='seDW' type="submit" class="btn btn-outline-primary btn-sm">&#x2193;</button>
+                                                                <button name="seUP" type="submit" class="btn btn-outline-primary btn-sm">&#x2191;</button></th>
         <th scope='col' style='white-space: nowrap; width: 1%;'>Documento&nbsp;
 		                                                <button name='docDW' type="submit" class="btn btn-outline-primary btn-sm">&#x2193;</button>
 		                                                <button name="docUP" type="submit" class="btn btn-outline-primary btn-sm">&#x2191;</button></th>
-	</form>
 	<th scope='col' style='white-space: nowrap; width: 1%;'>Caricamento&nbsp;
-		                                                <button name='docDW' type="submit" class="btn btn-outline-primary btn-sm">&#x2193;</button>
-		                                                <button name="docUP" type="submit" class="btn btn-outline-primary btn-sm">&#x2191;</button></th>
+		                                                <button name='carDW' type="submit" class="btn btn-outline-primary btn-sm">&#x2193;</button>
+		                                                <button name="carUP" type="submit" class="btn btn-outline-primary btn-sm">&#x2191;</button></th>
+	</form>
+
 	<th scope='col'><input class="form-check-input" type="checkbox" id="selectAll" name="selectAll" value='0' onClick="toggle(this);"/>&nbsp;<label for="selectAll" class="form-check-label">Tutti</label></th>
         {% if 'DOCUMENTO.EDIT' in permesso %}
         <th scope='col'>Elimina</th> 

documento/views.py

@@ -126,18 +126,48 @@ def welcome(request,utente=None):
   if request.method == "POST" and 'docDW' in request.POST:
     print('docDW')
     request.session['docOrder'] = 'docDW'
+
+  if request.method == "POST" and 'seUP' in request.POST:
+    print('seUP')
+    request.session['docOrder'] = 'seUP'
+        
+  if request.method == "POST" and 'seDW' in request.POST:
+    print('seDW')
+    request.session['docOrder'] = 'seDW'
+
+  if request.method == "POST" and 'carUP' in request.POST:
+    print('carUP')
+    request.session['docOrder'] = 'carUP'
+        
+  if request.method == "POST" and 'carDW' in request.POST:
+    print('carDW')
+    request.session['docOrder'] = 'carDW'
+
   print('Fine Sequenza di ordinamento - lettura tasti')
 
+  res = None
   if 'docOrder' in request.session and 'uteDW' in request.session.get('docOrder'):
-    tmp = sorted(tmp, key = lambda x: x.utente.nome,reverse=False)
+    res = sorted(tmp, key = lambda x: x.utente.nome,reverse=False)
   if 'docOrder' in request.session and 'uteUP' in request.session.get('docOrder'):
-    tmp = sorted(tmp, key = lambda x: x.utente.nome,reverse=True)
+    res = sorted(tmp, key = lambda x: x.utente.nome,reverse=True)
   if 'docOrder' in request.session and 'docDW' in request.session.get('docOrder'):
-    tmp = sorted(tmp, key = lambda x: x.documento ,reverse=False)
+    res = sorted(tmp, key = lambda x: x.documento ,reverse=False)
   if 'docOrder' in request.session and 'docUP' in request.session.get('docOrder'):
-    tmp = sorted(tmp, key = lambda x: x.documento,reverse=True)
-  data['ElencoDocumenti'] = tmp     
-   
+    res = sorted(tmp, key = lambda x: x.documento,reverse=True)
+  if 'docOrder' in request.session and 'seDW' in request.session.get('docOrder'):
+    res = sorted(tmp, key = lambda x: x.utente.sede.nome ,reverse=False)
+  if 'docOrder' in request.session and 'seUP' in request.session.get('docOrder'):
+    res = sorted(tmp, key = lambda x: x.utente.sede.nome,reverse=True)
+  if 'docOrder' in request.session and 'carDW' in request.session.get('docOrder'):
+    res = sorted(tmp, key = lambda x: x.dataupload ,reverse=False)
+  if 'docOrder' in request.session and 'carUP' in request.session.get('docOrder'):
+    res = sorted(tmp, key = lambda x: x.dataupload,reverse=True)
+
+  if not res:
+    data['ElencoDocumenti'] = tmp     
+  else:
+    data['ElencoDocumenti'] = res 
+
   print('inizio sequenza permessi')
   ### permessi inizio ###
   data['permesso'] = getAMP(admin)[0]