Skip to content
Merged
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
11 changes: 7 additions & 4 deletions FusionIIIT/applications/academic_procedures/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ def academic_procedures_student(request):
if user_sem==2 and des_flag==False and ug_flag==True:
branchchange_flag=True

pre_registration_date_flag = get_pre_registration_eligibility(current_date, user_sem, year)
pre_registration_date_flag, prd_start_date= get_pre_registration_eligibility(current_date, user_sem, 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)
pre_registration_flag = False
Expand Down Expand Up @@ -507,6 +507,7 @@ def academic_procedures_student(request):
# 'pre_register': pre_register,
'pre_registration_timestamp': pre_registration_timestamp,
'prd': pre_registration_date_flag,
'prd_start_date': prd_start_date,
'frd': final_registration_date_flag,
'adc_date_flag': add_or_drop_course_date_flag,
'pre_registration_flag' : pre_registration_flag,
Expand Down Expand Up @@ -1245,11 +1246,13 @@ def get_pre_registration_eligibility(current_date, user_sem, year):
prd_start_date = pre_registration_date.from_date
prd_end_date = pre_registration_date.to_date
if current_date>=prd_start_date and current_date<=prd_end_date:
return True
return True, None
if current_date<prd_start_date:
return False, prd_start_date
else :
return False
return False, None
except Exception as e:
return False
return False, None

def get_final_registration_eligibility(current_date):
try:
Expand Down
6 changes: 6 additions & 0 deletions FusionIIIT/templates/academic_procedures/register.html
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,16 @@

{% endif %}
{% else %}
{% if prd_start_date%}
<B>
<CENTER> Pre Registration will start on {{prd_start_date}}.
</B></CENTER>
{% else %}
<B>
<CENTER> Pre Registration date hasn't come yet
</B></CENTER>
{% endif %}
{% endif %}
{% else %}
<CENTER>
<p style="color: red"> You are not Eligible for Registration !! </p>
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ whitenoise==5.2.0
xhtml2pdf==0.2.5
xlrd==2.0.1
XlsxWriter==1.3.7
xlwt==1.3.0
xlwt==1.3.0