Fix Error in Microcredit Edit

synergatika · Jun 2, 2021 · e203b9d · e203b9d
1 parent d4b9404
commit e203b9d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 63 deletions.
diff --git a/...nu/partner-microcredit/edit-microcredit-campaign/edit-microcredit-campaign.component.html b/...nu/partner-microcredit/edit-microcredit-campaign/edit-microcredit-campaign.component.html
@@ -298,24 +298,11 @@
             <div class="form-group">
               <mat-form-field>
                 <mat-label>{{'FIELDS.MICROCREDIT_CAMPAIGN.STEP.TITLE' | translate}}</mat-label>
-                <<<<<<< HEAD <input matInput type="number" name="stepAmount" formControlName="stepAmount"
+                <input matInput type="number" name="stepAmount" formControlName="stepAmount"
                   placeholder="{{'FIELDS.MICROCREDIT_CAMPAIGN.STEP.PLACEHOLDER' | translate}}">
-                  <mat-error *ngIf="isControlHasError('stepAmount','required')" class="error text-danger">
-                    {{ 'FORM.VALIDATION.REQUIRED_FIELD' | translate }}
-                  </mat-error>
-                  <mat-error *ngIf="isControlHasError('stepAmount','min')" class="error text-danger">
-                    {{ 'FORM.VALIDATION.MIN_VALUE_FIELD' | translate }}: {{validator.stepAmount.minValue}}
-                  </mat-error>
-                  <mat-error *ngIf="isControlHasError('stepAmount','max')" class="error text-danger">
-                    {{ 'FORM.VALIDATION.MAX_VALUE_FIELD' | translate }}: {{validator.stepAmount.maxValue}}
-                  </mat-error>
-                  =======
-                  <input matInput type="number" name="stepAmount" formControlName="stepAmount"
-                    placeholder="{{'FIELDS.MICROCREDIT_CAMPAIGN.STEP.PLACEHOLDER' | translate}}">
-                  >>>>>>> ux
-                  <mat-hint class="form-text text-muted">
-                    {{'FIELDS.MICROCREDIT_CAMPAIGN.STEP.DESC' | translate}}
-                  </mat-hint>
+                <mat-hint class="form-text text-muted">
+                  {{'FIELDS.MICROCREDIT_CAMPAIGN.STEP.DESC' | translate}}
+                </mat-hint>
               </mat-form-field>
             </div>
             <!--end::Form Group "Step"-->
@@ -384,7 +371,6 @@
         <div class="row">
           <div class="sub-heading col-md-12">{{ 'FIELDS.MICROCREDIT_CAMPAIGN.SUBSECTIONS.DATES' | translate }}</div>
         </div>
-
         <div class="row">
           <div class="col-md-6">
 
@@ -436,8 +422,8 @@
                 </mat-error>
                 <mat-error
                   *ngIf="submitForm.get('redeemStarts').errors && submitForm.get('redeemStarts').errors.RedeemStartsGreaterThanRedeemEnds"
-                  class="error text-danger">{{ 'FORM.VALIDATION.CAMPAIGN_DATES.REDEEMSTARTSTOREDEEMENDS' | translate
-                  }}
+                  class="error text-danger">
+                  {{ 'FORM.VALIDATION.CAMPAIGN_DATES.REDEEMSTARTSTOREDEEMENDS' | translate }}
                 </mat-error>
                 <mat-hint class="form-text text-muted">
                   {{'FIELDS.MICROCREDIT_CAMPAIGN.REDEEM_STARTS.DESC' | translate}}
@@ -462,13 +448,14 @@
                 <mat-error *ngIf="isControlHasError('supportEnds','required')" class="error text-danger">
                   {{ 'FORM.VALIDATION.REQUIRED_FIELD' | translate }}
                 </mat-error>
-                <mat-error *ngIf="submitForm.get('supportEnds').errors
-                  && submitForm.get('supportEnds').errors.SupportStartsGreaterThanSupportEnds"
+                <mat-error
+                  *ngIf="submitForm.get('supportEnds').errors && submitForm.get('supportEnds').errors.SupportStartsGreaterThanSupportEnds"
                   class="error text-danger">
                   {{ 'FORM.VALIDATION.CAMPAIGN_DATES.SUPPORTSTARTSTOSUPPORTENDS' | translate }}
                 </mat-error>
-                <mat-error *ngIf="submitForm.get('supportEnds').errors
-                  && submitForm.get('supportEnds').errors.SupportEndsGreaterThanRedeemEnds" class="error text-danger">
+                <mat-error
+                  *ngIf="submitForm.get('supportEnds').errors && submitForm.get('supportEnds').errors.SupportEndsGreaterThanRedeemEnds"
+                  class="error text-danger">
                   {{ 'FORM.VALIDATION.CAMPAIGN_DATES.SUPPORTENDSTOREDEEMENDS' | translate }}
                 </mat-error>
                 <mat-hint class="form-text text-muted">
@@ -478,38 +465,6 @@
             </div>
             <!--end::Form Group "Support Ends"-->
 
-          </div>
-          <div class="col-md-6">
-
-            <!--begin::Form Group "Redeem Starts"-->
-            <div class="form-group">
-              <mat-form-field>
-                <mat-label>{{'FIELDS.MICROCREDIT_CAMPAIGN.REDEEM_STARTS.TITLE' | translate}}</mat-label>
-                <input matInput [matDatepicker]="redeemStartsPicker" [min]="minDate" name="RedeemStarts"
-                  formControlName="redeemStarts"
-                  placeholder="{{'FIELDS.MICROCREDIT_CAMPAIGN.REDEEM_STARTS.PLACEHOLDER' | translate}}">
-                <mat-datepicker-toggle matSuffix [for]="redeemStartsPicker"></mat-datepicker-toggle>
-                <mat-datepicker #redeemStartsPicker></mat-datepicker>
-                <mat-error *ngIf="isControlHasError('redeemStarts','required')" class="error text-danger">
-                  {{ 'FORM.VALIDATION.REQUIRED_FIELD' | translate }}
-                </mat-error>
-                <mat-error
-                  *ngIf="submitForm.get('redeemStarts').errors && submitForm.get('redeemStarts').errors.SupportStartsGreaterThanRedeemStarts"
-                  class="error text-danger">
-                  {{ 'FORM.VALIDATION.CAMPAIGN_DATES.SUPPORTSTARTSTOREDEEMSTARTS' | translate }}
-                </mat-error>
-                <mat-error
-                  *ngIf="submitForm.get('redeemStarts').errors && submitForm.get('redeemStarts').errors.RedeemStartsGreaterThanRedeemEnds"
-                  class="error text-danger">{{ 'FORM.VALIDATION.CAMPAIGN_DATES.REDEEMSTARTSTOREDEEMENDS' | translate
-                  }}
-                </mat-error>
-                <mat-hint class="form-text text-muted">
-                  {{'FIELDS.MICROCREDIT_CAMPAIGN.REDEEM_STARTS.DESC' | translate}}
-                </mat-hint>
-              </mat-form-field>
-            </div>
-            <!--end::Form Group "Redeem Starts"-->
-
             <!--begin::Form Group "Redeem Ends"-->
             <div class="form-group" *ngIf="isRedeemable">
               <mat-form-field>
@@ -523,13 +478,12 @@
                 </mat-error>
                 <mat-error
                   *ngIf="submitForm.get('redeemEnds').errors && submitForm.get('redeemEnds').errors.RedeemStartsGreaterThanRedeemEnds"
-                  class="error text-danger">{{ 'FORM.VALIDATION.CAMPAIGN_DATES.REDEEMSTARTSTOREDEEMENDS' |
-                  translate }}
+                  class="error text-danger">{{ 'FORM.VALIDATION.CAMPAIGN_DATES.REDEEMSTARTSTOREDEEMENDS' | translate
+                  }}
                 </mat-error>
                 <mat-error
                   *ngIf="submitForm.get('redeemEnds').errors && submitForm.get('redeemEnds').errors.SupportEndsGreaterThanRedeemEnds"
-                  class="error text-danger">
-                  {{ 'FORM.VALIDATION.CAMPAIGN_DATES.SUPPORTENDSTOREDEEMENDS' | translate }}
+                  class="error text-danger">{{ 'FORM.VALIDATION.CAMPAIGN_DATES.SUPPORTENDSTOREDEEMENDS' | translate }}
                 </mat-error>
                 <mat-hint class="form-text text-muted">
                   {{'FIELDS.MICROCREDIT_CAMPAIGN.REDEEM_ENDS.DESC' | translate}}

diff --git a/...menu/partner-microcredit/edit-microcredit-campaign/edit-microcredit-campaign.component.ts b/...menu/partner-microcredit/edit-microcredit-campaign/edit-microcredit-campaign.component.ts
@@ -434,9 +434,10 @@ export class EditMicrocreditCampaignComponent implements OnInit, OnDestroy {
   publishItemModal() {
     this.modalService.open(this.publish_item).result.then((result) => {
       console.log('closed');
-    }, (reason) => {
       this.loading = false;
+    }, (reason) => {
       console.log('dismissed');
+      this.loading = false;
     });
   }
 
@@ -447,9 +448,10 @@ export class EditMicrocreditCampaignComponent implements OnInit, OnDestroy {
   deleteItemModal() {
     this.modalService.open(this.remove_item).result.then((result) => {
       console.log('closed');
-    }, (reason) => {
       this.loading = false;
+    }, (reason) => {
       console.log('dismissed');
+      this.loading = false;
     });
   }
 

diff --git a/...r-menu/partner-microcredit/new-microcredit-campaign/new-microcredit-campaign.component.ts b/...r-menu/partner-microcredit/new-microcredit-campaign/new-microcredit-campaign.component.ts
@@ -377,9 +377,10 @@ export class NewMicrocreditCampaignComponent implements OnInit, OnDestroy {
   publishItemModal() {
     this.modalService.open(this.publish_item).result.then((result) => {
       console.log('closed');
-    }, (reason) => {
       this.loading = false;
+    }, (reason) => {
       console.log('dismissed');
+      this.loading = false;
     });
   }