Skip to content

Placement branch 2.0 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sksingh55 merged 5 commits into from
Feb 3, 2019
Merged

Placement branch 2.0 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36df334
faculty view placement_statistic
rohit427 Feb 2, 2019
7c91f8f
accordian working
Sanji515 Feb 3, 2019
2339097
Merge remote-tracking branch 'origin/placement-branch' into placement…
Sanji515 Feb 3, 2019
bce0966
Merge remote-tracking branch 'upstream/master' into placement-branch
Sanji515 Feb 3, 2019
fc6ea55
working placement 2.0
Sanji515 Feb 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified FusionIIIT/Fusion/fusion.db
View file
Open in desktop
Binary file not shown.
110 changes: 0 additions & 110 deletions FusionIIIT/applications/globals/static/globals/js/editProfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
Expand Down Expand Up @@ -234,4 +125,3 @@ function editCatalog() {
$("#aboutSpan").show();
}
}
>>>>>>> 8840ea3da5f4a670a7683a29f89c0509c75da90e
47 changes: 1 addition & 46 deletions FusionIIIT/applications/globals/static/globals/js/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<<<<<<< HEAD
function modalCancel(){
$(document).ready(function() {
$('#cancel')
Expand Down Expand Up @@ -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
}
1 change: 0 additions & 1 deletion FusionIIIT/applications/placement_cell/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<username>[a-zA-Z0-9\.]{1,20})/$', views.cv, name="cv"),

]
9 changes: 4 additions & 5 deletions FusionIIIT/applications/placement_cell/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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']
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
10 changes: 3 additions & 7 deletions FusionIIIT/templates/coursemanagement/viewcourse.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ <h4 class="ui dividing header">{{course.course_name}}</h4><br>
<use x="5.397434" y="-68.326835" transform="matrix(0.15880563740596462,0,0,0.1590301359360811,-34.233496722840435,-44.6817534019825) " id="icon" xlink:href="#svg_1"/> <path id="svg_4" d="m24,8.380953l0.190475,22.761904l16.952381,-11.333332l-17.142857,-11.428572z" stroke-linecap="null" stroke-linejoin="null" stroke-width="5" stroke="null" fill="#ffffff"/> <path id="relleno" d="m24.285713,8.666666l0,22.666666l17.238094,-11.523809l-17.238094,-11.142857z" stroke-linecap="null" stroke-linejoin="null" stroke-width="5" stroke="null" fill="#ffffff"/> </g> <defs> <svg id="svg_1" viewBox="0 0 944 1024" height="1024" width="944" xmlns:xlink="http://www.w3.org/1999/xlink"> <g id="icomoon-ignore"/> <path id="play-svg" d="m589.426025,406.15799c0,-31.289978 -25.345032,-56.652985 -56.618042,-56.652985h-265.616974c-31.27301,0 -56.618011,25.359985 -56.618011,56.652985v151.894989c0,31.290039 25.345001,56.653015 56.618011,56.653015h265.616974c31.273987,0 56.618042,-25.361023 56.618042,-56.653015v-151.894989l0,0zm-227.311035,140.032013v-142.677002l108.192017,71.339996l-108.19101,71.339996l-0.001007,-0.002991z"/> </svg> </defs>
</svg>
</div>
<h4>{{video.video_name}}</h4>
h4>{{video.video_name}}</h4>
</div>
<div class="ui modal" id="vid_modal{{forloop.counter}}">
<i class="close icon"></i>
Expand Down Expand Up @@ -436,11 +436,8 @@ <h4 class="ui dividing header">Quiz Time Table</h4>
<script type="text/javascript" src="{% static 'globals/js/tablesort.js' %}"></script>

<script type="text/javascript" src="{% static 'globals/js/semantic.min.js' %}"></script>
<!-- <script>
$(document).ready(function() {
$('table').tablesort();
});
</script> -->


<script type="text/javascript">
$(document).ready(function() {
var prevassessmenttab = 1;
Expand Down Expand Up @@ -1052,4 +1049,3 @@ <h4 class="ui dividing header">Quiz Time Table</h4>


{% endblock %}
>>>>>>> cead69955c163798dcb5d30c8fa5b6356b5ecfaf
2 changes: 1 addition & 1 deletion FusionIIIT/templates/globals/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,4 @@
{% block javascript %}
{% endblock %}

</html>
</html>
2 changes: 1 addition & 1 deletion FusionIIIT/templates/globals/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ <h1 class="cover-heading">Fusion!</h1>
</body>

<script type="text/javascript" src="{% static 'Fusion/js/jquery.min.js' %}"></script>
<script type="text/javascript" src="{% static 'Fusion/bootstrap/js/bootstrap.min.js' %}"></script>
<script type="text/javascript" src="{% static 'Fusion/bootstrap/js/bootstrap.min.js' %}"></script>
12 changes: 6 additions & 6 deletions FusionIIIT/templates/placementModule/placement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,13 +366,13 @@
{% comment %}Form Tag starts here!{% endcomment %}
<form method="post" enctype = "multipart/form-data" class="ui form" role="form" action="{% url 'placement:placement' %}">
{% comment %}The add a new skill Accordian starts here!{% endcomment %}
<div class="ui accordion field">
<div class="title">
<div class="ui accordion">
<div class="title active">
<i class="icon dropdown"></i>
Add a new Event!
</div>

<div class="{% if form5.errors %}content active{% else %}content{% endif %}">
<div class="content active">
<div class="ui form" style="padding: 8px; padding-left: 24px; padding-right: 24px;">
{% csrf_token %}
<div class="three fields">
Expand Down Expand Up @@ -465,13 +465,13 @@
{% comment %}Form Tag starts here!{% endcomment %}
<form method="post" class="ui form" role="form" >
{% comment %}The add a new skill Accordian starts here!{% endcomment %}
<div class="ui accordion field">
<div class="title">
<div class="ui accordion field">
<div class="title active">
<i class="icon dropdown"></i>
Add a new Event!
</div>
{{ form5.non_field_errors }}
<div class="content">
<div class="content active">
<div class="ui form" style="padding: 8px; padding-left: 24px; padding-right: 24px;">
{% csrf_token %}
<div class="three fields">
Expand Down