Merge pull request #734 from scieloorg/beta

Preparação para release de versão estável r2014.04.03.001

scielomanager/articletrack/modelmanagers.py

@@ -17,6 +17,12 @@ def active(self, get_active_collection=user_request_context.get_current_user_act
         return self.filter(
             article__journals__collection=get_active_collection()).distinct()
 
+    def accepted(self):
+        return self.filter(accepted_by__isnull=False)
+
+    def pending(self):
+        return self.filter(accepted_by__isnull=True)
+
 
 class CheckinManager(UserObjectManager):
 

scielomanager/articletrack/templates/articletrack/checkin_list.html

@@ -1,22 +1,43 @@
 {% extends "base_list_lv0.html" %}
 {% load i18n %}
-{% load scielo_common %}
+{% load pagination_tags %}
 {% load trans_status %}
 
 {% block page_title %}{% trans "List of Article Check ins" %}{% endblock %}
 
 {% block content %}
 
+<!-- NAVIGATIONS -->
+<div class="navbar">
+  <div class="navbar-inner">
+    <ul class="nav">
+      <li>
+        <a class="brand" href="#">{% trans 'List of Check-ins by Article' %}</a>
+      </li>
+      <li class="divider-vertical"></li>
+    </ul>
+    <ul class="nav pull-right">
+      <li class="divider-vertical"></li>
+      <li><a href="#pending" role="menuitem"><i class="icon-time"></i> {% trans "Pending" %}</a></li>
+      <li class="divider-vertical"></li>
+      <li><a href="#accepted" role="menuitem"><i class="icon-ok-circle"></i> {% trans "Accepted" %}</a></li>
+    </ul>
+  </div>
+</div>
+
 <div class="row-fluid show-grid">
-  <div class="span10">
-    <h3>{% trans 'List of Check-ins by Article' %}:</h3>
+  <div class="span8">
+    <a name="pending"></a>
+    <h3>{% trans 'Pending' %}:</h3>
   </div>
-  <div class="2" style="text-align:right; margin-bottom:20px;">
-    {% simple_pagination checkins %}
+  <div class="span4">
+    <div class="pull-right">
+      {% simple_pagination checkins_pending "pending_page" %}
+    </div>
   </div>
 </div>
 
-{% regroup checkins.object_list by article as article_list %}
+
 <table class="table table-striped table-condensed">
   <thead>
     <tr>
@@ -30,8 +51,7 @@ <h3>{% trans 'List of Check-ins by Article' %}:</h3>
     </tr>
   </thead>
   <tbody>
-    {% for article in article_list %}
-      {% with article.list|first as checkin %}
+    {% for checkin in checkins_pending.object_list %}
       <tr>
         <td>{{ checkin.package_name }}</td>
         <td>{{ checkin.article.article_title|truncatewords:5 }}</td>
@@ -47,7 +67,6 @@ <h3>{% trans 'List of Check-ins by Article' %}:</h3>
           <a href="{% url notice_detail checkin.pk %}" class="btn btn-mini btn">{% trans "Details" %}</a>
         </td>
       </tr>
-      {% endwith %}
     {% empty %}
       <tr>
         <td colspan="7">
@@ -61,4 +80,63 @@ <h3>{% trans 'List of Check-ins by Article' %}:</h3>
   </tbody>
 </table>
 
+
+<div class="row-fluid show-grid">
+  <div class="span8">
+    <a name="accepted"></a>
+    <h3>{% trans 'Accepted' %}:</h3>
+  </div>
+  <div class="span4">
+    <div class="pull-right">
+      {% simple_pagination checkins_accepted "accepted_page" %}
+    </div>
+  </div>
+</div>
+
+<table class="table table-striped table-condensed">
+  <thead>
+    <tr>
+      <th>{% trans "Package" %}</th>
+      <th>{% trans "Article" %}:</th>
+      <th>{% trans "Journal" %}:</th>
+      <th>{% trans "Issue label" %}:</th>
+      <th>{% trans "Most recent upload" %}:</th>
+      <th>{% trans "Error Level" %}:</th>
+      <th>{% trans "Accepted by" %}:</th>
+      <th>{% trans "Accepted at" %}:</th>
+      <th class="span1">&nbsp;</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for checkin in checkins_accepted.object_list %}
+      <tr>
+        <td>{{ checkin.package_name }}</td>
+        <td>{{ checkin.article.article_title|truncatewords:5 }}</td>
+        <td>{{ checkin.article.journal_title }}</td>
+        <td>{{ checkin.article.issue_label }}</td>
+        <td>{{ checkin.created_at|date:"d/m/Y - H:i" }}</td>
+        <td>
+          <span class="label label-{% trans_status checkin.get_error_level to_label='True' %}">
+            {{ checkin.get_error_level }}
+          </span>
+        </td>
+        <td>{{ checkin.accepted_by.get_full_name }}</td>
+        <td>{{ checkin.accepted_at|date:"d/m/Y - H:i" }}</td>
+        <td>
+          <a href="{% url notice_detail checkin.pk %}" class="btn btn-mini btn">{% trans "Details" %}</a>
+        </td>
+      </tr>
+    {% empty %}
+      <tr>
+        <td colspan="9">
+          <div class="alert alert-info">
+            <i class="icon-info-sign"></i>
+            {% trans 'There are no items.' %}
+          </div>
+        </td>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>
+
 {% endblock %}

scielomanager/articletrack/templates/articletrack/history.html

@@ -1,6 +1,6 @@
 {% extends "base_list_lv0.html" %}
 {% load i18n %}
-{% load scielo_common %}
+{% load pagination_tags %}
 
 {% block page_title %}{% trans "List of specific attempt" %}{% endblock %}
 

scielomanager/articletrack/templates/articletrack/notice_detail.html

@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load static %}
 {% load trans_status %}
-{% load scielo_common %}
 {% load user_avatar %}
 
 {% block page_title %}{% trans "Details of checkin" %}: {{ checkin.pk }}{% endblock %}
@@ -69,9 +68,6 @@ <h4>{% trans "Check-in Information" %}:</h4>
     </div>
 
   </div>
-  <div class="2" style="text-align:right; margin-bottom:20px;">
-    {% simple_pagination notices %}
-  </div>
 </div>
 
 <div class="row-fluid show-grid" id="notices">
@@ -109,7 +105,7 @@ <h3>{% trans 'Notices' %}:</h3>
     </tr>
   </thead>
   <tbody>
-    {% for notice in notices.object_list %}
+    {% for notice in notices %}
     <tr class="{% trans_status notice.status %}">
       <td>
         {{ notice.stage }}

scielomanager/articletrack/templates/articletrack/ticket_list.html

@@ -1,6 +1,6 @@
 {% extends "base_list_lv0.html" %}
 {% load i18n %}
-{% load scielo_common %}
+{% load pagination_tags %}
 
 {% block page_title %}{% trans "List of Tickets" %}{% endblock %}