From 830fdc42e8f8464ee808059968d4f768a11392bd Mon Sep 17 00:00:00 2001
From: Hironsan <hiroki.nakayama.py@gmail.com>
Date: Mon, 11 Jun 2018 11:57:11 +0900
Subject: [PATCH] Update progress

---
 doccano/app/db.sqlite3                     | Bin 184320 -> 184320 bytes
 doccano/app/server/static/annotation.js    |   9 +++++++++
 doccano/app/server/static/project_admin.js |  13 +++++++++++++
 doccano/app/server/urls.py                 |   4 ++--
 doccano/app/server/views.py                |  11 ++++++-----
 5 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/doccano/app/db.sqlite3 b/doccano/app/db.sqlite3
index 26bddf1c0da7cbb178d1fbe989e5d061b80a91bf..3eae58d5768e4ac2a2b4fec72398e3e899565e13 100644
GIT binary patch
delta 934
zcmZ{i-%C?r7{}jVv%PcenPNZG%%e6)(rstk*>RIFE9xpTs4Ee7+)itv=g2mLGE3+_
ziV?d^Z|pj}@ItV^p@_1J97sZjqO3AVFM7|JLki>^-j{Qp@AEy+=RMz<+1i=e+ULz!
zeR1XrR^KG%TTgNV8^B=+?!aSs38N5$*U-AqCT)3|8wl;jsZq^Ho5NaaJYx)xnQ3;q
zjw-nL?iFchqzym=&YYgTuV;rf!!Yw&K4Tj2tZ*yPf_cFVNL?S$F`m=CZtBAa!ZB?`
zA0zc%+F5-wku^v4WS$n50*wqIbmHksU~wgYyC&QWHjtQb4}QV+LS5oB6b4GH!^s>J
zV;8ko!YJl0m*``#g<v0kLm9S&_zM7|95ZX7)<PEd-(siN%{*lU%kT(#J!OHq=1E*<
z96^|0z`S3+Y9=Sgbt5mCBi2;XdAW0Ns$EN^^i+FXnwp*-a)yF(Pj@idEz43c6jzjZ
zNbyHiaYg#5FzT?4!UGj7X++BwKbG*>b73VO4Ej|i6jPN;L<oJhFjN)ZolI-C(jAV(
z71=MxBC%+=xLm^5oEY{68v?<#4aL1a!d=wD-GiStYzf+G7#5(^-UwlgbADW$3iYfb
zn1jonb;0_{^JI|LppIC7fAy<kyxaFOIZ51_HLG;+JN*ArR)-HpBB7%ysyak!kgxa9
z+(J5Zx1KH@<zGSWi79IIKmTeaDu;@5K$3!d6Tu(&0h{7DRzY%5hA^iNVr_(BhAQX;
zRuOE%s!+X$pqn_*DZn>OLw_(%>ahd)fZxofH6!!T4z6j1h{BE)qFvY#U2AsUny8&L
zLMY|Dq7ebIgC;azq3JMTRRw`v+eOsB+aBIZxAj9Xi0-ned;^bL%-X{9dM+=e%;fw8
GN&E%Q*X{)X

delta 339
zcmZozz}>KbdxA8h(L@<%Mx%`h%jCrrnD}4vU*X@)AIe|H-^ZWDZ^^%cUtzPN0SiB?
zxFEAB=k$y7nM5Q+_?h)Nic^cqQj6jf^YZdb5=%1k^Z4ga4%C-r<d~eVub{)jtO`?+
zlbDp6!@$76$(fRsm?tQ}tjP)0TTqmrm6}{KdAGhKi!c+jZu1TO?Kkupbqd%R`F}I;
z|K2Q^@Sb0gfq{jYk&}xHXapnw9|rzEU}0t;cl)3Hj2r?$#rqie_W?z>@K4`&pV4hQ
zO99g#{z(Na=*F;ca&q#5jakURzYwTlI{);A{7lI}b-x(+e}T<qXJBDu0lIZl0t?7w
cxP8-qzGvjd5ZKI8@JD`90rz(90;aF=0Ciquk^lez

diff --git a/doccano/app/server/static/annotation.js b/doccano/app/server/static/annotation.js
index c6493996..7a4d3b8b 100644
--- a/doccano/app/server/static/annotation.js
+++ b/doccano/app/server/static/annotation.js
@@ -176,6 +176,15 @@ var vm = new Vue({
                 console.log('ERROR!! happend by Backend.')
             });
 
+        axios.get('/' + base_url + '/apis/progress')
+            .then(function (response) {
+                self.total = response.data['total'];
+                self.remaining = response.data['remaining'];
+            })
+            .catch(function (error) {
+                console.log('ERROR!! happend by Backend.')
+            });
+
         axios.get('/' + base_url + '/apis/data')
             .then(function (response) {
                 self.items = response.data['data'];
diff --git a/doccano/app/server/static/project_admin.js b/doccano/app/server/static/project_admin.js
index 0e370c2f..e38b248c 100644
--- a/doccano/app/server/static/project_admin.js
+++ b/doccano/app/server/static/project_admin.js
@@ -23,6 +23,8 @@ var vm = new Vue({
         editedTodo: null,
         newLabel: '',
         newShortcut: '',
+        total: 0,
+        remaining: 0,
     },
 
     methods: {
@@ -120,6 +122,17 @@ var vm = new Vue({
             .catch(function (error) {
                 console.log('ERROR!! happend by Backend.')
             });
+        axios.get('/' + base_url + '/apis/progress')
+            .then(function (response) {
+                console.log(response.data);
+                self.total = response.data['total'];
+                self.remaining = response.data['remaining'];
+                console.log(self.total);
+                console.log(self.remaining);
+            })
+            .catch(function (error) {
+                console.log('ERROR!! happend by Backend.')
+            });
     },
     directives: {
         'todo-focus': function (el, binding) {
diff --git a/doccano/app/server/urls.py b/doccano/app/server/urls.py
index 2b504ae9..a36b34ef 100644
--- a/doccano/app/server/urls.py
+++ b/doccano/app/server/urls.py
@@ -1,6 +1,6 @@
 from django.urls import path
 
-from .views import AnnotationView, AnnotationAPIView, MetaInfoAPI, SearchAPI
+from .views import AnnotationView, AnnotationAPIView, ProgressAPI, SearchAPI
 from .views import ProjectListView, ProjectAdminView, RawDataAPI, LabelAPI
 
 urlpatterns = [
@@ -10,6 +10,6 @@ urlpatterns = [
     path('<int:project_id>/apis/data', AnnotationAPIView.as_view()),
     path('<int:pk>/apis/raw_data', RawDataAPI.as_view(), name='data_api'),
     path('<int:pk>/apis/labels', LabelAPI.as_view(), name='label_api'),
-    path('<int:project_id>/apis/label', MetaInfoAPI.as_view()),
+    path('<int:project_id>/apis/progress', ProgressAPI.as_view()),
     path('<int:project_id>/apis/search', SearchAPI.as_view()),
 ]
diff --git a/doccano/app/server/views.py b/doccano/app/server/views.py
index 51ceac01..a4a33e35 100644
--- a/doccano/app/server/views.py
+++ b/doccano/app/server/views.py
@@ -56,11 +56,14 @@ class AnnotationAPIView(View):
         return JsonResponse({})
 
 
-class MetaInfoAPI(View):
+class ProgressAPI(View):
 
     def get(self, request, *args, **kwargs):
-        total = Document.objects.count()
-        remaining = Document.objects.filter(annotation__isnull=True).count()
+        project_id = kwargs.get('project_id')
+        project = Project.objects.get(id=project_id)
+        docs = Document.objects.filter(project=project)
+        total = docs.count()
+        remaining = docs.filter(annotation__isnull=True).count()
 
         return JsonResponse({'total': total, 'remaining': remaining})
 
@@ -71,8 +74,6 @@ class SearchAPI(View):
         keyword = request.GET.get('keyword')
         docs = Document.objects.filter(text__contains=keyword)
         labels = [[a.as_dict() for a in Annotation.objects.filter(data=d.id)] for d in docs]
-        # print(annotations)
-        # print(docs)
         docs = [{**d.as_dict(), **{'labels': []}} for d in docs]
         # Annotation.objects.select_related('data').all().filter(data__text__contains=keyword)