فهرست منبع

Modifiche di cui verrà eseguito il commit:
modificato: static/templates/base.html
nuovo file: utente/migrations/0009_utente_daticompleti_utente_encrypt_utente_primologin_and_more.py
modificato: utente/models.py

finalmente funziona il top menu.
modificato il database affinche siano gestiti i nuovi login,
completamento dei dati e crypt dei dati su disco

mauro 1 سال پیش
والد
کامیت
3bbd305837

+ 32 - 14
static/templates/base.html

@@ -14,23 +14,41 @@
 </head>
 
 <body style='padding-top:50px;padding-bottom:20px;'>
-<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
-</nav>
+{% if Navbar %}
+  <nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
+
+    <div class="container-fluid">
+    <a class="navbar-brand" href="#">Gestione Documenti</a>
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+      <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+            Selezione Azienda
+          </a>
+          <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
+	    {% for a in azienda %}
+	      <li><a class="dropdown-item" href="#">{{ a.nome }}</a></li>
+	    {% endfor %}
+            <li><hr class="dropdown-divider"></li>
+            <li><a class="dropdown-item" href="#">Nuova Azienda</a></li>
+          </ul>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
+        </li>
+      </ul>
+      <form class="d-flex">
+        <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
+        <button class="btn btn-outline-success" type="submit">Search</button>
+      </form>
+    </div>
+  </div>
 
-{% if Navbar %}<!-- se navbar e' presente con un 1 all'interno, viene visualizza la navbar -->
-  <nav class="navbar navbar-expand-lg navbar-light bg-primary">
-    <a class='navbar-brand href='#'>Home</a>
-    <li class="nav-item dropdown">
-      <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Azienda</a>
-      <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-		  {% for az in azienda %}{{ az.nome }}
-	  <a class="dropdown-item" href="#">{{ az.nome }}</a>
-        {% endfor %}
-      </div>
-    </li>
   </nav>
 {% endif %}
-
 <div class="col-md-3 col-sm-3 col-xs-3">&nbsp;</div>
  
 <div class='container'>

+ 33 - 0
utente/migrations/0009_utente_daticompleti_utente_encrypt_utente_primologin_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.1.3 on 2024-11-27 15:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('utente', '0008_alter_utente_inserimento'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='utente',
+            name='daticompleti',
+            field=models.BooleanField(default=0),
+        ),
+        migrations.AddField(
+            model_name='utente',
+            name='encrypt',
+            field=models.CharField(default='', max_length=64),
+        ),
+        migrations.AddField(
+            model_name='utente',
+            name='primologin',
+            field=models.BooleanField(default=1),
+        ),
+        migrations.AlterField(
+            model_name='utente',
+            name='pin',
+            field=models.CharField(default='', max_length=64),
+        ),
+    ]

+ 4 - 1
utente/models.py

@@ -6,13 +6,16 @@ from django.utils import timezone
 
 class Utente(models.Model):
     codicefiscale = models.CharField(max_length=16,null=False)
-    pin = models.CharField(max_length=10,null=False,default="")
     nome = models.CharField(max_length=128,null=False,default="")
     datanascita = models.DateField(null=True)
     luogonascita = models.CharField(max_length=256,null=False,default="")
     inserimento = models.DateField(null=False,default=timezone.now)
     mail = models.CharField(max_length=128,null=False,default="")
     azienda = models.ForeignKey(Azienda,on_delete=models.PROTECT)
+    primologin = models.BooleanField(null=False,default=1)
+    daticompleti=models.BooleanField(null=False,default=0)
+    pin = models.CharField(max_length=64,null=False,default="")
+    encrypt=models.CharField(max_length=64,null=False,default="")
     @property
     def documenti(self):
       return len(self.documento_set.all())