From 933c32798cc26461ca5b62ec3eb89c18f29e4953 Mon Sep 17 00:00:00 2001
From: Baptiste Lemoine <contact@cipherbliss.com>
Date: Tue, 19 Nov 2019 11:18:58 +0100
Subject: [PATCH] :bug: fix deletions in date buttons , input of type date

---
 src/app/pages/dates/dates.component.html | 29 ++++++++++++++----------
 src/app/pages/dates/dates.component.scss |  8 +++++--
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/app/pages/dates/dates.component.html b/src/app/pages/dates/dates.component.html
index a07424db..cac4c28a 100644
--- a/src/app/pages/dates/dates.component.html
+++ b/src/app/pages/dates/dates.component.html
@@ -28,14 +28,7 @@
 >
     {{"dates.add"|translate}}
 </button>
-<button
-    class="btn btn-primary"
-    (click)="addtime()"
-    id="add_time_button"
-    *ngIf="config.allowSeveralHours=='false'"
->
-    {{"dates.addTime"|translate}}
-</button>
+
 
 <button
     class="btn btn-warning"
@@ -44,10 +37,21 @@
 >{{"dates.empty"|translate}}
 </button>
 <div class="dates-list">
+    <span class="count-dates">
     {{config.dateList.length}}
-    <span>
+    </span>
+    <span class="count-dates-txt">
 		{{"dates.count_dates"|translate}}
 	</span>
+    <button
+        class="btn btn-primary pull-right"
+        (click)="addtime()"
+        id="add_time_button"
+        *ngIf="config.allowSeveralHours=='false'"
+    >
+        {{"dates.addTime"|translate}}
+    </button>
+
     <div
         class="identical-dates"
         *ngIf="'false'==config.allowSeveralHours"
@@ -61,7 +65,7 @@
                 name="timeChoices_{{id}}"
                 [(ngModel)]="choice.literal"
             >
-            <button (click)="config.timeList.splice(id, 1)">X</button>
+            <button class="btn btn-warning" (click)="config.timeList.splice(id, 1)">X</button>
         </div>
     </div>
     <hr>
@@ -73,7 +77,7 @@
         class="date-choice"
     >
         <input
-            type="text"
+            type="date"
             name="dateChoices_{{id}}"
             [(ngModel)]="choice.literal"
         >
@@ -83,6 +87,7 @@
         >X
         </button>
         <button
+            *ngIf="config.allowSeveralHours=='true'"
             class="btn btn-primary"
             (click)="addTimetoDate(choice, id)"
         > Ajouter un choix d'heure
@@ -102,7 +107,7 @@
                 >
                 <button
                     class="btn btn-warning"
-                    (click)="config.timeList.splice(idTime, 1)"
+                    (click)="choice.timeList.splice(idTime, 1)"
                 >X
                 </button>
             </div>
diff --git a/src/app/pages/dates/dates.component.scss b/src/app/pages/dates/dates.component.scss
index a62fa1c8..84c17656 100644
--- a/src/app/pages/dates/dates.component.scss
+++ b/src/app/pages/dates/dates.component.scss
@@ -1,7 +1,11 @@
 .several-times {
     padding-left: 1em;
+}
 
-    input {
-        margin-right: 1em;
+:host {
+    input, button {
+        + button {
+            margin-left: 1em;
+        }
     }
 }