merge

pnshiralkar · pnshiralkar · commit 634abef1475b · 2020-01-19T22:59:10.000+05:30
Merge branch 'master' of https://github.com/pnshiralkar/Picsoreel-voting-platform
diff --git a/backend/voting/static/img/bloodDonation.JPG b/backend/voting/static/img/bloodDonation.JPG
diff --git a/backend/voting/templates/voting/count.html b/backend/voting/templates/voting/count.html
@@ -31,7 +31,7 @@ <h3>
             </tr>
             {% for key, value in sortedp.items %}
             <tr>
-                <td>P00{{key}}</td>
+                <td>P{{key}}</td>
                 <td>{{value}}</td>
             </tr>
             {% endfor %}
@@ -47,7 +47,7 @@ <h3>
             </tr>
             {% for key, value in sortedd.items %}
             <tr>
-                <td>S00{{key}}</td>
+                <td>S{{key}}</td>
                 <td>{{value}}</td>
             </tr>
             {% endfor %}
diff --git a/backend/voting/templates/voting/thanks.html b/backend/voting/templates/voting/thanks.html
@@ -21,6 +21,7 @@
 <body>
 
     <div class="container center-align">
+        <!--
         <h1 class="header center white-text">THANK YOU</h1>
         <h5 class="white-text">Your choices have been recorded</h5>
         <br>
@@ -38,6 +39,29 @@ <h5 class="white-text">Your choices have been recorded</h5>
                 <a href="#">PARTICIPATE</a>
             </div>
         </div>
+        -->
+        <h1 class="white-text">THANK YOU</h1>
+        <h5 class="white-text">Your choices have been recorded</h5>
+        <br>
+        <div class="card">
+            <div class="card-image">
+                <img src="../../static/img/bloodDonation.JPG">
+                <span class="card-title">Blood Donation</span>
+            </div>
+            <div class="card-content" style="font-size:15px">
+                <i>
+                    "A single pint of blood can save three lives. A single guesture can create a million smiles."
+                </i>
+                <br>
+                <br>
+                <p>Team Pictoreal plans to organize a blood donation drive on <b>DD/MM/YYYY</b></p>
+                <ul class="left-align">
+                <li>Every year, we witness hundreds of enthusiastic donors.</li>
+                <li>Refreshments are provided to all blood donors for their contributions.</li>
+                <li>So join us on <b>DD/MM/YYYY</b> to be a part of this noble cause.</li>
+                </ul>
+            </div>
+        </div>
     </div>
 
 
@@ -46,7 +70,7 @@ <h5 class="white-text">Your choices have been recorded</h5>
 
     </main>
     <footer class="page-footer">
-        <div class="container">
+        <!--div class="container">
             <div class="row">
                 <div class="col l6 s12">
                     <h5 class="white-text center">Team Pictoreal values your feedback</h5>
@@ -60,7 +84,7 @@ <h5 class="white-text center">Team Pictoreal values your feedback</h5>
                     <a class="waves-effect waves-black btn-floating green"><i class="medium material-icons">sentiment_very_satisfied</i></a>
                 </div>
             </div>
-        </div>
+        </div-->
         <div class="footer-copyright">
             <div class="container">
                 © <a href="https://pictoreal.in/" target="_blank"> PICTOREAL </a>
@@ -84,4 +108,4 @@ <h5 class="white-text center">Team Pictoreal values your feedback</h5>
 
     <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
     <script src="js/materialize.js"></script>
-</body></html>
+</body></html>
diff --git a/backend/voting/views.py b/backend/voting/views.py
@@ -123,7 +123,7 @@ def count(request):
     if request.user.is_staff or request.user.is_superuser:
         listp = []
         listd = []
-        for i in range(0, 30):
+        for i in range(0, 500):
             try:
                 vote = Vote.objects.get(pk=i)
                 drawing1 = int(vote.drawing1[1:])
