aggiornata visualizzazione quote

comunicazioni/templates/Controllo.Quota.html

@@ -18,7 +18,6 @@
       </tr>
     </thead>
     <tbody>
-      {% csrf_token %}
       {% for d in domini %}
       <tr {% if d|QuotaAlert %} class='bg-warning' {% endif %}>
           <td scope='row'>{{ d.nome }} </td>

comunicazioni/views.py

@@ -988,6 +988,7 @@ def ComunicazioneControlloQuota(request,demo=False,dominio=0):
   quota_accounting = getConfigurazione('quota:notifica:accounting')
   quota_accounting = re.split(',| ',quota_accounting)
   sm.set_listadestinatari(quota_accounting)
+  print('Quota_Account',quota_accounting)
 
   if not demo:
     print('richiesta demo:1')
@@ -1062,6 +1063,7 @@ def OccupazioneControlloQuota(request,dominio=None):
       dc = dc +1
       ftpdict['dc'] = dc
       ftpdict['dtask'] = dtask
+      ftpdict['stampa']=True
       print('ftp id',lf.id,'counter',dc,'dtask',dtask)
       try:
         #print('ftpgroup',lf.ftpgroup.id)

dashboard4/settings.py

@@ -36,6 +36,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     #'django.contrib.staticfiles',
+    'django.contrib.humanize',
     'configurazione',
     'login',
     'sicurezza',

domini/templates/gestione.domain.edit.html

@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load humanize %}
 {% block headersupplement %}
   <script>
     function UpdateHome() {
@@ -370,27 +371,27 @@
   <div class='row'>
     <div class='col'>
       <label for='mail_quota'>Mail Quota</label>
-      <input type='text' class='form-control' id='mail_quota' name='mail_quota' value='{{ dominio.mail_quota }}' readonly>
+      <input type='text' class='form-control' id='mail_quota' name='mail_quota' value='{{ dominio.mail_quota|intcomma }}M' readonly>
     </div>
     <div class='col'>
       <label for='http_quota'>Http Quota</label>
-      <input type='Text' class='form-control' id='http_quota' name='http_quota' value='{{ dominio.http_quota }}' readonly>
+      <input type='Text' class='form-control' id='http_quota' name='http_quota' value='{{ dominio.http_quota|intcomma }}M' readonly>
     </div>
     <div class='col'>
       <label for='ftp_quota'>Ftp Quota</label>
-      <input type='Text' class='form-control' id='ftp_quota' name='ftp_quota'value='{{ dominio.ftp_quota }}' readonly>
+      <input type='Text' class='form-control' id='ftp_quota' name='ftp_quota'value='{{ dominio.ftp_quota|intcomma }}M' readonly>
     </div>
     <div class='col'>
       <label for='http_quota'>Sql Quota</label>
-      <input type='Text' class='form-control' id='http_quota' name='sql_quota' value='{{ dominio.sql_quota }}' readonly>
+      <input type='Text' class='form-control' id='http_quota' name='sql_quota' value='{{ dominio.sql_quota|intcomma }}M' readonly>
     </div>
     <div class='col'>
       <label for='nextcloud_quota'>Nextcloud quota</label>
-     <input type='text' class='form-control' id='Nextcloud_quota' name='nextcloud_quota' value='{{ dominio.nextcloud_quota }}' readonly>
+     <input type='text' class='form-control' id='Nextcloud_quota' name='nextcloud_quota' value='{{ dominio.nextcloud_quota|intcomma }}M' readonly>
     </div>
     <div class='col'>
      <label for='totale'>Totale</label>
-     <input type='text' class='form-control' id='Totale' name='totale' value='{{ totale }}' readonly>
+     <input type='text' class='form-control' id='Totale' name='totale' value='{{ totale|intcomma }}M' readonly>
     </div>
  </div>
 
@@ -431,7 +432,7 @@
       <tr>
               <td>{{ f.utente }}</td>
               <td>{{ f.homedir }}</td>
-	      <td>{{ f.quota }}</td>
+	      <td>{{ f.quota|intcomma }}M</td>
      </tr>
     {% endfor %}
     </tbody>

domini/templates/gestione.domain.show.html

@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-
+{% load humanize %}
 {% block body %}
 <div>Informazioni Generali sul Servizio</div>
 <div></div>
@@ -148,28 +148,28 @@
   <div class='row'>
     <div class='col text-center'>
       <label for='mail_quota'>Mail Quota</label>
-      <input type='text' class='form-control' id='mail_quota' name='mail_quota' value='{{ dominio.mail_quota }}' readonly>
+      <input type='text' class='form-control' id='mail_quota' name='mail_quota' value='{{ dominio.mail_quota|intcomma }}M' readonly>
     </div>
     <div class='col'>
       <label for='http_quota'>Http Quota</label>
-      <input type='Text' class='form-control' id='http_quota' name='http_quota' value='{{ dominio.http_quota }}' readonly>
+      <input type='Text' class='form-control' id='http_quota' name='http_quota' value='{{ dominio.http_quota|intcomma }}M' readonly>
     </div>
    <div class='col'>
       <label for='ftp_quota'>Ftp Quota</label>
-      <input type='Text' class='form-control' id='ftp_quota' name='ftp_quota'value='{{ dominio.ftp_quota }}' readonly>
+      <input type='Text' class='form-control' id='ftp_quota' name='ftp_quota'value='{{ dominio.ftp_quota|intcomma }}M' readonly>
     </div>
     <div class='col'>
       <label for='http_quota'>Sql Quota</label>
-      <input type='Text' class='form-control' id='http_quota' name='sql_quota' value='{{ dominio.sql_quota }}' readonly>
+      <input type='Text' class='form-control' id='http_quota' name='sql_quota' value='{{ dominio.sql_quota|intcomma }}M' readonly>
     </div>
     <div class='col'>
       <label for='nextcloud_quota'>Nextcloud quota</label>
-     <input type='text' class='form-control' id='nextcloud_quota' name='nextcloud_quota' value='{{ dominio.nextcloud_quotaa }}' readonly>
+     <input type='text' class='form-control' id='nextcloud_quota' name='nextcloud_quota' value='{{ dominio.nextcloud_quota|intcomma }}M' readonly>
     </div>
 
      <div class='col'>
       <label for='totale'>Totale quota</label>
-     <input type='text' class='form-control' id='totale' name='totale' value='{{ totale }}' readonly>
+     <input type='text' class='form-control' id='totale' name='totale' value='{{ totale|intcomma }}M' readonly>
     </div>
   </div>
   <div>
@@ -209,7 +209,7 @@
       <tr>
 	      <td>{{ f.utente }}</td>
 	      <td>{{ f.homedir }}</td>
-	      <td>{{ f.quota }}</td>
+	      <td>{{ f.quota|intcomma }}M</td>
      </tr>
     {% endfor %}
     </tbody>

domini/templatetags/domini_tags.py

@@ -1,7 +1,7 @@
 from django import template
 from datetime import date,datetime
 from domini.models import *
- 
+
 register = template.Library()
 
 @register.filter(name='account_mail')
@@ -42,4 +42,3 @@ def ExpiredSoon(value):
   if (value - date.today()).days < 7 and (value - date.today()).days > 0:
     return "bg-danger"
 
-