From c37270109055162959d2603330bb6069afd5266d Mon Sep 17 00:00:00 2001
From: ari201604d7 <2016047@iiitdmj.ac.in>
Date: Sun, 3 Feb 2019 19:41:18 +0530
Subject: [PATCH] New feature of award notification added,Award Form validation
 applied, UI bug fixed in apply award, Browse Catalog Bug fixed

---
 FusionIIIT/Fusion/fusion.db                   | Bin 7630848 -> 7630848 bytes
 .../applications/scholarships/models.py       |   2 +
 FusionIIIT/applications/scholarships/views.py |  17 +-
 .../scholarshipsModule/applyNew.html          | 152 +++++++++---------
 .../scholarshipsModule/browsecatalogue.html   |   4 +-
 .../scholarships_student.html                 |  76 +++++++--
 .../templates/scholarshipsModule/winners.html |  12 +-
 7 files changed, 165 insertions(+), 98 deletions(-)

diff --git a/FusionIIIT/Fusion/fusion.db b/FusionIIIT/Fusion/fusion.db
index ec071c6bb64a3f4a4d2f0f3b2ab860449da0d39c..53a42f6f0bb3521bb2311c795ab21799dba53ee9 100644
GIT binary patch
delta 2230
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
H`lEjVn|-$U

delta 1441
zcmaLWZA?>F7zglkZ*SY%_P$gcAeLdN%5>IQsuNJb0(R&WsEThmkqScf@TSGdBAW%|
zwwudxbtXq0Mi?0;Cdwp^vn8-B8_P_LiHk9DE-@ItEc@c-+?LI_?9a!2*-d`ud2;SK
z&wYDtV)}ba0!+^=N{GFJ5TSz*@+orplz+KEuhoC6*_RVy8&B=*^Xo~!E`SIYkiZHy
zu!9T^aDt2bb>&__Uav(^QOIP<ZM&bZ3MsR-QxTbOty0PbH@Tmx#n~THr5Nv}79~fj
z6+Tj})_E;iq?_40)FZ6EPaWjhht!`mTNYVE^m?Wx)CHPlulSAV6B6V{OcH+Wj5=i*
zKcUvUq@L{5VkSIPa@oyZwTR{Psbzi@^|MG7(RXQ|YiVk`a$CuFop%1_tZ|GvGUQJC
z9edDr#`@H{S-Q&nrt0JOE9T|NQcq5*k`4W;<R;IZRY3zC+%OB$U^ct}>HOT;jJ6#`
zql8$82@$*CEx1XD^abKEyoTSAPawa9IEnZn{E7KL;3*INlF=)Q;;rP=lMKj&IgkZ&
z!2{WR>dA|tV#^Bg5wiz!4)C<WU2%~=3g*1{oE=VV@N%zLoYwz;WLPt3nDY$NYnZu)
z=`+mvhPl8n7aC@sVZLOTiwtwIVZLmbOAOO*m`e@w6~kO+n1OLKUoa(cJE><@Z?J%s
zc!Tfr8{XgtLZ0*<$!mz_@9zj6?Ft+!Y;P(opsj)En=1<%TRUS%0<l=EQ>aaL`+~3>
zR=}&U5(=OYieMG2=H0$Espn3M9wYh<{k$IIv%F%h&ST4p&$)GVC9w(vL}`$_tPg|%
z?hX}iRa`yQJ?ZvLk4Nl{v*;B%TeRF^qk}Y^oxDOXNQ<>`!g3SwjAV6XF_ges2tg^7
zK{>30FuVp8upTzR>#z|vK_yf{HAG-DY=Ny%1KVIb?0}uH3u<9Eya9Wl4)#Jluda-K
z=Cd?eLg@JDt(gaH5t%n0btfb7DC~m<XoUUH1kDhG13VHxI5uIsNJ`{>!sGyL7KT|{
zfG*)51*jyaJGYT^bpL-3cD<0U62{o$LV8_t6<a*~QW4!_6Yy0-bV?9r?x8?pLYU@S
z`^mzMGRyy%dYpUPTN>y0IV~GRcCCx%@PlD`-f2k_Czw4#hb1&~8owH$+vjB~;$xyZ
zwIynW^R8o3ekfaQAuG4KrFQW#_jb@W1*`Fk<2ru!WjEc#j&GqQZ2jBx5x*RvcZKl;
z72F=hL!9I|aZWh)Xp{DTtk0wYOR?~P99QdRwl?suPtgGvN(tpW>{z{4;B^=1i0IRW
zW}-dQ+SGt@(RE%wCO&XZJErBo<fZm9TfdkqG|y~r)U1EoGfPXwlSezF`&#z1p&>e#
z$-~q$=jZY*;nJG0x2CjgQ?KpaCONZ5-zfI3X66X>GUYN2vA~G~>1?vKNfF|_d5Dfl
zA|cE(LZgnVb>W>}Ut4=8?;oLaZLIDvJ<am3(1m>WJM<HQeb-HUlHH>eTA&r$pdC8k
N5FF;+qwy18{R^5$)v^Ep

diff --git a/FusionIIIT/applications/scholarships/models.py b/FusionIIIT/applications/scholarships/models.py
index 5acdf8bf4..228204fff 100644
--- a/FusionIIIT/applications/scholarships/models.py
+++ b/FusionIIIT/applications/scholarships/models.py
@@ -152,6 +152,8 @@ class Release(models.Model):
     enddate = models.DateField()
     award = models.CharField(default='',max_length=25)
     remarks = models.TextField(max_length=500,default='')
+    notif_visible = models.IntegerField(default=1)
+    award_form_visible = models.IntegerField(default=0)
 
     class Meta:
         db_table = 'Release'
diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index aac6cbeda..7c45f4463 100644
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -29,6 +29,19 @@
 @login_required(login_url='/accounts/login')
 def spacs(request):
     # context = {}
+    if request.method == 'POST':
+        if 'studentapprovesubmit' in request.POST:
+            pk = request.POST.get('studentapprovesubmit')
+            obj1 = Release.objects.get(pk=pk)
+            obj1.notif_visible = 0
+            obj1.award_form_visible = 1
+            obj1.save()
+        if 'studentdeclinesubmit' in request.POST:
+            pk = request.POST.get('studentdeclinesubmit')
+            obj2 = Release.objects.get(pk=pk)
+            obj2.notif_visible = 0
+            obj2.award_form_visible = 0
+            obj2.save()
     convener = Designation.objects.get(name='spacsconvenor')
     assistant = Designation.objects.get(name='spacsassistant')
     hd = HoldsDesignation.objects.filter(user=request.user,designation=convener)
@@ -54,7 +67,9 @@ def convener_view(request):
                 startdate=from_date,
                 enddate=to_date,
                 award=award,
-                remarks=remarks
+                remarks=remarks,
+                notif_visible=1,
+                award_form_visible=0
             )
             messages.success(request,award+' are invited successfully')
             return HttpResponseRedirect('/spacs/convener_view')
diff --git a/FusionIIIT/templates/scholarshipsModule/applyNew.html b/FusionIIIT/templates/scholarshipsModule/applyNew.html
index f8fb2edda..346e05ee9 100644
--- a/FusionIIIT/templates/scholarshipsModule/applyNew.html
+++ b/FusionIIIT/templates/scholarshipsModule/applyNew.html
@@ -2,7 +2,8 @@
 {% 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
@@ -17,8 +18,8 @@
         <div class="ui vertical segment">
             <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
@@ -41,7 +42,7 @@
             <div class="content">
                 <div class="description">
                     <form method="POST" class="ui form" style="padding-left: 36px; padding-right: 36px;" enctype="multipart/form-data">
-                        {% csrf_token %} 
+                        {% csrf_token %}
                 <div class="three fields">
                         <div class="six wide field ">
                                 <label>Category</label>
@@ -55,7 +56,7 @@
                                     <input value="{{request.user.extrainfo.student.hall_no}}" name="hall_no" type="text" readonly>
                                 </div>
                             </div>
-                        
+
                 <div class="four wide field">
                         <label>Room no</label>
                         <div class="ui large input">
@@ -77,7 +78,7 @@
                                     {% for p,v in source %}
                                     <option value="{{p}}">{{v}}</option>
                                     {% endfor %}
-        
+
                                 </select>
                         </div>
                 </div>
@@ -96,7 +97,7 @@
                                     {% for p,v in mother_occ %}
                                     <option value="{{p}}">{{v}}</option>
                                     {% endfor %}
-        
+
                             </select>
                         </div>
                 </div>
@@ -157,16 +158,16 @@
                                 <input placeholder="Income" name="mother_income" type="number" required>
                             </div>
                         </div>
-                       
+
                         <div class=" field">
                             <label>Other sources Annual Income</label>
                             <div class="ui large input">
                                 <input placeholder="Income" name="other_income" type="number">
                             </div>
                         </div>
-                             
+
                     </div>
-                    
+
                 <div class="two fields">
                     <div class="eight wide field ">
                         <label># of Four Wheeler</label>
@@ -291,7 +292,7 @@
                 </div>
                 <div><br/><br/></div>
             </form>
-                
+
                 </div>
             </div>
         </div>
@@ -302,7 +303,7 @@
                     <div class="ui header">
                             Please read below instructions before applying for any of the Convocation Medals:
                         </div>
-            
+
                         <div class="content">
                             <div class="description">
                                 <label>Brief Description for Cultural:</label>
@@ -318,34 +319,34 @@
                                          <br/>
                                     </p>
                                     <br><br>
-                                
+
                             </div>
                         </div>
                     <button type="button" class="ui primary large right floated button" onclick="java_script_:dis(1)" >Proceed</button>
                <br><br> </div>
-        
+
                     <div class="ui vertical segment" id="form_part2" style="display:none">
                             <div class="ui large input">
                                     <div class="sixteen wide field">
                                     <label>Award</label>
-                                    
+
                                     <select class="ui fluid search large dropdown" name="award" id="award" onchange="java_script_:show(this.options[this.selectedIndex].value)">
                                         <option selected hidden default>Select</option>
                                         <option value="silver">Director Silver Medal</option>
                                         <option value="gold">Director Gold Medal</option>
                                         <option value="dandm">D&M Proficiency Gold Medal</option>
-                                        
+
                                     </select>
                                 </div>
                             </div>
                             <br>
-                        
+
 
     <div class="ui tab" id="dandm">
         <div class="ui active tab" data-tab="dandm">
             <div class="ui vertical segment">
                 <form method="POST" class="ui form" style="padding-left: 36px; padding-right: 36px;" enctype="multipart/form-data">
-                    {% csrf_token %} 
+                    {% csrf_token %}
                     <div class="field">
                             <label>PBI Project/Design Project</label>
                             <div class="ui large input">
@@ -359,24 +360,24 @@
                                                 <input placeholder="Room no."  name="room_no" value="{{request.user.extrainfo.student.hall_no}}" type="number" readonly>
                                             </div>
                                         </div>
-                                
+
                                     <div class="six wide field">
                                         <label>Room no</label>
                                         <div class="ui large input">
                                             <input placeholder="Room no."  name="room_no" type="text" value="{{request.user.extrainfo.student.room_no}}" readonly>
                                         </div>
                                     </div>
-                
+
                                     <div class="six wide field">
                                             <label>Type</label>
                                             <select class="ui fluid search selection large dropdown" name="award" required>
-                                                    <option value="">Select</option> 
+                                                    <option value="">Select</option>
                                                     <option value="D&M Proficiency Gold Medal">D&M Proficiency Gold Medal</option>
                                                     <option value="IIITDM Proficiency Prizes">IIITDM Proficiency Prizes</option>
                                             </select>
                                      </div>
                                 </div>
-               
+
                            <div class="two fields">
                                 <div class="eight wide field ">
                                     <label>Father's Name</label>
@@ -396,7 +397,7 @@
                                         <label>Permanent Address:</label>
                                         <textarea rows="2" name="p_address" readonly>{{request.user.extrainfo.address}}</textarea>
                                     </div>
-                
+
                                    <div class="field">
                                         <label>Correspondance Address:</label>
                                         <textarea rows="2" name="c_address" required></textarea>
@@ -415,12 +416,12 @@
                                         <input placeholder="Railway Station" name="nrs" type="text" required>
                                     </div>
                             </div>
-                        </div> 
+                        </div>
                         <div class="two fields">
                                 <div class="twelve wide field">
                                         <div class="sixteen wide field">
                                             <label>Financial Assistance</label required>
-                        
+
                                                <textarea rows="3" name="financial_assitance" required></textarea>
                                         </div>
                                    </div>
@@ -430,7 +431,7 @@
                                             <input placeholder="Total" name="grand_total" type="number" required>
                                         </div>
                                 </div>
-                            </div>  
+                            </div>
                             <div class="eight wide field">
                                 <label>Number Of Student</label>
                                 <select class="ui fluid search selection large dropdown" name="students" required>
@@ -474,7 +475,7 @@
                                                     <input placeholder="Student5" type="number" name="roll_no5">
                                                 </div>
                                             </div>
-                                
+
                             </div>
 
                 <div class="two fields">
@@ -547,7 +548,7 @@
                 <div class="two fields">
                         <div class="field" style="width:700px;">
                                 <a class="right floated item">
-                               <label><br></label>               
+                               <label><br></label>
                                <div class="seven wide field">
                                    <label>Upload file</label>
                                    <div class="ui fluid input">
@@ -584,7 +585,7 @@
          <div class="ui active tab" data-tab="goldmedal">
                 <div class="ui vertical segment">
                     <form method="POST" class="ui form" style="padding-left: 36px; padding-right: 36px;" enctype="multipart/form-data">
-                        {% csrf_token %} 
+                        {% csrf_token %}
                         <div class="two fields">
                                 <div class="eight wide field">
                                         <label>Hall no</label>
@@ -592,17 +593,17 @@
                                                 <input placeholder="Room no."  name="room_no" value="{{request.user.extrainfo.student.hall_no}}" type="number" readonly>
                                             </div>
                                         </div>
-                                
+
                                     <div class="eight wide field">
                                         <label>Room no</label>
                                         <div class="ui large input">
                                             <input placeholder="Room no."  name="room_no" type="text" value="{{request.user.extrainfo.student.room_no}}" readonly>
                                         </div>
                                     </div>
-                
-                                    
+
+
                                 </div>
-               
+
                            <div class="two fields">
                                 <div class="eight wide field ">
                                     <label>Father's Name</label>
@@ -622,7 +623,7 @@
                                         <label>Permanent Address:</label>
                                         <textarea rows="2" name="p_address" readonly>{{request.user.extrainfo.address}}</textarea>
                                     </div>
-                
+
                                    <div class="field">
                                         <label>Correspondance Address:</label>
                                         <textarea rows="2" name="c_address" required></textarea>
@@ -641,12 +642,12 @@
                                         <input placeholder="Railway Station" name="nrs" type="text" required>
                                     </div>
                             </div>
-                        </div>   
+                        </div>
                         <div class="two fields">
                                 <div class="twelve wide field">
                                         <div class="sixteen wide field">
                                             <label>Financial Assistance</label required>
-                        
+
                                                <textarea rows="3" name="financial_assitance" required></textarea>
                                         </div>
                                    </div>
@@ -663,21 +664,21 @@
                                        <textarea rows="5" name="academic_achievements" required></textarea>
                                 </div>
                            </div>
-       
+
                            <div class="field">
                                 <div class="sixteen wide field">
                                     <label>Brief Description of Science and Technology (Inside IIITDMJ) Achievement:</label>
                                        <textarea rows="5" name="science_inside" required></textarea>
                                 </div>
                            </div>
-       
+
                            <div class="field">
                                 <div class="sixteen wide field">
                                     <label>Brief Description of Science and Technology (Outside IIITDMJ) Achievement:</label>
                                        <textarea rows="5" name="science_outside" required></textarea>
                                 </div>
                            </div>
-       
+
                            <div class="field">
                                 <div class="sixteen wide field">
                                     <label>Brief Description of Games and Sports (Inside IIITDMJ) Achievement:</label>
@@ -690,7 +691,7 @@
                                        <textarea rows="5" name="games_outside" required></textarea>
                                 </div>
                            </div>
-       
+
                            <div class="field">
                                 <div class="sixteen wide field">
                                     <label>Brief Description of Cultural (Inside IIITDMJ) Achievement:</label>
@@ -703,8 +704,8 @@
                                        <textarea rows="5" name="cultural_outside" required></textarea>
                                 </div>
                            </div>
-       
-       
+
+
                            <div class="field">
                                 <div class="sixteen wide field">
                                     <label>Brief Description of Social Service:</label>
@@ -756,7 +757,7 @@
                            <div class=" two fields" style="width:700px;">
                                    <div class="field">
                                            <a class="right floated item">
-                                          <label><br></label>               
+                                          <label><br></label>
                                           <div class="seven wide field">
                                               <label>Upload files</label>
                                               <div class="ui fluid input">
@@ -764,7 +765,7 @@
                                               </div>
                                           </div>
                                       </div>
-   
+
                                <div class="field">
                                    <a class="right floated item">
                                        <label><br></label>
@@ -778,13 +779,13 @@
             </div>
          </div>
         </div>
-        
-        
+
+
     <div class="ui tab" id="silver">
      <div class="ui active tab" data-tab="goldmedal">
             <div class="ui vertical segment">
                 <form method="POST" class="ui form" style="padding-left: 36px; padding-right: 36px;" enctype="multipart/form-data">
-                    {% csrf_token %} 
+                    {% csrf_token %}
             <div class="three fields">
                     <div class="six wide field">
                             <label>Hall no</label>
@@ -792,24 +793,24 @@
                                     <input placeholder="Room no."  name="room_no" value="{{request.user.extrainfo.student.hall_no}}" type="number" readonly>
                                 </div>
                             </div>
-                    
+
                         <div class="six wide field">
                             <label>Room no</label>
                             <div class="ui large input">
                                 <input placeholder="Room no."  name="room_no" type="text" value="{{request.user.extrainfo.student.room_no}}" readonly>
                             </div>
                         </div>
-    
+
                         <div class="six wide field">
                                 <label>Type</label>
                                 <select class="ui fluid search selection large dropdown" name="award" required>
-                                        <option value="">Select</option> 
+                                        <option value="">Select</option>
                                         <option value="Director Silver Medal Games and Sports">Director Silver Medal Games and Sports</option>
                                         <option value="Director Silver Medal Cultural">Director Silver Medal Cultural</option>
                                 </select>
                          </div>
                     </div>
-   
+
                <div class="two fields">
                     <div class="eight wide field ">
                         <label>Father's Name</label>
@@ -829,7 +830,7 @@
                             <label>Permanent Address:</label>
                             <textarea rows="2" name="p_address" readonly>{{request.user.extrainfo.address}}</textarea>
                         </div>
-    
+
                        <div class="field">
                             <label>Correspondance Address:</label>
                             <textarea rows="2" name="c_address" required></textarea>
@@ -848,12 +849,12 @@
                             <input placeholder="Railway Station" name="nrs" type="text" required>
                         </div>
                 </div>
-            </div>   
+            </div>
             <div class="two fields">
                     <div class="twelve wide field">
                             <div class="sixteen wide field">
                                 <label>Financial Assistance</label required>
-            
+
                                    <textarea rows="3" name="financial_assitance" required></textarea>
                             </div>
                        </div>
@@ -863,36 +864,36 @@
                                 <input placeholder="Total" name="grand_total" type="number" required>
                             </div>
                     </div>
-                </div>   
+                </div>
             <div class="field">
                     <div class="sixteen wide field">
                         <label>Brief Description of Games and Sports/Cultural Achievement: (INSIDE IIITDMJ)</label required>
-    
+
                            <textarea rows="5" name="inside_achievements" required></textarea>
                     </div>
                </div>
-    
-    
+
+
                <div class="field">
                     <div class="sixteen wide field">
                         <label>Brief Description of Game and Sports/Cultural Achievement: (OUTSIDE IIITDMJ)</label>
-    
+
                            <textarea rows="5" name="outside_achievements" required></textarea>
                     </div>
                </div>
-    
-    
+
+
                <div class="field">
                     <div class="sixteen wide field">
                         <label>Justification:</label>
                            <textarea rows="3" name="justification" required></textarea>
                     </div>
                </div>
-        
+
                         <div class="two fields">
                                 <div class="field" style="width:700px;">
                                         <a class="right floated item">
-                                       <label><br></label>               
+                                       <label><br></label>
                                        <div class="seven wide field">
                                            <label>Upload file</label>
                                            <div class="ui fluid input">
@@ -910,13 +911,17 @@
                                 </a>
                             </div>
                         </div>
-    
+
                 </form>
         </div>
      </div>
     </div>
-             </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">
@@ -948,19 +953,19 @@
                 if (aval == "gold") {
                 silver.style.display='none';
                 dandm.style.display='none';
-                gold.style.display='inline-block';
+                gold.style.display='inline';
                 Form.fileURL.focus();
-                } 
+                }
                 if (aval == "silver") {
                 dandm.style.display='none';
                 gold.style.display='none';
-                silver.style.display='inline-block';
+                silver.style.display='inline';
                 Form.fileURL.focus();
-                } 
+                }
                 if (aval == "dandm") {
                 silver.style.display='none';
                 gold.style.display='none';
-                dandm.style.display='inline-block';
+                dandm.style.display='inline';
                 Form.fileURL.focus();
                 }
             }
@@ -970,16 +975,17 @@
         if(aval == 1)
         {
             form_part1.style.display='none';
-            form_part2.style.display='inline-block';
+            form_part2.style.display='inline';
             form_part3.style.display='none';
         }
         else if(aval == 2)
         {
             form_part1.style.display='none';
             form_part2.style.display='none';
-            form_part3.style.display='inline-block';
+            form_part3.style.display='inline';
         }
     }
     </script>
+
 </body>
-{%  endblock %}
\ No newline at end of file
+{%  endblock %}
diff --git a/FusionIIIT/templates/scholarshipsModule/browsecatalogue.html b/FusionIIIT/templates/scholarshipsModule/browsecatalogue.html
index 15958c397..bdd9be746 100644
--- a/FusionIIIT/templates/scholarshipsModule/browsecatalogue.html
+++ b/FusionIIIT/templates/scholarshipsModule/browsecatalogue.html
@@ -22,8 +22,6 @@
         </div>
 
 
-
-    </div>
     <div class="ui vertical segment">
         <div class="ui grid row">
             <div class="twelve wide column centered">  <label class="ui header" id="content_heading">   </label> </div>
@@ -84,4 +82,4 @@
 
 
 
-{% endblock javascript %}
\ No newline at end of file
+{% endblock javascript %}
diff --git a/FusionIIIT/templates/scholarshipsModule/scholarships_student.html b/FusionIIIT/templates/scholarshipsModule/scholarships_student.html
index 0dc3036a7..771b0d47d 100644
--- a/FusionIIIT/templates/scholarshipsModule/scholarships_student.html
+++ b/FusionIIIT/templates/scholarshipsModule/scholarships_student.html
@@ -40,11 +40,11 @@
                     <i class="right floated chevron right icon"></i>
                 </a>
 
-                
 
-                
 
-               
+
+
+
                 <a class="item" data-tab="two">
                     Spacs Members Details
                     <i class="right floated chevron right icon"></i>
@@ -53,7 +53,7 @@
                     Apply for Awards
                     <i class="right floated chevron right icon"></i>
                 </a>
-                
+
                 <a class="item" data-tab="four">
                         View Application Status
                         <i class="right floated chevron right icon"></i>
@@ -62,7 +62,7 @@
                     Browse Award Catalogue
                     <i class="right floated chevron right icon"></i>
                 </a>
-                
+
             </div>
             {% comment %}The Tab-Menu ends here!{% endcomment %}
 
@@ -85,13 +85,13 @@
             </div>
             {% comment %}The Personal Details end here!{% endcomment %}
 
-        
+
             {% comment %}The Publications starts here!{% endcomment %}
-            
+
             {% comment %}The Publications notionalprize ends here!{% endcomment %}
 
-            
-                    
+
+
                 {% comment %}The Publications about spacs  starts here!{% endcomment %}
                     <div class="ui tab segment" data-tab="two">
                             {% block aboutspacs %}
@@ -99,7 +99,7 @@
                             {% endblock %}
                     </div>
                     {% comment %}The Publications about spacs  ends here!{% endcomment %}
-                    
+
                     {% comment %}The Publications awards  starts here!{% endcomment %}
                         <div class="ui tab segment" data-tab="three">
                                 {% block awards %}
@@ -108,7 +108,7 @@
                         </div>
                             {% comment %}The Publications about awards ends here!{% endcomment %}
 
-                   
+
                        <div class="ui tab segment" data-tab="four">
                              {% block viewmcm %}
                                          {% include 'scholarshipsModule/viewstatus.html' with winners=winners mcm=mcm gold=gold silver=silver dandm=dandm %}
@@ -119,7 +119,7 @@
                                     {% include 'scholarshipsModule/browsecatalogue.html' with winners=winners mcm=mcm gold=gold silver=silver dandm=dandm awards=awards %}
                        {% endblock %}
                   </div>
-                      
+
                 {% comment %}The Publications about view mcm details ends here!{% endcomment %}
         </div>
         {% comment %}The central-rail segment ends here!{% endcomment %}
@@ -127,7 +127,7 @@
         {% comment %}The right-rail segment starts here!{% endcomment %}
         <div class="three wide column">
                 <div class="row">
-                    
+
                     {% if messages %}
                     <div class="field">
                     <div class="ui positive message">
@@ -140,9 +140,53 @@
                     </div>
                     </div>
                     {% endif %}
-    
+
                 </div>
-            </div>
+
+
+                {% if release %}
+
+                    <div class="ui cards">
+
+                    {% for m in release %}
+                    {% if m.notif_visible == 1 %}
+                    <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>
+                    {% endif %}
+                    {% endfor %}
+                    </div>
+
+
+                {% endif %}
+                </div>
+
         {% comment %}The right-rail segment ends here!{% endcomment %}
 
         {% comment %}The right-margin segment!{% endcomment %}
@@ -168,4 +212,4 @@
       })
     ;
         </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/FusionIIIT/templates/scholarshipsModule/winners.html b/FusionIIIT/templates/scholarshipsModule/winners.html
index 743e5ac39..3ca93a5e6 100644
--- a/FusionIIIT/templates/scholarshipsModule/winners.html
+++ b/FusionIIIT/templates/scholarshipsModule/winners.html
@@ -95,7 +95,7 @@
                 </tbody>
             </table>
 
-           
+
 
             <br>
 
@@ -145,6 +145,12 @@
                             console.log(response.result)
                         }
                         else{
+                                txt="<tr>";
+                                txt += '<td>' + "" + '</td>' +
+                                '<td>' + "No Data Found!!"  + '</td>' +
+                                '<td>' + "" + '</td>';
+                                txt +='</tr>';
+                                element.after(txt);
                             console.log(response.result);
                         }
 
@@ -157,7 +163,3 @@
     </script>
 
 {% endblock javascript %}
-
-
-
-