Merge pull request #11 from ankitjavalkar/pending-count

Pending count

2 files changed, 81 insertions, 16 deletions

diff --git a/tbc/templates/base.html b/tbc/templates/base.html
index a6e5856..62b2da4 100755
--- a/tbc/templates/base.html
+++ b/tbc/templates/base.html
@@ -58,6 +58,38 @@
             position: relative;
             top: -2px;
         }
+       .badge-custom {
+            padding: 1.5px 7px 1.5px;
+            font-size: 12.025px;
+            font-weight: bold;
+            white-space: nowrap;
+            color: #ffffff;
+            background-color: #f89406;
+            -webkit-border-radius: 9px;
+            -moz-border-radius: 9px;
+            border-radius: 15px;
+        }
+/*        .tooltip-custom {
+            max-width: 150px;
+            width: auto;
+            background-color: #1ABC9C;
+        }*/
+
+ /*       .tooltip-custom .tooltip-inner {
+            background-color: #1ABC9C;
+        }
+        .tooltip-custom .tooltip-arrow {
+              border-top-color: #1ABC9C;
+        }*/
+
+        .tooltip-inner {
+            background-color: #1ABC9C;
+            width: 150px;
+        }
+
+        .tooltip.bottom .tooltip-arrow {
+            border-bottom: 5px solid #1ABC9C;
+        }
     </style>
 
    {% block css %}
@@ -91,7 +123,7 @@
                   <li><a href="http://python.fossee.in" target="_blank">Python Team</a></li>
                 </ul>
               </li>
-	      <li class="dropdown">
+	            <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Textbooks<b class="caret"></b></a>
                 <ul class="dropdown-menu">
                   <li><a href="{% url 'tbc:CompletedBooks' %}">Completed Books</a></li>
@@ -101,18 +133,35 @@
               <li><a href="{% url 'tbc:InternshipForms' %}">Internship Forms</a></li>
 
             {% if user %}
-                 <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.first_name }}<b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                      <li><a href="{% url 'tbc:SubmitBook' %}">Submit Book (OLD)</a></li>
-                      <li><a href="{% url 'tbc:ListAICTE' %}">Submit Proposal</a></li>
-                      <li><a href="{% url 'tbc:SubmitSample' %}">Submit Sample Notebook</a></li>
-                      <li><a href="{% url 'tbc:ConfirmBookDetails' %}">Submit Codes</a></li>
-                      <li><a href="{% url 'tbc:GetCertificate' %}">Get Certificate</a></li>
-                      <li><a href="{% url 'tbc:UpdatePassword' %}">Update Password</a></li>
-                      <li><a href="{% url 'tbc:UserLogout' %}">Logout</a></li>
-                    </ul>
-                 </li>
+                {% if proposal_position %}
+                     <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.first_name }}<span class="badge-custom" rel="tooltip" title="Pending Proposal Position: {{ proposal_position }}" data-placement="bottom" style="margin-left:5px; margin-right:5px; display: inline-block">{{ proposal_position }}</span>
+                        <b class="caret"></b></a>
+                        <ul class="dropdown-menu">
+                          <li><a href="{% url 'tbc:SubmitBook' %}">Submit Book (OLD)</a></li>
+                          <li><a href="{% url 'tbc:ListAICTE' %}">Submit Proposal</a></li>
+                          <li><a href="{% url 'tbc:SubmitSample' %}">Submit Sample Notebook</a></li>
+                          <li><a href="{% url 'tbc:ConfirmBookDetails' %}">Submit Codes</a></li>
+                          <li><a href="{% url 'tbc:GetCertificate' %}">Get Certificate</a></li>
+                          <li><a href="{% url 'tbc:UpdatePassword' %}">Update Password</a></li>
+                          <li><a href="{% url 'tbc:UserLogout' %}">Logout</a></li>
+                        </ul>
+                     </li>
+
+                {% else %}
+                     <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.first_name }}<b class="caret"></b></a>
+                        <ul class="dropdown-menu">
+                          <li><a href="{% url 'tbc:SubmitBook' %}">Submit Book (OLD)</a></li>
+                          <li><a href="{% url 'tbc:ListAICTE' %}">Submit Proposal</a></li>
+                          <li><a href="{% url 'tbc:SubmitSample' %}">Submit Sample Notebook</a></li>
+                          <li><a href="{% url 'tbc:ConfirmBookDetails' %}">Submit Codes</a></li>
+                          <li><a href="{% url 'tbc:GetCertificate' %}">Get Certificate</a></li>
+                          <li><a href="{% url 'tbc:UpdatePassword' %}">Update Password</a></li>
+                          <li><a href="{% url 'tbc:UserLogout' %}">Logout</a></li>
+                        </ul>
+                     </li>
+                {% endif %}
             {% endif %}
 
             {% if reviewer %}
@@ -187,7 +236,7 @@
         <center>
             <div class="alert" style="width:650px;height:40px;">
                 <a class="close" data-dismiss="alert" href="#">&times;</a>
-                <p>Thank you for showing interest in contributing to Python TBC. <br>We have recevied your proposal. Please be patient we will get back to you within few days.</p>
+                <p>Thank you for showing interest in contributing to Python TBC. <br>We have received your proposal. Please be patient we will get back to you within few days.</p>
             </div>
         </center>
         <div class="clearfix"></div>
@@ -301,6 +350,11 @@
     g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
   })();
 </script>
+<script type="text/javascript">
+  $(document).ready(function(){
+    $("[rel=tooltip]").tooltip();
+  });
+</script>
 <noscript><p><img src="http://analytics.spoken-tutorial.org/piwik.php?idsite=15" style="border:0;" alt="" /></p></noscript>
 <!-- End Piwik Code -->
   </body>
diff --git a/tbc/views.py b/tbc/views.py
index 2c8dac9..3d981f2 100755
--- a/tbc/views.py
+++ b/tbc/views.py
@@ -48,7 +48,7 @@ def email_send(to,subject,msg):
 
 
 def is_reviewer(user):
-    if user.groups.filter(name='reviewer').count() == 1:
+    if user.groups.filter(name='reviewer').exists():
         return True
 
 
@@ -127,6 +127,18 @@ def Home(request):
         obj = {'book':books[i], 'image':images[i]}
         book_images.append(obj)
     context['items'] = book_images
+
+    #Check if user is logged in and fetch user's pending proposal ID
+    if context.get('user'):
+        curr_user = request.user
+        proposal_pos = 0
+
+        user_profile = Profile.objects.filter(user=curr_user)
+        user_proposal = Proposal.objects.filter(user=user_profile)
+        user_proposal_pending = user_proposal.filter(status="pending")
+        if user_proposal_pending:
+            context['proposal_position'] = user_proposal_pending[0].id
+
     return render_to_response('base.html', context)
 
 
@@ -1266,7 +1278,6 @@ def RedirectToIpynb(request, notebook_path=None):
 # ajax views
 @csrf_exempt
 def ajax_matching_books(request):
-    print "here"
     titles = request.POST["titles"]
     titles = json.loads(titles)
     matches = []