From fccb15888f9fba8283bc5164412a2b3a01514145 Mon Sep 17 00:00:00 2001
From: Spitzer Daniel <daniel.spitzer@inode.at>
Date: Tue, 9 Jan 2024 18:52:56 +0100
Subject: [PATCH 1/2] Mobile Ansicht Bugfixing

---
 Layout/default/UserProfile/Form.php | 2 +-
 Layout/default/header.php           | 2 +-
 Layout/default/mfLogin/Index.php    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Layout/default/UserProfile/Form.php b/Layout/default/UserProfile/Form.php
index 81af72b6c..73538819d 100644
--- a/Layout/default/UserProfile/Form.php
+++ b/Layout/default/UserProfile/Form.php
@@ -94,7 +94,7 @@ if ($twofa == 0) {
                                     </div>
                                     <?php if ($twofa == 2) : ?>
                                         <div class="col-lg-4 ">
-                                            <span class="info-span alert alert-info"> Um die Mobilnummer zu ändern bitte 2FA auf Email umschalten.</span>
+                                            <div class="info-span alert alert-info"> Um die Mobilnummer zu ändern bitte 2FA auf Email umschalten.</div>
                                         </div>
                                     <?php endif; ?>
                                 </div>
diff --git a/Layout/default/header.php b/Layout/default/header.php
index 123d80019..d43bf00cc 100644
--- a/Layout/default/header.php
+++ b/Layout/default/header.php
@@ -57,7 +57,7 @@
         <!-- End Navigation Bar-->
         
   
-<div class="wrapper">
+<div class="wrapper pl-0 pl-lg-1 pr-0 pr-lg-1 ">
   <div class="container-fluid">
         
     <?php if(isset($_flash_set) && $_flash_set == true): ?>
diff --git a/Layout/default/mfLogin/Index.php b/Layout/default/mfLogin/Index.php
index bcc0cc688..6db44b77d 100644
--- a/Layout/default/mfLogin/Index.php
+++ b/Layout/default/mfLogin/Index.php
@@ -133,10 +133,10 @@ if ($requesttype == "2fa" || $requesttype == "false2fa") {
                 <?= $twoFactorInput ?>
                 <?= $error ?>
                 <div class="row">
-                    <div class="col-8">
+                    <div class="col-6 col-lg-8">
                     </div>
                     <!-- /.col -->
-                    <div class="col-4">
+                    <div class="col-6 col-lg-4">
                         <button type="submit" class="btn btn-primary btn-block">Einloggen</button>
                     </div>
                     <!-- /.col -->

From ff2e31166661df047d6de9aabf604b5121432bfe Mon Sep 17 00:00:00 2001
From: Spitzer Daniel <daniel.spitzer@inode.at>
Date: Wed, 10 Jan 2024 13:13:23 +0100
Subject: [PATCH 2/2] Mobilnummern mit Leerzeichen bereinigung/Zeiterfassung
 Erweiterungen

---
 .../default/TimerecordingCategories/Form.php  | 11 ++++++-
 .../default/TimerecordingCategories/Index.php |  5 ++-
 .../TimerecordingCategoryController.php       |  4 +++
 .../TimerecordingCategoryModel.php            |  1 +
 .../UserProfile/UserProfileController.php     |  2 ++
 application/UserTwofactor/UserTwofactor.php   |  1 +
 ..._timerecording_category_add_only_admin.php | 32 +++++++++++++++++++
 7 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 db/migrations/20240109195730_timerecording_category_add_only_admin.php

diff --git a/Layout/default/TimerecordingCategories/Form.php b/Layout/default/TimerecordingCategories/Form.php
index f7ca11247..e1d509eac 100644
--- a/Layout/default/TimerecordingCategories/Form.php
+++ b/Layout/default/TimerecordingCategories/Form.php
@@ -76,7 +76,16 @@
                                     <div class="col-lg-3">
                                         <div class="form-check">
                                             <input class="form-check-input" <?php if ($timerecordingcategoriess->require_comment) echo 'checked="checked"'; ?>
-                                                   type="checkbox" name="require_comment" value="1" id="olt">
+                                                   type="checkbox" name="require_comment" value="1">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-lg-2 col-form-label" for="only_admin">Nur für Buchhaltung zu buchen</label>
+                                    <div class="col-lg-3">
+                                        <div class="form-check">
+                                            <input class="form-check-input" <?php if ($timerecordingcategoriess->only_admin) echo 'checked="checked"'; ?>
+                                                   type="checkbox" name="only_admin" value="1">
                                         </div>
                                     </div>
                                 </div>
diff --git a/Layout/default/TimerecordingCategories/Index.php b/Layout/default/TimerecordingCategories/Index.php
index 37747edcf..5dd43f9d2 100644
--- a/Layout/default/TimerecordingCategories/Index.php
+++ b/Layout/default/TimerecordingCategories/Index.php
@@ -41,6 +41,7 @@
                     <th class="text-center">Buchungszeitraum</th>
                     <th class="text-center">Genehmigungspflichtig</th>
                     <th class="text-center">Anmerkung Pflichtfeld</th>
+                    <th class="text-center">Nur Buchhaltung</th>
                     <th class="edit-width"></th>
                 </tr>
                 <tr id="filterrow">
@@ -50,6 +51,7 @@
                     <th></th>
                     <th></th>
                     <th></th>
+                    <th></th>
                 </tr>
                 </thead>
                 <tbody>
@@ -60,6 +62,7 @@
                         <td><?= $timerecordingcategorieshourday[$timerecordingcategories->hourday] ?></td>
                         <td><?= $timerecordingcategoriesapproval[$timerecordingcategories->approval] ?></td>
                         <td><?= $timerecordingcategoriesrequire_comment[$timerecordingcategories->require_comment] ?></td>
+                        <td><?= $timerecordingcategoriesrequire_comment[$timerecordingcategories->only_admin] ?></td>
                  <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
                             <a href="<?= self::getUrl("TimerecordingCategory", "edit", ["id" => $timerecordingcategories->id]) ?>"><i
                                         class="far fa-edit" title="Bearbeiten"></i></a>
@@ -80,7 +83,7 @@
 
 
     <script type="text/javascript">
-        var hidesearch = [5];
+        var hidesearch = [6];
 
         $(document).ready(function () {
 
diff --git a/application/TimerecordingCategory/TimerecordingCategoryController.php b/application/TimerecordingCategory/TimerecordingCategoryController.php
index 7237ea75c..1e485610c 100644
--- a/application/TimerecordingCategory/TimerecordingCategoryController.php
+++ b/application/TimerecordingCategory/TimerecordingCategoryController.php
@@ -81,6 +81,7 @@ class TimerecordingCategoryController extends mfBaseController
         $data['hourday'] = trim($r->hourday);
         $data['approval'] = trim($r->approval);
         $data['require_comment'] = trim($r->require_comment);
+        $data['only_admin'] = trim($r->only_admin);
 
 
         if (!$data['name']) {
@@ -95,6 +96,9 @@ class TimerecordingCategoryController extends mfBaseController
         if (!$data['require_comment']) {
             $data['require_comment'] = 0;
         }
+        if (!$data['only_admin']) {
+            $data['only_admin'] = 0;
+        }
 
 //        var_dump($_FILES);
 //        var_dump($upload);
diff --git a/application/TimerecordingCategory/TimerecordingCategoryModel.php b/application/TimerecordingCategory/TimerecordingCategoryModel.php
index 88aedcecb..155c3ac76 100644
--- a/application/TimerecordingCategory/TimerecordingCategoryModel.php
+++ b/application/TimerecordingCategory/TimerecordingCategoryModel.php
@@ -7,6 +7,7 @@ class TimerecordingCategoryModel
     private $hourday;
     private $approval;
     private $require_comment;
+    private $only_admin;
     public static $hourday_definition = array(1 => "Uhrzeit (von/bis)", 2 => "Tage (von/bis)", 3 => "Startdatum", 4 => "Enddatum");
     public static $approval_definition = array(0 => "Nein", 1 => "Ja");
     public static $require_comment_definition = array(0 => "Nein", 1 => "Ja");
diff --git a/application/UserProfile/UserProfileController.php b/application/UserProfile/UserProfileController.php
index 60f1b693e..d60dcfa54 100644
--- a/application/UserProfile/UserProfileController.php
+++ b/application/UserProfile/UserProfileController.php
@@ -68,6 +68,7 @@ class UserProfileController extends mfBaseController
         $id = $this->me->id;
         $emailaddress = $this->me->email;
         $mobile = str_replace('+', '', $this->me->mobile);
+        $mobile = str_replace(' ', '', $mobile);
         $verification = $r->twofactor;
 
         $User = new User($id);
@@ -207,6 +208,7 @@ class UserProfileController extends mfBaseController
         $id = $this->me->id;
         $emailaddress = $this->me->email;
         $mobile = str_replace('+', '', $this->me->mobile);
+        $mobile = str_replace(' ', '', $mobile);
         $verification = $r->twofactor;
 
         $User = new User($id);
diff --git a/application/UserTwofactor/UserTwofactor.php b/application/UserTwofactor/UserTwofactor.php
index 2fcc30821..12f3a36c3 100644
--- a/application/UserTwofactor/UserTwofactor.php
+++ b/application/UserTwofactor/UserTwofactor.php
@@ -61,6 +61,7 @@ class UserTwofactor
         $User = new User($id);
         $emailaddress = $User->email;
         $mobile = str_replace('+', '', $User->mobile);
+        $mobile = str_replace(' ', '', $mobile);
 
         $data = [];
         $data['twofactorcode'] = $code;
diff --git a/db/migrations/20240109195730_timerecording_category_add_only_admin.php b/db/migrations/20240109195730_timerecording_category_add_only_admin.php
new file mode 100644
index 000000000..ea3d1f7dc
--- /dev/null
+++ b/db/migrations/20240109195730_timerecording_category_add_only_admin.php
@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class TimerecordingCategoryAddOnlyadmin extends AbstractMigration
+{
+    public function up(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $timerecordingCategory = $this->table("TimerecordingCategory");
+            $timerecordingCategory->addColumn("only_admin", "integer", ["null" => false, "default" => "0", "after" => "require_comment"]);
+            $timerecordingCategory->update();
+        }
+
+        if ($this->getEnvironment() == "addressdb") {
+
+        }
+    }
+
+    public function down(): void
+    {
+        if ($this->getEnvironment() == "thetool") {
+            $timerecordingCategory = $this->table("TimerecordingCategory");
+            $timerecordingCategory->removeColumn("only_admin");
+            $timerecordingCategory->save();
+        }
+        if ($this->getEnvironment() == "addressdb") {
+
+        }
+    }
+}