Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ad85eac
Update README.md
vikrantwiz02 Feb 17, 2026
ab9c1c4
Update README with module-wise Git workflow guide
vikrantwiz02 Feb 17, 2026
689b128
Consolidate Critical Prerequisites and Software Requirements sections
vikrantwiz02 Feb 17, 2026
c265c21
Consolidate Critical Prerequisites and Software Requirements sections
vikrantwiz02 Feb 17, 2026
3a56ab3
Merge remote-tracking branch 'production/prod/acad-react' into hr-eis-v1
nkg05official Feb 20, 2026
3da8131
backend refactored
RuchiF Mar 17, 2026
1ad1d53
structured backend added
RuchiF Apr 6, 2026
dd2191b
changes done till T-025 not highlighted
RuchiF Apr 7, 2026
cdc29db
T-028 Implemented : Add optional date range filter to all GET endpoints
samhitamandal Apr 7, 2026
8f66087
backend changes done
d-sanchita28 Apr 7, 2026
d82e6fe
Implemented T-024 & T-014: HR leave balances(all endpoint) and form a…
RuchiF Apr 13, 2026
a3d1eae
Implemented T-024 & T-014: HR leave balances(all endpoint) and form a…
RuchiF Apr 13, 2026
82a3a93
Resolve merge conflict in hr2 serializers
RuchiF Apr 13, 2026
ecc8412
backend setup done
d-sanchita28 Apr 13, 2026
477303e
leave balance route corrected
RuchiF Apr 17, 2026
f99d2e0
some parts of cpda working
RuchiF Apr 17, 2026
5c9a245
resolve merge conflicts in hr2 urls.py and views.py
RuchiF Apr 18, 2026
13cb69c
cpda advance and ltc forms working mostly
RuchiF Apr 18, 2026
c600926
view button working in forms
RuchiF Apr 18, 2026
da8efd5
cpda claim form working
RuchiF Apr 18, 2026
de0d8c7
everything working - (but msg not showing on submitting)
RuchiF Apr 18, 2026
29f9892
all forms working well
RuchiF Apr 18, 2026
f8a1644
cpda workflow changes made
RuchiF Apr 18, 2026
4769903
all workflows working
RuchiF Apr 18, 2026
5e0e986
fix cpda archive
RuchiF Apr 18, 2026
c65b988
leave workflow working
RuchiF Apr 19, 2026
6a918de
appraisal - constraint of minimum 1 yr service added
RuchiF Apr 19, 2026
a52edf8
ltc constraint last req > 4 yrs added
RuchiF Apr 19, 2026
5438071
cpda expense check added
RuchiF Apr 19, 2026
0917b1e
director self sanction and reviewer assignment flow by hr for apprais…
RuchiF Apr 19, 2026
579d655
LTC thresholding added
RuchiF Apr 20, 2026
c44fa9c
subs added
RuchiF May 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion FusionIIIT/Fusion/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,4 +288,9 @@
# session settings
SESSION_COOKIE_AGE = 15 * 60
SESSION_EXPIRE_AT_BROWSER_CLOSE = True
SESSION_SAVE_EVERY_REQUEST = True
SESSION_SAVE_EVERY_REQUEST = True

# Monkey patch for django.conf.urls.url (removed in Django 4+)
import django.urls
import django.conf.urls
django.conf.urls.url = django.urls.re_path
4 changes: 2 additions & 2 deletions FusionIIIT/Fusion/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import notifications.urls
import debug_toolbar
from django.conf import settings
from django.conf.urls import include, url
from django.urls import include, re_path as url
from django.conf.urls.static import static
from django.contrib import admin
from django.contrib.auth import views as auth_views
Expand Down Expand Up @@ -61,7 +61,7 @@
url(r'^counselling/', include('applications.counselling_cell.urls')),
url(r'^hostelmanagement/', include('applications.hostel_management.urls')),
url(r'^income-expenditure/', include('applications.income_expenditure.urls')),
url(r'^hr2/', include('applications.hr2.urls')),
url(r'^hr2/', include('applications.hr2.api.urls')),
url(r'^recruitment/', include('applications.recruitment.urls')),
url(r'^examination/', include('applications.examination.urls')),
url(r'^otheracademic/', include('applications.otheracademic.urls')),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.5 on 2026-04-07 15:02

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('academic_information', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='student',
name='specialization',
field=models.CharField(choices=[('Power and Control', 'Power and Control'), ('Power & Control', 'Power & Control'), ('Microwave and Communication Engineering', 'Microwave and Communication Engineering'), ('Communication and Signal Processing', 'Communication and Signal Processing'), ('Micro-nano Electronics', 'Micro-nano Electronics'), ('Nanoelectronics and VLSI Design', 'Nanoelectronics and VLSI Design'), ('CAD/CAM', 'CAD/CAM'), ('Design', 'Design'), ('Manufacturing', 'Manufacturing'), ('Manufacturing and Automation', 'Manufacturing and Automation'), ('CSE', 'CSE'), ('AI & ML', 'AI & ML'), ('Data Science', 'Data Science'), ('Mechatronics', 'Mechatronics'), ('MDes', 'MDes'), ('None', 'None'), ('', 'No Specialization')], default='', max_length=40, null=True),
),
]
2 changes: 1 addition & 1 deletion FusionIIIT/applications/department/views.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from cgitb import html
# removed cgitb
from datetime import date
import json
from multiprocessing import Process
Expand Down
53 changes: 53 additions & 0 deletions FusionIIIT/applications/eis/migrations/0003_auto_20260407_1502.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Generated by Django 3.1.5 on 2026-04-07 15:02

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('eis', '0002_auto_20250201_2228'),
]

operations = [
migrations.AlterField(
model_name='emp_achievement',
name='a_year',
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024), (2025, 2025), (2026, 2026)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_confrence_organised',
name='k_year',
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024), (2025, 2025), (2026, 2026)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_expert_lectures',
name='l_year',
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024), (2025, 2025), (2026, 2026)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_keynote_address',
name='k_year',
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024), (2025, 2025), (2026, 2026)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_mtechphd_thesis',
name='s_year',
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024), (2025, 2025), (2026, 2026)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_patents',
name='p_year',
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024), (2025, 2025), (2026, 2026)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_published_books',
name='pyear',
field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024), (2025, 2025), (2026, 2026)], null=True, verbose_name='year'),
),
migrations.AlterField(
model_name='emp_research_papers',
name='year',
field=models.CharField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024), (2025, 2025), (2026, 2026)], max_length=10, null=True),
),
]
16 changes: 12 additions & 4 deletions FusionIIIT/applications/filetracking/sdk/methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,12 @@ def view_outbox(username: str, designation: str, src_module: str) -> list:
# remove duplicate file ids (from sending back and forth)
sent_files_unique = uniqueList(sent_files)

sent_files_serialized = FileHeaderSerializer(sent_files_unique, many=True)
return sent_files_serialized.data
sent_files_serialized = list(FileHeaderSerializer(sent_files_unique, many=True).data)
for file in sent_files_serialized:
uploader_extrainfo = ExtraInfo.objects.get(id=file['uploader'])
file['uploader_name'] = uploader_extrainfo.user.username
file['designation_name'] = Designation.objects.get(id=file['designation']).name if file.get('designation') else ''
return sent_files_serialized



Expand Down Expand Up @@ -175,8 +179,12 @@ def view_archived(username: str, designation: str, src_module: str) -> dict:
# remove duplicate file ids (from sending back and forth)
archived_files_unique = uniqueList(archived_files)

archived_files_serialized = FileHeaderSerializer(archived_files_unique, many=True)
return archived_files_serialized.data
archived_files_serialized = list(FileHeaderSerializer(archived_files_unique, many=True).data)
for file in archived_files_serialized:
uploader_extrainfo = ExtraInfo.objects.get(id=file['uploader'])
file['uploader_name'] = uploader_extrainfo.user.username
file['designation_name'] = Designation.objects.get(id=file['designation']).name if file.get('designation') else ''
return archived_files_serialized



Expand Down
Binary file added FusionIIIT/applications/hr2.zip
Binary file not shown.
Loading
Loading