updated code

.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (skyonnweb)" project-jdk-type="Python SDK" />
-  <component name="PyCharmProfessionalAdvertiser">
-    <option name="shown" value="true" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/skyonnweb.iml" filepath="$PROJECT_DIR$/.idea/skyonnweb.iml" />
-    </modules>
-  </component>
-</project>

.idea/skyonnweb.iml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/venv" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

skyonnweb/skyonnadmin/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.11 on 2024-03-14 07:02
+# Generated by Django 4.2.11 on 2024-05-07 11:06
 
 from django.db import migrations, models
 
@@ -11,6 +11,26 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Contact',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('client_id', models.CharField(max_length=30, null=True)),
+                ('name', models.CharField(max_length=40, null=True)),
+                ('designation', models.CharField(max_length=50, null=True)),
+                ('department', models.CharField(max_length=50, null=True)),
+                ('phone_no', models.CharField(max_length=50, null=True)),
+                ('email', models.EmailField(max_length=254, null=True)),
+                ('location', models.CharField(max_length=102, null=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Locations',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('location', models.CharField(max_length=50, null=True)),
+            ],
+        ),
         migrations.CreateModel(
             name='skyonnAdmin',
             fields=[
@@ -35,4 +55,30 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        migrations.CreateModel(
+            name='SubcompanyDetails',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('parent_company', models.CharField(max_length=100)),
+                ('sub_company', models.CharField(max_length=100, unique=True)),
+                ('location', models.CharField(max_length=100)),
+                ('gst_no', models.CharField(max_length=50)),
+                ('address', models.CharField(max_length=200)),
+                ('client_id', models.CharField(max_length=20, null=True)),
+                ('contacts', models.ManyToManyField(related_name='subcompany_contacts', to='skyonnadmin.contact')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ClientDetails',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('parent_company', models.CharField(max_length=100)),
+                ('location', models.CharField(max_length=100)),
+                ('department', models.CharField(max_length=100)),
+                ('gst_no', models.CharField(max_length=50)),
+                ('address', models.CharField(max_length=200)),
+                ('client_id', models.CharField(max_length=20, null=True)),
+                ('contacts', models.ManyToManyField(related_name='contacts', to='skyonnadmin.contact')),
+            ],
+        ),
     ]

skyonnweb/skyonnadmin/migrations/0002_addcontact_rename_phone_no_contact_first_name_and_more.py

@@ -0,0 +1,141 @@
+# Generated by Django 5.0.6 on 2024-05-25 05:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('skyonnadmin', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AddContact',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('Company', models.CharField(max_length=100, null=True)),
+                ('Sub_company', models.CharField(max_length=100, null=True)),
+                ('location', models.CharField(max_length=50, null=True)),
+                ('Department', models.CharField(max_length=50, null=True)),
+                ('Designation', models.CharField(max_length=50, null=True)),
+                ('Phone_number', models.IntegerField(null=True)),
+                ('Email', models.EmailField(max_length=254, null=True)),
+            ],
+        ),
+        migrations.RenameField(
+            model_name='contact',
+            old_name='phone_no',
+            new_name='first_name',
+        ),
+        migrations.RemoveField(
+            model_name='clientdetails',
+            name='contacts',
+        ),
+        migrations.RemoveField(
+            model_name='contact',
+            name='email',
+        ),
+        migrations.RemoveField(
+            model_name='contact',
+            name='location',
+        ),
+        migrations.RemoveField(
+            model_name='contact',
+            name='name',
+        ),
+        migrations.RemoveField(
+            model_name='subcompanydetails',
+            name='contacts',
+        ),
+        migrations.AddField(
+            model_name='contact',
+            name='company_email',
+            field=models.EmailField(default='default_company_email@example.com', max_length=254, null=True),
+        ),
+        migrations.AddField(
+            model_name='contact',
+            name='last_name',
+            field=models.CharField(max_length=50, null=True),
+        ),
+        migrations.AddField(
+            model_name='contact',
+            name='phone_no1',
+            field=models.CharField(max_length=20, null=True),
+        ),
+        migrations.AddField(
+            model_name='contact',
+            name='phone_no2',
+            field=models.CharField(blank=True, max_length=20, null=True),
+        ),
+        migrations.AddField(
+            model_name='subcompanydetails',
+            name='department',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='clientdetails',
+            name='address',
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AlterField(
+            model_name='clientdetails',
+            name='department',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='clientdetails',
+            name='gst_no',
+            field=models.CharField(max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='clientdetails',
+            name='location',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='clientdetails',
+            name='parent_company',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='contact',
+            name='client_id',
+            field=models.CharField(max_length=20, null=True),
+        ),
+        migrations.AlterField(
+            model_name='contact',
+            name='department',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='contact',
+            name='designation',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='subcompanydetails',
+            name='address',
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AlterField(
+            model_name='subcompanydetails',
+            name='gst_no',
+            field=models.CharField(max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='subcompanydetails',
+            name='location',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='subcompanydetails',
+            name='parent_company',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='subcompanydetails',
+            name='sub_company',
+            field=models.CharField(max_length=100, null=True),
+        ),
+    ]

skyonnweb/skyonnadmin/migrations/0002_contact_subcompanydetails_clientdetails.py

@@ -1,75 +0,0 @@
-# Generated by Django 4.2.11 on 2024-03-18 07:10
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('skyonnadmin', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Contact',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('first_name', models.CharField(max_length=50)),
-                ('last_name', models.CharField(max_length=50)),
-                ('phone_no1', models.CharField(max_length=20)),
-                ('phone_no2', models.CharField(blank=True, max_length=20, null=True)),
-                ('company_email', models.EmailField(max_length=254)),
-                ('designation', models.CharField(max_length=100)),
-                ('department', models.CharField(max_length=100)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='SubcompanyDetails',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('parent_company', models.CharField(max_length=100)),
-                ('sub_company', models.CharField(max_length=100)),
-                ('location', models.CharField(max_length=100)),
-                ('department', models.CharField(max_length=100)),
-                ('gst_no', models.CharField(max_length=50)),
-                ('address', models.CharField(max_length=200)),
-                ('client_id', models.CharField(max_length=20, null=True)),
-                ('admin_first_name', models.CharField(max_length=50)),
-                ('admin_last_name', models.CharField(max_length=50)),
-                ('admin_phone_no1', models.CharField(max_length=20)),
-                ('admin_phone_no2', models.CharField(blank=True, max_length=20, null=True)),
-                ('admin_company_email', models.EmailField(max_length=254)),
-                ('admin_designation', models.CharField(max_length=100, null=True)),
-                ('admin_department', models.CharField(max_length=100, null=True)),
-                ('admin_location', models.CharField(max_length=100, null=True)),
-                ('accounts_contacts', models.ManyToManyField(related_name='subcompany_accounts_contacts', to='skyonnadmin.contact')),
-                ('admin_contacts', models.ManyToManyField(related_name='subcompany_admin_contacts', to='skyonnadmin.contact')),
-                ('hr_contacts', models.ManyToManyField(related_name='subcompany_hr_contacts', to='skyonnadmin.contact')),
-                ('recruiter_contacts', models.ManyToManyField(related_name='subcompany_recruiter_contacts', to='skyonnadmin.contact')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='ClientDetails',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('parent_company', models.CharField(max_length=100)),
-                ('location', models.CharField(max_length=100)),
-                ('department', models.CharField(max_length=100)),
-                ('gst_no', models.CharField(max_length=50)),
-                ('address', models.CharField(max_length=200)),
-                ('client_id', models.CharField(max_length=20, null=True)),
-                ('admin_first_name', models.CharField(max_length=50)),
-                ('admin_last_name', models.CharField(max_length=50)),
-                ('admin_phone_no1', models.CharField(max_length=20)),
-                ('admin_phone_no2', models.CharField(blank=True, max_length=20, null=True)),
-                ('admin_company_email', models.EmailField(max_length=254)),
-                ('admin_designation', models.CharField(max_length=100, null=True)),
-                ('admin_department', models.CharField(max_length=100, null=True)),
-                ('admin_location', models.CharField(max_length=100, null=True)),
-                ('accounts_contacts', models.ManyToManyField(related_name='accounts_contacts', to='skyonnadmin.contact')),
-                ('admin_contacts', models.ManyToManyField(related_name='admin_contacts', to='skyonnadmin.contact')),
-                ('hr_contacts', models.ManyToManyField(related_name='hr_contacts', to='skyonnadmin.contact')),
-                ('recruiter_contacts', models.ManyToManyField(related_name='recruiter_contacts', to='skyonnadmin.contact')),
-            ],
-        ),
-    ]

skyonnweb/skyonnadmin/migrations/0003_rename_address_clientdetails_street_and_more.py

@@ -0,0 +1,161 @@
+# Generated by Django 5.0.6 on 2024-05-25 06:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('skyonnadmin', '0002_addcontact_rename_phone_no_contact_first_name_and_more'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='clientdetails',
+            old_name='address',
+            new_name='Street',
+        ),
+        migrations.RenameField(
+            model_name='clientdetails',
+            old_name='department',
+            new_name='location_Id',
+        ),
+        migrations.RenameField(
+            model_name='contact',
+            old_name='first_name',
+            new_name='phone_no',
+        ),
+        migrations.RenameField(
+            model_name='subcompanydetails',
+            old_name='address',
+            new_name='State',
+        ),
+        migrations.RenameField(
+            model_name='subcompanydetails',
+            old_name='department',
+            new_name='location_id',
+        ),
+        migrations.RenameField(
+            model_name='subcompanydetails',
+            old_name='client_id',
+            new_name='sub_client_id',
+        ),
+        migrations.RemoveField(
+            model_name='clientdetails',
+            name='location',
+        ),
+        migrations.RemoveField(
+            model_name='contact',
+            name='client_id',
+        ),
+        migrations.RemoveField(
+            model_name='contact',
+            name='company_email',
+        ),
+        migrations.RemoveField(
+            model_name='contact',
+            name='last_name',
+        ),
+        migrations.RemoveField(
+            model_name='contact',
+            name='phone_no1',
+        ),
+        migrations.RemoveField(
+            model_name='contact',
+            name='phone_no2',
+        ),
+        migrations.RemoveField(
+            model_name='subcompanydetails',
+            name='location',
+        ),
+        migrations.AddField(
+            model_name='clientdetails',
+            name='Pincode',
+            field=models.IntegerField(max_length=200, null=True),
+        ),
+        migrations.AddField(
+            model_name='clientdetails',
+            name='address_1',
+            field=models.CharField(blank=True, max_length=300, null=True),
+        ),
+        migrations.AddField(
+            model_name='clientdetails',
+            name='address_2',
+            field=models.CharField(blank=True, max_length=200, null=True),
+        ),
+        migrations.AddField(
+            model_name='clientdetails',
+            name='contacts',
+            field=models.ManyToManyField(related_name='contacts', to='skyonnadmin.contact'),
+        ),
+        migrations.AddField(
+            model_name='clientdetails',
+            name='country',
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AddField(
+            model_name='clientdetails',
+            name='state',
+            field=models.CharField(blank=True, max_length=300, null=True),
+        ),
+        migrations.AddField(
+            model_name='contact',
+            name='email',
+            field=models.EmailField(max_length=254, null=True),
+        ),
+        migrations.AddField(
+            model_name='contact',
+            name='location',
+            field=models.CharField(max_length=102, null=True),
+        ),
+        migrations.AddField(
+            model_name='contact',
+            name='name',
+            field=models.CharField(max_length=40, null=True),
+        ),
+        migrations.AddField(
+            model_name='subcompanydetails',
+            name='Pincode',
+            field=models.IntegerField(max_length=200, null=True),
+        ),
+        migrations.AddField(
+            model_name='subcompanydetails',
+            name='Street',
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AddField(
+            model_name='subcompanydetails',
+            name='address_1',
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AddField(
+            model_name='subcompanydetails',
+            name='address_2',
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AddField(
+            model_name='subcompanydetails',
+            name='country',
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AlterField(
+            model_name='addcontact',
+            name='Phone_number',
+            field=models.IntegerField(max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='contact',
+            name='department',
+            field=models.CharField(max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='contact',
+            name='designation',
+            field=models.CharField(max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='subcompanydetails',
+            name='sub_company',
+            field=models.CharField(max_length=100, null=True, unique=True),
+        ),
+    ]

skyonnweb/skyonnadmin/migrations/0004_remove_clientdetails_street_and_more.py

@@ -0,0 +1,21 @@
+# Generated by Django 5.0.6 on 2024-05-27 06:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('skyonnadmin', '0003_rename_address_clientdetails_street_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='clientdetails',
+            name='Street',
+        ),
+        migrations.RemoveField(
+            model_name='subcompanydetails',
+            name='Street',
+        ),
+    ]

skyonnweb/skyonnadmin/migrations/0005_subcompanydetails_city.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.6 on 2024-05-27 06:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('skyonnadmin', '0004_remove_clientdetails_street_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='subcompanydetails',
+            name='City',
+            field=models.CharField(max_length=200, null=True),
+        ),
+    ]