Skip to content

Form Validation Update in Mcm and Award Section #10

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
merged 1 commit into from
Feb 7, 2019
Merged

Form Validation Update in Mcm and Award Section #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 14 additions & 9 deletions FusionIIIT/templates/scholarshipsModule/applyNew.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
{% block awards %}
{% comment %}The tab menu starts here!{% endcomment %}
<body>
{% for i in release %}
{% if i.award_form_visible == 1 %}
<div class="ui pointing secondary menu">
<a class="active item" data-tab="mcm">
Mcm Scholarship
Expand All @@ -16,10 +14,9 @@

<div class="ui active tab" data-tab="mcm">
<div class="ui vertical segment">
{% if show_mcm_flag == 1 %}
<div class="ui header">
Application Form for Merit Cum Means (MCM) Scholarship:


<a class="right floated item" style="padding-left:50px" href="https://drive.google.com/open?id=1Ylcj_ZX_h-0TTZ_zOGVF1JLEJE1_YQGD" target="_blank">
<button class="ui primary button">
Form A
Expand Down Expand Up @@ -295,11 +292,17 @@

</div>
</div>
{% else %}
<p>Form Not available for You!!</p>
{% endif %}
</div>
</div>



<div class="ui tab" data-tab="medals">
<div class="ui vertical segment" id="form_part1">
{% if show_convocation_flag == 1 %}
<div class="ui header">
Please read below instructions before applying for any of the Convocation Medals:
</div>
Expand All @@ -323,7 +326,11 @@
</div>
</div>
<button type="button" class="ui primary large right floated button" onclick="java_script_:dis(1)" >Proceed</button>
<br><br> </div>
<br><br>
{% else %}
<p>Form not available for you!!</p>
{% endif %}
</div>

<div class="ui vertical segment" id="form_part2" style="display:none">
<div class="ui large input">
Expand Down Expand Up @@ -918,10 +925,8 @@
</div>
</div>
</div>
{% else %}
<p> Form not available to you!! </p>
{% endif %}
{% endfor %}


<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>

<!--<script type="text/javascript">
Expand Down
19 changes: 12 additions & 7 deletions FusionIIIT/templates/scholarshipsModule/invite.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,40 @@
<div class="six wide field">
<label>Type</label>
<select class="ui fluid search selection large dropdown" name="type" required>
<option value="">Select</option>
<option value="">Select</option>
<option value="Convocation Medals">Convocation Medals</option>
<option value="Mcm Scholarship">Mcm Scholarship</option>
</select>
</div>
<div class="field">
<div class="sixteen wide field">
<label>Batch</label>
<input type="text" value="all" name="batch" placeholder="All Batches" required>
</div>
</div>


</div>

<div class="two fields">
<div class="field">
<label>Start date</label>

<div class="ui input large left icon">
<i class="calendar icon"></i>
<input type="text" name="From" placeholder="YYYY-MM-DD" required>
</div>

</div>

<div class="field">
<label>End Date</label>

<div class="ui input large left icon">
<i class="calendar icon"></i>
<input type="text" name="To" placeholder="YYYY-MMM-DD" required>
</div>
</div>

</div>
<div class="field">
<div class="sixteen wide field">
Expand All @@ -68,4 +73,4 @@
</div>
</div>

{% endblock %}
{% endblock %}
32 changes: 31 additions & 1 deletion FusionIIIT/templates/scholarshipsModule/scholarships_student.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,37 @@
<div class="ui cards">

{% for m in release %}
{% if m.notif_visible == 1 %}
{% if m.notif_visible == 1 and m.batch == 'all' %}
<div class="ui fluid card">
<div class="content">
<div class="header">
{{ m.award }} Invitation
</div>
<div class="meta">
Last Date: {{ m.enddate }}
</div>

<div class="ui divider"></div>

<div class="description">
<p>{{ m.remarks }} </p>
<p>Do you want to accept the invitation?</p>
</div>
</div>
<div class="extra content">
<div class="ui two buttons">
<form method="post" action="{% url 'spacs:spacs' %}" class="ui form" role="form">
{% csrf_token %}
<button name="studentapprovesubmit" value="{{ m.pk }}" class="ui basic green button" type="submit">Apply</button>
</form>
<form method="post" action="{% url 'spacs:spacs' %}" class="ui form" role="form">
{% csrf_token %}
<button name="studentdeclinesubmit" value="{{ m.pk }}" class="ui basic red button" type="submit">Ignore</button>
</form>
</div>
</div>
</div>
{% elif m.notif_visible == 1 and m.batch == student_batch %}
<div class="ui fluid card">
<div class="content">
<div class="header">
Expand Down