fix/issue-111: updated peer review issues and extra changes of #109 r…

…emoved
CarnegieLearningWeb · Mar 11, 2021 · 2ee682a · 2ee682a
1 parent ad5e78d
commit 2ee682a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 42 deletions.
diff --git a/...app/features/dashboard/home/components/experiment-design/experiment-design.component.html b/...app/features/dashboard/home/components/experiment-design/experiment-design.component.html
@@ -128,18 +128,7 @@
       + {{ 'home.new-experiment.design.add-condition.text' | translate }}
     </button>
   </ng-container>
-  <!-- applyEqualWeight -->
-  <mat-card class="result">
-    <mat-card-content>
-      <section class="example-section">
-        <mat-checkbox
-            class="example-margin"
-            (change)="applyEqualWeight($event)">
-            Equal Weight Assignment
-        </mat-checkbox>
-      </section>
-    </mat-card-content>
-  </mat-card>
+
   <!-- Partition Table -->
   <ng-container>
     <mat-table

diff --git a/...c/app/features/dashboard/home/components/experiment-design/experiment-design.component.ts b/...c/app/features/dashboard/home/components/experiment-design/experiment-design.component.ts
@@ -244,25 +244,6 @@ export class ExperimentDesignComponent implements OnInit, OnChanges, OnDestroy {
     return partition;
   }
 
-  applyEqualWeight(event){
-    console.log(event.checked);
-    const conditions = this.experimentDesignForm.get('conditions') as FormArray;
-
-    if(event.checked){ 
-      const len = conditions.controls.length;
-      conditions.controls.forEach( control => {
-        control.get('assignmentWeight').setValue((100.0/len).toFixed(2));
-      });
-    }
-    else {
-      conditions.controls.forEach( control => {
-      control.get('assignmentWeight').setValue(0);
-      });
-    }
-
-  }
-
-
   get condition(): FormArray {
     return this.experimentDesignForm.get('conditions') as FormArray;
   }

diff --git a/...src/app/features/dashboard/home/components/experiment-list/experiment-list.component.html b/...src/app/features/dashboard/home/components/experiment-list/experiment-list.component.html
@@ -139,7 +139,7 @@
         <td class="ft-12-600" mat-cell *matCellDef="let experiment">
           <span>{{ experiment.postExperimentRule | titlecase }}</span>
           <br />
-          <span class="experiment-revertTo ft-10-400" *ngIf= "experiment.postExperimentRule === 'assign'">
+          <span class="experiment-revertTo ft-10-400" *ngIf= "experiment.postExperimentRule === ('home-global.post-experiment-rule.assign.text' | translate)">
             {{ experiment.revertTo ? getConditionCode(experiment.revertTo, experiment.id) : "(" + ('home-global.post-experiment-rule.default.text' | translate)  + ")" }}
           </span>
         </td>

diff --git a/...ting/src/app/features/dashboard/home/pages/view-experiment/view-experiment.component.html b/...ting/src/app/features/dashboard/home/pages/view-experiment/view-experiment.component.html
@@ -88,20 +88,21 @@
               <ng-container
                 *ngIf="permissions?.experiments.update && experiment.state !== ExperimentState.CANCELLED; else readOnlyRule"
               >
-              <td>
+              <div class="section-data-value section-data-value--editablediv">
                 <span
                   class="ft-18-700 section-data-value section-data-value--editable"
                   (click)="openDialog(DialogType.CHANGE_POST_EXPERIMENT_RULE)"
                 >{{ experiment.postExperimentRule | titlecase }}</span>
                 <mat-icon class="edit-icon" *ngIf="permissions?.experiments.update">create</mat-icon>
-                <br />
-                <span class="ft-14-400 experiment-assign" *ngIf= "experiment.postExperimentRule === 'assign'">
+              </div>
+                <span class="ft-14-400 experiment-assign" *ngIf= "experiment.postExperimentRule === ('home-global.post-experiment-rule.assign.text' | translate)">
                   {{ experiment.revertTo ? getConditionCode(experiment.revertTo, experiment.id) : "(" + ('home-global.post-experiment-rule.default.text' | translate)  + ")" }}
-                </span></td>
+                </span>
               </ng-container>
               <ng-template #readOnlyRule>
                 <span class="ft-18-700 section-data-value">{{ experiment.postExperimentRule | titlecase }}</span>
-                <span class="ft-14-400 experiment-assign" *ngIf= "experiment.postExperimentRule === 'assign'">
+                <br />
+                <span class="ft-14-400 experiment-assign" *ngIf= "experiment.postExperimentRule === ('home-global.post-experiment-rule.assign.text' | translate)">
                   {{ experiment.revertTo ? getConditionCode(experiment.revertTo, experiment.id) : "(" + ('home-global.post-experiment-rule.default.text' | translate)  + ")" }} 
                 </span>
 

diff --git a/...ting/src/app/features/dashboard/home/pages/view-experiment/view-experiment.component.scss b/...ting/src/app/features/dashboard/home/pages/view-experiment/view-experiment.component.scss
@@ -62,7 +62,7 @@ $font-size-small: 15px;
     }
 
     &-assign {
-      display: block;
+      word-break: break-word;
       color: var(--grey-3);
     }
 
@@ -89,8 +89,9 @@ $font-size-small: 15px;
             margin-bottom: 20px;
 
             .experiment-state-container {
+              flex-direction: column;
               display: flex;
-              align-items: center;
+              align-items: flex-start;
 
               .state-circle {
                 display: inline-block;
@@ -177,6 +178,12 @@ $font-size-small: 15px;
                   cursor: pointer;
                 }
               }
+
+              &--editablediv{
+                display: flex;
+                align-items: center;
+
+              }
             }
 
             &-group {

diff --git a/projects/abtesting/src/app/features/dashboard/home/validators/experiment-form.validators.ts b/projects/abtesting/src/app/features/dashboard/home/validators/experiment-form.validators.ts
@@ -12,9 +12,9 @@ export class ExperimentFormValidators {
     if (conditions.length < 2) {
       return { conditionCountError: true };
     } else if (conditions.length >= 2) {
-      let sumOfAssignmentWeights = 0.0;
-      conditions.forEach(condition => (sumOfAssignmentWeights += parseFloat(condition.assignmentWeight)));
-      return Math.ceil(sumOfAssignmentWeights) !== 100.0 ? { assignmentWightsSumError: true } : null;
+      let sumOfAssignmentWeights = 0;
+      conditions.forEach(condition => (sumOfAssignmentWeights += parseInt(condition.assignmentWeight, 10)));
+      return sumOfAssignmentWeights !== 100 ? { assignmentWightsSumError: true } : null;
     }
     if (partitions.length < 1) {
       return { partitionCountError: true };

diff --git a/projects/abtesting/src/assets/i18n/en.json b/projects/abtesting/src/assets/i18n/en.json
@@ -45,6 +45,7 @@
   "home-global.consistency-rule.text": "Consistency Rule",
   "home-global.post-experiment-rule.text": "POST EXPERIMENT RULE",
   "home-global.post-experiment-rule.default.text": "default",
+  "home-global.post-experiment-rule.assign.text": "assign",
   "home-global.enrollments-per-custom.text": " per ",
   "home-global.assignment-weight.text": "ASSIGNMENT WEIGHT",
   "home.experiment.text.subtitle": "Create and analyze experiments",