Merge branch 'master' into leaderboard_decimal_precision

Author: Sanji515

src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.html

@@ -59,6 +59,8 @@
             [name]="'max_submissions_per_day'" [isRequired]="true"
             [label]="'max_submissions_per_day'" [placeholder]="''"
             [type]="'number'" [value]="maxSubmissionsPerDay" #formmodal></app-input>
+            <div class="editor-validation-message fs-12"
+              *ngIf="isPerDaySubmissionFieldMessage">{{perDaySubmisionValidationMessage}}</div>
         </div>
       </div>
 
@@ -70,6 +72,8 @@
             [name]="'max_submissions'" [isRequired]="true"
             [label]="'max_submissions_per_month'" [placeholder]="''"
             [type]="'number'" [value]="maxSubmissionsPerMonth" #formmodal></app-input>
+            <div class="editor-validation-message fs-12"
+              *ngIf="isPerMonthSubmissionFieldMessage">{{PerMonthSubmissionValidationMessage}}</div>
         </div>
       </div>
 

src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.ts

@@ -64,11 +64,31 @@ export class EditphasemodalComponent implements OnInit {
    */
   isEditorFieldMessage = false;
 
+  /**
+   * If per day maximum submission error message
+   */
+  isPerDaySubmissionFieldMessage = false;
+
+  /**
+   * If per month maximum submission error message
+   */
+  isPerMonthSubmissionFieldMessage = false;
+
   /**
    * Editor validation message
    */
   editorValidationMessage = '';
 
+  /**
+   * per day submission validation message
+   */
+  perDaySubmisionValidationMessage = '';
+
+  /**
+   * Editor validation message
+   */
+  PerMonthSubmissionValidationMessage = '';
+
   /**
    * Modal accept button
    */
@@ -165,6 +185,17 @@ export class EditphasemodalComponent implements OnInit {
    * Form Validate function.
    */
   formValidate() {
+    this.formComponents.map(val => {
+      if (val.label === 'max_submissions_per_day') {
+        this.maxSubmissionsPerDay = parseInt(val.value, 10);
+      }
+      if (val.label === 'max_submissions_per_month') {
+        this.maxSubmissionsPerMonth = parseInt(val.value, 10);
+      }
+      if (val.label === 'max_submissions') {
+        this.maxSubmissions = parseInt(val.value, 10);
+      }
+    });
     if (this.formComponents.length > 0) {
       this.globalService.formValidate(this.formComponents, this.confirmed, this);
     } else {
@@ -182,6 +213,18 @@ export class EditphasemodalComponent implements OnInit {
       self.editorValidationMessage = 'This field cannot be empty!';
       return;
     }
+    if (self.maxSubmissionsPerDay > self.maxSubmissionsPerMonth) {
+      self.denyCallback();
+      self.isPerDaySubmissionFieldMessage = true;
+      self.perDaySubmisionValidationMessage = 'Max number of per day submission cannot be greater than max number of per month submissions';
+      return;
+    }
+    if (self.maxSubmissionsPerMonth > self.maxSubmissions) {
+      self.denyCallback();
+      self.  isPerMonthSubmissionFieldMessage = true;
+      self.PerMonthSubmissionValidationMessage = 'Max number of per month submissions cannot be greater than max total submissions';
+      return;
+    }
     const PARAMS = self.globalService.formFields(self.formComponents);
     PARAMS[self.label] = self.description;
     self.globalService.hideEditPhaseModal();