Merge pull request #17 from Pear-Trading/finn/RegisterViewFix

made register view fix

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 # Next Release
 
+* Fixed register box view on login page
+* Made the form reset properly if adding a new one
+* Added better error messages on register and account edit
+
 # v0.0.1
 
 * Added Travis Testing

src/app/auth/login.component.html

@@ -37,7 +37,7 @@
                 </form>
             </div>
           </div>
-          <div class="card card-inverse card-primary py-5 d-md-down-none" style="width:44%">
+          <div class="card card-inverse card-primary py-5">
             <div class="card-block text-center">
               <div>
                 <h2>Sign up</h2>

src/app/auth/register.component.html

@@ -137,7 +137,7 @@
           Form validation failed, please ensure the form is filled correctly.
         </div>
         <div *ngSwitchCase="'send_failed'" class="alert alert-danger" role="alert">
-          Failed to send to server, please try again later.
+          {{registerStatusError}}
         </div>
       </div>
 		  </div>

src/app/auth/register.component.ts

@@ -16,6 +16,7 @@ export class RegisterComponent {
   organisationForm: ValidationManager;
   years: Object[];
   registerStatus: any;
+  registerStatusError: string = 'Error received, please try again.';
 
   constructor(
 	private http: Http,
@@ -85,9 +86,18 @@ export class RegisterComponent {
 		  this.router.navigate(['/dashboard']);
         },
         error => {
-          console.log( error._body );
+          console.log('Register Error');
+          console.log(error);
+          try {
+            console.log(error.error);
+            let jsonError = error.json();
+            console.log("boop");
+            this.registerStatusError = '"' + jsonError.error + '" Error, ' + jsonError.message;
+          } catch(e) {
+            this.registerStatusError = 'There was a server error, please try again later.';
+          }
           this.registerStatus = "send_failed";
-          console.log(this.registerStatus)
+          console.log(this.registerStatus);
         }
       );
   }
@@ -125,7 +135,16 @@ export class RegisterComponent {
         this.router.navigate(['/dashboard']);
         },
         error => {
-          console.log( error._body );
+          console.log('Register Error');
+          console.log(error);
+          try {
+            console.log(error.error);
+            let jsonError = error.json();
+            console.log("boop");
+            this.registerStatusError = '"' + jsonError.error + '" Error, ' + jsonError.message;
+          } catch(e) {
+            this.registerStatusError = 'There was a server error, please try again later.';
+          }
           this.registerStatus = "send_failed";
           console.log(this.registerStatus);
         }

src/app/dashboard/account-edit.component.html

@@ -122,7 +122,7 @@
                       Form validation failed, please ensure the form is filled correctly.
                     </div>
                     <div *ngSwitchCase="'send_failed'" class="alert alert-danger" role="alert">
-                      Failed to send to server, please try again later.
+                      {{submitStatusError}}
                     </div>
                   </div>
                 </div>
@@ -160,7 +160,7 @@
                       Form validation failed, please ensure the form is filled correctly.
                     </div>
                     <div *ngSwitchCase="'send_failed'" class="alert alert-danger" role="alert">
-                      Failed to send to server, please try again later.
+                      {{submitStatusError}}
                     </div>
                   </div>
                 </div>

src/app/dashboard/account-edit.component.ts

@@ -14,6 +14,7 @@ export class AccountEditComponent implements OnInit {
   accountType: any;
   // @ViewChild('fileInput') fileInput;
   submitStatus: any;
+  submitStatusError: string = 'Error received, please try again.';
 
   constructor(
   private http: Http,
@@ -111,7 +112,16 @@ export class AccountEditComponent implements OnInit {
         console.log(this.submitStatus);
       },
       error => {
-        console.log( error._body );
+        console.log('Edit Error');
+        console.log(error);
+        try {
+          console.log(error.error);
+          let jsonError = error.json();
+          console.log("boop");
+          this.submitStatusError = '"' + jsonError.error + '" Error, ' + jsonError.message;
+        } catch(e) {
+          this.submitStatusError = 'There was a server error, please try again later.';
+        }
         this.submitStatus = "send_failed";
         console.log(this.submitStatus);
       }
@@ -159,7 +169,16 @@ export class AccountEditComponent implements OnInit {
         console.log(this.submitStatus);
       },
       error => {
-        console.log( error._body );
+        console.log('Edit Error');
+        console.log(error);
+        try {
+          console.log(error.error);
+          let jsonError = error.json();
+          console.log("boop");
+          this.submitStatusError = '"' + jsonError.error + '" Error, ' + jsonError.message;
+        } catch(e) {
+          this.submitStatusError = 'There was a server error, please try again later.';
+        }
         this.submitStatus = "send_failed";
         console.log(this.submitStatus);
       }

src/app/dashboard/add-data.component.ts

@@ -239,6 +239,7 @@ export class AddDataComponent {
     this.storeList = null;
     this.amount = null;
     this.transactionFormInvalid = true;
+    this.showAddStore = false;
   }
 
   onSubmitPayroll() {