update

gest_anu/models.py

@@ -2,7 +2,7 @@ from django import forms
 from django.db import models
 from django.utils import timezone
 
-from gest_parc.models import Services as Services
+from parc_info.models import Services as Services
 
 SITE = [
 	('GENT', 'Gentilly'),

gest_anu/views.py

@@ -29,7 +29,7 @@ def index(request):
 		print(get_id)
 		page.item_id = get_id
 	
-	page.p_adresse = reverse('gest_parc_taches_show_list')
+	page.p_adresse = reverse('parc_info_taches_show_list')
 	page.p_titre = "Listing des utilisateurs"
 	page.p_contenu = "Listing des utilisateurs"
 	page.p_right = "Les Outils :"
@@ -44,7 +44,7 @@ def index(request):
 def user_get(request, id):
 	template = loader.get_template('page.html')
 	page = gen_page_base()
-	page.p_adresse = reverse('gest_parc_taches_show_list')
+	page.p_adresse = reverse('parc_info_taches_show_list')
 	page.p_titre = "Détail d'un utilisateur"
 	page.p_contenu = "Détail d'un utilisateur"
 	page.p_right = ""

gest_parc/urls.py

@@ -1,65 +0,0 @@
-from django.urls import path, re_path
-from django.views.generic import RedirectView, TemplateView
-
-from . import views
-from . import api 
-
-urlpatterns = [
-
-	path('maintenance/update', views.update, name='gest_parc_update'),
-	path('import/snow', views.import_snow_data, name='gest_parc_import_snow'),
-
-	#api taches
-	# path('api/taches/get_list', api.taches_get_list, name='gest_parc_api_taches_get_list'),
-	# re_path('api/taches/edit_taches/(?P<id_tache>\d+)', api.taches_edit_info, name='gest_parc_api_taches_edit_info'),
-
-	#api switchs
-	path('api/switch/get_list', api.switch_get_list, name='gest_parc_api_switch_get_list'),
-	re_path('api/switch/get/(?P<id>\d+)', api.switch_get_info, name='gest_parc_api_switch_get_info'),
-	re_path('api/switch/edit/(?P<id>\d+)', api.switch_edit_info, name='gest_parc_api_switch_edit_info'),
-	re_path('api/switch/edit/port/(?P<switch_id>\d+)/(?P<port_id>\d+)', api.switch_edit_port, name='gest_parc_api_switch_edit_port'),
-	re_path('api/switch/update/(?P<switch_id>\d+)', api.switch_update_port, name='gest_parc_api_switch_update_port'),
-
-	#api serveurs
-	path('api/serveurs/get_list', api.srv_get_list, name='gest_parc_api_srv_get_list'),
-	re_path('api/serveurs/get_srv/(?P<id_srv>\d+)', api.srv_get_info, name='gest_parc_api_srv_get_info'),
-	#path('api/serveurs/add_srv', api.srv_edit_info, {'id_srv': None}, name='gest_parc_api_srv_add_info'),
-	re_path('api/serveurs/edit_srv/(?P<id_srv>\d+)', api.srv_edit_info, name='gest_parc_api_srv_edit_info'),
-	path('api/serveurs/update', api.srv_update, name='gest_parc_api_srv_update'),
-
-	#api clients
-	path('api/clients/get_list', api.user_get_list, name='gest_parc_api_user_get_list'),
-	re_path('api/clients/get_user/(?P<id_user>\d+)', api.user_get_info, name='gest_parc_api_user_get_info'),
-	#path('api/clients/add_user', api.user_edit_info, {'id_user': None}, name='gest_parc_api_user_add_info'),
-	re_path('api/clients/edit_user/(?P<id_user>\d+)', api.user_edit_info, name='gest_parc_api_user_edit_info'),
-	re_path('api/clients/edit_statut/(?P<id_user>\d+)', api.user_edit_statut, name='gest_parc_api_user_edit_statut'),
-	re_path('api/clients/novnc/(?P<cl_hostname>[a-zA-Z0-9_.,-]+)', api.user_start_novnc, name='gest_parc_api_user_start_novnc'),
-	path('api/client/update', api.user_update, name='gest_parc_api_user_update'),
-
-	# taches
-	# path('taches', views.taches_show_list, name='gest_parc_taches_show_list'),
-	# re_path('taches/edit/(?P<id_tache>\d+)', views.taches_edit_info, name='gest_parc_taches_edit_info'),
-
-	# switch
-	path('switch', views.switch_show_list, name='gest_parc_switch_show_list'),
-	re_path('switch/edit/(?P<id>\d+)', views.switch_edit_info, name='gest_parc_switch_edit_info'),
-	re_path('switch/edit/port/(?P<switch_id>\d+)/(?P<port_id>\d+)', views.switch_edit_port, name='gest_parc_switch_edit_port'),
-	re_path('switch/update/(?P<switch_id>\d+)', views.switch_update_port, name='gest_parc_switch_update_port'),
-
-	# serveurs
-	path('serveurs', views.srv_show_list, name='gest_parc_srv_show_list'),
-	re_path('serveurs/edit/(?P<id_srv>\d+)', views.srv_edit_info, name='gest_parc_srv_edit_info'),
-
-	# client
-	path('clients', views.user_show_list, name='gest_parc_user_show_list'),
-	re_path('clients/edit/(?P<id_user>\d+)', views.user_edit_info, name='gest_parc_user_edit_info'),
-	re_path('clients/edit_statut/(?P<id_user>\d+)', views.user_edit_statut, name='gest_parc_user_edit_statut'),
-	path('clients/enstock', views.user_show_list_en_stock, name='gest_parc_user_show_list_en_stock'),
-	path('clients/aprep', views.user_show_list_aprep, name='gest_parc_user_show_list_aprep'),
-	path('clients/deprod', views.user_show_list_deprod, name='gest_parc_user_show_list_deprod'),
-	path('clients/imp', views.user_show_list_imp, name='gest_parc_user_show_list_imp'),
-	path('clients/stat/par-services', views.stat_user_by_service, name='gest_parc_stat_user_by_service'),
-	path('clients/stat/without-snow', views.stat_user_without_snow, name='gest_parc_stat_user_without_snow'),
-	
-
-]

gest_taches/api.py

@@ -38,7 +38,7 @@ def text_to_icon(text):
 
 
 def taches_get_list(request):
-	template = loader.get_template('gest_parc_api_taches_get_list.html')
+	template = loader.get_template('parc_info_api_taches_get_list.html')
 
 	data_query = Taches.objects.exclude(Tache_Statut = 'FINI').order_by('-Tache_Priorite','-Tache_Date_Cree')
 	for item in data_query:
@@ -52,7 +52,7 @@ def taches_get_list(request):
 	return HttpResponse(html)
 
 def taches_get_info(request, id_tache):
-	template = loader.get_template('gest_parc_api_taches_get.html')
+	template = loader.get_template('parc_info_api_taches_get.html')
 	
 	item = Taches.objects.get(id = id_tache)
 	item.Tache_Priorite = text_to_icon(item.Tache_Priorite)
@@ -65,7 +65,7 @@ def taches_get_info(request, id_tache):
 	return HttpResponse(html)
 
 def taches_edit_info(request, id_tache):
-	template = loader.get_template('gest_parc_api_taches_edit.html')
+	template = loader.get_template('parc_info_api_taches_edit.html')
 	if id_tache == None or id_tache == '0':
 		item = Taches()
 		item.Tache_Date_Programee = timezone.now()

gest_taches/templates/parc_info_api_taches_edit.html

@@ -8,7 +8,7 @@
 				</button>
 			</div>
 			<div class="modal-body">
-				<form id="form_edit" action="{% url 'gest_parc_taches_edit_info' item.id %}" method="post">
+				<form id="form_edit" action="{% url 'parc_info_taches_edit_info' item.id %}" method="post">
 					{% csrf_token %}
 					{{ form|crispy }}
 				</form>

gest_taches/templates/parc_info_taches_edit.html

@@ -14,7 +14,7 @@
 	<div class="card text-white bg-dark">
 		{% if page.p_f_titre %}<div class="card-header">{{page.p_f_titre}}</div>{% endif %}
 		<div class="card-body">
-			<form action="{% if item.id == None %}{% url 'gest_parc_taches_edit_info' 0 %}{% else %}{% url 'gest_parc_taches_edit_info' item.id %}{% endif %}" method="post">{% csrf_token %}
+			<form action="{% if item.id == None %}{% url 'parc_info_taches_edit_info' 0 %}{% else %}{% url 'parc_info_taches_edit_info' item.id %}{% endif %}" method="post">{% csrf_token %}
 				{{ form|crispy }}
 				<input type="submit" class="btn btn-success mt-1" value="Valider">
 			</form>

gest_taches/urls.py

@@ -7,12 +7,12 @@ from . import api
 urlpatterns = [
 	
 	#api taches
-	path('api/get_list', api.taches_get_list, name='gest_parc_api_taches_get_list'),
-	re_path('api/get_taches/(?P<id_tache>\d+)', api.taches_get_info, name='gest_parc_api_taches_get_info'),
-	re_path('api/edit_taches/(?P<id_tache>\d+)', api.taches_edit_info, name='gest_parc_api_taches_edit_info'),
+	path('api/get_list', api.taches_get_list, name='parc_info_api_taches_get_list'),
+	re_path('api/get_taches/(?P<id_tache>\d+)', api.taches_get_info, name='parc_info_api_taches_get_info'),
+	re_path('api/edit_taches/(?P<id_tache>\d+)', api.taches_edit_info, name='parc_info_api_taches_edit_info'),
 
 	# taches
-	path('', views.taches_show_list, name='gest_parc_taches_show_list'),
-	re_path('edit/(?P<id_tache>\d+)', views.taches_edit_info, name='gest_parc_taches_edit_info'),
+	path('', views.taches_show_list, name='parc_info_taches_show_list'),
+	re_path('edit/(?P<id_tache>\d+)', views.taches_edit_info, name='parc_info_taches_edit_info'),
 
 ]

gest_taches/views.py

@@ -18,14 +18,14 @@ from .models import *
 def taches_show_list(request):
 	get_search = request.GET.get('get_search', '')
 
-	template = loader.get_template('gest_parc_taches_index.html')
+	template = loader.get_template('parc_info_taches_index.html')
 	page = gen_page_base()
 
 	if get_search :
 		print(get_search)
 		page.search = get_search
 
-	page.p_adresse = reverse('gest_parc_taches_show_list')
+	page.p_adresse = reverse('parc_info_taches_show_list')
 	page.p_titre = "Listing des tâches"
 	page.p_contenu = "Listing des tâches à réaliser"
 	page.p_right = "Les Outils :"
@@ -38,7 +38,7 @@ def taches_show_list(request):
 	return HttpResponse(html)
 
 def taches_edit_info(request, id_tache):
-	template = loader.get_template('gest_parc_taches_edit.html')
+	template = loader.get_template('parc_info_taches_edit.html')
 	if id_tache == None or id_tache == '0':
 		item = Taches()
 		item.Tache_Date_Programee = timezone.now()
@@ -83,7 +83,7 @@ def taches_edit_info(request, id_tache):
 				msg.attach_alternative(html_content, "text/html")
 				msg.send()
 
-			return HttpResponseRedirect(reverse('gest_parc_taches_show_list'))
+			return HttpResponseRedirect(reverse('parc_info_taches_show_list'))
 	else:
 		form = Edit_Tache_form(instance=item)
 

gest_user/migrations/0001_initial.py

@@ -8,10 +8,6 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-        ('gest_parc', '0046_alter_swich_sw_nom'),
-    ]
-
     operations = [
         migrations.CreateModel(
             name='GES_User',
@@ -26,7 +22,7 @@ class Migration(migrations.Migration):
                 ('GES_ELSAN_EMAIL', models.BooleanField(default=False, verbose_name='Compte Email Elsan')),
                 ('GES_PULSY_EMAIL', models.BooleanField(default=False, verbose_name='Compte Email Plusy')),
                 ('GES_Commentaire', models.TextField(blank=True, null=True, verbose_name='Commentaires')),
-                ('GES_Service', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gest_parc.services')),
+                ('GES_Service', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='parc_info.services')),
             ],
         ),
     ]

gest_user/migrations/0019_remove_ges_user_ges_service.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.4 on 2023-12-21 22:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gest_user', '0018_alter_ges_user_ges_l_site'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ges_user',
+            name='GES_Service',
+        ),
+    ]

gest_user/migrations/0020_ges_user_ges_service.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.4 on 2023-12-21 22:42
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parc_info', '0074_alter_pic_pic_type'),
+        ('gest_user', '0019_remove_ges_user_ges_service'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ges_user',
+            name='GES_Service',
+            field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='parc_info.services'),
+            preserve_default=False,
+        ),
+    ]

gest_user/models.py

@@ -2,7 +2,7 @@ from django import forms
 from django.db import models
 from django.utils import timezone
 
-from gest_parc.models import Services as Services
+from parc_info.models import Services as NServices
 
 SITE = [
 	('GENT', 'Gentilly'),
@@ -52,7 +52,8 @@ class GES_User(models.Model):
 	GES_Nom = models.CharField("Nom", max_length=16)
 	GES_Prenom = models.CharField("Prénom", max_length=16)
 	GES_Motdepasse = models.CharField("Mot de passe", max_length=16)
-	GES_Service = models.ForeignKey(Services, on_delete=models.CASCADE)
+	#GES_Service = models.ForeignKey(Services, on_delete=models.CASCADE)
+	GES_Service = models.ForeignKey(NServices, on_delete=models.CASCADE)
 	GES_Fonction = models.ForeignKey(GES_Fonction, on_delete=models.CASCADE, blank=True, null=True)
 	GES_APPs = models.ManyToManyField(GES_APP)
 	GES_OK = models.BooleanField("Création complété", default = False)

gest_user/views.py

@@ -32,7 +32,7 @@ def index(request):
 		print(get_id)
 		page.item_id = get_id
 	
-	page.p_adresse = reverse('gest_parc_taches_show_list')
+	page.p_adresse = reverse('parc_info_taches_show_list')
 	page.p_titre = "Listing des utilisateurs"
 	page.p_contenu = "Listing des utilisateurs"
 	page.p_right = "Les Outils :"
@@ -47,7 +47,7 @@ def index(request):
 def user_get(request, id):
 	template = loader.get_template('page.html')
 	page = gen_page_base()
-	page.p_adresse = reverse('gest_parc_taches_show_list')
+	page.p_adresse = reverse('parc_info_taches_show_list')
 	page.p_titre = "Détail d'un utilisateur"
 	page.p_contenu = "Détail d'un utilisateur"
 	page.p_right = ""