fix(watch): check if watchpage is invoked to modify or add a new watc…

…h and act accordingly

src/pages/dashboard/dashboard.html

@@ -55,6 +55,7 @@ <h1>{{ 'no-watch' | translate }}</h1>
               <h2>{{ watch.brand }}</h2>
               <h3>{{ watch.name }}</h3>
 
+            </div>
 
               <div id="accuracy">
                 <span  *ngIf="watch.status !== WatchStatus.NeverMeasured && watch.lastCompleteMeasure() !== null">
@@ -64,8 +65,6 @@ <h3>{{ watch.name }}</h3>
                 </span>
               </div>
 
-            </div>
-
 
 
             <div class="item-stats">

src/pages/dashboard/dashboard.scss

@@ -78,10 +78,7 @@
         top:15%;
         right:4%;
         span{
-            white-space: nowrap;
-            overflow: hidden;
             margin-right:5%;
-            text-overflow: clip;
             width:100%;
             display:block;
             text-align:right;
@@ -113,16 +110,18 @@
     }
 
     #right-action{
-        padding-top:4%;
+        padding-top:2%;
         height:17vw;
         padding-left:20%;
+        width:70%;
     }
 
     h2{
-        width:70%;
+        width:68%;
         font-size:1.2em;
         color:#2a2a2c;
         overflow: hidden;
+
     }
 
     h3{

src/pages/watch/watch.ts

@@ -50,7 +50,9 @@ export class WatchPage extends WatchComponent {
 		);
 
 		let receivedWatch:Watch = this.navParams.get('watch');
-		this.watchModel = receivedWatch.clone();
+		if(receivedWatch !== undefined){
+			this.watchModel = receivedWatch.clone();
+		}
 
 	}