Added include weekend checkbox when copying entries

ITK-Leantime · Jan 10, 2025 · fe58611 · fe58611
1 parent 99b0dca
commit fe58611
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/Templates/timetable.blade.php b/Templates/timetable.blade.php
@@ -219,9 +219,15 @@ class="timetable-modal-submit btn btn-primary">{{ __('timeTable.button_modal_sav
             <input type="hidden" name="entryCopyToDate" />
             <p class="entry-copy-headline"></p>
             <p class="entry-copy-text"></p>
-            <div class="entry-copy-overwrite-checkbox">
-                <input type="checkbox" name="entryCopyOverwrite" id="entry-copy-overwrite" />
-                <label for="entry-copy-overwrite"><small>Overskriv allerede registrerede felter</small></label>
+            <div class="entry-copy-checkboxes">
+                <div class="entry-copy-overwrite-checkbox">
+                    <input type="checkbox" name="entryCopyOverwrite" id="entry-copy-overwrite" />
+                    <label for="entry-copy-overwrite"><small>Overskriv allerede registrerede felter</small></label>
+                </div>
+                <div class="entry-copy-weekend-checkbox">
+                    <input type="checkbox" name="entryCopyWeekend" id="entry-copy-weekend" />
+                    <label for="entry-copy-weekend"><small>Inkluder weekender</small></label>
+                </div>
             </div>
             <div class="buttons flex-container gap-1">
                 <button type="button"

diff --git a/assets/timeTable.css b/assets/timeTable.css
@@ -892,7 +892,6 @@
 #entry-copy-modal {
   .entry-copy-form {
     display: flex;
-    height: 150px;
     flex-direction: column;
     background-color: #fefefe;
     margin: auto;
@@ -907,16 +906,20 @@
       margin-top: 2px;
     }
     .entry-copy-headline {
-      margin-bottom: 7px;
+      margin-bottom: var(--itk-spacing-xs);
     }
 
-    .entry-copy-overwrite-checkbox {
+      .entry-copy-checkboxes {
+          display: flex;
+          flex-direction: column;
+          margin: var(--itk-spacing-xs) 0 var(--itk-spacing) 0;
+      }
+    .entry-copy-overwrite-checkbox, .entry-copy-weekend-checkbox {
       display: flex;
       align-items: center;
-      margin: 5px 0;
     }
 
-    .entry-copy-overwrite-checkbox label {
+    .entry-copy-overwrite-checkbox label, .entry-copy-weekend-checkbox label {
       margin-left: 8px;
       font-size: 0.875rem;
       color: #333;
@@ -928,7 +931,7 @@
       user-select: none;
     }
 
-    .entry-copy-overwrite-checkbox input[type="checkbox"] {
+    .entry-copy-overwrite-checkbox input[type="checkbox"], .entry-copy-weekend-checkbox input[type="checkbox"] {
       cursor: pointer;
       margin: 0;
     }

diff --git a/dist/css/timeTable.css b/dist/css/timeTable.css
@@ -892,7 +892,6 @@
 #entry-copy-modal {
   .entry-copy-form {
     display: flex;
-    height: 150px;
     flex-direction: column;
     background-color: #fefefe;
     margin: auto;
@@ -907,16 +906,20 @@
       margin-top: 2px;
     }
     .entry-copy-headline {
-      margin-bottom: 7px;
+      margin-bottom: var(--itk-spacing-xs);
     }
 
-    .entry-copy-overwrite-checkbox {
+      .entry-copy-checkboxes {
+          display: flex;
+          flex-direction: column;
+          margin: var(--itk-spacing-xs) 0 var(--itk-spacing) 0;
+      }
+    .entry-copy-overwrite-checkbox, .entry-copy-weekend-checkbox {
       display: flex;
       align-items: center;
-      margin: 5px 0;
     }
 
-    .entry-copy-overwrite-checkbox label {
+    .entry-copy-overwrite-checkbox label, .entry-copy-weekend-checkbox label {
       margin-left: 8px;
       font-size: 0.875rem;
       color: #333;
@@ -928,7 +931,7 @@
       user-select: none;
     }
 
-    .entry-copy-overwrite-checkbox input[type="checkbox"] {
+    .entry-copy-overwrite-checkbox input[type="checkbox"], .entry-copy-weekend-checkbox input[type="checkbox"] {
       cursor: pointer;
       margin: 0;
     }