From a30c211e736313232bd488dd6afe8d9a5c862755 Mon Sep 17 00:00:00 2001 From: Nastro_ Date: Thu, 17 Oct 2024 11:39:51 +0200 Subject: [PATCH] Fixes --- GestionaleITS/Readme.md | 1 - GestionaleITS/docker-compose.yaml~ | 0 .../0006_alter_bundle_is_deleted.py | 18 +++++++++++++++ ...ccessory_is_deleted_computer_is_deleted.py | 23 +++++++++++++++++++ .../0008_alter_bundle_is_deleted.py | 18 +++++++++++++++ GestionaleITS/gestionale/models.py | 4 ++-- 6 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 GestionaleITS/docker-compose.yaml~ create mode 100644 GestionaleITS/gestionale/migrations/0006_alter_bundle_is_deleted.py create mode 100644 GestionaleITS/gestionale/migrations/0007_accessory_is_deleted_computer_is_deleted.py create mode 100644 GestionaleITS/gestionale/migrations/0008_alter_bundle_is_deleted.py diff --git a/GestionaleITS/Readme.md b/GestionaleITS/Readme.md index bde245f..a931e9b 100644 --- a/GestionaleITS/Readme.md +++ b/GestionaleITS/Readme.md @@ -40,7 +40,6 @@ GOOGLE_KEY= (generally empty) - BUILD=false #if true creates the superuser, if already done please set it false expose: - "8000" #must match with env port - - "8000/udp" networks: - nginx depends_on: diff --git a/GestionaleITS/docker-compose.yaml~ b/GestionaleITS/docker-compose.yaml~ new file mode 100644 index 0000000..e69de29 diff --git a/GestionaleITS/gestionale/migrations/0006_alter_bundle_is_deleted.py b/GestionaleITS/gestionale/migrations/0006_alter_bundle_is_deleted.py new file mode 100644 index 0000000..fa8f08f --- /dev/null +++ b/GestionaleITS/gestionale/migrations/0006_alter_bundle_is_deleted.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.16 on 2024-10-17 08:45 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('gestionale', '0005_alter_record_prev_product_detail_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='bundle', + name='is_deleted', + field=models.BooleanField(default=False, null=True), + ), + ] diff --git a/GestionaleITS/gestionale/migrations/0007_accessory_is_deleted_computer_is_deleted.py b/GestionaleITS/gestionale/migrations/0007_accessory_is_deleted_computer_is_deleted.py new file mode 100644 index 0000000..05f32e4 --- /dev/null +++ b/GestionaleITS/gestionale/migrations/0007_accessory_is_deleted_computer_is_deleted.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.16 on 2024-10-17 08:48 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('gestionale', '0006_alter_bundle_is_deleted'), + ] + + operations = [ + migrations.AddField( + model_name='accessory', + name='is_deleted', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='computer', + name='is_deleted', + field=models.BooleanField(default=False), + ), + ] diff --git a/GestionaleITS/gestionale/migrations/0008_alter_bundle_is_deleted.py b/GestionaleITS/gestionale/migrations/0008_alter_bundle_is_deleted.py new file mode 100644 index 0000000..30e65e3 --- /dev/null +++ b/GestionaleITS/gestionale/migrations/0008_alter_bundle_is_deleted.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.16 on 2024-10-17 09:18 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('gestionale', '0007_accessory_is_deleted_computer_is_deleted'), + ] + + operations = [ + migrations.AlterField( + model_name='bundle', + name='is_deleted', + field=models.BooleanField(default=False), + ), + ] diff --git a/GestionaleITS/gestionale/models.py b/GestionaleITS/gestionale/models.py index af3c5b0..7ab8c26 100644 --- a/GestionaleITS/gestionale/models.py +++ b/GestionaleITS/gestionale/models.py @@ -118,7 +118,7 @@ class Computer(models.Model): notes = models.CharField(max_length=255, blank=True, null=True) cespite = models.CharField(max_length=255, blank=True, null=True) serial = models.CharField(max_length=255, unique=True) - # is_deleted = models.BooleanField(default=False) + is_deleted = models.BooleanField(default=False) def __str__(self): return f"Id Studente: {self.id_student}, Id Bundle: {self.id_bundle}, Status: {self.status}, Data di assegnazione: {self.assignment_date}, Motivazione di Assegnazione: {self.assignment_motivation}, Data di restituzione: {self.return_date}, Motivazione di restituzione: {self.return_motivation}, Eol: {self.eol}, Data di Eol: {self.eol_date}, Note: {self.notes}, Cespite: {self.cespite}, Seriale: {self.serial}" @@ -135,7 +135,7 @@ class Accessory(models.Model): return_date = models.DateField(blank=True, null=True) return_motivation = models.CharField(max_length=255, blank=True, null=True) notes = models.CharField(max_length=255, blank=True, null=True) - # is_deleted = models.BooleanField(default=False) + is_deleted = models.BooleanField(default=False) def __str__(self): return f"Id Studente: {self.id_student}, Id Bundle: {self.id_bundle}, Name: {self.name}, Status: {self.status}, Data di assegnazione: {self.assignment_date}, Motivazione di Assegnazione: {self.assignment_motivation}, Data di restituzione: {self.return_date}, Motivazione di restituzione: {self.return_motivation}, Note: {self.notes}"