bug fix

Author: Joe Qiao

.gitignore

@@ -7,6 +7,7 @@ annotation-app/.npmrc
 annotation-app/chart
 annotation-app/src/environments/environment.stg.ts
 annotation-app/src/environments/environment.test.ts
+annotation-app/.angular
 # annotation-app/package-lock.json
 annotation-app/tsconfig.spec.json
 annotation-app/dist

README.md

@@ -16,6 +16,7 @@ Core features include:
   - Tabular classification and regresion
   - Images recognition with bounding boxes and polygons
   - Log labeling
+  - Question answer
 - Active learning with uncertainly sampling to query unlabeled data
 - Project tracking with real time data aggregation and review process
 - User management panel with role-based access control

annotation-app/src/app/components/projects/annotate/annotate.component.html

@@ -916,10 +916,13 @@ <h4 style="margin-top: 2rem; margin-left: 0.5rem">
               >
               <label class="circle" [style.background-color]="getLabelColor(item)">&nbsp;&nbsp;<b>{{index+1}}</b></label>
               <clr-radio-wrapper class="clr-col-10">
-                <input type="radio" clrRadio name="questionRadio"  class="questionRadio"
+                <input  clrRadio 
+                  class="questionRadio"
+                  type="radio"
+                  name="questionRadio"
                   value="{{item}}" 
-                  (change)="onSelectingEntity($event, index, index)"
-                  [attr.checked]="index == 0?'checked': null "
+                  (change)="onSelectingEntity($event, item, index)"
+                  [attr.checked]="index == 0?'checked': null"
                 />
                 <label (change)="editQuestion($event, index)">
                     <textarea

annotation-app/src/app/components/projects/annotate/annotate.component.ts

@@ -346,9 +346,9 @@ export class AnnotateComponent implements OnInit, AfterViewInit, OnDestroy {
             this.toReadStorageSetting('display');
           }
           if (this.projectType == 'ner' || this.projectType == 'qa') {
-            this.getQuestionListAndSetQuestionColors(this.sr.questionForText);
             this.sr = this.resetNerSrData(this.sr);
             this.toShowExistingLabel();
+            this.getQuestionListAndSetQuestionColors(this.sr.questionForText);
           }
           if (this.projectType == 'image') {
             this.sr = this.resetImageSrData(this.sr);

annotation-service/services/project.service.js

@@ -30,11 +30,11 @@ async function getProjects(req) {
 
     if (src == SRCS.ANNOTATE) {
         console.log(`[ PROJECT ] Service query current annotator project list`);
-        const annotateConditions = { annotator: { $regex: email } };
-        const logReviewConditions = { creator: { $regex: email }, annotator: { $not: { $size: 0 } } };
+        const annotateConditions = { annotator: email };
+        const logReviewConditions = { creator: email, annotator: { $not: { $size: 0 } } };
         condition = { $or: [annotateConditions, logReviewConditions] };
     } else if (src == SRCS.PROJECTS && user.role != "Annotator") {
-        condition = { creator: { $regex: email } };
+        condition = { creator: email };
     } else if (src == SRCS.ADMIN && user.role == "Admin") {
         condition = {};
     } else if (src == SRCS.COMMUNITY) {
@@ -56,7 +56,7 @@ async function getProjects(req) {
 
 async function getProjectByAnnotator(req) {
     console.log(`[ PROJECT ] Service query project name by annotator: ${req.auth.email}`);
-    const condition = { annotator: { $regex: req.auth.email } };
+    const condition = { annotator: req.auth.email };
     const columns = "projectName";
     return mongoDb.findByConditions(ProjectModel, condition, columns);
 }
@@ -559,7 +559,7 @@ async function getReviewList(req) {
     const user = req.auth.email;
     await validator.checkAnnotator(user);
 
-    const conditions = { creator: { $regex: user }, projectType: PROJECTTYPE.LOG };
+    const conditions = { creator: user, projectType: PROJECTTYPE.LOG };
     const options = { sort: { updatedDate: -1 } };
     return mongoDb.findByConditions(ProjectModel, conditions, null, options);
 }
@@ -1052,7 +1052,7 @@ async function getProjectsTextTabular(email) {
         { projectType: PROJECTTYPE.TABULAR }
     ];
     condition.$or = [
-        { annotator: { $regex: email } },
+        { annotator: email },
         { assignSlackChannels: { $exists: true } }
     ];
     return mongoDb.findByConditions(ProjectModel, condition, project, options);

annotation-service/utils/srsImporter.js

@@ -45,13 +45,13 @@ module.exports = {
             fork: true,
             flatKeys: true,
             headers: header,
-            checkType: true
+            checkType: false
         };
         if (req.body.isHasHeader == 'no') {
             headerRule.noheader = true;
         };
-        if (projectType == PROJECTTYPE.TEXT) {
-            headerRule.checkType = false;
+        if (projectType == PROJECTTYPE.TABULAR) {
+            headerRule.checkType = true;
         }
         let fileStream = await fileSystemUtils.handleFileStream(req.body.location);
 
@@ -86,10 +86,10 @@ module.exports = {
                 if (projectType == PROJECTTYPE.QA) {
                     let questions = [];
                     for (const q of questionForText) {
-                        if (!q || !q.trim() || !oneData[q]) {
+                        if (!`${q}`.trim() || !oneData[q].trim()) {
                             continue;
                         }
-                        for (const question of oneData[q].split("?")) {
+                        for (const question of oneData[q].trim().split("?")) {
                             if (question.trim()) {
                                 questions.push(question.trim()+"?");
                             }
@@ -205,4 +205,4 @@ module.exports = {
         }
     }
 
-}
+}