testing

sheets/views.py

@@ -4,29 +4,43 @@ from django.apps import apps
 from datetime import date
 from .models import Client
 
-# Clients Page (Now the homepage)
+
+# Clients Page (Main)
 def clients_list(request):
     clients = Client.objects.all().order_by('id')
     return render(request, 'clients_table.html', {'clients': clients})
 
+
 # Table One View (ExcelEntry)
 def table_one_view(request):
-    entries_table1 = apps.get_model('sheets', 'ExcelEntry').objects.all()
-    return render(request, 'table_one.html', {'entries_table1': entries_table1})
+    ExcelEntry = apps.get_model('sheets', 'ExcelEntry')
+    entries_table1 = ExcelEntry.objects.all()
+    clients = Client.objects.all()
+    return render(request, 'table_one.html', {
+        'entries_table1': entries_table1,
+        'clients': clients,
+    })
+
 
 # Table Two View (SecondTableEntry)
 def table_two_view(request):
-    entries_table2 = apps.get_model('sheets', 'SecondTableEntry').objects.all()
-    return render(request, 'table_two.html', {'entries_table2': entries_table2})
+    SecondTableEntry = apps.get_model('sheets', 'SecondTableEntry')
+    entries_table2 = SecondTableEntry.objects.all()
+    clients = Client.objects.all()
+    return render(request, 'table_two.html', {
+        'entries_table2': entries_table2,
+        'clients': clients,
+    })
 
-# Add Entry (Generic for all models)
+
+# Add Entry (Generic)
 def add_entry(request, model_name):
     if request.method == 'POST':
         try:
             model = apps.get_model('sheets', model_name)
-            name = request.POST.get('name', 'New Name')
 
             if model_name.lower() == 'client':
+                name = request.POST.get('name', 'New Name')
                 address = request.POST.get('address', '')
                 entry = model.objects.create(name=name, address=address)
                 return JsonResponse({
@@ -35,11 +49,13 @@ def add_entry(request, model_name):
                     'address': entry.address,
                 })
 
+            client_id = request.POST.get('client_id')
+            client = Client.objects.get(id=client_id)
             age = int(request.POST.get('age', 0))
             email = request.POST.get('email', 'example@email.com')
 
             entry = model.objects.create(
-                name=name,
+                client=client,
                 age=age,
                 email=email,
                 date_joined=date.today()
@@ -47,7 +63,7 @@ def add_entry(request, model_name):
 
             return JsonResponse({
                 'id': entry.id,
-                'name': entry.name,
+                'client_name': client.name,
                 'age': entry.age,
                 'email': entry.email,
                 'date_joined': entry.date_joined.strftime('%Y-%m-%d'),
@@ -58,19 +74,18 @@ def add_entry(request, model_name):
 
     return JsonResponse({'status': 'error', 'message': 'Invalid request'}, status=400)
 
-# Update Entry (Generic for all models)
+
+# Update Entry (Generic)
 def update_entry(request, model_name):
     if request.method == 'POST':
         try:
             model = apps.get_model('sheets', model_name)
             entry_id = int(request.POST.get('id'))
             entry = model.objects.get(id=entry_id)
-            name = request.POST.get('name')
 
             if model_name.lower() == 'client':
-                address = request.POST.get('address', '')
-                entry.name = name
-                entry.address = address
+                entry.name = request.POST.get('name')
+                entry.address = request.POST.get('address', '')
                 entry.save()
                 return JsonResponse({
                     'status': 'success',
@@ -79,10 +94,12 @@ def update_entry(request, model_name):
                     'address': entry.address,
                 })
 
+            client_id = request.POST.get('client_id')
+            client = Client.objects.get(id=client_id)
             age = int(request.POST.get('age'))
             email = request.POST.get('email')
 
-            entry.name = name
+            entry.client = client
             entry.age = age
             entry.email = email
             entry.save()
@@ -90,7 +107,7 @@ def update_entry(request, model_name):
             return JsonResponse({
                 'status': 'success',
                 'id': entry.id,
-                'name': entry.name,
+                'name': client.name,
                 'age': entry.age,
                 'email': entry.email,
                 'date_joined': entry.date_joined.strftime('%Y-%m-%d'),
@@ -103,7 +120,8 @@ def update_entry(request, model_name):
 
     return JsonResponse({'status': 'error', 'message': 'Invalid request'}, status=400)
 
-# Delete Entry (Generic for all models)
+
+# Delete Entry (Generic)
 def delete_entry(request, model_name):
     if request.method == 'POST':
         try: