Merge pull request #167 from wantero/master

Ajustes Facilitador
SharebookBR · Dec 29, 2018 · 6c1785a · 6c1785a
2 parents 064652d + dd1fda6
commit 6c1785a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/app/components/book/form/form.component.ts b/src/app/components/book/form/form.component.ts
@@ -78,7 +78,7 @@ export class FormComponent implements OnInit {
       title: ['', [Validators.required, Validators.minLength(3), Validators.maxLength(200)]],
       author: ['', [Validators.required, Validators.minLength(3), Validators.maxLength(200)]],
       categoryId: ['', [Validators.required]],
-      userIdFacilitator: ['', [Validators.required]],
+      userIdFacilitator: [''],
       userId: ['', [Validators.required]],
       freightOption: ['', [Validators.required]],
       imageBytes: [''],
@@ -121,7 +121,7 @@ export class FormComponent implements OnInit {
           title: x.title,
           author: x.author,
           categoryId: x.categoryId,
-          userIdFacilitator: x.userIdFacilitator,
+          userIdFacilitator: !!x.userIdFacilitator ? x.userIdFacilitator : null,
           userId: x.userId,
           freightOption: x.freightOption,
           imageBytes: '',
@@ -131,6 +131,7 @@ export class FormComponent implements OnInit {
           imageSlug: x.imageSlug,
           synopsis: !!x.synopsis ? x.synopsis : ''
         };
+        this.formGroup.get('userIdFacilitator').setValidators([Validators.required]); // Facilitador obrigatório para edição do admin
         this.formGroup.setValue(bookForUpdate);
       }
       );

diff --git a/src/app/components/book/list/list.component.ts b/src/app/components/book/list/list.component.ts
@@ -56,19 +56,25 @@ export class ListComponent implements OnInit {
         author: {
           title: 'Autor',
           filter: false,
-          width: '20%'
+          width: '15%'
         },
         donor: {
           title: 'Doador',
           valuePrepareFunction: data => data ? data : '',
           filter: false,
-          width: '20%'
+          width: '15%'
         },
         phoneDonor: {
           title: 'Telefone',
           valuePrepareFunction: data => data ? data : '',
           filter: false,
-          width: '20%'
+          width: '15%'
+        },
+        facilitator: {
+          title: 'Facilitador',
+          valuePrepareFunction: data => data ? data : '',
+          filter: false,
+          width: '15%'
         },
         approved: {
           title: 'Visível',