From a40440cff0a23ac5f760e85f74a93afbb7f315af Mon Sep 17 00:00:00 2001 From: Ravichendraa <ravichendraa@gmail.com> Date: Wed, 24 Apr 2024 23:36:24 +0530 Subject: [PATCH] fts user validation fixed and side panel notifications --- .../programme_curriculum/forms.py | 57 ++++ .../programme_curriculum/models.py | 5 + .../applications/programme_curriculum/urls.py | 5 + .../programme_curriculum/views.py | 309 +++++++++++++----- .../notifications/programme_curriculum.html | 26 ++ .../acad_admin/add_batch_form.html | 23 -- .../acad_admin/add_courseslot_form.html | 20 +- .../acad_admin/add_curriculum_form.html | 23 -- .../acad_admin/add_discipline_form.html | 23 -- .../acad_admin/add_programme_form.html | 23 -- .../acad_admin/admin_view_a_course.html | 23 -- .../acad_admin/admin_view_a_courseslot.html | 23 -- ...admin_view_a_semester_of_a_curriculum.html | 23 -- .../acad_admin/admin_view_all_batches.html | 23 -- .../acad_admin/admin_view_all_courses.html | 23 -- .../admin_view_all_disciplines.html | 23 -- .../acad_admin/admin_view_all_programmes.html | 23 -- .../admin_view_all_working_curriculums.html | 23 -- ...admin_view_curriculums_of_a_programme.html | 23 -- .../admin_view_semesters_of_a_curriculum.html | 23 -- .../acad_admin/common.html | 19 ++ .../acad_admin/course_form.html | 23 -- .../acad_admin/instigate_semester_form.html | 23 -- .../acad_admin/update_course_form.html | 23 -- .../programme_curriculum/common.html | 19 ++ .../programme_curriculum/faculty/common.html | 44 ++- .../faculty/course_proposal_form.html | 46 +-- .../faculty/dean_view_a_course_proposal.html | 5 +- .../faculty/faculty_view_a_course.html | 47 +-- .../faculty/faculty_view_all_courses.html | 45 +-- .../faculty/filetracking.html | 54 +-- .../programme_curriculum/faculty/forward.html | 100 ++---- .../faculty/inward_course_forms.html | 156 ++++----- .../faculty/outward_course_forms.html | 125 +++---- .../faculty/update_course_proposal_form.html | 46 +-- .../faculty/view_a_course.html | 42 +-- .../faculty/view_a_course_proposal.html | 66 +--- .../faculty/view_a_courseslot.html | 42 +-- .../view_a_semester_of_a_curriculum.html | 42 +-- .../faculty/view_all_batches.html | 45 +-- .../faculty/view_all_courses.html | 45 +-- .../faculty/view_all_disciplines.html | 42 +-- .../faculty/view_all_programmes.html | 42 +-- .../faculty/view_all_working_curriculums.html | 45 +-- .../faculty/view_course_proposal_forms.html | 205 +++++++++--- .../view_curriculums_of_a_programme.html | 42 +-- .../faculty/view_file.html | 115 +------ .../view_semesters_of_a_curriculum.html | 42 +-- .../programme_curriculum/view_a_course.html | 23 -- .../view_a_courseslot.html | 23 -- .../view_a_semester_of_a_curriculum.html | 23 -- .../view_all_batches.html | 23 -- .../view_all_courses.html | 23 -- .../view_all_disciplines.html | 23 -- .../view_all_programmes.html | 23 -- .../view_all_working_curriculums.html | 23 -- .../view_curriculums_of_a_programme.html | 23 -- .../view_semesters_of_a_curriculum.html | 23 -- 58 files changed, 784 insertions(+), 1780 deletions(-) create mode 100644 FusionIIIT/templates/notifications/programme_curriculum.html diff --git a/FusionIIIT/applications/programme_curriculum/forms.py b/FusionIIIT/applications/programme_curriculum/forms.py index 8100e4f60..394828004 100644 --- a/FusionIIIT/applications/programme_curriculum/forms.py +++ b/FusionIIIT/applications/programme_curriculum/forms.py @@ -5,6 +5,10 @@ from django.forms.models import ModelChoiceField from .models import Programme, Discipline, Curriculum, Semester, Course, Batch, CourseSlot, PROGRAMME_CATEGORY_CHOICES,NewProposalFile,Proposal_Tracking from django.utils.translation import gettext_lazy as _ +from django.contrib.auth.models import User +from applications.globals.models import (DepartmentInfo, Designation,ExtraInfo, Faculty, HoldsDesignation) +from applications.filetracking.sdk.methods import * + class ProgrammeForm(ModelForm): class Meta: @@ -315,3 +319,56 @@ class Meta: 'remarks' : 'remarks', } + + def clean(self): + + r_id = self.cleaned_data.get('receive_id') + r_des = self.cleaned_data.get('receive_design') + des=HoldsDesignation.objects.filter(user=r_id) + print(des) + data2='' + msg1='' + if des: + data2 = ', '.join(str(i) for i in des) + msg1 = f'{r_id} has only these working designations: {data2}' + + else: + msg1=f'{r_id} has no working designations' + data = HoldsDesignation.objects.select_related('designation').filter(user=r_id,designation=r_des) + + if not data: + msg = 'Invalid reciever id and reciever designation' + raise ValidationError({'receive_id': [msg, msg1]}) + + name="" + name = name+str(r_des) + if "hod" in name.lower() : + pass + elif "professor" in name.lower() : + pass + elif "dean academic" in name.lower(): + pass + else: + msg3 = f"You can't send Proposal Form to the user {r_id}-{r_des}" + raise ValidationError({'receive_id': [msg3]}) + + + + + return self.cleaned_data + + + # def sed(self): + # r_id = self.cleaned_data.get('receive_id') + # return r_id + # def __init__(self, *args, **kwargs): + # super().__init__(*args, **kwargs) + # des = HoldsDesignation.objects.select_related('working','designation').filter(user=5333) + # self.fields['receive_design'].queryset = Designation.objects.filter(id=list(des.designation)) + + + # def clean(self): + # cleaned_data = super().clean() + # user_id = cleaned_data.get('receive_id') + # if user_id: + # self.fields['receive_design'].queryset = HoldsDesignation.objects.select_related('designation').filter(user_id=user_id) diff --git a/FusionIIIT/applications/programme_curriculum/models.py b/FusionIIIT/applications/programme_curriculum/models.py index 01d235aa4..dd8ecaf3c 100644 --- a/FusionIIIT/applications/programme_curriculum/models.py +++ b/FusionIIIT/applications/programme_curriculum/models.py @@ -392,6 +392,7 @@ class NewProposalFile(models.Model): upload_date = models.DateTimeField(auto_now_add=True) is_read = models.BooleanField(default = False) is_update= models.BooleanField(default = False) + is_archive = models.BooleanField(default = False) class Meta: unique_together = ('code', 'uploader','name') # if code and faculty code matches to another proposal name will take care of it @@ -412,6 +413,10 @@ class Proposal_Tracking(models.Model): is_added = models.BooleanField(default = False) is_submitted = models.BooleanField(default = False) is_rejected = models.BooleanField(default = False) + sender_archive = models.BooleanField(default = False) + receiver_archive = models.BooleanField(default = False) + + class Meta: # unique_together = ('file_id', 'current_id','receive_id','receive_design') diff --git a/FusionIIIT/applications/programme_curriculum/urls.py b/FusionIIIT/applications/programme_curriculum/urls.py index 4d06893b1..156ff3d6d 100644 --- a/FusionIIIT/applications/programme_curriculum/urls.py +++ b/FusionIIIT/applications/programme_curriculum/urls.py @@ -65,4 +65,9 @@ path('forward_course_forms/<ProposalId>/',views.forward_course_forms,name='forward_course_forms'), path('view_inward_files/<ProposalId>/',views.view_inward_files,name='view_inward_files'), path('outward_files/',views.outward_files,name='outward_files'), + path('tracking_archive/<ProposalId>/',views.tracking_archive,name='tracking_archive'), + path('tracking_unarchive/<ProposalId>/',views.tracking_unarchive,name='tracking_unarchive'), + path('file_archive/<FileId>/',views.file_archive,name='file_archive'), + path('file_unarchive/<FileId>/',views.file_unarchive,name='file_unarchive'), + ] diff --git a/FusionIIIT/applications/programme_curriculum/views.py b/FusionIIIT/applications/programme_curriculum/views.py index f331737b9..406292d71 100644 --- a/FusionIIIT/applications/programme_curriculum/views.py +++ b/FusionIIIT/applications/programme_curriculum/views.py @@ -67,13 +67,14 @@ def view_all_programmes(request): elif 'hod' in request.session['currentDesignationSelected'].lower(): url+='faculty/' - + notifs = request.user.notifications.all() + ug = Programme.objects.filter(category='UG') pg = Programme.objects.filter(category='PG') phd = Programme.objects.filter(category='PHD') url+='view_all_programmes.html' - return render(request, url, {'ug': ug, 'pg': pg, 'phd': phd}) + return render(request, url, {'ug': ug, 'pg': pg, 'phd': phd,'notifications': notifs,}) def view_curriculums_of_a_programme(request, programme_id): @@ -100,7 +101,7 @@ def view_curriculums_of_a_programme(request, programme_id): elif 'hod' in request.session['currentDesignationSelected'].lower(): url+='faculty/' - + notifs = request.user.notifications.all() program = get_object_or_404(Programme, Q(id=programme_id)) curriculums = program.curriculums @@ -111,7 +112,7 @@ def view_curriculums_of_a_programme(request, programme_id): working_curriculums = curriculums.filter(working_curriculum=1) past_curriculums = curriculums.filter(working_curriculum=0) url+='view_curriculums_of_a_programme.html' - return render(request,url, {'program': program, 'past_curriculums': past_curriculums, 'working_curriculums': working_curriculums, 'curriculumfilter': curriculumfilter}) + return render(request,url, {'program': program, 'past_curriculums': past_curriculums, 'working_curriculums': working_curriculums, 'curriculumfilter': curriculumfilter,'notifications': notifs,}) def view_all_working_curriculums(request): @@ -130,11 +131,11 @@ def view_all_working_curriculums(request): elif 'hod' in request.session['currentDesignationSelected'].lower(): url+='faculty/' curriculums = Curriculum.objects.filter(working_curriculum=1) - + notifs = request.user.notifications.all() curriculumfilter = CurriculumFilter(request.GET, queryset=curriculums) curriculums = curriculumfilter.qs - return render(request,url+'view_all_working_curriculums.html',{'curriculums':curriculums, 'curriculumfilter': curriculumfilter}) + return render(request,url+'view_all_working_curriculums.html',{'curriculums':curriculums, 'curriculumfilter': curriculumfilter,'notifications': notifs,}) @@ -162,6 +163,7 @@ def view_semesters_of_a_curriculum(request, curriculum_id): elif 'hod' in request.session['currentDesignationSelected'].lower(): url+='faculty/' curriculum = get_object_or_404(Curriculum, Q(id=curriculum_id)) + notifs = request.user.notifications.all() semesters = curriculum.semesters semester_slots = [] for sem in semesters: @@ -189,7 +191,7 @@ def view_semesters_of_a_curriculum(request, curriculum_id): transpose_semester_slots = list(zip(*semester_slots)) - return render(request, url+'view_semesters_of_a_curriculum.html', {'curriculum': curriculum, 'semesters': semesters, 'semester_slots': transpose_semester_slots, 'semester_credits': semester_credits}) + return render(request, url+'view_semesters_of_a_curriculum.html', {'curriculum': curriculum, 'semesters': semesters, 'semester_slots': transpose_semester_slots, 'semester_credits': semester_credits,'notifications': notifs,}) def view_a_semester_of_a_curriculum(request, semester_id): @@ -207,8 +209,9 @@ def view_a_semester_of_a_curriculum(request, semester_id): url+='faculty/' semester = get_object_or_404(Semester, Q(id=semester_id)) course_slots = semester.courseslots + notifs = request.user.notifications.all() - return render(request, url+'view_a_semester_of_a_curriculum.html', {'semester': semester, 'course_slots': course_slots}) + return render(request, url+'view_a_semester_of_a_curriculum.html', {'semester': semester, 'course_slots': course_slots,'notifications': notifs,}) def view_a_courseslot(request, courseslot_id): @@ -224,7 +227,7 @@ def view_a_courseslot(request, courseslot_id): elif 'hod' in request.session['currentDesignationSelected'].lower(): url+='faculty/' course_slot = get_object_or_404(CourseSlot, Q(id=courseslot_id)) - return render(request, url+'view_a_courseslot.html', {'course_slot': course_slot}) + return render(request, url+'view_a_courseslot.html', {'course_slot': course_slot,'notifications': notifs,}) def view_all_courses(request): @@ -241,11 +244,12 @@ def view_all_courses(request): elif 'hod' in request.session['currentDesignationSelected'].lower(): url+='faculty/' courses = Course.objects.all() + notifs = request.user.notifications.all() coursefilter = CourseFilter(request.GET, queryset=courses) courses = coursefilter.qs - return render(request, url+'view_all_courses.html', {'courses': courses, 'coursefilter': coursefilter}) + return render(request, url+'view_all_courses.html', {'courses': courses, 'coursefilter': coursefilter,'notifications': notifs,}) def view_a_course(request, course_id): @@ -261,7 +265,8 @@ def view_a_course(request, course_id): elif 'hod' in request.session['currentDesignationSelected'].lower(): url+='faculty/' course = get_object_or_404(Course, Q(id=course_id)) - return render(request, url+'view_a_course.html', {'course': course}) + notifs = request.user.notifications.all() + return render(request, url+'view_a_course.html', {'course': course,'notifications': notifs,}) def view_all_discplines(request): @@ -278,7 +283,8 @@ def view_all_discplines(request): url+='faculty/' disciplines = Discipline.objects.all() - return render(request, url+'view_all_disciplines.html', {'disciplines': disciplines}) + notifs = request.user.notifications.all() + return render(request, url+'view_all_disciplines.html', {'disciplines': disciplines,'notifications': notifs,}) def view_all_batches(request): @@ -303,8 +309,9 @@ def view_all_batches(request): finished_batches = batches.filter(running_batch=False) batches = batches.filter(running_batch=True) + notifs = request.user.notifications.all() - return render(request, url+'view_all_batches.html', {'batches': batches, 'finished_batches': finished_batches, 'batchfilter': batchfilter}) + return render(request, url+'view_all_batches.html', {'batches': batches, 'finished_batches': finished_batches, 'batchfilter': batchfilter,'notifications': notifs,}) @@ -785,11 +792,9 @@ def add_course_form(request): return render(request,'programme_curriculum/acad_admin/course_form.html',{'form':form,'submitbutton': submitbutton}) - def update_course_form(request, course_id): - des = HoldsDesignation.objects.all().filter(user = request.user).first() - if request.session['currentDesignationSelected']== "student": # or request.session['currentDesignationSelected']== "Associate Professor" or request.session['currentDesignationSelected']== "Professor" or request.session['currentDesignationSelected']== "Assistant Professor" + if request.session['currentDesignationSelected']== "student": return HttpResponseRedirect('/programme_curriculum/programmes/') elif str(request.user) == "acadadmin" : pass @@ -810,17 +815,41 @@ def update_course_form(request, course_id): previous.save() form.latest_version=True new_course = form.save(commit=False) + add=True + ver=0 if(new_course.version>previous.version): - form.save() - course = Course.objects.last() - messages.success(request, "Added successful") - return HttpResponseRedirect("/programme_curriculum/admin_course/" + str(course.id) + "/") + # Check if a course with the same values (except version, latest_version, disciplines, and pre_requisit_courses) already exists + old_course=Course.objects.filter(code=new_course.code, name=new_course.name, credit=new_course.credit, lecture_hours=new_course.lecture_hours, tutorial_hours=new_course.tutorial_hours, pratical_hours=new_course.pratical_hours, discussion_hours=new_course.discussion_hours, project_hours=new_course.project_hours, pre_requisits=new_course.pre_requisits, syllabus=new_course.syllabus, percent_quiz_1=new_course.percent_quiz_1, percent_midsem=new_course.percent_midsem, percent_quiz_2=new_course.percent_quiz_2, percent_endsem=new_course.percent_endsem, percent_project=new_course.percent_project, percent_lab_evaluation=new_course.percent_lab_evaluation, percent_course_attendance=new_course.percent_course_attendance, ref_books=new_course.ref_books) + if old_course: + # Check if disciplines or pre_requisit_courses have been changed + for i in old_course: + if set(form.cleaned_data['disciplines']) != set(i.disciplines.all()) or set(form.cleaned_data['pre_requisit_courses']) != set(i.pre_requisit_courses.all()): + add=True + else: + add=False + ver=i.version + break + if add: + new_course.save() # Save the new course first before adding many-to-many fields + new_course.disciplines.set(form.cleaned_data['disciplines']) + new_course.pre_requisit_courses.set(form.cleaned_data['pre_requisit_courses']) + course = Course.objects.last() + messages.success(request, "Added successful") + return HttpResponseRedirect("/programme_curriculum/admin_course/" + str(course.id) + "/") + else: + form.add_error(None, 'A Course with the same values already exists at "Version Number '+' ' +str(ver)+'"') + else: + new_course.save() # Save the new course first before adding many-to-many fields + new_course.disciplines.set(form.cleaned_data['disciplines']) + new_course.pre_requisit_courses.set(form.cleaned_data['pre_requisit_courses']) + course = Course.objects.last() + messages.success(request, "Added successful") + return HttpResponseRedirect("/programme_curriculum/admin_course/" + str(course.id) + "/") else: version_error+=f'The version should be greater than {previous.version}' return render(request,'programme_curriculum/acad_admin/course_form.html',{'course':course, 'form':form, 'submitbutton': submitbutton,'version_error':version_error}) - def add_courseslot_form(request): user_details = ExtraInfo.objects.get(user = request.user) @@ -1060,14 +1089,17 @@ def view_course_proposal_forms(request): if request.session['currentDesignationSelected'] == "Associate Professor" or request.session['currentDesignationSelected'] == "Professor" or request.session['currentDesignationSelected'] == "Assistant Professor" : pass - elif request.session['currentDesignationSelected'] == "acadadmin" or request.session['currentDesignationSelected'] == "student" : + elif request.session['currentDesignationSelected'] == "student" : return HttpResponseRedirect('/programme_curriculum/programmes/') + elif request.session['currentDesignationSelected']== "acadadmin": + return render(request, 'programme_curriculum/admin_programmes/') else: data='Files Cannot be sent with current Designation Switch to "Professor or Assistant Professor or Associate Professor"' + notifs = request.user.notifications.all() courseProposal = NewProposalFile.objects.filter(uploader=des.user,designation=request.session['currentDesignationSelected'],is_update=False) updatecourseProposal = NewProposalFile.objects.filter(uploader=des.user,designation=request.session['currentDesignationSelected'],is_update=True) - return render(request, 'programme_curriculum/faculty/view_course_proposal_forms.html',{'courseProposals': courseProposal,'updateProposals':updatecourseProposal,'data':data}) + return render(request, 'programme_curriculum/faculty/view_course_proposal_forms.html',{'courseProposals': courseProposal,'updateProposals':updatecourseProposal,'data':data,'notifications': notifs,}) @login_required(login_url='/accounts/login') def faculty_view_all_courses(request): @@ -1085,12 +1117,12 @@ def faculty_view_all_courses(request): pass courses = Course.objects.all() - + notifs = request.user.notifications.all() coursefilter = CourseFilter(request.GET, queryset=courses) courses = coursefilter.qs - return render(request, 'programme_curriculum/faculty/faculty_view_all_courses.html', {'courses': courses, 'coursefilter': coursefilter}) + return render(request, 'programme_curriculum/faculty/faculty_view_all_courses.html', {'courses': courses, 'coursefilter': coursefilter,'notifications': notifs,}) def faculty_view_a_course(request, course_id): @@ -1107,7 +1139,8 @@ def faculty_view_a_course(request, course_id): elif 'hod' in request.session['currentDesignationSelected'].lower(): pass course = get_object_or_404(Course, Q(id=course_id)) - return render(request, 'programme_curriculum/faculty/faculty_view_a_course.html', {'course': course}) + notifs = request.user.notifications.all() + return render(request, 'programme_curriculum/faculty/faculty_view_a_course.html', {'course': course,'notifications': notifs,}) def view_a_course_proposal_form(request,CourseProposal_id): @@ -1126,7 +1159,8 @@ def view_a_course_proposal_form(request,CourseProposal_id): user_details = ExtraInfo.objects.get(user = request.user) des = HoldsDesignation.objects.all().filter(user = request.user).first() proposalform = get_object_or_404(NewProposalFile, Q(id=CourseProposal_id)) - return render(request, 'programme_curriculum/faculty/view_a_course_proposal.html', {'proposal': proposalform}) + notifs = request.user.notifications.all() + return render(request, 'programme_curriculum/faculty/view_a_course_proposal.html', {'proposal': proposalform,'notifications': notifs,}) def new_course_proposal_file(request): @@ -1141,7 +1175,6 @@ def new_course_proposal_file(request): uploader = request.user.extrainfo design=request.session['currentDesignationSelected'] form=NewCourseProposalFile(initial={'uploader':des.user,'designation':design}) - submitbutton= request.POST.get('Submit') if submitbutton: @@ -1181,24 +1214,28 @@ def filetracking(request,proposal_id): if request.method == 'POST': form = CourseProposalTrackingFile(request.POST) if form.is_valid(): - form.is_read=False - form.save() - receiver=request.POST.get('receive_id') - receiver_id = User.objects.get(id=receiver) - receiver_design=request.POST.get('receive_design') - receiver_des= Designation.objects.get(id=receiver_design) - uploader=request.POST.get('current_id') - uploader_design=request.POST.get('current_design') + try: + form.is_read=False + form.save() + receiver=request.POST.get('receive_id') + receiver_id = User.objects.get(id=receiver) + receiver_design=request.POST.get('receive_design') + receiver_des= Designation.objects.get(id=receiver_design) + uploader=request.POST.get('current_id') + uploader_design=request.POST.get('current_design') + data='Received as '+ str(receiver_id) +'-'+str(receiver_des) +' Course Proposal Form "'+file_data +'" By '+str(uploader)+' - '+str(uploader_design) + # data=file.subject + messages.success(request, "Submitted successful") + prog_and_curr_notif(request.user,receiver_id,data) + return HttpResponseRedirect('/programme_curriculum/outward_files/') + except IntegrityError as e: + # Handle the IntegrityError here, for example: + form.add_error(None, 'Proposal_ tracking with this File id, Current id, Current design and Disciplines already exists.') - data='Received as '+ str(receiver_id) +'-'+str(receiver_des) +' Course Proposal Form "'+file_data +'" By '+str(uploader)+' - '+str(uploader_design) - # data=file.subject - messages.success(request, "Submitted successful") - prog_and_curr_notif(request.user,receiver_id,data) - return HttpResponseRedirect('/programme_curriculum/outward_files/') - return render(request,'programme_curriculum/faculty/filetracking.html',{'form':form,'submitbutton': submitbutton,'file_info':file_data}) + return render(request,'programme_curriculum/faculty/filetracking.html',{'form':form,'submitbutton': submitbutton,'file_info':file_data,}) @@ -1208,7 +1245,7 @@ def inward_files(request): data='' if request.session['currentDesignationSelected'] == "Associate Professor" or request.session['currentDesignationSelected'] == "Professor" or request.session['currentDesignationSelected'] == "Assistant Professor" : - data='As a "Professor or Assistant Professor or Associate Professor" you cannot receive any proposal requests' + data=f'As a "{request.session["currentDesignationSelected"]}" you cannot receive any proposal requests' pass elif 'hod' in request.session['currentDesignationSelected'].lower(): pass @@ -1221,14 +1258,14 @@ def inward_files(request): id=request.user user_designation=HoldsDesignation.objects.select_related('user','working','designation').filter(user=request.user) - + notifs = request.user.notifications.all() designation = Designation.objects.get(name=request.session['currentDesignationSelected']) des_id = designation.id courseProposal = Proposal_Tracking.objects.filter(receive_design = des_id,receive_id= id) - return render(request, 'programme_curriculum/faculty/inward_course_forms.html',{'courseProposals': courseProposal,'design':request.session['currentDesignationSelected'],'data':data}) + return render(request, 'programme_curriculum/faculty/inward_course_forms.html',{'courseProposals': courseProposal,'design':request.session['currentDesignationSelected'],'data':data,'notifications': notifs,}) @@ -1237,16 +1274,19 @@ def outward_files(request): des = HoldsDesignation.objects.all().filter(user = request.user).last() data='' if request.session['currentDesignationSelected'] == "Dean Academic" : - data='As a "Dean Academic" you cannot have any out going files' + data=f'As a "{request.session["currentDesignationSelected"]}" you cannot have any out going files' pass elif request.session['currentDesignationSelected'] == "Associate Professor" or request.session['currentDesignationSelected'] == "Professor" or request.session['currentDesignationSelected'] == "Assistant Professor" : pass elif 'hod' in request.session['currentDesignationSelected'].lower(): pass - elif request.session['currentDesignationSelected'] == "acadadmin" or request.session['currentDesignationSelected'] == "student" : + elif request.session['currentDesignationSelected'] == "student" : return HttpResponseRedirect('/programme_curriculum/programmes/') + elif request.session['currentDesignationSelected']== "acadadmin": + return render(request, 'programme_curriculum/admin_programmes/') id=request.user + notifs = request.user.notifications.all() user_designation=HoldsDesignation.objects.select_related('user','working','designation').filter(user=request.user) design=request.session['currentDesignationSelected'] @@ -1257,16 +1297,16 @@ def outward_files(request): courseProposal = Proposal_Tracking.objects.filter(current_design = design,current_id= des.user) - return render(request, 'programme_curriculum/faculty/outward_course_forms.html',{'courseProposals': courseProposal,'design':request.session['currentDesignationSelected'],'data':data}) + return render(request, 'programme_curriculum/faculty/outward_course_forms.html',{'courseProposals': courseProposal,'design':request.session['currentDesignationSelected'],'data':data,'notifications': notifs,}) -def update_course_proposal_file(request,course_id): +def update_course_proposal_file(request, course_id): des = HoldsDesignation.objects.all().filter(user = request.user).first() if request.session['currentDesignationSelected'] == "Associate Professor" or request.session['currentDesignationSelected'] == "Professor" or request.session['currentDesignationSelected'] == "Assistant Professor": pass elif request.session['currentDesignationSelected'] == "acadadmin" : return HttpResponseRedirect('/programme_curriculum/admin_programmes') else: - return HttpResponseRedirect('/programme_curriculum/programmes') + return HttpResponseRedirect('/programme_curriculum/programmes/') uploader = request.user.extrainfo design=request.session['currentDesignationSelected'] @@ -1275,20 +1315,44 @@ def update_course_proposal_file(request,course_id): form = NewCourseProposalFile(initial={'uploader':des.user,'designation':design},instance=course) submitbutton= request.POST.get('Submit') - if submitbutton: if request.method == 'POST': form = NewCourseProposalFile(request.POST) if form.is_valid(): + previous = Course.objects.all().filter(code=course.code).order_by('version').last() + course.version=previous.version new_course=form.save(commit=False) new_course.is_read=False new_course.is_update=True - new_course.save() - messages.success(request, "Added successful") - return HttpResponseRedirect('/programme_curriculum/view_course_proposal_forms/') - - - return render(request,'programme_curriculum/faculty/course_proposal_form.html',{'form':form,'submitbutton': submitbutton,'file_info':file_data}) + add=True + ver=0 + # Check if a course with the same values (except version, latest_version, disciplines, and pre_requisit_courses) already exists + old_course=Course.objects.filter(code=new_course.code, name=new_course.name, credit=new_course.credit, lecture_hours=new_course.lecture_hours, tutorial_hours=new_course.tutorial_hours, pratical_hours=new_course.pratical_hours, discussion_hours=new_course.discussion_hours, project_hours=new_course.project_hours, pre_requisits=new_course.pre_requisits, syllabus=new_course.syllabus, percent_quiz_1=new_course.percent_quiz_1, percent_midsem=new_course.percent_midsem, percent_quiz_2=new_course.percent_quiz_2, percent_endsem=new_course.percent_endsem, percent_project=new_course.percent_project, percent_lab_evaluation=new_course.percent_lab_evaluation, percent_course_attendance=new_course.percent_course_attendance, ref_books=new_course.ref_books) + if old_course: + # Check if disciplines or pre_requisit_courses have been changed + for i in old_course: + if set(form.cleaned_data['pre_requisit_courses']) != set(i.pre_requisit_courses.all()): + add=True + else: + add=False + ver=i.version + break + if add: + new_course.save() # Save the new course first before adding many-to-many fields + new_course.pre_requisit_courses.set(form.cleaned_data['pre_requisit_courses']) + course = Course.objects.last() + messages.success(request, "Added successful") + return HttpResponseRedirect("/programme_curriculum/admin_course/" + str(course.id) + "/") + else: + form.add_error(None, 'A Course with the same values already exists at "Version Number '+' ' +str(ver)+'"') + else: + new_course.save() # Save the new course first before adding many-to-many fields + new_course.pre_requisit_courses.set(form.cleaned_data['pre_requisit_courses']) + course = Course.objects.last() + messages.success(request, "Added successful") + return HttpResponseRedirect("/programme_curriculum/admin_course/" + str(course.id) + "/") + + return render(request,'programme_curriculum/faculty/course_proposal_form.html',{'form':form,'submitbutton': submitbutton,'file_info':file_data,}) @@ -1316,7 +1380,7 @@ def forward_course_forms(request,ProposalId): if(course): previous = Course.objects.all().filter(code=course.code).order_by('version').last() course.version=previous.version - form = CourseForm(instance=course) + form = CourseForm(instance=file2,initial={'disciplines':file.disciplines}) submitbutton= request.POST.get('Submit') if submitbutton: if request.method == 'POST': @@ -1336,10 +1400,10 @@ def forward_course_forms(request,ProposalId): receiver=file2.uploader receiver_id = User.objects.get(username=receiver) - data='The Course "'+ file2.code+ ' - '+ file2.name + '" Updated Successfully' + data=f'The Course " {file2.code} -{file2.name}" Updated Successfully' # data=file.subject prog_and_curr_notif(request.user,receiver_id,data) - messages.success(request, data) + messages.success(request, "Updated "+ file2.code+'-'+file2.name +" successful") return HttpResponseRedirect("/programme_curriculum/course/" + str(course.id) + "/") else: version_error+=f'The version should be greater than {previous.version}' @@ -1365,7 +1429,7 @@ def forward_course_forms(request,ProposalId): # data=file.subject prog_and_curr_notif(request.user,receiver_id,data) course =Course.objects.all().filter(code=file2.code).last() - messages.success(request, "Updated "+ file2.name +" successful") + messages.success(request, "Added "+ file2.name +" successful") return HttpResponseRedirect("/programme_curriculum/course/" + str(course.id) + "/") @@ -1385,25 +1449,28 @@ def forward_course_forms(request,ProposalId): if request.method == 'POST': form = CourseProposalTrackingFile(request.POST) if form.is_valid(): - file.is_submitted=True - file.save() - form.is_read=False - form.save() - - receiver=request.POST.get('receive_id') - - uploader=request.POST.get('current_id') - uploader_design=request.POST.get('current_design') - - - receiver_design=request.POST.get('receive_design') - receiver_des= Designation.objects.get(id=receiver_design) - receiver_id = User.objects.get(id=receiver) - messages.success(request, "Added successful") - data='Received as '+ str(receiver_id) +'-'+str(receiver_des) +' Course Proposal of Course '+file_data +' By '+str(uploader)+' - '+str(uploader_design) + try: + file.is_submitted=True + file.save() + form.is_read=False + form.save() + + receiver=request.POST.get('receive_id') + + uploader=request.POST.get('current_id') + uploader_design=request.POST.get('current_design') + + + receiver_design=request.POST.get('receive_design') + receiver_des= Designation.objects.get(id=receiver_design) + receiver_id = User.objects.get(id=receiver) + messages.success(request, "Added successful") + data='Received as '+ str(receiver_id) +'-'+str(receiver_des) +' Course Proposal of Course '+file_data +' By '+str(uploader)+' - '+str(uploader_design) - prog_and_curr_notif(request.user,receiver_id,data) - return HttpResponseRedirect('/programme_curriculum/outward_files/') + prog_and_curr_notif(request.user,receiver_id,data) + return HttpResponseRedirect('/programme_curriculum/outward_files/') + except IntegrityError as e: + form.add_error(None, 'Proposal_ tracking with this File id, Current id, Current design and Disciplines already exists.') elif request.session['currentDesignationSelected'] == "acadadmin" : return HttpResponseRedirect('/programme_curriculum/admin_programmes') else: @@ -1426,8 +1493,6 @@ def view_inward_files(request,ProposalId): return HttpResponseRedirect('/programme_curriculum/programmes/') des = HoldsDesignation.objects.all().filter(user = request.user).first() - - uploader = request.user.extrainfo design=request.session['currentDesignationSelected'] file = get_object_or_404(Proposal_Tracking, Q(id=ProposalId)) @@ -1474,4 +1539,84 @@ def reject_form(request,ProposalId): else: messages.error(request, "course already forwarded or added can't be rejected") return HttpResponseRedirect('/programme_curriculum/inward_files/') - \ No newline at end of file + + +def tracking_unarchive(request,ProposalId): + if request.session['currentDesignationSelected'] == "Associate Professor" or request.session['currentDesignationSelected'] == "Professor" or request.session['currentDesignationSelected'] == "Assistant Professor" or request.session['currentDesignationSelected'] == "Dean Academic": + pass + elif 'hod' in request.session['currentDesignationSelected'].lower(): + pass + elif request.session['currentDesignationSelected'] == "acadadmin": + return HttpResponseRedirect('/programme_curriculum/admin_programmes/') + else: + return HttpResponseRedirect('/programme_curriculum/programmes/') + + track=get_object_or_404(Proposal_Tracking, Q(id=ProposalId)) + file = get_object_or_404(NewProposalFile,Q(id = track.file_id)) + print(request.user) + if str(track.current_design)==str(request.session['currentDesignationSelected']) and str(track.current_id)==str(request.user): + track.sender_archive=False + track.save() + messages.success(request, "File UnArchived") + return HttpResponseRedirect('/programme_curriculum/outward_files/') + else : + track.receiver_archive=False + track.save() + messages.success(request, "File UnArchived") + return HttpResponseRedirect('/programme_curriculum/inward_files/') + + + +def tracking_archive(request,ProposalId): + + if request.session['currentDesignationSelected'] == "Associate Professor" or request.session['currentDesignationSelected'] == "Professor" or request.session['currentDesignationSelected'] == "Assistant Professor" or request.session['currentDesignationSelected'] == "Dean Academic": + pass + elif 'hod' in request.session['currentDesignationSelected'].lower(): + pass + elif request.session['currentDesignationSelected'] == "acadadmin": + return HttpResponseRedirect('/programme_curriculum/admin_programmes/') + else: + return HttpResponseRedirect('/programme_curriculum/programmes/') + + track=get_object_or_404(Proposal_Tracking, Q(id=ProposalId)) + if str(track.current_design)==str(request.session['currentDesignationSelected']) and str(track.current_id)==str(request.user): + track.sender_archive=True + track.save() + messages.success(request, "File Archived") + return HttpResponseRedirect('/programme_curriculum/outward_files/') + + else: + track.receiver_archive=True + track.save() + messages.success(request, "File Archived") + return HttpResponseRedirect('/programme_curriculum/inward_files/') + +def file_archive(request,FileId): + if request.session['currentDesignationSelected'] == "Associate Professor" or request.session['currentDesignationSelected'] == "Professor" or request.session['currentDesignationSelected'] == "Assistant Professor" or request.session['currentDesignationSelected'] == "Dean Academic": + pass + elif 'hod' in request.session['currentDesignationSelected'].lower(): + pass + elif request.session['currentDesignationSelected'] == "acadadmin": + return HttpResponseRedirect('/programme_curriculum/admin_programmes/') + else: + return HttpResponseRedirect('/programme_curriculum/programmes/') + + file = get_object_or_404(NewProposalFile,Q(id = FileId)) + file.is_archive=True + file.save() + return HttpResponseRedirect('/programme_curriculum/view_course_proposal_forms/') + +def file_unarchive(request,FileId): + if request.session['currentDesignationSelected'] == "Associate Professor" or request.session['currentDesignationSelected'] == "Professor" or request.session['currentDesignationSelected'] == "Assistant Professor" or request.session['currentDesignationSelected'] == "Dean Academic": + pass + elif 'hod' in request.session['currentDesignationSelected'].lower(): + pass + elif request.session['currentDesignationSelected'] == "acadadmin": + return HttpResponseRedirect('/programme_curriculum/admin_programmes/') + else: + return HttpResponseRedirect('/programme_curriculum/programmes/') + + file = get_object_or_404(NewProposalFile,Q(id = FileId)) + file.is_archive=False + file.save() + return HttpResponseRedirect('/programme_curriculum/view_course_proposal_forms/') \ No newline at end of file diff --git a/FusionIIIT/templates/notifications/programme_curriculum.html b/FusionIIIT/templates/notifications/programme_curriculum.html new file mode 100644 index 000000000..ce3d906e0 --- /dev/null +++ b/FusionIIIT/templates/notifications/programme_curriculum.html @@ -0,0 +1,26 @@ +{% load static %} +{% block sidepanel %} + {% load notifications_tags %} + {% for notice in notifications %} + {% if notice.unread %} + {% if notice.data.module == "Programme and Curriculum" %} + <div class="ui icon message"> + <i class="inbox icon"></i> + <div class="content"> + <div class="header"> + <a href="{% url 'notifications:mark_as_read_and_redirect' notice.slug %}"> + {{ notice.data.module }} + </a> + </div> + <p>{{ notice.verb }}</p> + </div> + <div class="ui right floated"> + <a href="{% url 'notifications:delete' notice.slug %}"> + <i class="close icon"></i> + </a> + </div> +</div> + {% endif%} + {% endif %} + {% endfor %} +{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/add_batch_form.html b/FusionIIIT/templates/programme_curriculum/acad_admin/add_batch_form.html index 1159944eb..30632c0f9 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/add_batch_form.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/add_batch_form.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui segment" > <div class="header"><h1>Batch Form</h1></div> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/add_courseslot_form.html b/FusionIIIT/templates/programme_curriculum/acad_admin/add_courseslot_form.html index 0d007cc63..2553cac21 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/add_courseslot_form.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/add_courseslot_form.html @@ -1,25 +1,7 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} {% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> + {% endblock %} {% block content %} diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/add_curriculum_form.html b/FusionIIIT/templates/programme_curriculum/acad_admin/add_curriculum_form.html index a44dc5aac..707c8f05e 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/add_curriculum_form.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/add_curriculum_form.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui segment" > <div class="header"><h1>Curriculum Form</h1></div> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/add_discipline_form.html b/FusionIIIT/templates/programme_curriculum/acad_admin/add_discipline_form.html index 4629ec121..fba1a8afb 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/add_discipline_form.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/add_discipline_form.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui segment" > <div class="header"><h1>Discipline Form</h1></div> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/add_programme_form.html b/FusionIIIT/templates/programme_curriculum/acad_admin/add_programme_form.html index 35c1b9870..01fda3096 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/add_programme_form.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/add_programme_form.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui segment" > <div class="header"><h1>Programme Form</h1></div> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_course.html b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_course.html index 1206b5a7a..9e88958e3 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_course.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_course.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui bottom attached tab segment active" data-tab="afirst"> <div class="content"> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_courseslot.html b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_courseslot.html index 6bd1707b7..c31a8fd0b 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_courseslot.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_courseslot.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">{{ course_slot.name }}</a> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_semester_of_a_curriculum.html b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_semester_of_a_curriculum.html index bf3ba45e0..950d30756 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_semester_of_a_curriculum.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_semester_of_a_curriculum.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Semester {{ semester.semester_no }} Info</a> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_batches.html b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_batches.html index dfedd63c0..5212883f2 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_batches.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_batches.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:admin_view_all_batches' %}"><B>Batch</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Batches</a> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_courses.html b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_courses.html index 5b2e096fc..dd0863038 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_courses.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_courses.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:admin_view_all_courses' %}"><B>Courses</B> - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Courses</a> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_disciplines.html b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_disciplines.html index f629a476a..95ab49469 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_disciplines.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_disciplines.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}"><B>Discipline</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Disciplines</a> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_programmes.html b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_programmes.html index 76656008c..6108a1a3f 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_programmes.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_programmes.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="active item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}"><B>Programmes & Curriculums</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_working_curriculums.html b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_working_curriculums.html index f9ced979e..9e5c8d32a 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_working_curriculums.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_working_curriculums.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}"><B>Working Curriculums</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Working Curriculums</a> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_curriculums_of_a_programme.html b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_curriculums_of_a_programme.html index f7711d5a2..67ad22687 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_curriculums_of_a_programme.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_curriculums_of_a_programme.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_semesters_of_a_curriculum.html b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_semesters_of_a_curriculum.html index b66c65e1b..35f30d2d7 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_semesters_of_a_curriculum.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_semesters_of_a_curriculum.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">{{ curriculum.name }} Table</a> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/common.html b/FusionIIIT/templates/programme_curriculum/acad_admin/common.html index f2b1cfeb1..c02082f22 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/common.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/common.html @@ -33,6 +33,25 @@ {% comment %}The Tab-Menu starts here!{% endcomment %} {% block sidetabmenu %} + <div class="ui medium fluid vertical pointing menu" + style="max-width: 320px;"> + + <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses + <i class="right floated chevron right icon"></i> + </a> + </div> {% endblock %} {% comment %}The Tab-Menu ends here!{% endcomment %} </div> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/course_form.html b/FusionIIIT/templates/programme_curriculum/acad_admin/course_form.html index 1b83030bc..aeb2779df 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/course_form.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/course_form.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui segment" > <div class="header"><h1>Course Form</h1></div> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/instigate_semester_form.html b/FusionIIIT/templates/programme_curriculum/acad_admin/instigate_semester_form.html index 91995e288..4df9ea271 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/instigate_semester_form.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/instigate_semester_form.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui segment" > <div class="header"><h1>Instigate Semester<i class="bell icon"></i></h1></div> diff --git a/FusionIIIT/templates/programme_curriculum/acad_admin/update_course_form.html b/FusionIIIT/templates/programme_curriculum/acad_admin/update_course_form.html index 3a750e9fc..d15b14bdc 100644 --- a/FusionIIIT/templates/programme_curriculum/acad_admin/update_course_form.html +++ b/FusionIIIT/templates/programme_curriculum/acad_admin/update_course_form.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/acad_admin/common.html' %} - -{% block sidetabmenu %} - <div class="ui medium fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui segment" > <div class="header"><h1>Course Form</h1></div> diff --git a/FusionIIIT/templates/programme_curriculum/common.html b/FusionIIIT/templates/programme_curriculum/common.html index 22f83d34a..39af1a101 100644 --- a/FusionIIIT/templates/programme_curriculum/common.html +++ b/FusionIIIT/templates/programme_curriculum/common.html @@ -32,6 +32,25 @@ {% comment %}The Tab-Menu starts here!{% endcomment %} {% block sidetabmenu %} + <div class="ui huge fluid vertical pointing menu" + style="max-width: 320px;"> + + <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches + <i class="right floated chevron right icon"></i> + </a> + </div> {% endblock %} {% comment %}The Tab-Menu ends here!{% endcomment %} </div> diff --git a/FusionIIIT/templates/programme_curriculum/faculty/common.html b/FusionIIIT/templates/programme_curriculum/faculty/common.html index 22f83d34a..73e689eb3 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/common.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/common.html @@ -32,7 +32,45 @@ {% comment %}The Tab-Menu starts here!{% endcomment %} {% block sidetabmenu %} - {% endblock %} + <div class="ui huge fluid vertical pointing menu" + style="max-width: 320px;"> + + <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches + <i class="right floated chevron right icon"></i> + </a> + <div class="ui dropdown"> + <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> + + <div class="menu"> + <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking + <i class="right floated chevron right icon"></i> + </a> + <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files + <i class="right floated chevron right icon"></i> + </a> + </div> + </div> + <script> + $('.ui.dropdown').dropdown(); + </script> + </div> +{% endblock %} + {% comment %}The Tab-Menu ends here!{% endcomment %} </div> @@ -59,7 +97,11 @@ TODO: the right rail! {% endcomment %} {% block rightcontent %} + {% endblock %} + {% block sidepanel%} + {% include 'notifications/programme_curriculum.html' %} + {% endblock %} </div> </div> {% comment %}The right-rail segment ends here!{% endcomment %} diff --git a/FusionIIIT/templates/programme_curriculum/faculty/course_proposal_form.html b/FusionIIIT/templates/programme_curriculum/faculty/course_proposal_form.html index 70b13d9a9..7f5166712 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/course_proposal_form.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/course_proposal_form.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui segment" > <div class="header"><h1>New Course Proposal Form</h1></div> @@ -255,5 +215,7 @@ {% endblock %} {% block rightcontent %} <br> - +{% block sidepanel%} + {% include 'notifications/programme_curriculum.html' %} + {% endblock %} {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/programme_curriculum/faculty/dean_view_a_course_proposal.html b/FusionIIIT/templates/programme_curriculum/faculty/dean_view_a_course_proposal.html index 458d4ec4b..a0b4811cc 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/dean_view_a_course_proposal.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/dean_view_a_course_proposal.html @@ -1,4 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} +{% extends 'programme_curriculum/faculty/common.html' %} {% block sidetabmenu %} <div class="ui huge fluid vertical pointing menu" style="max-width: 320px;"> @@ -246,4 +246,7 @@ {% block rightcontent %} <br> <br> +{% block sidepanel%} + {% include 'notifications/programme_curriculum.html' %} + {% endblock %} {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/programme_curriculum/faculty/faculty_view_a_course.html b/FusionIIIT/templates/programme_curriculum/faculty/faculty_view_a_course.html index 6dff57ef2..d762d0a86 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/faculty_view_a_course.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/faculty_view_a_course.html @@ -1,46 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui bottom attached tab segment active" data-tab="afirst"> <div class="content"> @@ -178,4 +136,7 @@ <h3>{{ discipline }}</h3> <br> </div> </div> +{% block sidepanel%} + {% include 'notifications/programme_curriculum.html' %} + {% endblock %} {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/programme_curriculum/faculty/faculty_view_all_courses.html b/FusionIIIT/templates/programme_curriculum/faculty/faculty_view_all_courses.html index ed5666e36..44be82ab3 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/faculty_view_all_courses.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/faculty_view_all_courses.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Courses</a> @@ -102,4 +62,7 @@ </form> </div> </div> +{% block sidepanel%} + {% include 'notifications/programme_curriculum.html' %} + {% endblock %} {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/programme_curriculum/faculty/filetracking.html b/FusionIIIT/templates/programme_curriculum/faculty/filetracking.html index aa60e326b..5dbb53b39 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/filetracking.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/filetracking.html @@ -1,47 +1,8 @@ -{% extends 'programme_curriculum/common.html' %} -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui segment" > - <div class="header"><h1>New Course Proposal Form</h1></div> + <div class="header"><h1> Course Proposal Form</h1></div> <div class="ui divider"></div> <form class="ui large form error" method="POST"> @@ -68,6 +29,13 @@ </div> {% endif %} </div> + <div class="field"> + {% if form.receive_id.errors %} + <div class="ui error message"> + <p>{{ form.receive_id.errors }}</p> + </div> + {% endif %} + </div> <div class="field"> <label for="{{ form.file_id.id_for_label }}">File Id:</label> {{ form.file_id }} @@ -122,5 +90,7 @@ {% endblock %} {% block rightcontent %} <br> - +{% block sidepanel%} + {% include 'notifications/programme_curriculum.html' %} + {% endblock %} {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/programme_curriculum/faculty/forward.html b/FusionIIIT/templates/programme_curriculum/faculty/forward.html index d7dc4483f..3e89cd0d7 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/forward.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/forward.html @@ -1,74 +1,9 @@ -{% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:view_all_courses' %}"><B>Courses</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} - <div class="ui pointing secondary menu"> - <a class="active item" data-tab="notesheet"> - Note Sheet - </a> - - - </div> - - <div class="ui active tab" data-tab="notesheet"> -<!-- - <div class="ui two item menu"> - <a class="item"><b>Created By :-</b><b class="meta" style="text-indent: 1em; color: #1B1C1D;">{{file.current_id}}-{{file.designation}}</b></a> - <a class="item"><b>File ID :</b><b class="meta" style="text-indent: 1em; color: #1B1C1D;">{{file.uploader.department.name}}-{{file.upload_date.year}}-{{file.upload_date.month}}-#{{file.id}}</b></a> - </div> --> - - <!-- <form class="ui large form" method="POST" enctype="multipart/form-data" id="form1"> --> - - - <div class="ui two item menu"> - <a class="item"><b>Created By :</b><b class="meta" style="text-indent: 1em; color: #1B1C1D;">{{ proposal.uploader }} - {{proposal.designation}}</b></a> - </div> - - {% csrf_token %} - <form class="ui large form error" method="POST"> - - <div> - <b>Receive date:</b><i>{{receive_date}}</i> - </div> +<div class="header"><h1>Forward Form</h1></div><br> + <div> + {% csrf_token %} {% if form.non_field_errors %} @@ -93,6 +28,26 @@ </div> {% endif %} </div> + <div class="field"> + {% if form.receive_id.errors %} + <div class="ui error message"> + <p>{{ form.receive_id.errors }}</p> + </div> + {% endif %} + </div> + <form class="ui large form error" method="POST"> + + + <div class="ui two item menu"> + <a class="item"><b>Created By :</b><b class="meta" style="text-indent: 1em; color: #1B1C1D;">{{ proposal.uploader }} - {{proposal.designation}}</b></a> + </div> + + {% csrf_token %} + + + <div> + <b>Receive date:</b><i>{{receive_date}}</i> + </div> <div class="field"> <label for="{{ form.file_id.id_for_label }}">File Id:</label> @@ -109,7 +64,7 @@ {{ form.current_design }} </div> <div class="field"> - <label for="{{ form.receive_id.id_for_label }}">Uploader ID:</label> + <label for="{{ form.receive_id.id_for_label }}">Forward To:</label> {{ form.receive_id }} </div> <div class="field"> @@ -137,8 +92,9 @@ </div> </div> - - +{% block sidepanel%} + {% include 'notifications/programme_curriculum.html' %} + {% endblock %} {% endblock %} diff --git a/FusionIIIT/templates/programme_curriculum/faculty/inward_course_forms.html b/FusionIIIT/templates/programme_curriculum/faculty/inward_course_forms.html index c87957cc6..6510bdb90 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/inward_course_forms.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/inward_course_forms.html @@ -1,47 +1,7 @@ -{% extends 'programme_curriculum/common.html' %} -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} +{% extends 'programme_curriculum/faculty/common.html' %} {% load static %} {% load static %} - {% block content %} - {%if data %} <div style=" padding-left: 18px; padding-top: 10px; font-size:25px "><br> @@ -50,32 +10,83 @@ {%endif%} {%if not data %} <div class="ui pointing secondary menu"> - <h3> - <a class="active item" data-tab="inward"> - Inward Files of "{{request.user.extrainfo.user}} - {{design}}" - </a> - </h3> + <a class="active item" data-tab="notesheet"> + <h3>Inward Files of "{{request.user.extrainfo.user}} - {{design}}"</h3> + </a> + <a class="item" data-tab="attachments"> + <h3>Archived Files</h3> + </a> </div> - <div class="ui divider"></div> + + + + + <div class="ui active tab" data-tab="notesheet"> <table class="ui very basic celled sortable table"> <thead> - <tr> - <th>Received as</th> - <th>Send by</th> - <th>File ID</th> - <th>Remark</th> - <th>Date</th> - <th>View File</th> - <th>Submit File</th> -<!-- <th>R/UnR</th>--> - </tr> + <tr> + <th>Received as</th> + <th>Send by</th> + <th>File ID</th> + <th>Remark</th> + <th>Date</th> + <th>View File</th> + <th>Submit File</th> + </tr> </thead> <tbody> {% for courseProposal in courseProposals %} + {%if not courseProposal.receiver_archive %} + <tr> + <td>{{request.user.extrainfo.user}} - {{courseProposal.receive_design}}</td> + <td>{{courseProposal.current_id}} - {{courseProposal.current_design}}</td> + <td>{{courseProposal.file_id}}</td> + <td>{{courseProposal.remarks}}</td> + <td>{{courseProposal.receive_date}}</td> + <td><a href="{% url 'programme_curriculum:view_inward_files' courseProposal.id %}"><button class="ui primary button"> + View + </button></a></td> + {%if not courseProposal.is_submitted %} + <td><a href="{% url 'programme_curriculum:forward_course_forms' courseProposal.id %}"><button class="ui primary button"> + Submit + </button></a></td> + {%endif%} + {%if courseProposal.is_submitted %} + <td><a href="{% url 'programme_curriculum:tracking_archive' courseProposal.id %}"><button class="ui grey button"> + Archive + </button></a></td> + {%endif%} + </tr> + {%endif%} + {% endfor %} + </tbody> + + </table> + + <br> + + </div> + <div class="ui tab" data-tab="attachments"> + + <table class="ui very basic celled sortable table"> + <thead> + <tr> + <th>Received as</th> + <th>Send by</th> + <th>File ID</th> + <th>Remark</th> + <th>Date</th> + <th>View File</th> + </tr> + </thead> + + <tbody> + {% for courseProposal in courseProposals %} + {%if courseProposal.receiver_archive %} <tr> <td>{{request.user.extrainfo.user}} - {{courseProposal.receive_design}}</td> <td>{{courseProposal.current_id}} - {{courseProposal.current_design}}</td> @@ -85,23 +96,20 @@ <h3> <td><a href="{% url 'programme_curriculum:view_inward_files' courseProposal.id %}"><button class="ui primary button"> View </button></a></td> - {%if not courseProposal.is_submitted %} - <td><a href="{% url 'programme_curriculum:forward_course_forms' courseProposal.id %}"><button class="ui primary button"> - Submit - </button></a></td>{%endif%} - - - - - - - + <td><a href="{% url 'programme_curriculum:tracking_unarchive' courseProposal.id %}"><button class="ui green button"> + UnArchive + </button></a></td> </tr> - {% endfor %} - </tbody> - - </table> + {%endif%} + {% endfor %} + </tbody> + + </table> + + <br> + </div> + + {%endif%} - <br> -{%endif%} {% endblock %} + diff --git a/FusionIIIT/templates/programme_curriculum/faculty/outward_course_forms.html b/FusionIIIT/templates/programme_curriculum/faculty/outward_course_forms.html index fb47647a0..158cc7f0a 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/outward_course_forms.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/outward_course_forms.html @@ -1,49 +1,5 @@ -{% extends 'programme_curriculum/common.html' %} -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} -{% load static %} -{% load static %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} - - {%if data %} <div style=" padding-left: 18px; padding-top: 10px; font-size:25px "><br> @@ -52,15 +8,20 @@ {%endif%} {%if not data %} <div class="ui pointing secondary menu"> - <h3> - <a class="active item" data-tab="inward"> - Outward Files of "{{request.user.extrainfo.user}} - {{design}}" - </a> - </h3> + <a class="active item" data-tab="notesheet"> + <h3>Outward Files of "{{request.user.extrainfo.user}} - {{design}}"</h3> + </a> + <a class="item" data-tab="attachments"> + <h3>Archived Files</h3> + </a> </div> - <div class="ui divider"></div> + + + + + <div class="ui active tab" data-tab="notesheet"> <table class="ui very basic celled sortable table"> <thead> @@ -71,12 +32,12 @@ <h3> <th>Remark</th> <th>Date</th> <th>View File</th> -<!-- <th>R/UnR</th>--> </tr> </thead> <tbody> {% for courseProposal in courseProposals %} + {%if not courseProposal.sender_archive %} <tr> <td>{{request.user.extrainfo.user}}-{{courseProposal.current_design}}</td> <td> {{courseProposal.receive_id}} - {{courseProposal.receive_design}}</td> @@ -85,21 +46,63 @@ <h3> <td>{{courseProposal.receive_date}}</td> <td><a href="{% url 'programme_curriculum:view_inward_files' courseProposal.id %}"><button class="ui primary button"> View - </button></a></td> - - - - - - - - + </button></a></td> + <td><a href="{% url 'programme_curriculum:tracking_archive' courseProposal.id %}"><button class="ui grey button"> + Archive + </button></a></td> </tr> + {%endif%} {% endfor %} </tbody> </table> <br> + + </div> + <div class="ui tab" data-tab="attachments"> + + <table class="ui very basic celled sortable table"> + <thead> + <tr> + <th>Send by</th> + <th>Received as</th> + <th>File ID</th> + <th>Remark</th> + <th>Date</th> + <th>View File</th> + </tr> + </thead> + + <tbody> + {% for courseProposal in courseProposals %} + {%if courseProposal.sender_archive %} + <tr> + <td>{{request.user.extrainfo.user}}-{{courseProposal.current_design}}</td> + <td> {{courseProposal.receive_id}} - {{courseProposal.receive_design}}</td> + <td>{{courseProposal.file_id}}</td> + <td>{{courseProposal.remarks}}</td> + <td>{{courseProposal.receive_date}}</td> + <td><a href="{% url 'programme_curriculum:view_inward_files' courseProposal.id %}"><button class="ui primary button"> + View + </button></a></td> + <td><a href="{% url 'programme_curriculum:tracking_unarchive' courseProposal.id %}"><button class="ui green button"> + UnArchive + </button></a></td> + </tr> + {%endif%} + + {% endfor %} + </tbody> + + </table> + + <br> + + + </div> + {%endif%} + {% endblock %} + diff --git a/FusionIIIT/templates/programme_curriculum/faculty/update_course_proposal_form.html b/FusionIIIT/templates/programme_curriculum/faculty/update_course_proposal_form.html index a9b4ee0c0..e064a8f84 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/update_course_proposal_form.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/update_course_proposal_form.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui segment" > <div class="header"><h1>Course Update Proposal Form</h1></div> @@ -256,6 +216,6 @@ {% endblock %} {% block rightcontent %} -<br> -<br> + + {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/programme_curriculum/faculty/view_a_course.html b/FusionIIIT/templates/programme_curriculum/faculty/view_a_course.html index 0018bb821..6bce511a7 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/view_a_course.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/view_a_course.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui bottom attached tab segment active" data-tab="afirst"> <div class="content"> diff --git a/FusionIIIT/templates/programme_curriculum/faculty/view_a_course_proposal.html b/FusionIIIT/templates/programme_curriculum/faculty/view_a_course_proposal.html index e05130498..cc1eea5a3 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/view_a_course_proposal.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/view_a_course_proposal.html @@ -1,44 +1,4 @@ - -{% extends 'programme_curriculum/common.html' %} -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui bottom attached tab segment active" data-tab="afirst"> <div class="content"> @@ -168,25 +128,7 @@ <h3>{{ discipline }}</h3> {% block rightcontent %} <br> <br> -{% comment %} <div class="ui center aligned segment"> - <div class="extra content"> - <a class="fluid ui large positive animated button" tabindex="0" - href="{% url 'programme_curriculum:forward_form' proposal.id %}" - type="Submit" name="Submit"> - <div class="visible content">FORWARD</div> - <div class="hidden content"> - <i class="edit icon"></i> - </div> - </a> - <br> - <a class="fluid ui large primary animated button" tabindex="0" - href="{% url 'programme_curriculum:reject_form' proposal.id %}" - type="Submit" name="Submit"> - <div class="visible content">REJECT</div> - <div class="hidden content"> - <i class="add icon"></i> - </div> - </a> - </div> -</div> {% endcomment %} +{% block sidepanel%} + {% include 'notifications/programme_curriculum.html' %} + {% endblock %} {% endblock %} diff --git a/FusionIIIT/templates/programme_curriculum/faculty/view_a_courseslot.html b/FusionIIIT/templates/programme_curriculum/faculty/view_a_courseslot.html index 8dd37ce83..58597aa02 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/view_a_courseslot.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/view_a_courseslot.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">{{ course_slot.name }}</a> diff --git a/FusionIIIT/templates/programme_curriculum/faculty/view_a_semester_of_a_curriculum.html b/FusionIIIT/templates/programme_curriculum/faculty/view_a_semester_of_a_curriculum.html index d55e68930..de1fb2bd5 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/view_a_semester_of_a_curriculum.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/view_a_semester_of_a_curriculum.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Semester {{ semester.semester_no }} Info</a> diff --git a/FusionIIIT/templates/programme_curriculum/faculty/view_all_batches.html b/FusionIIIT/templates/programme_curriculum/faculty/view_all_batches.html index 6a6744242..3726bf66a 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/view_all_batches.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/view_all_batches.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:view_all_batches' %}"><B>Batches</B> - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Batches</a> @@ -131,4 +91,7 @@ </button> </form> </div> +{% block sidepanel%} + {% include 'notifications/programme_curriculum.html' %} + {% endblock %} {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/programme_curriculum/faculty/view_all_courses.html b/FusionIIIT/templates/programme_curriculum/faculty/view_all_courses.html index c63bc8476..5327e2bf7 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/view_all_courses.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/view_all_courses.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:view_all_courses' %}"><B>Courses</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Courses</a> @@ -89,4 +49,7 @@ </button> </form> </div> +{% block sidepanel%} + {% include 'notifications/programme_curriculum.html' %} + {% endblock %} {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/programme_curriculum/faculty/view_all_disciplines.html b/FusionIIIT/templates/programme_curriculum/faculty/view_all_disciplines.html index 22de51f2e..d65b88849 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/view_all_disciplines.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/view_all_disciplines.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:view_all_discplines' %}"><B>Disciplines</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Disciplines</a> diff --git a/FusionIIIT/templates/programme_curriculum/faculty/view_all_programmes.html b/FusionIIIT/templates/programme_curriculum/faculty/view_all_programmes.html index 5cf42a58c..6a4a8e94f 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/view_all_programmes.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/view_all_programmes.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - <a class="active item" href="{% url 'programme_curriculum:view_all_programmes' %}"><B>Programmes</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} diff --git a/FusionIIIT/templates/programme_curriculum/faculty/view_all_working_curriculums.html b/FusionIIIT/templates/programme_curriculum/faculty/view_all_working_curriculums.html index e9c7a5d45..e8ef69ccd 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/view_all_working_curriculums.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/view_all_working_curriculums.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}"><B>Curriculums</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Working Curriculums</a> @@ -94,4 +54,7 @@ </form> </div> +{% block sidepanel%} + {% include 'notifications/programme_curriculum.html' %} + {% endblock %} {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/programme_curriculum/faculty/view_course_proposal_forms.html b/FusionIIIT/templates/programme_curriculum/faculty/view_course_proposal_forms.html index 11b90efab..14e15d700 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/view_course_proposal_forms.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/view_course_proposal_forms.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} {%if data %} @@ -47,10 +7,18 @@ </div> {%endif%} {%if not data %} -<div class="ui top attached tabular large menu"> - <a class="item active" data-tab="afirst">New Course Proposal Forms</a> +<div> +<div class="ui pointing secondary menu"> + <a class="active item" data-tab="notesheet"> + <h3>New Course Proposal Forms</h3> + </a> + <a class="item" data-tab="attachments"> + <h3>Archived Files</h3> + </a> + + </div> -<div class="ui bottom attached tab segment active" data-tab="afirst"> +<div class="ui active tab" data-tab="notesheet"> <div class="content"> <div class="description" style="overflow: auto; max-height: 495px"> <table class="ui celled medium table" @@ -68,6 +36,7 @@ </thead> <tbody> {% for courseProposal in courseProposals %} + {%if not courseProposal.is_archive %} <tr> <td>{{ courseProposal.uploader }} - {{ courseProposal.designation }}</td> <td>{{ courseProposal.name }}</td> @@ -89,7 +58,17 @@ </div> </a> </td> + <td class="collapsing"><a class="tiny ui grey button" tabindex="0" + href="{% url 'programme_curriculum:file_archive' courseProposal.id%}" + type="Submit" name="Submit"> + <div class="visible content">Archive</div> + <div class="hidden content"> + </div> + </a> + </td> </tr> + {%endif%} + {% empty %} <tr><td colspan="3">No Courses Proposals Submitted</td><tr> {% endfor %} @@ -98,15 +77,75 @@ </div> </div> </div> -<div class="ui top attached tabular large menu"> - <a class="item active" data-tab="afirst">Update Proposal Forms</a> +<div class="ui tab" data-tab="attachments"> + <div class="content"> + <div class="description" style="overflow: auto; max-height: 495px"> + <table class="ui celled medium table" + style="text-align: center; + margin: auto;"> + + <thead> + <tr style="font-size: medium; + background-color: whitesmoke;"> + <td><h4>Created As</h4></td> + <td><h4>Course Name</h4></td> + <td><h4>Course Code</h4></td> + <td><h4>View</h4></td> + </tr> + </thead> + <tbody> + {% for courseProposal in courseProposals %} + {%if courseProposal.is_archive %} + <tr> + <td>{{ courseProposal.uploader }} - {{ courseProposal.designation }}</td> + <td>{{ courseProposal.name }}</td> + <td>{{ courseProposal.code }}</td> + <td class="collapsing"><a class="tiny ui positive animated button" tabindex="0" + href="{% url 'programme_curriculum:view_a_course_proposal_form' courseProposal.id%}" + type="Submit" name="Submit"> + <div class="visible content">VIEW</div> + <div class="hidden content"> + </div> + </a> + </td> + <td class="collapsing"><a class="tiny ui grey button" tabindex="0" + href="{% url 'programme_curriculum:file_unarchive' courseProposal.id%}" + type="Submit" name="Submit"> + <div class="visible content">UnArchive</div> + <div class="hidden content"> + </div> + </a> + </td> + </tr> + + {%endif%} + + {% empty %} + <tr><td colspan="3">No Courses Proposals Submitted</td><tr> + {% endfor %} + </tbody> + </table> + </div> + </div> +</div> +</div> +<div class="ui pointing secondary menu"> + <a class="active item" data-tab="notes"> + <h3>Update Proposal Forms</h3> + </a> + <a class="item" data-tab="attachs"> + <h3>Archived Files</h3> + </a> + </div> -<div class="ui bottom attached tab segment active" data-tab="afirst"> +<div> +<div class="ui active tab" data-tab="notes"> <div class="content"> <div class="description" style="overflow: auto; max-height: 495px"> <table class="ui celled medium table" style="text-align: center; margin: auto;"> + <thead> <tr style="font-size: medium; background-color: whitesmoke;"> @@ -118,6 +157,7 @@ </thead> <tbody> {% for courseProposal in updateProposals %} + {%if not courseProposal.is_archive %} <tr> <td>{{ courseProposal.uploader }} - {{ courseProposal.designation }}</td> <td>{{ courseProposal.name }}</td> @@ -139,7 +179,17 @@ </div> </a> </td> + <td class="collapsing"><a class="tiny ui grey button" tabindex="0" + href="{% url 'programme_curriculum:file_archive' courseProposal.id%}" + type="Submit" name="Submit"> + <div class="visible content">Archive</div> + <div class="hidden content"> + </div> + </a> + </td> </tr> + {%endif%} + {% empty %} <tr><td colspan="3">No Courses Proposals Submitted</td><tr> {% endfor %} @@ -148,10 +198,58 @@ </div> </div> </div> -{%endif%} - - +<div class="ui tab" data-tab="attachs"> + <div class="content"> + <div class="description" style="overflow: auto; max-height: 495px"> + <table class="ui celled medium table" + style="text-align: center; + margin: auto;"> + + <thead> + <tr style="font-size: medium; + background-color: whitesmoke;"> + <td><h4>Created As</h4></td> + <td><h4>Course Name</h4></td> + <td><h4>Course Code</h4></td> + <td><h4>View</h4></td> + </tr> + </thead> + <tbody> + {% for courseProposal in updateProposals %} + {%if courseProposal.is_archive %} + <tr> + <td>{{ courseProposal.uploader }} - {{ courseProposal.designation }}</td> + <td>{{ courseProposal.name }}</td> + <td>{{ courseProposal.code }}</td> + <td class="collapsing"><a class="tiny ui positive animated button" tabindex="0" + href="{% url 'programme_curriculum:view_a_course_proposal_form' courseProposal.id%}" + type="Submit" name="Submit"> + <div class="visible content">VIEW</div> + <div class="hidden content"> + </div> + </a> + </td> + <td class="collapsing"><a class="tiny ui grey button" tabindex="0" + href="{% url 'programme_curriculum:file_unarchive' courseProposal.id%}" + type="Submit" name="Submit"> + <div class="visible content">UnArchive</div> + <div class="hidden content"> + </div> + </a> + </td> + </tr> + {%endif%} + {% empty %} + <tr><td colspan="3">No Courses Proposals Submitted</td><tr> + {% endfor %} + </tbody> + </table> + </div> + </div> +</div> +</div> +{%endif%} {% endblock %} {% block rightcontent %} {%if not data %} @@ -168,6 +266,7 @@ </div> </a> </div> +</div> <div class="ui center aligned segment"> <a class="fluid ui large primary animated button" tabindex="0" @@ -179,7 +278,9 @@ </div> </a> </div> - <br> +{% block sidepanel%} + {% include 'notifications/programme_curriculum.html' %} + {% endblock %} {%endif%} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/FusionIIIT/templates/programme_curriculum/faculty/view_curriculums_of_a_programme.html b/FusionIIIT/templates/programme_curriculum/faculty/view_curriculums_of_a_programme.html index 75f744e83..d6052930b 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/view_curriculums_of_a_programme.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/view_curriculums_of_a_programme.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui top attached tabular large menu"> diff --git a/FusionIIIT/templates/programme_curriculum/faculty/view_file.html b/FusionIIIT/templates/programme_curriculum/faculty/view_file.html index f22932408..c6f2725f9 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/view_file.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/view_file.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:view_all_courses' %}"><B>Courses</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui pointing secondary menu"> @@ -292,78 +252,5 @@ <h3>{{ discipline }}</h3> </div> </div> - - <script type="text/javascript"> - $('#input_search1').keyup(function(){ - - console.log('asdasd'); - value = $('#input_search1').val(); - - $.ajax({ - type: 'POST', - url: '/filetracking/ajax/', - data: { - 'value': value, - 'csrfmiddlewaretoken': '{{csrf_token}}' - }, - dataType: 'json', - success: function(response){ - console.log('coming-----------------------'); - - console.log(response.holds[0]); - - all_designations = JSON.parse(response.holds); - console.log(all_designations[0].fields.name); - app = [] - $('#input_list1').html(''); - for(var i=0;i<all_designations.length;i++){ - $('#input_list1').append('<option value="'+all_designations[i].fields.name+'">'+all_designations[i].fields.name+'</option>'); - } - }, - error: function(rs, e){ - console.log('error-------'); - }, - }); - console.log("dsfagdfdshadf"); - }); - </script> - - - <script type="text/javascript"> - $('#input_search').keyup(function(){ - - console.log('asdasd'); - value = $('#input_search').val(); - - $.ajax({ - type: 'POST', - url: '/filetracking/ajax_dropdown/', - data: { - 'value': value, - 'csrfmiddlewaretoken': '{{csrf_token}}' - }, - dataType: 'json', - success: function(response){ - console.log('coming-----------------------'); - - - - all_users = JSON.parse(response.users); - console.log(all_users[0].fields.username); - app = [] - $('#input_list').html(''); - for(var i=0;i<all_users.length;i++){ - $('#input_list').append('<option value="'+all_users[i].fields.username+'">'+all_users[i].fields.username+'</option>'); - } - }, - error: function(rs, e){ - console.log('error-------'); - }, - }); - console.log("dsfagdfdshadf"); - }); - </script> - - {% endblock %} diff --git a/FusionIIIT/templates/programme_curriculum/faculty/view_semesters_of_a_curriculum.html b/FusionIIIT/templates/programme_curriculum/faculty/view_semesters_of_a_curriculum.html index 18b6e06f6..2b8f7e5dc 100644 --- a/FusionIIIT/templates/programme_curriculum/faculty/view_semesters_of_a_curriculum.html +++ b/FusionIIIT/templates/programme_curriculum/faculty/view_semesters_of_a_curriculum.html @@ -1,44 +1,4 @@ -{% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - <div class="ui dropdown"> - <div class="item" >Course Proposal Form <i class="dropdown icon"></i></div> - - <div class="menu"> - <a class="item" href="{% url 'programme_curriculum:view_course_proposal_forms' %}">Course Proposal Form - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:outward_files' %}">Course Proposal Tracking - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:inward_files' %}">Inward Files - <i class="right floated chevron right icon"></i> - </a> - </div> - </div> - <script> - $('.ui.dropdown').dropdown(); - </script> - </div> -{% endblock %} - +{% extends 'programme_curriculum/faculty/common.html' %} {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">{{ curriculum.name }} Table</a> diff --git a/FusionIIIT/templates/programme_curriculum/view_a_course.html b/FusionIIIT/templates/programme_curriculum/view_a_course.html index 5be3fde68..2e6e7b7af 100644 --- a/FusionIIIT/templates/programme_curriculum/view_a_course.html +++ b/FusionIIIT/templates/programme_curriculum/view_a_course.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui bottom attached tab segment active" data-tab="afirst"> <div class="content"> diff --git a/FusionIIIT/templates/programme_curriculum/view_a_courseslot.html b/FusionIIIT/templates/programme_curriculum/view_a_courseslot.html index 981087ef3..bb29e8174 100644 --- a/FusionIIIT/templates/programme_curriculum/view_a_courseslot.html +++ b/FusionIIIT/templates/programme_curriculum/view_a_courseslot.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">{{ course_slot.name }}</a> diff --git a/FusionIIIT/templates/programme_curriculum/view_a_semester_of_a_curriculum.html b/FusionIIIT/templates/programme_curriculum/view_a_semester_of_a_curriculum.html index 040ab13b3..734551ed1 100644 --- a/FusionIIIT/templates/programme_curriculum/view_a_semester_of_a_curriculum.html +++ b/FusionIIIT/templates/programme_curriculum/view_a_semester_of_a_curriculum.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Semester {{ semester.semester_no }} Info</a> diff --git a/FusionIIIT/templates/programme_curriculum/view_all_batches.html b/FusionIIIT/templates/programme_curriculum/view_all_batches.html index 6fffbfce5..f0d0d4d28 100644 --- a/FusionIIIT/templates/programme_curriculum/view_all_batches.html +++ b/FusionIIIT/templates/programme_curriculum/view_all_batches.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:view_all_batches' %}"><B>Batches</B> - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Batches</a> diff --git a/FusionIIIT/templates/programme_curriculum/view_all_courses.html b/FusionIIIT/templates/programme_curriculum/view_all_courses.html index 754862bba..3b676baf0 100644 --- a/FusionIIIT/templates/programme_curriculum/view_all_courses.html +++ b/FusionIIIT/templates/programme_curriculum/view_all_courses.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:view_all_courses' %}"><B>Courses</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Courses</a> diff --git a/FusionIIIT/templates/programme_curriculum/view_all_disciplines.html b/FusionIIIT/templates/programme_curriculum/view_all_disciplines.html index f5af318b6..ce76d51e6 100644 --- a/FusionIIIT/templates/programme_curriculum/view_all_disciplines.html +++ b/FusionIIIT/templates/programme_curriculum/view_all_disciplines.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:view_all_discplines' %}"><B>Disciplines</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Disciplines</a> diff --git a/FusionIIIT/templates/programme_curriculum/view_all_programmes.html b/FusionIIIT/templates/programme_curriculum/view_all_programmes.html index fd938789d..6488e9012 100644 --- a/FusionIIIT/templates/programme_curriculum/view_all_programmes.html +++ b/FusionIIIT/templates/programme_curriculum/view_all_programmes.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="active item" href="{% url 'programme_curriculum:view_all_programmes' %}"><B>Programmes</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} diff --git a/FusionIIIT/templates/programme_curriculum/view_all_working_curriculums.html b/FusionIIIT/templates/programme_curriculum/view_all_working_curriculums.html index 34c2bf306..9052f2989 100644 --- a/FusionIIIT/templates/programme_curriculum/view_all_working_curriculums.html +++ b/FusionIIIT/templates/programme_curriculum/view_all_working_curriculums.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="active item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}"><B>Curriculums</B> - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">Working Curriculums</a> diff --git a/FusionIIIT/templates/programme_curriculum/view_curriculums_of_a_programme.html b/FusionIIIT/templates/programme_curriculum/view_curriculums_of_a_programme.html index ed8846f8f..a8d017690 100644 --- a/FusionIIIT/templates/programme_curriculum/view_curriculums_of_a_programme.html +++ b/FusionIIIT/templates/programme_curriculum/view_curriculums_of_a_programme.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> diff --git a/FusionIIIT/templates/programme_curriculum/view_semesters_of_a_curriculum.html b/FusionIIIT/templates/programme_curriculum/view_semesters_of_a_curriculum.html index 8954afbc0..f6e3bb580 100644 --- a/FusionIIIT/templates/programme_curriculum/view_semesters_of_a_curriculum.html +++ b/FusionIIIT/templates/programme_curriculum/view_semesters_of_a_curriculum.html @@ -1,27 +1,4 @@ {% extends 'programme_curriculum/common.html' %} - -{% block sidetabmenu %} - <div class="ui huge fluid vertical pointing menu" - style="max-width: 320px;"> - - <a class="item" href="{% url 'programme_curriculum:view_all_programmes' %}">Programmes - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_working_curriculums' %}">Curriculums - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_courses' %}">Courses - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_discplines' %}">Disciplines - <i class="right floated chevron right icon"></i> - </a> - <a class="item" href="{% url 'programme_curriculum:view_all_batches' %}">Batches - <i class="right floated chevron right icon"></i> - </a> - </div> -{% endblock %} - {% block content %} <div class="ui top attached tabular large menu"> <a class="item active" data-tab="afirst">{{ curriculum.name }} Table</a>