Merge branch 'develop' of http://git.trustie.net/wrm1995/codepedia2 into develop

Codepedia2/settings.py

@@ -120,7 +120,7 @@ WSGI_APPLICATION = 'Codepedia2.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'codepedia',
+        'NAME': 'codepedia_1',
         'USER': 'root',
         'PASSWORD': 'codepedia123',
         'HOST': '127.0.0.1'

apps/operations/views.py

@@ -86,11 +86,14 @@ class ShowAnnotationView(View):
     def get_group_annotation(self,file_id,line_num,user_id):
         # 首先获取当前组的所有用户id
         # 根据到当前的id获取到group username list
-        users = get_group_users(user_id,file_id)
+        users = get_group_users(user_id,file_id)            
         # user_ids = []
         # 然后调用
         commit_id = self.get_current_commitid_by_fileid(file_id)
-        annotations = Annotation.objects.filter(file_id=file_id, linenum=line_num,user__in=users,is_latest=1,commit_id=commit_id)
+        if users is None:
+            annotations = Annotation.objects.filter(file_id=file_id, linenum=line_num,user_id=user_id,is_latest=1,commit_id=commit_id)
+        else:
+            annotations = Annotation.objects.filter(file_id=file_id, linenum=line_num,user__in=users,is_latest=1,commit_id=commit_id)
         return annotations
 
 
@@ -948,11 +951,12 @@ def get_project_info(project_id):
     anno_sum = len(annos)
     issue_sum = len(Issue.objects.filter(project_id=project_id))
     question_sum = len(Question.objects.filter(project_id=project_id))
+    issue_question_sum = issue_sum + question_sum
+    
 
     # 参与用户数
     usersum = len(annos.values('user_id').annotate(user_num=Count('user_id')))
-    
-
+    annoted_method_num = 0
     # 获取文件信息和热门问题
     anno_filenum = len(annos.values(
         'file_id').annotate(file_num=Count('file_id')))
@@ -1021,9 +1025,11 @@ def get_annoted_method_num(file_ids):
     for i in range(len(file_ids)):
         file_id = file_ids[i]
         method_lines = get_files_method_lines(file_id)
+        if method_lines is None:
+            return 0
         for j in range(len(method_lines)):
             current_line = method_lines[j]
-            if Annotation.objects.filter(linenum=current_line) is not None:
+            if len(Annotation.objects.filter(file_id__in=file_ids,linenum=current_line))>0:
                 annoted_method_num = annoted_method_num + 1    
         return annoted_method_num
     # 调用api接口
@@ -1068,6 +1074,7 @@ def get_dir_info(project_id,path):
         question_sum += fileid_questionnum[i]['question_num']
 
     issue_question_sum = issue_sum + question_sum
+    print(issue_question_sum)
 
     anno_num = len(Annotation.objects.filter(file_id=file_id))
     question_num = len(Question.objects.filter(file_id=file_id))

templates/projects/filesub/dir_info.html

@@ -83,8 +83,9 @@
             <span class="fl mt7 info-nav">Comments</span>
         </p>
     </div> -->
+    <div class="fl font-20 colorFFF">Annotated Files</div>
     <div class="filePathInfo">
-        <div class="fl font-20 colorFFF">Annotated Files</div>
+        <div></div>
         <div class="clearfix filePathline fileinfo-item">
             <span>File Name</span>
             <span>Num.of Annotations</span>