diff --git a/Layout/default/Timerecording/Index.php b/Layout/default/Timerecording/Index.php index a5199b793..3d3eefab8 100644 --- a/Layout/default/Timerecording/Index.php +++ b/Layout/default/Timerecording/Index.php @@ -33,6 +33,8 @@ for ($i = 1; $i <= 12; $i++) { $years[time() + 31536000] = date('Y', time() + 31536000); $years[time()] = date('Y', time()); $years[time() - 31536000] = date('Y', time() - 31536000); +$closedmonth = strtotime("01." . $timerecordingBilling->month); +$mindate = date("Y-m-d", strtotime("+ 1 Month", $closedmonth)); ?> Datum
- " placeholder="" required="required"/>
diff --git a/application/Timerecording/TimerecordingController.php b/application/Timerecording/TimerecordingController.php index bee96e9a4..f5d6d14aa 100644 --- a/application/Timerecording/TimerecordingController.php +++ b/application/Timerecording/TimerecordingController.php @@ -20,10 +20,11 @@ class TimerecordingController extends mfBaseController { $this->updatePlushours($this->me->id); $this->updateHolidays($this->me->id); - + $timerecordingBilling = TimerecordingBillingModel::getLast(); $timerecordingCategoriess = TimerecordingCategoryModel::getAll(); $timerecordingCars = TimerecordingCarModel::search(['timerecording' => 1]); $this->layout()->set("timerecordingCategoriess", $timerecordingCategoriess); + $this->layout()->set("timerecordingBilling", $timerecordingBilling); $this->layout()->set("timerecordingCars", $timerecordingCars); $this->layout()->setTemplate("Timerecording/Index"); } diff --git a/application/TimerecordingBilling/TimerecordingBillingController.php b/application/TimerecordingBilling/TimerecordingBillingController.php index b9d7768a7..a970f5514 100644 --- a/application/TimerecordingBilling/TimerecordingBillingController.php +++ b/application/TimerecordingBilling/TimerecordingBillingController.php @@ -623,7 +623,7 @@ class TimerecordingBillingController extends mfBaseController $timerecordingEmployee = new TimerecordingEmployee($timerecordingbillingsemployee->timerecordingEmployee->id); $dataemployee = []; $dataemployee['bpahours'] = $timerecordingEmployee->bpahours + $this->request->overtimebpa * 3600; - $data['transfer_bpahours'] = $timerecordingbillingsemployee->transfer_overtimebpa - $this->request->overtimebpa * 3600; + $data['transfer_bpahours'] = $timerecordingbillingsemployee->transfer_bpahours - $this->request->overtimebpa * 3600; $sum += $this->request->overtimebpa * 3600; $timerecordingEmployee->update($dataemployee); $timerecordingEmployee->save(); @@ -662,7 +662,7 @@ class TimerecordingBillingController extends mfBaseController $timerecordingEmployee = new TimerecordingEmployee($timerecordingbillingsemployee->timerecordingEmployee->id); $dataemployee = []; $dataemployee['bpahours'] = $timerecordingEmployee->bpahours + $this->request->overtimebpa * 3600; - $data['transfer_bpahours'] = $timerecordingbillingsemployee->transfer_overtimebpa - $this->request->overtimebpa * 3600; + $data['transfer_bpahours'] = $timerecordingbillingsemployee->transfer_bpahours - $this->request->overtimebpa * 3600; $sum += $this->request->overtimebpa * 3600; $timerecordingEmployee->update($dataemployee); $timerecordingEmployee->save(); diff --git a/application/TimerecordingBilling/TimerecordingBillingModel.php b/application/TimerecordingBilling/TimerecordingBillingModel.php index b6751ed67..b36738a61 100644 --- a/application/TimerecordingBilling/TimerecordingBillingModel.php +++ b/application/TimerecordingBilling/TimerecordingBillingModel.php @@ -76,12 +76,10 @@ class TimerecordingBillingModel } - public static function getFirst() + public static function getLast() { $db = FronkDB::singleton(); - - $where = self::getSqlFilter($filter); - $res = $db->select("TimerecordingBilling", "*", "$where "); + $res = $db->select("TimerecordingBilling", "*", "1=1 ORDER BY id DESC LIMIT 1"); if ($db->num_rows($res)) { $data = $db->fetch_object($res); $item = new TimerecordingBilling($data);