Trib -128: Review approve attributes

src/app/pages/review-attributes/_services/review-attributes.api.service.ts

@@ -26,7 +26,7 @@ export class ReviewAttributesApiService {
 
                         resolve(_data);         
                     }, (err) => {
-                        reject(err);
+                        resolve(err.error);
                     });
             });
 

src/app/pages/review-attributes/_services/review-attributes.model.service.ts

@@ -22,8 +22,12 @@ export class ReviewAttributesModelService {
     getNewPhrase() {
         return new Promise((resolve, reject) => {
             this.ReviewAttributesApiService.getPhrase().then((response) => {
+                if(response == null)
+                    resolve(response);
+                else{
                     this.model = response;
-                   resolve(this.model);
+                    resolve(this.model);
+                }
            })
         })   
 
@@ -34,9 +38,9 @@ export class ReviewAttributesModelService {
             this.saveReview['reviewerId'] = this._authService.getUser().id;
             this.saveReview['reasonId'] = reasonId; 
             return new Promise((resolve, reject) => {
-                this.ReviewAttributesApiService.saveRA(this.saveReview).then((data) =>{
+                this.ReviewAttributesApiService.saveRA(this.saveReview).then(() =>{
                     console.log("saved Review Attributes");
-                    resolve(data);
+                    resolve(this.saveReview);
                 });
             }) 
     }

src/app/pages/review-attributes/review-attributes.page.ts

@@ -57,21 +57,21 @@ export class ReviewAttributesPage implements OnInit {
   onApprovePhraseBtnClick() {
     const self = this;
     const reasonIDApprove = 1;
-    self._reviewAttributesModelService.saveReviewAttributes(reasonIDApprove).then((data) =>{
-      console.log(data);
+    self._reviewAttributesModelService.saveReviewAttributes(reasonIDApprove).then(() =>{
+      this._alertService.show({
+        header: 'Message approved!',
+        buttons: [{
+          text: 'OK', role: 'cancel',
+          handler: () => {
+          }
+          }]
+        })
+
+        this.phraseToBeReviewed = "";
+        this.getNextPhraseButtonDisabled = false;
+        this.approveAndRejectButtonDisplayed = false;
     });
-    self._alertService.show({
-    header: 'Message approved!',
-    buttons: [{
-      text: 'OK', role: 'cancel',
-      handler: () => {
-      }
-      }]
-    })
-
-    this.phraseToBeReviewed = "";
-    this.getNextPhraseButtonDisabled = false;
-    this.approveAndRejectButtonDisplayed = false;
+
   }
 
   onGetNextPhraseBtnClick() {
@@ -81,11 +81,24 @@ export class ReviewAttributesPage implements OnInit {
 
   getNextPhraseToBeReviewed() {
     this._reviewAttributesModelService.getNewPhrase().then((phrase) => {
-      const phraseTBRAsString = this.getAttrString(phrase); 
-      console.log(phraseTBRAsString);
-      this.phraseToBeReviewed = phraseTBRAsString;
-      this.getNextPhraseButtonDisabled = true;
-      this.approveAndRejectButtonDisplayed = true;
+      if(phrase == null){
+        this._alertService.show({
+          header: 'No More Phrases',
+          buttons: [{
+            text: 'OK', role: 'cancel',
+            handler: () => {
+            }
+            }]
+          })
+         this.getNextPhraseButtonDisabled = false;  
+      }
+      else{
+        const phraseTBRAsString = this.getAttrString(phrase); 
+        console.log(phraseTBRAsString);
+        this.phraseToBeReviewed = phraseTBRAsString;
+        this.getNextPhraseButtonDisabled = true;
+        this.approveAndRejectButtonDisplayed = true;
+      }
     });
   }