Fix Slack auth and campaign contributions

Author: Thomah

src/app/app-routing.module.ts

@@ -27,7 +27,7 @@ const routes: Routes = [
   {
     path: '', component: LesProjetsCagnottesComponent, canActivate: [AuthGuard],
     children: [
-      { path: '', redirectTo: '/projects?status=in_progress', pathMatch: 'full' },
+      { path: '', redirectTo: '/projects%3Fstatus=in_progress', pathMatch: 'full' },
       { path: 'news/new', component: EditNewsComponent },
       { path: 'news/:id/edit', component: EditNewsComponent },
       { path: 'news', component: ListNewsComponent },

src/app/app/projects/view/view-project.component.html

@@ -45,8 +45,8 @@ <h3 class="card-title" i18n>Founding</h3>
                         <tr *ngFor="let campaign of campaigns">
                             <td>
                                 <span *ngIf="campaign.status === 'IN_PROGRESS'" class="badge bg-yellow">J - {{ campaign.remainingDays }}</span>
-                                <span *ngIf="campaign.status == 'FAILED'" class="badge bg-gray" i18n>Avorted</span>
-                                <span *ngIf="campaign.status == 'SUCCESSFUL'" class="badge bg-green" i18n>Validated</span>
+                                <span *ngIf="campaign.status === 'FAILED'" class="badge bg-gray" i18n>Avorted</span>
+                                <span *ngIf="campaign.status === 'SUCCESSFUL'" class="badge bg-green" i18n>Validated</span>
                             </td>
                             <td i18n>Campaign</td>
                             <td><span *ngIf="campaignsBudgets[campaign.budgetsRef[0]] !== undefined">{{ campaignsBudgets[campaign.budgetsRef[0]].name }}</span></td>
@@ -55,12 +55,12 @@ <h3 class="card-title" i18n>Founding</h3>
                             <td>{{ campaign.totalDonations.toFixed(2) }} € / {{ campaign.donationsRequired.toFixed(2) }}
                                 €</td>
                             <td class="action-bar">
-                                <a *ngIf="campaign.status == 'IN_PROGRESS' && userLoggedIn.id === campaign.leader.id" class="btn btn-default btn-sm" (click)="openContributingModal(contributeFinancially, campaign)">
+                                <a *ngIf="campaign.status == 'IN_PROGRESS' && campaign.totalDonations < campaign.donationsRequired" class="btn btn-default btn-sm" (click)="openContributingModal(contributeFinancially, campaign)">
                                     <i class="fas fa-hand-holding-usd">
                                     </i>
                                     <span i18n>Contribute financially</span>
                                 </a>
-                                <a *ngIf="campaign.status == 'IN_PROGRESS' && userLoggedIn.id === campaign.leader.id" class="btn btn-default btn-sm" (click)="editFundingModal(addFundingTemplate, campaign.id)">
+                                <a *ngIf="campaign.status == 'IN_PROGRESS' && userLoggedIn.id === project.leader.id" class="btn btn-default btn-sm" (click)="editFundingModal(addFundingTemplate, campaign.id)">
                                     <i class="fas fa-edit">
                                     </i>
                                     <span i18n>Edit</span>
@@ -89,7 +89,7 @@ <h4 class="modal-title pull-left" i18n>Contribute financially
                         <div class="form-group">
                             <label for="amount" i18n>Budget</label>
                             <select class="form-control select-border" style="width: 100%;" formControlName="budget" (ngModelChange)="onAccountSelectionChange()">
-                                <option *ngFor="let account of accounts; index as i" value="{{ i }}">
+                                <option *ngFor="let account of filterByCampaignBudgets; index as i" value="{{ i }}">
                                     {{ campaignsBudgets[account.budget.id].name }}</option>
                             </select>
                         </div>

src/app/app/projects/view/view-project.component.ts

@@ -201,13 +201,13 @@ export class ViewProjectComponent implements OnInit {
 
   openContributingModal(template: TemplateRef<any>, campaign: Campaign) {
     this.selectedCampaign = campaign;
-    this.donationForm.controls.amount.setValidators([Validators.required, Validators.min(0), Validators.max(
+    this.donationForm.controls.amount.setValidators([Validators.required, Validators.min(0.01), Validators.max(
       +(this.min(this.accounts[this.donationForm.controls.budget.value].amount, campaign.donationsRequired - campaign.totalDonations)).toFixed(2))]);  
     this.contributeFinanciallyModalRef = this.modalService.show(template);
   }
 
   onAccountSelectionChange() {
-    this.donationForm.controls.amount.setValidators([Validators.required, Validators.min(0), Validators.max(
+    this.donationForm.controls.amount.setValidators([Validators.required, Validators.min(0.01), Validators.max(
       +(this.min(this.accounts[this.donationForm.controls.budget.value].amount, this.selectedCampaign.donationsRequired - this.selectedCampaign.totalDonations)).toFixed(2))]);
   }
 
@@ -250,6 +250,10 @@ export class ViewProjectComponent implements OnInit {
   }
 
   openAddFundingModal(template: TemplateRef<any>) {
+    this.campaign = new Campaign();
+    this.formFunding.controls['budget'].enable();
+    this.formFunding.controls['fundingDeadline'].enable();
+    this.formFunding.controls['donationsRequired'].setValidators([Validators.required, Validators.min(0.01)]);
     this.nowPlus3Months.setMonth(this.now.getMonth() + 3);
     this.fundingDeadlineValue.setMonth(this.now.getMonth() + 1);
     this.openFundingModal(template);
@@ -364,4 +368,9 @@ export class ViewProjectComponent implements OnInit {
       return val1;
     }
   }
+
+  get filterByCampaignBudgets() {
+    return this.accounts.filter( a => this.selectedCampaign.budgetsRef.includes(a.budget.id));
+  }
 }
+