Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Empty file added FusionIIIT/Fusion/__init__.py
Empty file.
Empty file.
11 changes: 0 additions & 11 deletions FusionIIIT/applications/central_mess/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,17 +149,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, 6, 19))),
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
],
),
migrations.CreateModel(
name='Mess_minutes',
fields=[
Expand Down
2 changes: 1 addition & 1 deletion FusionIIIT/applications/health_center/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
from django.contrib.auth.models import User

from applications.globals.models import ExtraInfo
from applications.hr2.models import EmpDependents

# Create your models here.
# Note: EmpDependents model (previously imported from hr2) does not exist - removed from imports

class Constants:
DAYS_OF_WEEK = (
Expand Down
34 changes: 18 additions & 16 deletions FusionIIIT/applications/health_center/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from django.shortcuts import get_object_or_404
from django.db.models import Q
from applications.globals.models import ExtraInfo
from applications.hr2.models import EmpDependents
# from applications.hr2.models import EmpDependents # Model does not exist

def datetime_handler(date):
'''
Expand Down Expand Up @@ -463,21 +463,23 @@ def compounder_view_handler(request):
data = {'status': status, 'stock': stock}
return JsonResponse(data)
elif 'user_for_dependents' in request.POST:
user = request.POST.get('user_for_dependents')
if not User.objects.filter(username__iexact = user).exists():
return JsonResponse({"status":-1})
user_id = User.objects.get(username__iexact = user)
info = ExtraInfo.objects.get(user = user_id)
dep_info = EmpDependents.objects.filter(extra_info = info)
dep=[]
for d in dep_info:
obj={}
obj['name'] = d.name
obj['relation'] = d.relationship
dep.append(obj)
if(len(dep) == 0) :
return JsonResponse({'status':-2})
return JsonResponse({'status':1,'dep':dep})
# EmpDependents model does not exist - functionality disabled
return JsonResponse({"status":-2})
# user = request.POST.get('user_for_dependents')
# if not User.objects.filter(username__iexact = user).exists():
# return JsonResponse({"status":-1})
# user_id = User.objects.get(username__iexact = user)
# info = ExtraInfo.objects.get(user = user_id)
# dep_info = EmpDependents.objects.filter(extra_info = info)
# dep=[]
# for d in dep_info:
# obj={}
# obj['name'] = d.name
# obj['relation'] = d.relationship
# dep.append(obj)
# if(len(dep) == 0) :
# return JsonResponse({'status':-2})
# return JsonResponse({'status':1,'dep':dep})
elif 'prescribe_b' in request.POST:
user_id = request.POST.get('user')
doctor_id = request.POST.get('doctor')
Expand Down
Binary file added FusionIIIT/applications/hr2.zip
Binary file not shown.
1 change: 1 addition & 0 deletions FusionIIIT/applications/hr2/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# HR2 Module - Leave, Appraisal, LTC, and CPDA Management
75 changes: 0 additions & 75 deletions FusionIIIT/applications/hr2/a.py

This file was deleted.

23 changes: 14 additions & 9 deletions FusionIIIT/applications/hr2/admin.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
from django.contrib import admin
from .models import (
Employee, EmpConfidentialDetails, EmpDependents, ForeignService,
EmpAppraisalForm, WorkAssignemnt, LTCform, CPDAAdvanceform,
CPDAReimbursementform, LeaveForm, LeaveClaim, LeaveBalance,
LeavePerYear, Appraisalform
)

from .models import *
# from .models import CPDAReimbursementform
# Register your models here.

# Register existing models
admin.site.register(Employee)
admin.site.register(EmpConfidentialDetails)
admin.site.register(EmpDependents)
admin.site.register(ForeignService)
admin.site.register(EmpAppraisalForm)
admin.site.register(WorkAssignemnt)
admin.site.register(LeaveBalance)
admin.site.register(LeaveForm)
admin.site.register(LTCform)
admin.site.register(Appraisalform)
admin.site.register(CPDAAdvanceform)
admin.site.register(CPDAReimbursementform)
admin.site.register(CPDAAdvanceform)
admin.site.register(CPDAReimbursementform)
admin.site.register(LeaveForm)
admin.site.register(LeaveClaim)
admin.site.register(LeaveBalance)
admin.site.register(LeavePerYear)
admin.site.register(Appraisalform)
1 change: 1 addition & 0 deletions FusionIIIT/applications/hr2/api/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# HR2 API Module
Loading
Loading