提交代码

Signed-off-by: zouap <zouap@pcl.ac.cn>

models/models.go

@@ -133,7 +133,6 @@ func init() {
 		new(FileChunk),
 		new(BlockChain),
 		new(RecommendOrg),
-		new(UserBusinessAnalysis),
 	)
 
 	tablesStatistic = append(tablesStatistic,

models/user_business_analysis.go

@@ -63,7 +63,7 @@ type UserBusinessAnalysis struct {
 }
 
 func CountData(wikiCountMap map[string]int) {
-	log.Info("start to count data")
+	log.Info("start to count other user info data")
 	sess := x.NewSession()
 	defer sess.Close()
 	sess.Select("`user`.*").Table("user")
@@ -82,7 +82,6 @@ func CountData(wikiCountMap map[string]int) {
 	end_unix := endTime.Unix()
 
 	CountDate := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 0, 1, 0, 0, currentTimeNow.Location())
-	//codeMergeCountMap := queryAction(start_unix,end_unix,11)
 
 	CodeMergeCountMap := queryAction(start_unix, end_unix, 11)
 	CommitCountMap := queryAction(start_unix, end_unix, 5)
@@ -96,6 +95,8 @@ func CountData(wikiCountMap map[string]int) {
 	CommitCodeSizeMap, err := GetAllUserKPIStats()
 	if err != nil {
 		log.Info("query commit code errr.")
+	} else {
+		log.Info("query commit code size, len=" + fmt.Sprint(len(CommitCodeSizeMap)))
 	}
 	CommitDatasetSizeMap := queryDatasetSize(start_unix, end_unix)
 	SolveIssueCountMap := querySolveIssue(start_unix, end_unix)

public/self/labelTaskPage.js

@@ -500,7 +500,9 @@ function getTaskSataus(task_status,task_status_desc){
     return "关联的数据集已经被删除。"
   }
   else if(task_status == 20){
-    return "自动标注进行中"
+    return "自动标注进行中:" + task_status_desc;
+  }else if(task_status == 21){
+    return task_status_desc;
   }
   return "";
 }
@@ -517,7 +519,7 @@ function getVerify(task_status,id,task_type){
 }
 
 function getLabel(task_status,id,task_type,task_flow_type){
-	if(task_status == 0 && (userType == 1 || userType == 0)){
+	if((task_status == 0 || task_status == 21) && (userType == 1 || userType == 0)){
 		return "<a onclick=\"personLabel(\'" + id + "\'," + task_type + ")\"><b>" + getLabelDesc(task_flow_type) + "标注</b></a><br>";
 	}else{
 		return "";

routers/repo/attachment.go

@@ -146,8 +146,6 @@ func DeleteAttachment(ctx *context.Context) {
 
 	DeleteAllUnzipFile(attach, "")
 
-	TimeingCountData()
-
 	_, err = models.DeleteFileChunkById(attach.UUID)
 	if err != nil {
 		ctx.Error(500, fmt.Sprintf("DeleteFileChunkById: %v", err))

routers/repo/user_data_analysis.go

@@ -50,6 +50,6 @@ func TimeingCountData() {
 			}
 		}
 	}
-
+	//other user info data
 	models.CountData(wikiMap)
 }

templates/repo/datasets/label/index.tmpl

@@ -47,7 +47,7 @@
                                              </div>
 
                                              <div class="ui container" style="height: 30px;">
-                                                <button type="button"  onclick="setPredictTask();"  class="ui blue button"  style="float:left">新建图片自动标注</button> 
+                                                <button type="button"  onclick="setPredictTask();"  class="ui blue button"  style="float:left">新建图片自动标注</button>
                                                 <button type="button"  onclick="setDataSetTask();"  class="ui blue button"  style="float:left">新建图片人工标注</button>
 												
 												<button type="button"  onclick="setMultiTaskId();"  class="ui blue button"  style="float:right;margin-left:20px;">导出标注数据</button>