mise a jour gest_parc avec gest_clin

.gitignore

@@ -1,10 +1,2 @@
 db.sqlite3
-system/__pycache__/settings.cpython-312.pyc
-system/__pycache__/__init__.cpython-312.pyc
-gest_clin/migrations/__pycache__/0002_auto_20231229_0916.cpython-312.pyc
-gest_clin/migrations/__pycache__/0001_initial.cpython-312.pyc
-gest_clin/migrations/__pycache__/__init__.cpython-312.pyc
-gest_clin/__pycache__/models.cpython-312.pyc
-gest_clin/__pycache__/apps.cpython-312.pyc
-gest_clin/__pycache__/admin.cpython-312.pyc
-gest_clin/__pycache__/__init__.cpython-312.pyc
+

parc_info/admin.py

@@ -5,46 +5,42 @@ from .models import *
 
 @admin.register(PIC)
 class PICAdmin(ImportExportModelAdmin):
-	list_display = ('PIC_Nom_netbios', 'PIC_Utilisateur', 'PIC_NUnic', 'PIC_L_Statut', 'PIC_L_Site', 'PIC_L_Service', 'PIC_L_Chassi_Type')
-	list_filter = ('PIC_L_Site', 'PIC_Deg', 'PIC_with_Snow', 'PIC_L_Chassi_Type', 'PIC_L_Statut', 'PIC_L_Service','PIC_CPU','PIC_RAM')
-	search_fields = ['PIC_Nom_netbios', 'PIC_Adresse_IP', 'PIC_Utilisateur', 'PIC_L_Service__SERVICE_Nom', 'PIC_L_Service__SERVICE_Anag','PIC_Precisions']
+	list_display = ('PIC_Nom_netbios', 'PIC_Utilisateur', 'PIC_NUnic', 'PIC_L_Statut', 'PIC_Site', 'PIC_Service', 'PIC_L_Chassi_Type')
+	list_filter = ('PIC_Site', 'PIC_Deg', 'PIC_with_Snow', 'PIC_L_Chassi_Type', 'PIC_L_Statut', 'PIC_Service','PIC_CPU','PIC_RAM')
+	search_fields = ['PIC_Nom_netbios', 'PIC_Adresse_IP', 'PIC_Utilisateur', 'PIC_Service__SERVICE_Nom', 'PIC_Service__SERVICE_Anag','PIC_Precisions']
+	exclude =('PIC_L_Service',)
+	pass
+
+@admin.register(PIC_History)
+class PIC_HistoryAdmin(admin.ModelAdmin):
+	list_display = ('H_PIC', 'H_Date', 'H_Commentaire')
 	pass
 
 @admin.register(PIS)
 class PISAdmin(ImportExportModelAdmin):
-	list_display = ('PIS_L_Site', 'PIS_Localisation','PIS_Nom_netbios','PIS_Friendly_Name', 'PIS_Type', 'PIS_Role', 'PIS_Adresse_IP', 'PIS_Commentaires')
-	list_filter = ('PIS_L_Site', 'PIS_Type', 'PIS_Archive', 'PIS_Role')
+	list_display = ('PIS_Site', 'PIS_Localisation','PIS_Nom_netbios','PIS_Friendly_Name', 'PIS_Type', 'PIS_Role', 'PIS_Adresse_IP', 'PIS_Commentaires')
+	list_filter = ('PIS_Site', 'PIS_Type', 'PIS_Archive', 'PIS_Role')
 	search_fields = ['PIS_Nom_netbios', 'PIS_Role', 'PIS_Adresse_IP','PIS_Localisation', 'PIS_Commentaires']
 	pass
 
 @admin.register(Swich)
 class SwichAdmin(ImportExportModelAdmin):
 	list_display = ('SW_Baie','SW_Nom', 'SW_IP', 'SW_OS', 'SW_TYPE')
-	list_filter = ('SW_Baie__BAIE_Site','SW_Baie', 'SW_OS', 'SW_TYPE')
+	list_filter = ('SW_Baie__BAIE_Site_NG','SW_Baie', 'SW_OS', 'SW_TYPE')
 	search_fields = ['SW_Baie', 'SW_Nom','SW_IP', 'SW_Commentaires']
 	pass
 
-@admin.register(Services)
-class ServicesAdmin(admin.ModelAdmin):
-	list_display = ('SERVICE_Anag', 'SERVICE_Nom')
-	pass
-
 @admin.register(Port_Link)
 class Port_LinkAdmin(admin.ModelAdmin):
-	list_display = ('PL_Swich', 'PL_Port', 'PL_VLAN', 'PL_Headbang_plug', 'PL_Commentaires')
+	list_display = ('PL_Swich', 'PL_Port_NG', 'PL_VLAN', 'PL_Headbang_plug', 'PL_Commentaires')
 	pass
 
 @admin.register(Baie)
 class BaieAdmin(admin.ModelAdmin):
-	list_display = ('BAIE_Site', 'BAIE_Nom', 'BAIE_Local')
+	list_display = ('BAIE_Site_NG', 'BAIE_Nom', 'BAIE_Local')
 	pass
 
 @admin.register(Accessory_Link)
 class Accessory_LinkAdmin(admin.ModelAdmin):
 	list_display = ('Accessory_Nom', 'Accessory_N_slugify', 'Accessory_icone', 'Accessory_on_list')
 	pass
-
-# @admin.register(Taches)
-# class TachesAdmin(admin.ModelAdmin):
-# 	list_display = ('Taches_Nom', 'Taches_Tech', 'Tache_Date_Cree', 'Tache_Date_Programee', 'Tache_Date_Terminee', 'Tache_Statut')
-# 	pass

parc_info/api.py

@@ -47,14 +47,14 @@ def switch_get_list(request):
 	if get_search :
 		#print(get_search)
 		data_query = Swich.objects.exclude(SW_Archive=True).filter(Q(SW_Nom__icontains=get_search)
-										|Q(SW_Baie__BAIE_Site__icontains=get_search)
+										|Q(SW_Baie__BAIE_Site_NG__CLIN_Anag__icontains=get_search)
 										|Q(SW_Baie__BAIE_Nom__icontains=get_search)
 										|Q(SW_IP__icontains=get_search)
 										|Q(SW_Commentaires__icontains=get_search)
-										).order_by('SW_Baie__BAIE_Site','SW_Baie','SW_Nom')
+										).order_by('SW_Baie__BAIE_Site_NG','SW_Baie','SW_Nom')
 	else :
 		#print("not get_search")
-		data_query = Swich.objects.exclude(SW_Archive=True).all().order_by('SW_Baie__BAIE_Site','SW_Baie','SW_Nom')
+		data_query = Swich.objects.exclude(SW_Archive=True).all().order_by('SW_Baie__BAIE_Site_NG','SW_Baie','SW_Nom')
 
 	html = template.render({
 			'data_query': data_query,
@@ -136,15 +136,15 @@ def srv_get_list(request):
 		#print(get_search)
 		data_query = PIS.objects.filter(Q(PIS_Nom_netbios__icontains=get_search)
 										|Q(PIS_Friendly_Name__icontains=get_search)
-										|Q(PIS_L_Site__icontains=get_search)
+										|Q(PIS_Site__CLIN_Anag__icontains=get_search)
 										|Q(PIS_Adresse_IP__icontains=get_search)
 										|Q(PIS_Role__icontains=get_search)
 										|Q(PIS_SN__icontains=get_search)
 										|Q(PIS_Adresse_Mac__icontains=get_search)
-										).order_by('PIS_Archive','PIS_L_Site','PIS_Role', 'PIS_Adresse_IP')
+										).order_by('PIS_Archive','PIS_Site','PIS_Role', 'PIS_Adresse_IP')
 	else :
 		#print("not get_search")
-		data_query = PIS.objects.all().order_by('PIS_Archive','PIS_L_Site','PIS_Role', 'PIS_Adresse_IP')
+		data_query = PIS.objects.all().order_by('PIS_Archive','PIS_Site','PIS_Role', 'PIS_Adresse_IP')
 
 	html = template.render({
 			'data_query': data_query,
@@ -191,30 +191,30 @@ def user_get_list(request):
 	if get_search :
 		#print(get_search)
 		data_query_1 = PIC.objects.exclude(PIC_L_Statut__in = ['INAPTE', 'EN STOCK']).filter(Q(PIC_Nom_netbios__icontains=get_search)
-										|Q(PIC_L_Site__icontains=get_search)
+										|Q(PIC_Site__CLIN_Anag__icontains=get_search)
 										|Q(PIC_Adresse_IP__icontains=get_search)
 										|Q(PIC_Utilisateur__icontains=get_search)
 										|Q(PIC_Utilisateur_Fq__icontains=get_search)
 										|Q(PIC_Adresse_Mac__icontains=get_search)
-										|Q(PIC_L_Service__SERVICE_Nom__icontains=get_search)
+										|Q(PIC_Service__SERVICE_Nom__icontains=get_search)
 										|Q(PIC_SN__icontains=get_search)
 										|Q(PIC_L_Chassi_Type__icontains=get_search)
-										).order_by('PIC_L_Site','PIC_L_Service__SERVICE_Nom','PIC_NUnic','PIC_L_Statut')
+										).order_by('PIC_Site__CLIN_Anag','PIC_Service__SERVICE_Nom','PIC_NUnic','PIC_L_Statut')
 		data_query_2 = PIC.objects.filter(PIC_L_Statut =  'EN STOCK').filter(Q(PIC_Nom_netbios__icontains=get_search)
-										|Q(PIC_L_Site__icontains=get_search)
+										|Q(PIC_Site__CLIN_Anag__icontains=get_search)
 										|Q(PIC_Adresse_IP__icontains=get_search)
 										|Q(PIC_Utilisateur__icontains=get_search)
 										|Q(PIC_Utilisateur_Fq__icontains=get_search)
 										|Q(PIC_Adresse_Mac__icontains=get_search)
-										|Q(PIC_L_Service__SERVICE_Nom__icontains=get_search)
+										|Q(PIC_Service__SERVICE_Nom__icontains=get_search)
 										|Q(PIC_SN__icontains=get_search)
 										|Q(PIC_L_Chassi_Type__icontains=get_search)
-										).order_by('PIC_L_Site','PIC_L_Service__SERVICE_Nom','PIC_NUnic')
+										).order_by('PIC_Site__CLIN_Anag','PIC_Service__SERVICE_Nom','PIC_NUnic')
 		data_query = list(chain(data_query_1, data_query_2))
 
 	else :
 		#print("not get_search")
-		data_query = PIC.objects.exclude(PIC_L_Statut__in = ['INAPTE', 'EN STOCK']).order_by('PIC_L_Site','PIC_L_Service__SERVICE_Nom','PIC_NUnic','PIC_L_Statut')
+		data_query = PIC.objects.exclude(PIC_L_Statut__in = ['INAPTE', 'EN STOCK']).order_by('PIC_Site__CLIN_Anag','PIC_Service__SERVICE_Nom','PIC_NUnic','PIC_L_Statut')
 
 	for data in data_query:
 		data.accessoir = Accessory_Link.objects.filter(pic = data)
@@ -302,14 +302,14 @@ def user_update(request):
 		# 	tmp_service = Services.objects.get(SERVICE_Nom = item.PIC_Service)
 		# except:
 		# 	tmp_service = Services.objects.get(SERVICE_Nom = "VOID")
-		# item.PIC_L_Service = tmp_service
+		# item.PIC_Service = tmp_service
 		# if item.PIC_L_Chassi_Type == "CL" or item.PIC_L_Chassi_Type == "PC" :
 		# 	try :
 		# 		list_filter_ecran = Accessory_Link.objects.get(pic = item)
 		# 	except :
 		# 		item.PIC_Accessory.add(Accessory_Link.objects.get(Accessory_N_slugify = "ecran"))
-		if item.PIC_L_Site == "GEN":
-			item.PIC_L_Site = "HPN"
+		if item.PIC_Site.CLIN_Anag == "GEN":
+			item.PIC_Site.CLIN_Anag = "HPN"
 
 		item.save()
 	return HttpResponse("ok")

parc_info/forms.py

@@ -45,25 +45,25 @@ class Edit_switch_port_form(forms.ModelForm):
 class Edit_user_mini_form(forms.ModelForm):
 	class Meta:
 		model = PIC
-		fields = ['PIC_L_Site', 'PIC_L_Service', 'PIC_L_Chassi_Type', 'PIC_Nom_netbios', 'PIC_Utilisateur', 'PIC_Adresse_IP', 'PIC_Adresse_Mac', 'PIC_SN', 'PIC_Local', 'PIC_Precisions', 'PIC_Commentaires']
+		fields = ['PIC_Site', 'PIC_Service', 'PIC_L_Chassi_Type', 'PIC_Nom_netbios', 'PIC_Utilisateur', 'PIC_Adresse_IP', 'PIC_Adresse_Mac', 'PIC_SN', 'PIC_Local', 'PIC_Precisions', 'PIC_Commentaires']
 		widgets = {
 			'PIC_Precisions': forms.Textarea(attrs={'cols': 90, 'rows': 1}),
 			'PIC_Commentaires': forms.Textarea(attrs={'cols': 90, 'rows': 3}),
 			}
 		labels = {
-			'PIC_L_Service': 'Service',
+			'PIC_Service': 'Service',
 		}
 
 class Edit_imp_form(forms.ModelForm):
 	class Meta:
 		model = PIC
-		fields = ['PIC_L_Site', 'PIC_L_Service', 'PIC_L_Chassi_Type', 'PIC_Nom_netbios', 'PIC_Utilisateur', 'PIC_Adresse_IP', 'PIC_Marque', 'PIC_Type', 'PIC_SN', 'PIC_Precisions', 'PIC_Local' , 'PIC_Commentaires']
+		fields = ['PIC_Site', 'PIC_Service', 'PIC_L_Chassi_Type', 'PIC_Nom_netbios', 'PIC_Utilisateur', 'PIC_Adresse_IP', 'PIC_Marque', 'PIC_Type', 'PIC_SN', 'PIC_Precisions', 'PIC_Local' , 'PIC_Commentaires']
 		widgets = {
 			'PIC_Precisions': forms.Textarea(attrs={'cols': 90, 'rows': 1}),
 			'PIC_Commentaires': forms.Textarea(attrs={'cols': 90, 'rows': 3}),
 			}
 		labels = {
-			'PIC_L_Service': 'Service',
+			'PIC_Service': 'Service',
 		}
 
 class Edit_user_statut_form(forms.ModelForm):

parc_info/migrations/0075_pic_pic_site.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.23 on 2023-12-29 10:03
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gest_clin', '0002_auto_20231229_0916'),
+        ('parc_info', '0074_alter_pic_pic_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='pic',
+            name='PIC_Site',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='gest_clin.clinique'),
+        ),
+    ]

parc_info/migrations/0076_alter_pic_pic_site.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.23 on 2023-12-29 10:12
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gest_clin', '0002_auto_20231229_0916'),
+        ('parc_info', '0075_pic_pic_site'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='pic',
+            name='PIC_Site',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='gest_clin.clinique', verbose_name='Clinique'),
+        ),
+    ]

parc_info/migrations/0077_auto_20231229_1104.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.2.23 on 2023-12-29 11:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gest_clin', '0002_auto_20231229_0916'),
+        ('parc_info', '0076_alter_pic_pic_site'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='pic',
+            name='PIC_Service',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='gest_clin.services', verbose_name='Service'),
+        ),
+        migrations.AlterField(
+            model_name='pic',
+            name='PIC_Site',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='gest_clin.clinique', verbose_name='Clinique'),
+        ),
+    ]

parc_info/migrations/0078_baie_baie_site_ng.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.23 on 2023-12-29 13:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gest_clin', '0002_auto_20231229_0916'),
+        ('parc_info', '0077_auto_20231229_1104'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='baie',
+            name='BAIE_Site_NG',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='gest_clin.clinique', verbose_name='Clinique'),
+        ),
+    ]

parc_info/migrations/0079_auto_20231229_1406.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.23 on 2023-12-29 14:06
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parc_info', '0078_baie_baie_site_ng'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='baie',
+            name='BAIE_Site',
+        ),
+        migrations.RemoveField(
+            model_name='port_link',
+            name='PL_Port',
+        ),
+    ]

parc_info/migrations/0080_pis_pis_site.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.23 on 2023-12-29 14:17
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gest_clin', '0002_auto_20231229_0916'),
+        ('parc_info', '0079_auto_20231229_1406'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='pis',
+            name='PIS_Site',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='gest_clin.clinique', verbose_name='Clinique'),
+        ),
+    ]

parc_info/migrations/0081_auto_20231229_1423.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.23 on 2023-12-29 14:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parc_info', '0080_pis_pis_site'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='pic',
+            name='PIC_L_Site',
+        ),
+        migrations.RemoveField(
+            model_name='pis',
+            name='PIS_L_Site',
+        ),
+    ]