diff --git a/FusionIIIT/Fusion/middleware/custom_middleware.py b/FusionIIIT/Fusion/middleware/custom_middleware.py index fd8528e6e..74f7d7d72 100644 --- a/FusionIIIT/Fusion/middleware/custom_middleware.py +++ b/FusionIIIT/Fusion/middleware/custom_middleware.py @@ -2,7 +2,7 @@ from django.contrib.auth.signals import user_logged_in from django.dispatch import receiver from applications.globals.models import (ExtraInfo, Feedback, HoldsDesignation, - Issue, IssueImage, DepartmentInfo) + Issue, IssueImage, DepartmentInfo,ModuleAccess) from django.shortcuts import get_object_or_404, redirect, render def user_logged_in_middleware(get_response): @@ -35,7 +35,19 @@ def user_logged_in_handler(sender, user, request, **kwargs): print(i) request.session['currentDesignationSelected'] = designation[0] - request.session['allDesignations'] = designation + request.session['allDesignations'] = designation + first_designation = designation[0] + module_access = ModuleAccess.objects.filter(designation=first_designation).first() + + if module_access: + access_rights = {} + + field_names = [field.name for field in ModuleAccess._meta.get_fields() if field.name not in ['id', 'designation']] + + for field_name in field_names: + access_rights[field_name] = getattr(module_access, field_name) + + request.session['moduleAccessRights'] = access_rights print("logged iN") # Set the flag in the session to indicate that the function has bee+n executed @@ -47,4 +59,4 @@ def middleware(request): response = get_response(request) return response - return middleware \ No newline at end of file + return middleware \ No newline at end of file diff --git a/FusionIIIT/applications/academic_information/migrations/0001_initial.py b/FusionIIIT/applications/academic_information/migrations/0001_initial.py index 0335e5ac7..68d090ad7 100644 --- a/FusionIIIT/applications/academic_information/migrations/0001_initial.py +++ b/FusionIIIT/applications/academic_information/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.db import migrations, models import django.db.models.deletion diff --git a/FusionIIIT/applications/academic_procedures/migrations/0001_initial.py b/FusionIIIT/applications/academic_procedures/migrations/0001_initial.py index 8288015ad..3f3d51b8b 100644 --- a/FusionIIIT/applications/academic_procedures/migrations/0001_initial.py +++ b/FusionIIIT/applications/academic_procedures/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 import datetime from django.db import migrations, models @@ -12,8 +12,8 @@ class Migration(migrations.Migration): dependencies = [ ('globals', '0001_initial'), - ('programme_curriculum', '0001_initial'), ('academic_information', '0001_initial'), + ('programme_curriculum', '0001_initial'), ] operations = [ diff --git a/FusionIIIT/applications/central_mess/migrations/0001_initial.py b/FusionIIIT/applications/central_mess/migrations/0001_initial.py index 7f2ac6f35..9c9114cdd 100644 --- a/FusionIIIT/applications/central_mess/migrations/0001_initial.py +++ b/FusionIIIT/applications/central_mess/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 import applications.central_mess.models import datetime @@ -149,6 +149,17 @@ class Migration(migrations.Migration): ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), ], ), + migrations.CreateModel( + name='Payments', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('amount_paid', models.IntegerField(default=0)), + ('payment_month', models.CharField(default=applications.central_mess.models.current_month, max_length=20)), + ('payment_year', models.IntegerField(default=applications.central_mess.models.current_year)), + ('payment_date', models.DateField(default=datetime.date(2024, 6, 19))), + ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), + ], + ), migrations.CreateModel( name='Mess_minutes', fields=[ @@ -192,20 +203,6 @@ class Migration(migrations.Migration): ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), ], ), - migrations.CreateModel( - name='Payments', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('amount_paid', models.IntegerField(default=0)), - ('payment_month', models.CharField(default=applications.central_mess.models.current_month, max_length=20)), - ('payment_year', models.IntegerField(default=applications.central_mess.models.current_year)), - ('payment_date', models.DateField(default=datetime.date(2024, 4, 27))), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'unique_together': {('student_id', 'payment_date')}, - }, - ), migrations.CreateModel( name='Monthly_bill', fields=[ diff --git a/FusionIIIT/applications/complaint_system/migrations/0001_initial.py b/FusionIIIT/applications/complaint_system/migrations/0001_initial.py index 25e95f7f1..d8a5e84b9 100644 --- a/FusionIIIT/applications/complaint_system/migrations/0001_initial.py +++ b/FusionIIIT/applications/complaint_system/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.db import migrations, models import django.db.models.deletion diff --git a/FusionIIIT/applications/counselling_cell/migrations/0001_initial.py b/FusionIIIT/applications/counselling_cell/migrations/0001_initial.py index a20c97753..6c541bfd1 100644 --- a/FusionIIIT/applications/counselling_cell/migrations/0001_initial.py +++ b/FusionIIIT/applications/counselling_cell/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 import datetime from django.db import migrations, models @@ -10,8 +10,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('globals', '0001_initial'), ('academic_information', '0001_initial'), + ('globals', '0001_initial'), ] operations = [ diff --git a/FusionIIIT/applications/department/migrations/0001_initial.py b/FusionIIIT/applications/department/migrations/0001_initial.py index fc8a34834..b89a27ce2 100644 --- a/FusionIIIT/applications/department/migrations/0001_initial.py +++ b/FusionIIIT/applications/department/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 +# Generated by Django 3.1.5 on 2024-06-19 22:14 import datetime from django.db import migrations, models @@ -28,11 +28,22 @@ class Migration(migrations.Migration): ('request_maker', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), ], ), + migrations.CreateModel( + name='Information', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('phone_number', models.BigIntegerField()), + ('email', models.CharField(max_length=200)), + ('facilites', models.TextField()), + ('labs', models.TextField()), + ('department', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='globals.departmentinfo')), + ], + ), migrations.CreateModel( name='Announcements', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('ann_date', models.DateTimeField(default='04-04-2021')), + ('ann_date', models.DateTimeField(auto_now_add=True)), ('message', models.CharField(max_length=200)), ('batch', models.CharField(default='Year-1', max_length=40)), ('department', models.CharField(default='ALL', max_length=40)), diff --git a/FusionIIIT/applications/eis/migrations/0001_initial.py b/FusionIIIT/applications/eis/migrations/0001_initial.py index a7c38380e..b5beffb14 100644 --- a/FusionIIIT/applications/eis/migrations/0001_initial.py +++ b/FusionIIIT/applications/eis/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 import datetime from django.conf import settings diff --git a/FusionIIIT/applications/establishment/migrations/0001_initial.py b/FusionIIIT/applications/establishment/migrations/0001_initial.py index 8da9173cf..e8ef4435c 100644 --- a/FusionIIIT/applications/establishment/migrations/0001_initial.py +++ b/FusionIIIT/applications/establishment/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.conf import settings from django.db import migrations, models @@ -10,8 +10,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('auth', '0012_alter_user_first_name_max_length'), ('globals', '0001_initial'), + ('auth', '0012_alter_user_first_name_max_length'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] diff --git a/FusionIIIT/applications/estate_module/migrations/0001_initial.py b/FusionIIIT/applications/estate_module/migrations/0001_initial.py index 366378cf0..5aef74dbc 100644 --- a/FusionIIIT/applications/estate_module/migrations/0001_initial.py +++ b/FusionIIIT/applications/estate_module/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.conf import settings from django.db import migrations, models diff --git a/FusionIIIT/applications/examination/migrations/0001_initial.py b/FusionIIIT/applications/examination/migrations/0001_initial.py index 8f9bc8897..348f941c0 100644 --- a/FusionIIIT/applications/examination/migrations/0001_initial.py +++ b/FusionIIIT/applications/examination/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.db import migrations, models import django.db.models.deletion diff --git a/FusionIIIT/applications/feeds/migrations/0001_initial.py b/FusionIIIT/applications/feeds/migrations/0001_initial.py index 9a8691daa..314f41f7b 100644 --- a/FusionIIIT/applications/feeds/migrations/0001_initial.py +++ b/FusionIIIT/applications/feeds/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.conf import settings from django.db import migrations, models diff --git a/FusionIIIT/applications/filetracking/migrations/0001_initial.py b/FusionIIIT/applications/filetracking/migrations/0001_initial.py index 4fc89cffa..320a93dfb 100644 --- a/FusionIIIT/applications/filetracking/migrations/0001_initial.py +++ b/FusionIIIT/applications/filetracking/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.conf import settings from django.db import migrations, models diff --git a/FusionIIIT/applications/finance_accounts/migrations/0001_initial.py b/FusionIIIT/applications/finance_accounts/migrations/0001_initial.py index 18a9f6c88..09ff2fb32 100644 --- a/FusionIIIT/applications/finance_accounts/migrations/0001_initial.py +++ b/FusionIIIT/applications/finance_accounts/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.db import migrations, models diff --git a/FusionIIIT/applications/globals/migrations/0001_initial.py b/FusionIIIT/applications/globals/migrations/0001_initial.py index a8450bb11..ac0c416bd 100644 --- a/FusionIIIT/applications/globals/migrations/0001_initial.py +++ b/FusionIIIT/applications/globals/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 import applications.globals.models import datetime @@ -50,6 +50,32 @@ class Migration(migrations.Migration): ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), + migrations.CreateModel( + name='ModuleAccess', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('designation', models.CharField(max_length=155)), + ('program_and_curriculum', models.BooleanField(default=False)), + ('course_registration', models.BooleanField(default=False)), + ('course_management', models.BooleanField(default=False)), + ('other_academics', models.BooleanField(default=False)), + ('spacs', models.BooleanField(default=False)), + ('department', models.BooleanField(default=False)), + ('examinations', models.BooleanField(default=False)), + ('hr', models.BooleanField(default=False)), + ('iwd', models.BooleanField(default=False)), + ('complaint_management', models.BooleanField(default=False)), + ('fts', models.BooleanField(default=False)), + ('purchase_and_store', models.BooleanField(default=False)), + ('rspc', models.BooleanField(default=False)), + ('hostel_management', models.BooleanField(default=False)), + ('mess_management', models.BooleanField(default=False)), + ('gymkhana', models.BooleanField(default=False)), + ('placement_cell', models.BooleanField(default=False)), + ('visitor_hostel', models.BooleanField(default=False)), + ('phc', models.BooleanField(default=False)), + ], + ), migrations.CreateModel( name='Faculty', fields=[ @@ -106,7 +132,7 @@ class Migration(migrations.Migration): ('working', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='current_designation', to=settings.AUTH_USER_MODEL)), ], options={ - 'unique_together': {('user', 'designation'), ('working', 'designation')}, + 'unique_together': {('working', 'designation'), ('user', 'designation')}, }, ), ] diff --git a/FusionIIIT/applications/globals/models.py b/FusionIIIT/applications/globals/models.py index d51fbcb69..bc95a3042 100644 --- a/FusionIIIT/applications/globals/models.py +++ b/FusionIIIT/applications/globals/models.py @@ -310,3 +310,30 @@ class Issue(models.Model): """ End of feedback and bug report models""" + + + +class ModuleAccess(models.Model): + designation = models.CharField(max_length=155) + program_and_curriculum = models.BooleanField(default=False) + course_registration = models.BooleanField(default=False) + course_management = models.BooleanField(default=False) + other_academics = models.BooleanField(default=False) + spacs = models.BooleanField(default=False) + department = models.BooleanField(default=False) + examinations = models.BooleanField(default=False) + hr = models.BooleanField(default=False) + iwd = models.BooleanField(default=False) + complaint_management = models.BooleanField(default=False) + fts = models.BooleanField(default=False) + purchase_and_store = models.BooleanField(default=False) + rspc = models.BooleanField(default=False) + hostel_management = models.BooleanField(default=False) + mess_management = models.BooleanField(default=False) + gymkhana = models.BooleanField(default=False) + placement_cell = models.BooleanField(default=False) + visitor_hostel = models.BooleanField(default=False) + phc = models.BooleanField(default=False) + + def __str__(self): + return self.designation diff --git a/FusionIIIT/applications/globals/static/globals/img/Designer.jpg b/FusionIIIT/applications/globals/static/globals/img/Designer.jpg new file mode 100644 index 000000000..ee8305b77 Binary files /dev/null and b/FusionIIIT/applications/globals/static/globals/img/Designer.jpg differ diff --git a/FusionIIIT/applications/globals/static/globals/img/Designer.png b/FusionIIIT/applications/globals/static/globals/img/Designer.png new file mode 100644 index 000000000..c8c2bdf00 Binary files /dev/null and b/FusionIIIT/applications/globals/static/globals/img/Designer.png differ diff --git a/FusionIIIT/applications/globals/static/globals/img/LHTC.jpg b/FusionIIIT/applications/globals/static/globals/img/LHTC.jpg new file mode 100644 index 000000000..7cc2a7731 Binary files /dev/null and b/FusionIIIT/applications/globals/static/globals/img/LHTC.jpg differ diff --git a/FusionIIIT/applications/globals/static/globals/img/fusion.png b/FusionIIIT/applications/globals/static/globals/img/fusion.png new file mode 100644 index 000000000..3de95db63 Binary files /dev/null and b/FusionIIIT/applications/globals/static/globals/img/fusion.png differ diff --git a/FusionIIIT/applications/globals/static/globals/img/fusion_icon.png b/FusionIIIT/applications/globals/static/globals/img/fusion_icon.png new file mode 100644 index 000000000..195e9ded8 Binary files /dev/null and b/FusionIIIT/applications/globals/static/globals/img/fusion_icon.png differ diff --git a/FusionIIIT/applications/globals/views.py b/FusionIIIT/applications/globals/views.py index 9b0303c36..dedad3d8d 100644 --- a/FusionIIIT/applications/globals/views.py +++ b/FusionIIIT/applications/globals/views.py @@ -16,7 +16,7 @@ from applications.academic_information.models import Student from applications.globals.forms import IssueForm, WebFeedbackForm from applications.globals.models import (ExtraInfo, Feedback, HoldsDesignation, - Issue, IssueImage, DepartmentInfo) + Issue, IssueImage, DepartmentInfo,ModuleAccess) from applications.gymkhana.views import coordinator_club from applications.placement_cell.forms import (AddAchievement, AddCourse, AddEducation, AddExperience, @@ -745,7 +745,8 @@ def dashboard(request): hall_warden_user = [] for warden in hall_wardens: hall_warden_user.append(warden.faculty.id.user) - + print("modules are") + print(request.session.get('moduleAccessRights')) context={ 'notifications':notifs, 'Curr_desig' : roll_, @@ -1267,8 +1268,19 @@ def update_global_variable(request): if request.method == 'POST': selected_option = request.POST.get('dropdown') request.session['currentDesignationSelected'] = selected_option + module_access = ModuleAccess.objects.filter(designation=selected_option).first() + if module_access: + access_rights = {} + + field_names = [field.name for field in ModuleAccess._meta.get_fields() if field.name not in ['id', 'designation']] + + for field_name in field_names: + access_rights[field_name] = getattr(module_access, field_name) + + request.session['moduleAccessRights'] = access_rights + print(selected_option) print(request.session['currentDesignationSelected']) - return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) + return HttpResponseRedirect('/dashboard') # Redirect to home if not a POST request or some issue occurs - return HttpResponseRedirect(reverse('home')) + return HttpResponseRedirect(reverse('home')) \ No newline at end of file diff --git a/FusionIIIT/applications/gymkhana/migrations/0001_initial.py b/FusionIIIT/applications/gymkhana/migrations/0001_initial.py index 16c4ceed1..19690ba85 100644 --- a/FusionIIIT/applications/gymkhana/migrations/0001_initial.py +++ b/FusionIIIT/applications/gymkhana/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.conf import settings from django.db import migrations, models diff --git a/FusionIIIT/applications/health_center/migrations/0001_initial.py b/FusionIIIT/applications/health_center/migrations/0001_initial.py index 887666ff8..fb9d546ba 100644 --- a/FusionIIIT/applications/health_center/migrations/0001_initial.py +++ b/FusionIIIT/applications/health_center/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 import datetime from django.db import migrations, models diff --git a/FusionIIIT/applications/hostel_management/migrations/0001_initial.py b/FusionIIIT/applications/hostel_management/migrations/0001_initial.py index 04306f3c2..fe00be088 100644 --- a/FusionIIIT/applications/hostel_management/migrations/0001_initial.py +++ b/FusionIIIT/applications/hostel_management/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.conf import settings from django.db import migrations, models diff --git a/FusionIIIT/applications/hr2/migrations/0001_initial.py b/FusionIIIT/applications/hr2/migrations/0001_initial.py index 08e79b9c1..10a474d11 100644 --- a/FusionIIIT/applications/hr2/migrations/0001_initial.py +++ b/FusionIIIT/applications/hr2/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.conf import settings import django.core.validators diff --git a/FusionIIIT/applications/income_expenditure/migrations/0001_initial.py b/FusionIIIT/applications/income_expenditure/migrations/0001_initial.py index d5ef66c0d..c7a14180b 100644 --- a/FusionIIIT/applications/income_expenditure/migrations/0001_initial.py +++ b/FusionIIIT/applications/income_expenditure/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.db import migrations, models import django.db.models.deletion diff --git a/FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py b/FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py index c62bf6a0b..1285e9b78 100644 --- a/FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py +++ b/FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 import datetime from django.db import migrations, models diff --git a/FusionIIIT/applications/leave/migrations/0001_initial.py b/FusionIIIT/applications/leave/migrations/0001_initial.py index 536667a90..1049e0d3c 100644 --- a/FusionIIIT/applications/leave/migrations/0001_initial.py +++ b/FusionIIIT/applications/leave/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.conf import settings from django.db import migrations, models @@ -10,8 +10,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('globals', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ diff --git a/FusionIIIT/applications/office_module/migrations/0001_initial.py b/FusionIIIT/applications/office_module/migrations/0001_initial.py index a61863d3d..5e021add1 100644 --- a/FusionIIIT/applications/office_module/migrations/0001_initial.py +++ b/FusionIIIT/applications/office_module/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 import datetime from django.db import migrations, models @@ -12,8 +12,8 @@ class Migration(migrations.Migration): dependencies = [ ('globals', '0001_initial'), ('academic_information', '0001_initial'), - ('filetracking', '0001_initial'), ('leave', '0001_initial'), + ('filetracking', '0001_initial'), ] operations = [ diff --git a/FusionIIIT/applications/online_cms/migrations/0001_initial.py b/FusionIIIT/applications/online_cms/migrations/0001_initial.py index 94f9a00b0..51b1f514d 100644 --- a/FusionIIIT/applications/online_cms/migrations/0001_initial.py +++ b/FusionIIIT/applications/online_cms/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.db import migrations, models import django.db.models.deletion @@ -9,9 +9,9 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('academic_information', '0001_initial'), ('globals', '0001_initial'), ('programme_curriculum', '0001_initial'), - ('academic_information', '0001_initial'), ] operations = [ diff --git a/FusionIIIT/applications/otheracademic/migrations/0001_initial.py b/FusionIIIT/applications/otheracademic/migrations/0001_initial.py index 0cbedae6b..6b31bc9d8 100644 --- a/FusionIIIT/applications/otheracademic/migrations/0001_initial.py +++ b/FusionIIIT/applications/otheracademic/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.db import migrations, models import django.db.models.deletion diff --git a/FusionIIIT/applications/placement_cell/migrations/0001_initial.py b/FusionIIIT/applications/placement_cell/migrations/0001_initial.py index a9a945f1d..89a40cb84 100644 --- a/FusionIIIT/applications/placement_cell/migrations/0001_initial.py +++ b/FusionIIIT/applications/placement_cell/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 import datetime from django.db import migrations, models diff --git a/FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py b/FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py index b5bdb145e..429bfbad7 100644 --- a/FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py +++ b/FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.conf import settings import django.core.validators @@ -125,6 +125,8 @@ class Migration(migrations.Migration): ('is_added', models.BooleanField(default=False)), ('is_submitted', models.BooleanField(default=False)), ('is_rejected', models.BooleanField(default=False)), + ('sender_archive', models.BooleanField(default=False)), + ('receiver_archive', models.BooleanField(default=False)), ('disciplines', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.discipline')), ('receive_design', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.designation')), ('receive_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), @@ -162,6 +164,7 @@ class Migration(migrations.Migration): ('upload_date', models.DateTimeField(auto_now_add=True)), ('is_read', models.BooleanField(default=False)), ('is_update', models.BooleanField(default=False)), + ('is_archive', models.BooleanField(default=False)), ('pre_requisit_courses', models.ManyToManyField(blank=True, to='programme_curriculum.Course')), ], options={ diff --git a/FusionIIIT/applications/ps1/migrations/0001_initial.py b/FusionIIIT/applications/ps1/migrations/0001_initial.py index d3107b543..5e1b2fce1 100644 --- a/FusionIIIT/applications/ps1/migrations/0001_initial.py +++ b/FusionIIIT/applications/ps1/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.db import migrations, models import django.db.models.deletion @@ -10,8 +10,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('globals', '0001_initial'), ('filetracking', '0001_initial'), + ('globals', '0001_initial'), ] operations = [ @@ -26,6 +26,7 @@ class Migration(migrations.Migration): ('purpose', models.CharField(max_length=250)), ('specification', models.CharField(max_length=250)), ('item_type', models.CharField(max_length=250)), + ('item_subtype', models.CharField(default='computers', max_length=250)), ('nature', models.BooleanField(default=False)), ('indigenous', models.BooleanField(default=False)), ('replaced', models.BooleanField(default=False)), diff --git a/FusionIIIT/applications/recruitment/migrations/0001_initial.py b/FusionIIIT/applications/recruitment/migrations/0001_initial.py index 2acee0f5d..c9960bbd1 100644 --- a/FusionIIIT/applications/recruitment/migrations/0001_initial.py +++ b/FusionIIIT/applications/recruitment/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 import datetime from django.conf import settings diff --git a/FusionIIIT/applications/research_procedures/migrations/0001_initial.py b/FusionIIIT/applications/research_procedures/migrations/0001_initial.py index 56711cfcd..f723b02c9 100644 --- a/FusionIIIT/applications/research_procedures/migrations/0001_initial.py +++ b/FusionIIIT/applications/research_procedures/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 import datetime from django.conf import settings @@ -56,7 +56,7 @@ class Migration(migrations.Migration): ('year', models.IntegerField()), ('stipend', models.IntegerField()), ('staff_type', models.CharField(default='research', max_length=100)), - ('start_date', models.DateField(default=datetime.date(2024, 4, 27))), + ('start_date', models.DateField(default=datetime.date(2024, 6, 19))), ('end_date', models.DateField(blank=True, null=True)), ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects')), ('staff_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), @@ -95,4 +95,26 @@ class Migration(migrations.Migration): 'ordering': ['-financial_outlay_id'], }, ), + migrations.CreateModel( + name='co_project_investigator', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('co_pi_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects')), + ], + options={ + 'ordering': ['-co_pi_id'], + }, + ), + migrations.CreateModel( + name='co_pis', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('co_pi', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects')), + ], + options={ + 'ordering': ['-project_id'], + }, + ), ] diff --git a/FusionIIIT/applications/scholarships/migrations/0001_initial.py b/FusionIIIT/applications/scholarships/migrations/0001_initial.py index 7f0130f6e..19428800c 100644 --- a/FusionIIIT/applications/scholarships/migrations/0001_initial.py +++ b/FusionIIIT/applications/scholarships/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 import datetime from django.db import migrations, models @@ -10,8 +10,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('globals', '0001_initial'), ('academic_information', '0001_initial'), + ('globals', '0001_initial'), ] operations = [ diff --git a/FusionIIIT/applications/visitor_hostel/migrations/0001_initial.py b/FusionIIIT/applications/visitor_hostel/migrations/0001_initial.py index af48c39c4..841bcaf40 100644 --- a/FusionIIIT/applications/visitor_hostel/migrations/0001_initial.py +++ b/FusionIIIT/applications/visitor_hostel/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-06-19 22:14 from django.conf import settings from django.db import migrations, models diff --git a/FusionIIIT/templates/account/base.html b/FusionIIIT/templates/account/base.html index 986600600..b2bc50b08 100755 --- a/FusionIIIT/templates/account/base.html +++ b/FusionIIIT/templates/account/base.html @@ -70,11 +70,12 @@
{% else %} +
+ min-width: 360px;background-color: unset;backdrop-filter: blur(3px);"> {% endif %} {% block content %} @@ -83,6 +84,8 @@ {% if request.user.is_authenticated %}
+
+
{% comment %}The central-rail segment ends here!{% endcomment %} diff --git a/FusionIIIT/templates/account/login.html b/FusionIIIT/templates/account/login.html index 9bbff7e94..5940456f2 100755 --- a/FusionIIIT/templates/account/login.html +++ b/FusionIIIT/templates/account/login.html @@ -1,16 +1,17 @@ {% extends "account/base.html" %} -{%block content%} +{% block content %} {% load i18n %} {% load account socialaccount %} {% load static semanticui %} +
User Image + src="{% static 'globals/img/user.png' %}" + style="margin-top: -27.5%; margin-left: 27.5%;" + alt="User Image">
- Login -
+ Login +
@@ -18,31 +19,56 @@ {% csrf_token %} {% render_form form %} {% if redirect_field_value %} - + {% endif %}
- {% trans "Forgot Password?" %} + {% trans "Forgot Password?" %}
-
{% get_providers as socialaccount_providers %}
-
- {% if socialaccount_providers %} -
-
- {% include "socialaccount/snippets/provider_list.html" with process="login" %} -
+
+ {% if socialaccount_providers %} +
+
+ {% include "socialaccount/snippets/provider_list.html" with process="login" %}
- {% include "socialaccount/snippets/login_extra.html" %} - {% endif %} -
+
+ {% include "socialaccount/snippets/login_extra.html" %} + {% endif %} +
-{% endblock %} +{% if form.errors %} + +{% endif %} + + +{% endblock %} + \ No newline at end of file diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html index e6cc62d8d..3feb60384 100755 --- a/FusionIIIT/templates/dashboard/modules.html +++ b/FusionIIIT/templates/dashboard/modules.html @@ -12,170 +12,196 @@
- - {% if request.user.extrainfo.user_type != "staff" or "acadadmin" == global_var %} -
- -
-
- -
+ +
+
+ +
-
- Academics -
+
+ Academics
- -
- {% endif %} - - {% if request.user.extrainfo.user_type == "student" or "Professor" == global_var or "Dean Academic" == global_var or "acadadmin" == global_var or "Assistant Professor" == global_var or "HOD (CSE)" == global_var or "HOD (ECE)" == global_var or "HOD (ME)" == global_var or "HOD (NS)" == global_var or "HOD (Design)" == global_var or "HOD (Liberal Arts)" == global_var %} -
- -
-
- -
+ +
+
+ +
-
- Programme And Curriculum -
+
+ Programme And Curriculum
- -
- {% endif %} - - {% if request.user.extrainfo.user_type == "student" or "mess_manager" == global_var or "mess_warden" == global_var %} - + {% endif %} + + {% if request.session.moduleAccessRights.visitor_hostel %} -
- -
-
- -
+ +
+
+ +
-
- Visitor's Hostel -
+
+ Visitor's Hostel
- -
- - - + {% endif %} + + + + {% if request.session.moduleAccessRights.fts %} - {% if request.user.extrainfo.user_type != "student" %} - + {% endif %} + + - {% if request.user.extrainfo.user_type == "student" or "spacsconvenor" == global_var or "spacsassistant" == global_var %} -
- -
-
- -
- -
- Scholarship Portal -
+ +
+
+
- -
- {% endif %} + +
+ Scholarship Portal +
+
+ +
+ {% endif %} + {% if request.session.moduleAccessRights.complaint_management %} -
- -
-
- -
+ +
+
+ +
-
- Complaint System -
+
+ Complaint System
- -
- - - {% if request.user.extrainfo.user_type != "staff" or "placement officer" == global_var or "placement chairman" == global_var %} - + {% endif %} - - - - - + {% endif %} + + - {% if request.user.extrainfo.user_type == "faculty" or "rspc_admin" == global_var or "HOD (CSE)" == global_var or "HOD (ECE)" == global_var or "HOD (ME)" == global_var or "HOD (NS)" == global_var or "HOD (Design)" == global_var or "HOD (Liberal Arts)" == global_var or "dean_rspc" == global_var or "Director" == global_var %} -
- -
-
- -
+ +
+
+ +
-
- Research Module -
+
+ Research Module
- -
- {% endif %} - - - - --> + - - {% if request.user.extrainfo.user_type == "faculty" or "Professor" == global_var or "Associate Professor" == global_var or "Director" == global_var or "HOD (CSE)" == global_var or "HOD (ECE)" == global_var or "HOD (ME)" == global_var or "HOD (NS)" == global_var or "HOD (Design)" == global_var or "HOD (Liberal Arts)" == global_var or "Accounts Admin" == global_var or "Registrar" == global_var or "Deputy Registrar" == global_var or "asst. registrar aud" == global_var or "asst. registrar fa" == global_var or "ps_admin" == global_var or "deptadmin_cse" == global_var or "deptadmin_ece" == global_var or "deptadmin_me" == global_var or "deptadmin_sm" == global_var or "deptadmin_design" == global_var or "deptadmin_liberalarts" == global_var or "deptadmin_ns" == global_var %} -
- -
-
- -
+ +
+
+ +
-
- Purchase and Store -
+
+ Purchase and Store
- -
- {% endif %} - - {% if request.user.extrainfo.user_type != "student" %} - - {% endif %} - - + +
+ {% endif %} + - - {% if "acadadmin" == global_var %} - + {% endif %} + - {% if request.user.extrainfo.user_type != "staff" or "administrator" == global_var %} - + {% endif %} + + + + + + + - - {% if request.user.extrainfo.user_type == "student" or "dean_s" == global_var or request.user.extrainfo.user_type == "faculty" %} - + {% endif %} + + + {% if request.session.moduleAccessRights.iwd %} - {% if request.user.extrainfo.user_type != "student" %} - + {% endif %} + + + - - {% if request.user.extrainfo.user_type == "student" or user in hall_caretaker or user in hall_warden or request.user.is_superuser %} -
- -
-
- -
+ +
+
+ +
-
- Hostel Management -
+
+ Hostel Management
- -
- {% endif %} - + {% endif %} + +
- {% comment %} - - - - {% endcomment %} + {% comment %} + + + + {% endcomment %}
@@ -441,5 +473,5 @@ } } - -{% endblock %} \ No newline at end of file + +{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/dashboard/navbar.html b/FusionIIIT/templates/dashboard/navbar.html index 408e7ec5f..1105b93e5 100644 --- a/FusionIIIT/templates/dashboard/navbar.html +++ b/FusionIIIT/templates/dashboard/navbar.html @@ -9,7 +9,6 @@ - {% load notifications_tags %} {% register_notify_callbacks badge_class='badge' callbacks='fill_notification_badge' %} @@ -23,61 +22,50 @@ - - - - +
-
+ {% csrf_token %}
- - +
+
+ + {% if global_var %} + {{ global_var|capfirst }} + {% else %} + Select your designation + {% endif %} + + +
+
+ {% for d in global_var2 %} +
+ {{ d|capfirst }} +
+ {% endfor %} +
+
+
{% if 'staff' != request.user.extrainfo.user_type %} - - {% comment %} - TODO: User details! depending on type of user say: STUDENT/FACULTY/STAFF! - {% endcomment %} {{request.user.first_name}} {{request.user.last_name}} {% endif %} - {% if 'staff' == request.user.extrainfo.user_type %} - + {% if 'staff' == request.user.extrainfo.user_type %} - {% comment %} - TODO: User details! depending on type of user say: STUDENT/FACULTY/STAFF! - {% endcomment %} {{request.user.first_name}} {{request.user.last_name}} {% endif %} - {% comment %} - -
Notifications
- -
22
- TODO: Make dropdown menu -
-
Notification1
-
Notification1
-
- - {% endcomment %} -

Notifications

-
@@ -86,19 +74,16 @@

Notificati Leave - Complaint - Mess - Placement @@ -106,73 +91,131 @@

Notificati

-
- -
+
- -
+
- -
+
-
- - {% comment %} - TODO: LOGOUT! - {% endcomment %} Logout -
- - - - {% block data%} - + {% block data %} {% endblock %} - - -
- + function previous() { + let url = window.location.href; + const endPoint = url.split('/'); + let len = endPoint.length; + if (endPoint[len - 2] !== 'dashboard') { + window.history.go(-1); + } + } + -{% endblock %} \ No newline at end of file + +{% endblock %} diff --git a/FusionIIIT/templates/dashboard/sidenavbar.html b/FusionIIIT/templates/dashboard/sidenavbar.html index 08b79b47f..8182bdced 100644 --- a/FusionIIIT/templates/dashboard/sidenavbar.html +++ b/FusionIIIT/templates/dashboard/sidenavbar.html @@ -38,50 +38,54 @@

{{request.user.first_name}} {{request.user.last_n
- {% if request.user.extrainfo.user_type != "staff" or "acadadmin" == global_var %} + {% if request.session.moduleAccessRights.course_registration %}

Academics

{% endif %} - {% if request.user.extrainfo.user_type == "student" or "Professor" == global_var or "Dean Academic" == global_var or "acadadmin" == global_var or "Assistant Professor" == global_var or "HOD (CSE)" == global_var or "HOD (ECE)" == global_var or "HOD (ME)" == global_var or "HOD (NS)" == global_var or "HOD (Design)" == global_var or "HOD (Liberal Arts)" == global_var %} + {% if request.session.moduleAccessRights.program_and_curriculum %}

Programme And Curriculum

{% endif %} - {% if request.user.extrainfo.user_type == "student" or "mess_manager" == global_var or "mess_warden" == global_var %} + {% if request.session.moduleAccessRights.mess_management %}

Mess Management

 {% endif %} - + {% if request.session.moduleAccessRights.visitor_hostel %}

Visitor's Hostel

 + {% endif %} - + {% if request.session.moduleAccessRights.phc %}

Healthcare Center

 + {% endif %} - {% if request.user.extrainfo.user_type != "student" %} + {% if request.session.moduleAccessRights.fts %}

File Tracking

{% endif %} - {% if request.user.extrainfo.user_type == "student" or "spacsconvenor" == global_var or "spacsassistant" == global_var %} + {% if request.session.moduleAccessRights.spacs %}

Scholarship Portal

 {% endif %} + {% if request.session.moduleAccessRights.complaint_management %}

Complaint System

 - {% if request.user.extrainfo.user_type != "staff" or "placement officer" == global_var or "placement chairman" == global_var %} + {% endif %} + {% if request.session.moduleAccessRights.placement_cell %}

Placement Cell

 @@ -89,12 +93,13 @@

Placement Cell

- + {% if request.session.moduleAccessRights.department %}

Department Portal

+ {% endif %} - {% if request.user.extrainfo.user_type == "faculty" or "rspc_admin" == global_var or "HOD (CSE)" == global_var or "HOD (ECE)" == global_var or "HOD (ME)" == global_var or "HOD (NS)" == global_var or "HOD (Design)" == global_var or "HOD (Liberal Arts)" == global_var or "dean_rspc" == global_var or "Director" == global_var %} + {% if request.session.moduleAccessRights.rspc %}

Research Module

@@ -104,49 +109,47 @@

Research Module

Counselling Cell

--> - + {% comment %}

Leave Module

- + {% endcomment %} - {% if request.user.extrainfo.user_type == "faculty" or "Professor" == global_var or "Associate Professor" == global_var or "Director" == global_var or "HOD (CSE)" == global_var or "HOD (ECE)" == global_var or "HOD (ME)" == global_var or "HOD (NS)" == global_var or "HOD (Design)" == global_var or "HOD (Liberal Arts)" == global_var or "Accounts Admin" == global_var or "Registrar" == global_var or "Deputy Registrar" == global_var or "asst. registrar aud" == global_var or "asst. registrar fa" == global_var or "ps_admin" == global_var or "deptadmin_cse" == global_var or "deptadmin_ece" == global_var or "deptadmin_me" == global_var or "deptadmin_sm" == global_var or "deptadmin_design" == global_var or "deptadmin_liberalarts" == global_var or "deptadmin_ns" == global_var %} + {% if request.session.moduleAccessRights.purchase_and_store %}

Purchase and Store

{% endif %} - {% if request.user.extrainfo.user_type != "student" %} + {% if request.session.moduleAccessRights.hr %}

Human Resource

{% endif %} - {% if "acadadmin" == global_var %} + {% if request.session.moduleAccessRights.examinations %}

Examination

{% endif %} - {% if request.user.extrainfo.user_type != "staff" or "administrator" == global_var %} - -

Course Management

- - {% endif %} - {% if request.user.extrainfo.user_type == "student" or "dean_s" == global_var or request.user.extrainfo.user_type == "faculty" %} + + {% if request.session.moduleAccessRights.gymkhana %}

Gymkhana

{% endif %} - {% if request.user.extrainfo.user_type != "student" %} + {% if request.session.moduleAccessRights.iwd %}

Institute Work Departments

 {% endif %} - {% if request.user.extrainfo.user_type == "student" or user in hall_caretaker or user in hall_warden or request.user.is_superuser %} + {% if request.session.moduleAccessRights.hostel_management %}

Hostel Management

 {% endif %} + {% if request.session.moduleAccessRights.other_academics %}

Other Academic Procedure

- + + {% endif %}

diff --git a/FusionIIIT/templates/globals/base.html b/FusionIIIT/templates/globals/base.html index e7614c08a..6d2a2c0a9 100644 --- a/FusionIIIT/templates/globals/base.html +++ b/FusionIIIT/templates/globals/base.html @@ -3,11 +3,12 @@ - Fusion! + <title>Fusion! {% block title %}{% endblock %} - {% load static %} + + {% block override_base_links %} diff --git a/FusionIIIT/templates/globals/index1.html b/FusionIIIT/templates/globals/index1.html index 29775eb46..922f5f7d7 100755 --- a/FusionIIIT/templates/globals/index1.html +++ b/FusionIIIT/templates/globals/index1.html @@ -116,10 +116,10 @@
-
+
-
+
Home
@@ -130,7 +130,7 @@
-
+

FusionIIIT!

@@ -140,6 +140,7 @@


Enterprise Resource Planning Application!

+