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
3 changes: 2 additions & 1 deletion FusionIIIT/Fusion/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
'applications.library',
'applications.notifications_extension',
'applications.gymkhana',
'applications.gymkhana_v1',
'applications.office_module',
'applications.globals',
'applications.central_mess',
Expand Down Expand Up @@ -288,4 +289,4 @@
# session settings
SESSION_COOKIE_AGE = 15 * 60
SESSION_EXPIRE_AT_BROWSER_CLOSE = True
SESSION_SAVE_EVERY_REQUEST = True
SESSION_SAVE_EVERY_REQUEST = True
2 changes: 1 addition & 1 deletion FusionIIIT/Fusion/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +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'^gymkhana/', include('applications.gymkhana.urls')),
url(r'^gymkhana/', include('applications.gymkhana_v1.urls')),
url(r'^library/', include('applications.library.urls')),
url(r'^establishment/', include('applications.establishment.urls')),
url(r'^ocms/', include('applications.online_cms.urls')),
Expand Down
1 change: 1 addition & 0 deletions FusionIIIT/applications/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

53 changes: 26 additions & 27 deletions FusionIIIT/applications/central_mess/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@
from notification.views import central_mess_notif

import csv
import openpyxl


today_g = datetime.datetime.now()
today_g = datetime.datetime.now()
month_g = today_g.month
month_g_l = today_g.strftime('%B')
year_g = today_g.year
Expand All @@ -47,7 +44,7 @@
previous_month = last_day_prev_month.strftime('%B')

@login_required
def mess(request):
def mess(request):
"""
This view get the access to the central mess dashboard. View all details and apply for any changes.
It also shows the previous feedback submitted by the user.
Expand Down Expand Up @@ -1450,21 +1447,22 @@ def searchAddOrRemoveStudent(request):

return JsonResponse({'message':msg})
else:
if(request.FILES):
if(request.FILES):
# if 'excelUpload1' in request.POST:
# messNo='mess1'
# excel_file = request.FILES['excel_file1']
# else:
# messNo='mess2'
# excel_file = request.FILES['excel_file2']
try:
latest = Semdates.objects.latest('end_date')
latest_end_date=latest.end_date
print(latest_end_date)
except:
latest_end_date=None
excel_file = request.FILES['excel_file1']
wb = openpyxl.load_workbook(excel_file)
try:
latest = Semdates.objects.latest('end_date')
latest_end_date=latest.end_date
print(latest_end_date)
except:
latest_end_date=None
import openpyxl
excel_file = request.FILES['excel_file1']
wb = openpyxl.load_workbook(excel_file)
flag = False
for row in wb.active:
if(flag==False):
Expand Down Expand Up @@ -1492,14 +1490,14 @@ def searchAddOrRemoveStudent(request):
new_reg_record = Reg_records(student_id=reg_main.student_id,start_date=today_g,end_date=latest_end_date)
new_reg_record.save()
# messages.success(request,"Done.")
return HttpResponseRedirect("/mess")
@csrf_exempt
def uploadPaymentDue(request):
if(request.FILES):
excel_file = request.FILES['excel_file']
wb = openpyxl.load_workbook(excel_file)
return HttpResponseRedirect("/mess")

@csrf_exempt
def uploadPaymentDue(request):
if(request.FILES):
import openpyxl
excel_file = request.FILES['excel_file']
wb = openpyxl.load_workbook(excel_file)

for row in wb.active:
studentId=(str(row[0].value)).upper()
Expand Down Expand Up @@ -1619,11 +1617,12 @@ def update_payment(request):
temp.save()
return HttpResponseRedirect("/mess")

@csrf_exempt
def update_bill_excel(request):
if(request.FILES):
excel_file = request.FILES['excel_file_bill']
wb = openpyxl.load_workbook(excel_file)
@csrf_exempt
def update_bill_excel(request):
if(request.FILES):
import openpyxl
excel_file = request.FILES['excel_file_bill']
wb = openpyxl.load_workbook(excel_file)
flag = False
for row in wb.active:
if(flag==False):
Expand Down
2 changes: 1 addition & 1 deletion FusionIIIT/applications/counselling_cell/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from applications.academic_information.models import Student
import django. utils. timezone as timezone
from collections import defaultdict
import openpyxl


from .models import (
Expand Down Expand Up @@ -194,6 +193,7 @@ def assign_student_to_sg(request):
# third_year_students = Student.objects.filter(batch=year-3)

if request.method == 'POST' and request.FILES:
import openpyxl
profiles=request.FILES['mappedStudent']
# excel = xlrd.open_workbook(file_contents=profiles.read())
wb_obj = openpyxl.load_workbook(profiles)
Expand Down
12 changes: 9 additions & 3 deletions FusionIIIT/applications/examination/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
from django.db.models import IntegerField
from django.db.models.functions import Cast
from rest_framework.parsers import MultiPartParser, FormParser
from openpyxl import Workbook
from openpyxl.utils import get_column_letter
from openpyxl.styles import Alignment, Font, PatternFill, Border, Side
import traceback
from applications.academic_information.models import Course
from reportlab.lib import colors
Expand All @@ -36,6 +33,14 @@
from collections import defaultdict
from django.db.models import Case, When, IntegerField


def _load_openpyxl_exports():
from openpyxl import Workbook
from openpyxl.styles import Alignment, Font, PatternFill, Border, Side
from openpyxl.utils import get_column_letter

return Workbook, Alignment, Font, PatternFill, Border, Side, get_column_letter

grade_conversion = {
"O": 1.0, "A+": 1.0, "A": 0.9, "B+": 0.8, "B": 0.7,
"C+": 0.6, "C": 0.5, "D+": 0.4, "D": 0.3, "F": 0.2, "S": 0.0,
Expand Down Expand Up @@ -1285,6 +1290,7 @@ def post(self, request):

courses = Courses.objects.filter(id__in=course_ids)
courses_map = {course.id: course.credit for course in courses}
Workbook, Alignment, Font, PatternFill, Border, Side, get_column_letter = _load_openpyxl_exports()

wb = Workbook()
ws = wb.active
Expand Down
12 changes: 9 additions & 3 deletions FusionIIIT/applications/examination/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
from django.contrib.auth import get_user_model
import csv
import json
from openpyxl import Workbook
from openpyxl.styles import Alignment, Font
from openpyxl.utils import get_column_letter
from io import BytesIO,StringIO
from django.db.models import IntegerField
from django.db.models.functions import Cast
Expand Down Expand Up @@ -38,6 +35,14 @@
from applications.academic_information.models import Course
from applications.academic_procedures.models import course_registration, Register,Semester
from applications.programme_curriculum.filters import CourseFilter


def _load_openpyxl_exports():
from openpyxl import Workbook
from openpyxl.styles import Alignment, Font
from openpyxl.utils import get_column_letter

return Workbook, Alignment, Font, get_column_letter
from notification.views import examination_notif
from applications.department.models import SpecialRequest, Announcements
from applications.globals.models import (
Expand Down Expand Up @@ -1887,6 +1892,7 @@ def checkresult(request):

def grades_report(request):
if request.method == 'POST':
Workbook, Alignment, Font, get_column_letter = _load_openpyxl_exports()
des = request.session.get("currentDesignationSelected")
if des == "student":
pass
Expand Down
3 changes: 1 addition & 2 deletions FusionIIIT/applications/globals/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from applications.academic_information.models import Student
from applications.eis.api.views import profile as eis_profile
from applications.globals.models import (HoldsDesignation,Designation)
from applications.gymkhana.api.views import coordinator_club
from applications.placement_cell.models import (Achievement, Course, Education,
Experience, Has, Patent,
Project, Publication, Skill)
Expand Down Expand Up @@ -447,4 +446,4 @@ def admin_delete_course_proxy(request, course_id):
'success': False,
'message': 'An unexpected error occurred while deleting the course.',
'error': str(e)
}, status=500)
}, status=500)
15 changes: 5 additions & 10 deletions FusionIIIT/applications/gymkhana/admin.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.contrib import admin

from .models import (Club_budget,Club_info,Club_member,Club_report,Fest_budget,Fest,Other_report,Session_info,Event_info,Registration_form,Form_available,Inventory,Budget,Budget_Comments,Event_Comments)
from .models import (Club_budget,Club_info,Club_member,Club_report,Core_team,Fest_budget,Other_report,Session_info,Voting_choices,Voting_polls,Voting_voters,Event_info,Registration_form,Form_available)


# Register your models here.
Expand All @@ -15,20 +15,15 @@ class ClubMemberAdmin(admin.ModelAdmin):

admin.site.register(Club_info, ClubInfoAdmin)
admin.site.register(Club_member, ClubMemberAdmin)
# admin.site.register(Core_team)
admin.site.register(Core_team)
admin.site.register(Club_budget)
admin.site.register(Session_info)
admin.site.register(Event_info)
admin.site.register(Club_report)
admin.site.register(Fest_budget)
admin.site.register(Other_report)
# admin.site.register(Voting_polls)
# admin.site.register(Voting_choices)
# admin.site.register(Voting_voters)
admin.site.register(Voting_polls)
admin.site.register(Voting_choices)
admin.site.register(Voting_voters)
admin.site.register(Registration_form)
admin.site.register(Form_available)
admin.site.register(Inventory)
admin.site.register(Budget)
admin.site.register(Budget_Comments)
admin.site.register(Event_Comments)
admin.site.register(Fest)
Loading
Loading