Merge branch 'spidev' into 'master'

Zeiterfassung

See merge request fronk/thetool!1609

application/TimerecordingEmployee/TimerecordingEmployeeController.php

@@ -204,9 +204,11 @@ class TimerecordingEmployeeController extends mfBaseController
         if (!$data['overtime']) {
             $data['overtime'] = 0;
         }
+
         if (!$data['bmd_active']) {
             $data['bmd_active'] = 0;
         }
+
         if (!$data['enddate']) {
             $data['enddate'] = null;
         }
@@ -216,6 +218,13 @@ class TimerecordingEmployeeController extends mfBaseController
         } else {
             $data['birthday'] = null;
         }
+        if ($r->insurance_number) {
+            $data['insurance_number'] = $r->insurance_number;
+        } else {
+            $data['insurance_number'] = null;
+        }
+
+
         if (!$data['user_id']) {
             $this->layout()->setFlash("Mitarbeiter darf nicht leer sein", "error");
             $this->redirect("TimerecordingEmployee");

application/TimerecordingEmployee/TimerecordingEmployeeModel.php

@@ -22,6 +22,7 @@ class TimerecordingEmployeeModel
     private $jobbike;
     private $only_admin;
     private $birthday;
+    private $insurance_number;
     public static $employeetypesbmd = array('1' => '1000', '2' => '1200', '3' => '1400');