ac : added functionality to run payroll button in finance and accounts

FusionIIIT/Fusion/settings/common.py

@@ -125,6 +125,7 @@
     'applications.health_center',
     'applications.online_cms',
     'applications.ps1',
+    'applications.ps2',
     'applications.programme_curriculum',
     'applications.placement_cell',
     'applications.recruitment',
@@ -170,7 +171,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(BASE_DIR, '..', 'templates/'),],
+        'DIRS': [os.path.join(BASE_DIR, '..', 'templates'),],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -254,9 +255,13 @@
 
 # os.path.join(BASE_DIR, 'static/')
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, '..', 'static/')
+STATIC_ROOT = os.path.join(BASE_DIR, '..', 'static')
 STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
-MEDIA_ROOT = os.path.join(BASE_DIR, '..', 'media/')
+STATICFILES_DIRS = (
+    os.path.join(BASE_DIR, "static"),
+)
+
+MEDIA_ROOT = os.path.join(BASE_DIR, '..', 'media')
 MEDIA_URL = '/media/'
 
 ACCOUNT_USERNAME_REQUIRED = False

FusionIIIT/Fusion/settings/development.py

@@ -52,4 +52,4 @@
 
     DEBUG_TOOLBAR_CONFIG = {
         'INTERCEPT_REDIRECTS': False,
-    }
+    }

FusionIIIT/Fusion/urls.py

@@ -22,8 +22,11 @@
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
 
+from rest_framework.authtoken.views import obtain_auth_token
+
 
 urlpatterns = [
+    url(r'^api-token-auth/', obtain_auth_token, name='api_token_auth'),
     url(r'^', include('applications.globals.urls')),
     url(r'^feeds/', include('applications.feeds.urls')),
     url(r'^admin/', admin.site.urls),
@@ -51,6 +54,7 @@
     url(r'^office/', include('applications.office_module.urls')),
     url(r'^finance/', include('applications.finance_accounts.urls')),
     url(r'^purchase-and-store/', include('applications.ps1.urls')),
+    url(r'^purchase-and-store2/', include('applications.ps2.urls')),
     url(r'^gymkhana/', include('applications.gymkhana.urls')),
     url(r'^library/', include('applications.library.urls')),
     url(r'^establishment/', include('applications.establishment.urls')),

FusionIIIT/applications/academic_information/migrations/0002_student_hall_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.5 on 2023-04-04 11:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('academic_information', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='student',
+            name='hall_id',
+            field=models.CharField(blank=True, choices=[('saraswati', 'saraswati'), ('vivekananda', 'vivekananda'), ('aryabhatta', 'aryabhatta'), ('vashishtha', 'vashishtha')], max_length=255, null=True),
+        ),
+    ]

FusionIIIT/applications/academic_information/migrations/0003_auto_20230406_1845.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.1.5 on 2023-04-06 18:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('academic_information', '0002_student_hall_id'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='calendar',
+            name='end_time',
+            field=models.TimeField(default='20:00'),
+        ),
+        migrations.AddField(
+            model_name='calendar',
+            name='start_time',
+            field=models.TimeField(default='20:00'),
+        ),
+    ]

FusionIIIT/applications/academic_information/models.py

@@ -64,6 +64,12 @@ class Constants:
         ('Management Science', 'Management Science'),
     )
 
+    HALL_NAMES = (
+        ('saraswati', 'saraswati'),
+        ('vivekananda', 'vivekananda'),
+        ('aryabhatta', 'aryabhatta'),
+        ('vashishtha', 'vashishtha'),
+    )  
 
 class Student(models.Model):
     '''
@@ -96,6 +102,7 @@ class Student(models.Model):
     father_name = models.CharField(max_length=40, default='')
     mother_name = models.CharField(max_length=40, default='')
     hall_no = models.IntegerField(default=0)
+    hall_id = models.CharField(max_length=255,null=True,blank=True, choices=Constants.HALL_NAMES)
     room_no = models.CharField(max_length=10, blank=True, null=True)
     specialization = models.CharField(max_length=40,choices=Constants.MTechSpecialization, null=True, default='')
     curr_semester_no = models.IntegerField(default=1)
@@ -274,6 +281,8 @@ class Calendar(models.Model):
     '''
     from_date = models.DateField()
     to_date = models.DateField()
+    start_time = models.TimeField(default='20:00')
+    end_time = models.TimeField(default='20:00')
     description = models.CharField(max_length=40)
 
     class Meta:

FusionIIIT/applications/academic_information/views.py

@@ -30,7 +30,8 @@
 
 from applications.academic_procedures.views import acad_proced_global_context
 from applications.programme_curriculum.models import Batch
-
+from django.conf import settings
+from django.core.files.storage import FileSystemStorage
 
 
 @login_required
@@ -613,7 +614,11 @@ def add_timetable(request):
     acadTtForm = AcademicTimetableForm()
     if request.method == 'POST' and request.FILES:
         acadTtForm = AcademicTimetableForm(request.POST, request.FILES)
-        if acadTtForm.is_valid():
+        file = request.FILES['time_table']
+        full_path2 = settings.BASE_DIR+'\\..'+'\\applications'+'\\globals'+settings.STATIC_URL+'academic_procedures'
+        fs = FileSystemStorage(location=full_path2)
+        if acadTtForm.is_valid():   
+             fs.save(file.name, file)
              acadTtForm.save()
         return render(request, "ais/ais.html", context)
     else:
@@ -725,21 +730,35 @@ def add_calendar(request):
             from_date = request.POST.getlist('from_date')
             to_date = request.POST.getlist('to_date')
             desc = request.POST.getlist('description')[0]
+            start = request.POST.getlist('start')
+            end = request.POST.getlist('end')
             from_date = from_date[0].split('-')
             from_date = [int(i) for i in from_date]
             from_date = datetime.datetime(*from_date).date()
             to_date = to_date[0].split('-')
             to_date = [int(i) for i in to_date]
             to_date = datetime.datetime(*to_date).date()
+            if start[0]:
+                start = start[0]+':00'
+            else:
+                start = '00:00:00'
+            if end[0]:
+                end =  end[0]+':00'
+            else:
+                end = '00:00:00'
         except Exception as e:
             from_date=""
             to_date=""
             desc=""
+            start = '00:00:00'
+            end = '00:00:00'
             pass
         c = Calendar(
             from_date=from_date,
             to_date=to_date,
-            description=desc)
+            description=desc,
+            start_time=start,
+            end_time=end)
         c.save()
         HttpResponse("Calendar Added")
 
@@ -774,6 +793,8 @@ def update_calendar(request):
         try:
             from_date = request.POST.getlist('from_date')
             to_date = request.POST.getlist('to_date')
+            start = request.POST.getlist('start')
+            end = request.POST.getlist('end')
             desc = request.POST.getlist('description')[0]
             prev_desc = request.POST.getlist('prev_desc')[0]
             from_date = from_date[0].split('-')
@@ -782,15 +803,27 @@ def update_calendar(request):
             to_date = to_date[0].split('-')
             to_date = [int(i) for i in to_date]
             to_date = datetime.datetime(*to_date).date()
+            if start[0]:
+                start = start[0]+':00'
+            else:
+                start = '00:00:00'
+            if end[0]:
+                end =  end[0]+':00'
+            else:
+                end = '00:00:00'
             get_calendar_details = Calendar.objects.all().filter(description=prev_desc).first()
             get_calendar_details.description = desc
             get_calendar_details.from_date = from_date
             get_calendar_details.to_date = to_date
+            get_calendar_details.start_time = start
+            get_calendar_details.end_time = end
             get_calendar_details.save()
         except Exception as e:
             from_date=""
             to_date=""
             desc=""
+            start = "00:00:00"
+            end = "00:00:00"
         return render(request, "ais/ais.html", context)
     return render(request, "ais/ais.html", context)
 
@@ -1169,9 +1202,9 @@ def add_new_profile (request):
     }
     if request.method == 'POST' and request.FILES:
         profiles=request.FILES['profiles']
-        excel = xlrd.open_workbook(file_contents=profiles.read())
+        excel = xlrd.open_workbook(profiles.name,file_contents=profiles.read())
         sheet=excel.sheet_by_index(0)
-        for i in range(sheet.nrows):
+        for i in range(1,sheet.nrows):
             roll_no=sheet.cell(i,0).value
             first_name=str(sheet.cell(i,1).value)
             last_name=str(sheet.cell(i,2).value)
@@ -1191,7 +1224,7 @@ def add_new_profile (request):
             category=""
             phone_no=0
             address=""
-            dept=str(sheet.cell(i,12).value)
+            dept=str(sheet.cell(i,11).value)
             specialization=str(sheet.cell(i,12).value)
             hall_no=None
 
@@ -1209,14 +1242,14 @@ def add_new_profile (request):
             batch_year=request.POST['Batch']
 
             batch = Batch.objects.all().filter(name = programme_name, discipline__acronym = dept, year = batch_year).first()
-
             user = User.objects.create_user(
                 username=roll_no,
                 password='hello123',
                 first_name=first_name,
                 last_name=last_name,
                 email=email,
             )
+
 
             einfo = ExtraInfo.objects.create(
                 id=roll_no,
@@ -1253,6 +1286,11 @@ def add_new_profile (request):
                 working=user,
                 designation=desig,
             )
+
+            user.save()
+            einfo.save()
+            stud_data.save()
+            hold_des.save()
 
             sem_id = Semester.objects.get(curriculum = batch.curriculum, semester_no = sem)
             course_slots = CourseSlot.objects.all().filter(semester = sem_id)

FusionIIIT/applications/academic_procedures/api/views.py

@@ -196,7 +196,7 @@ def academic_procedures_student(request):
 
         current_sem_branch_courses = get_branch_courses(current_user, user_sem, user_branch)
 
-        pre_registration_date_flag = get_pre_registration_eligibility(current_date)
+        pre_registration_date_flag = get_pre_registration_eligibility(current_date, user_sem, acad_year)
         final_registration_date_flag = get_final_registration_eligibility(current_date)
 
         add_or_drop_course_date_flag = get_add_or_drop_course_date_eligibility(current_date)