diff --git a/FusionIIIT/Fusion/fusion.db b/FusionIIIT/Fusion/fusion.db index 05f14b6ed..7b2082bae 100644 Binary files a/FusionIIIT/Fusion/fusion.db and b/FusionIIIT/Fusion/fusion.db differ diff --git a/FusionIIIT/applications/globals/static/globals/js/editProfile.js b/FusionIIIT/applications/globals/static/globals/js/editProfile.js index dc3caaea9..aa0a1cd4f 100644 --- a/FusionIIIT/applications/globals/static/globals/js/editProfile.js +++ b/FusionIIIT/applications/globals/static/globals/js/editProfile.js @@ -1,112 +1,3 @@ -<<<<<<< HEAD -function editFirst(){ - - var aboutSpan = $("#aboutSpan").text().trim(); - var educationSpan = $("#educationSpan").text().trim(); - var interestSpan = $("#interestSpan").text().trim(); - var contactSpan = $("#contactSpan").text().trim(); - - - var buttonValue = $("#editButton").val() - - if(buttonValue == "Edit"){ - $("#editButton").val("Save"); - - $("#contactInput").val(contactSpan); - $("#contactInput").show(); - $("#contactSpan").hide(); - $("#contactIcon").hide(); - - $("#aboutTextarea").val(aboutSpan); - $("#aboutTextarea").show(); - $("#aboutSpan").hide(); - - $("#educationTextarea").val(educationSpan); - $("#educationTextarea").show(); - $("#educationSpan").hide(); - - $("#interestTextarea").val(interestSpan); - $("#interestTextarea").show(); - $("#interestSpan").hide(); - - } - else if($("#editButton").val("Save")){ - $("#editButton").val("Edit"); - - var contactValue = $("#contactInput").val().trim(); - $("#contactSpan").text(contactValue); - $("#contactInput").hide(); - $("#contactSpan").show(); - $("#contactIcon").show(); - - var aboutSpan = $("#aboutTextarea").val().trim(); - $("#aboutSpan").text(aboutSpan); - $("#aboutTextarea").hide(); - $("#aboutSpan").show(); - - var educationSpan = $("#educationTextarea").val().trim(); - $("#educationSpan").text(educationSpan); - $("#educationTextarea").hide(); - $("#educationSpan").show(); - - var interestSpan = $("#interestTextarea").val().trim(); - $("#interestSpan").text(interestSpan); - $("#interestTextarea").hide(); - $("#interestSpan").show(); - - } - -} - -function editStudent() { - var aboutSpan = $("#aboutSpan").text().trim(); - var contactSpan = $("#contactSpan").text().trim(); - var interestSpan = $("#interestSpan").text().trim(); - - var buttonValue = $("#editButton").val() - - if(buttonValue == "Edit") { - $("#editButton").val("Save"); - - $("#contactInput").val(contactSpan); - $("#contactInput").show(); - $("#contactSpan").hide(); - $("#contactIcon").hide(); - - $("#aboutTextarea").val(aboutSpan); - $("#aboutTextarea").show(); - $("#aboutSpan").hide(); - - $("#interestTextarea").val(interestSpan); - $("#interestTextarea").show(); - $("#interestSpan").hide(); - } - - else if($("#editButton").val("Save")) { - $("#editButton").val("Edit"); - - var contactValue = $("#contactInput").val().trim(); - $("#contactSpan").text(contactValue); - $("#contactInput").hide(); - $("#contactSpan").show(); - $("#contactIcon").show(); - - var aboutSpan = $("#aboutTextarea").val().trim(); - $("#aboutSpan").text(aboutSpan); - $("#aboutTextarea").hide(); - $("#aboutSpan").show(); - - var interestSpan = $("#interestTextarea").val().trim(); - $("#interestSpan").text(interestSpan); - $("#interestTextarea").hide(); - $("#interestSpan").show(); - - - } -} - - -======= function editFirst(){ var aboutSpan = $("#aboutSpan").text().trim(); @@ -234,4 +125,3 @@ function editCatalog() { $("#aboutSpan").show(); } } ->>>>>>> 8840ea3da5f4a670a7683a29f89c0509c75da90e diff --git a/FusionIIIT/applications/globals/static/globals/js/modal.js b/FusionIIIT/applications/globals/static/globals/js/modal.js index 5f3cd7171..80c3d030d 100644 --- a/FusionIIIT/applications/globals/static/globals/js/modal.js +++ b/FusionIIIT/applications/globals/static/globals/js/modal.js @@ -1,4 +1,3 @@ -<<<<<<< HEAD function modalCancel(){ $(document).ready(function() { $('#cancel') @@ -64,48 +63,4 @@ function checkOutModal(id) { $(document).ready(function() { $('#check-out-modal-'.concat(id)).modal('show'); }); -} -======= -function modalCancel(){ - $(document).ready(function() { - $('#cancel') - .modal('setting', 'closable', false) - .modal('show') - ; - }); -} - -function modalDandm(){ - $(document).ready(function() { - $('#dandm') - .modal('show') - ; - }); -} - - -function modalCmc(){ - $(document).ready(function() { - $('#mcm') - .modal('show') - ; - }); -} - - -function modalGoldmedal(){ - $(document).ready(function() { - $('#goldmedal') - .modal('show') - ; - }); -} -/* - -function modalAvailability(){ - $('#availability') - .modal('show') - ; -} -*/ ->>>>>>> 8840ea3da5f4a670a7683a29f89c0509c75da90e +} \ No newline at end of file diff --git a/FusionIIIT/applications/placement_cell/urls.py b/FusionIIIT/applications/placement_cell/urls.py index 9462e141d..b48f98ca2 100644 --- a/FusionIIIT/applications/placement_cell/urls.py +++ b/FusionIIIT/applications/placement_cell/urls.py @@ -10,5 +10,4 @@ url(r'^manage_records/$', views.ManageRecords, name='manage_records'), url(r'^statistics/$', views.PlacementStatistics, name='placement_statistics'), url(r'^cv/(?P[a-zA-Z0-9\.]{1,20})/$', views.cv, name="cv"), - ] diff --git a/FusionIIIT/applications/placement_cell/views.py b/FusionIIIT/applications/placement_cell/views.py index c3952e63c..5e0a154d2 100644 --- a/FusionIIIT/applications/placement_cell/views.py +++ b/FusionIIIT/applications/placement_cell/views.py @@ -50,8 +50,8 @@ def Placement(request): form5 = AddSchedule(initial={}) current1 = HoldsDesignation.objects.filter(Q(working=user, designation__name="placement chairman")) current2 = HoldsDesignation.objects.filter(Q(working=user, designation__name="placement officer")) - current = HoldsDesignation.objects.filter(Q(working=user, designation__name="student")) + if current: student = get_object_or_404(Student, Q(id=profile.id)) placementschedule = PlacementSchedule.objects.filter( @@ -234,6 +234,9 @@ def Placement(request): hs = Patent.objects.get(Q(pk=hid)) hs.delete() + # facult and other staff view only statistics + if not (current or current1 or current2): + return redirect('/placement/statistics/') if 'deletesch' in request.POST: delete_sch_key = request.POST['delete_sch_key'] @@ -853,8 +856,6 @@ def ManageRecords(request): current1 = HoldsDesignation.objects.filter(Q(working=user, designation__name="placement chairman")) current2 = HoldsDesignation.objects.filter(Q(working=user, designation__name="placement officer")) - hold_design = get_object_or_404(HoldsDesignation, working=user) - current = HoldsDesignation.objects.filter(Q(working=user, designation__name="student")) if len(current) == 0: @@ -1127,8 +1128,6 @@ def PlacementStatistics(request): current1 = HoldsDesignation.objects.filter(Q(working=user, designation__name="placement chairman")) current2 = HoldsDesignation.objects.filter(Q(working=user, designation__name="placement officer")) - hold_design = get_object_or_404(HoldsDesignation, working=user) - current = HoldsDesignation.objects.filter(Q(working=user, designation__name="student")) if len(current) == 0: diff --git a/FusionIIIT/templates/coursemanagement/viewcourse.html b/FusionIIIT/templates/coursemanagement/viewcourse.html index 3c726bf78..bc0c181cc 100644 --- a/FusionIIIT/templates/coursemanagement/viewcourse.html +++ b/FusionIIIT/templates/coursemanagement/viewcourse.html @@ -324,7 +324,7 @@

{{course.course_name}}


-

{{video.video_name}}

+ h4>{{video.video_name}}