diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..6e99e98e9 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,33 @@ +# base image +FROM python:3.8 + +# setup environment variable for work directory +ENV FUSION_HOME=/home/app + +# make work directory +RUN mkdir -p $FUSION_HOME + +# set work directory +WORKDIR $FUSION_HOME + +# set environment variables +ENV PYTHONDONTWRITEBYTECODE 1 +ENV PYTHONUNBUFFERED 1 + +# copy requirements file +COPY requirements.txt $FUSION_HOME + +# install dependencies +RUN pip install --upgrade pip && pip install -r requirements.txt + +# copy api directory to docker's work directory. +COPY . $FUSION_HOME + +# Migrate all migrations +# RUN cd FusionIIIT && python manage.py migrate + +# port where the Django app runs +EXPOSE 8000 + +# start server +CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"] diff --git a/FusionIIIT/applications/academic_procedures/views.py b/FusionIIIT/applications/academic_procedures/views.py index cf234307d..aaae264d6 100644 --- a/FusionIIIT/applications/academic_procedures/views.py +++ b/FusionIIIT/applications/academic_procedures/views.py @@ -264,7 +264,7 @@ def academic_procedures_student(request): year = demo_date.year registers = get_student_register(user_details.id) - user_sem = get_user_semester(request.user, ug_flag, masters_flag, phd_flag) + # user_sem = get_user_semester(request.user, ug_flag, masters_flag, phd_flag) user_branch = get_user_branch(user_details) batch = obj.batch_id @@ -297,8 +297,12 @@ def academic_procedures_student(request): curr_sem_id = Semester.objects.get(curriculum = curr_id, semester_no = obj.curr_semester_no) try: - next_sem_id = Semester.objects.get(curriculum = curr_id, semester_no = obj.curr_semester_no+1) + semester_no = obj.curr_semester_no+1 + next_sem_id = Semester.objects.get(curriculum = curr_id, semester_no = semester_no) + user_sem = semester_no + except Exception as e: + user_sem = get_user_semester(request.user, ug_flag, masters_flag, phd_flag) next_sem_id = curr_sem_id student_registration_check_pre = get_student_registrtion_check(obj,next_sem_id) @@ -312,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) + pre_registration_date_flag = 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 @@ -326,6 +330,7 @@ def academic_procedures_student(request): final_registration_flag = student_registration_check_final.final_registration_flag # print(">>>>>>>>>>>>>>>>>>>>>>",student_registration_check_pre.pre_registration_flag) + acad_year = get_acad_year(user_sem, year) currently_registered_courses = get_currently_registered_courses(user_details.id, user_sem) @@ -1214,9 +1219,29 @@ def phd_details(request): def get_student_register(id): return Register.objects.all().select_related('curr_id','student_id','curr_id__course_id','student_id__id','student_id__id__user','student_id__id__department').filter(student_id = id) -def get_pre_registration_eligibility(current_date): +def get_pre_registration_eligibility(current_date, user_sem, year): + ''' + This function is used to extract the elgibility of pre-registration for a given semester + for a given year from the Calendar table. + + @param: + current_date - current date at the user end + user_sem - current semester of the user(integer) + year - current year at the user end + + @variables: + pre_registration_date - stores the object returned from calendar table for a given description + prd_start_date - holds start date of the pre registeration + prd_end_date - holds end date of the pre registration + + #exception handling: + In case calendar table has no row for the given description pre_registration_date will store None value, + Therefore from_date and to_date attributes cannot be accessed so the function will return False. + + ''' try: - pre_registration_date = Calendar.objects.all().filter(description="Pre Registration").first() + # pre_registration_date = Calendar.objects.all().filter(description="Pre Registration").first() + pre_registration_date = Calendar.objects.all().filter(description=f"Pre Registration {user_sem} {year}").first() 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: diff --git a/FusionIIIT/templates/libraryModule/issuedItems.html b/FusionIIIT/templates/libraryModule/issuedItems.html index 8a5b3afe0..8e73513f5 100644 --- a/FusionIIIT/templates/libraryModule/issuedItems.html +++ b/FusionIIIT/templates/libraryModule/issuedItems.html @@ -9,7 +9,7 @@
-
+
{% block tab1content1 %} {% include 'libraryModule/issuedItems_content.html' %} {% endblock %} diff --git a/FusionIIIT/templates/libraryModule/libraryModule.html b/FusionIIIT/templates/libraryModule/libraryModule.html index cb617b11c..ac94c2d17 100644 --- a/FusionIIIT/templates/libraryModule/libraryModule.html +++ b/FusionIIIT/templates/libraryModule/libraryModule.html @@ -34,7 +34,7 @@ {% endblock %} {% comment %}The user image card ends here!{% endcomment %} -
+
{% comment %}The Tab-Menu starts here!{% endcomment %}