X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/39ccd603de95cb71725f7daff81c6e7abd70bb29..cd967f39df8f99e94a150233825d2505b72ae6f4:/plugins/MonthlyQuota.class.php diff --git a/plugins/MonthlyQuota.class.php b/plugins/MonthlyQuota.class.php index 0ad73d8b..06b20922 100644 --- a/plugins/MonthlyQuota.class.php +++ b/plugins/MonthlyQuota.class.php @@ -1,21 +1,49 @@ db = getConnection(); $i18n = $GLOBALS['I18N']; $this->holidays = $i18n->holidays; global $user; - $this->usersTeamId = $user->team_id; + $this->team_id = $user->team_id; } - + + // update - deletes a quota, then inserts a new one. public function update($year, $month, $quota) { - $teamId = $this->usersTeamId; + $teamId = $this->team_id; $deleteSql = "DELETE FROM tt_monthly_quotas WHERE year = $year AND month = $month AND team_id = $teamId"; $this->db->exec($deleteSql); if ($quota){ @@ -25,17 +53,18 @@ class MonthlyQuota { } return true; } - + + // get - obains either a single month quota or an array of quotas for an entire year. public function get($year, $month) { if (is_null($month)){ return $this->getMany($year); } - return $this->getSingle($year, $month); } - public function getDailyWorkingHours(){ - $teamId = $this->usersTeamId; + // getWorkdayHours - obtains workday_hours value for a team from the database. + public function getWorkdayHours(){ + $teamId = $this->team_id; $sql = "SELECT workday_hours FROM tt_teams where id = $teamId"; $reader = $this->db->query($sql); if (is_a($reader, 'PEAR_Error')) { @@ -43,11 +72,12 @@ class MonthlyQuota { } $row = $reader->fetchRow(); - return $row["workday_hours"]; + return $row['workday_hours']; } - + + // getSingle - obtains a quota for a single month. private function getSingle($year, $month) { - $teamId = $this->usersTeamId; + $teamId = $this->team_id; $sql = "SELECT quota FROM tt_monthly_quotas WHERE year = $year AND month = $month AND team_id = $teamId"; $reader = $this->db->query($sql); if (is_a($reader, 'PEAR_Error')) { @@ -55,26 +85,17 @@ class MonthlyQuota { } $row = $reader->fetchRow(); + if ($row) + return $row['quota']; - // if we don't find a record, return calculated monthly quota - if (is_null($row)){ - - $holidaysWithYear = array(); - foreach ($this->holidays as $day) { - $parts = explode("/", $day); - $holiday = "$year-$parts[0]-$parts[1]"; - array_push($holidaysWithYear, $holiday); - } - - $daysInMonth = cal_days_in_month(CAL_GREGORIAN, $month, $year); - return $this->getWorkingDays("$year-$month-01", "$year-$month-$daysInMonth", $holidaysWithYear) * $this->getDailyWorkingHours(); - } - - return $row["quota"]; + // If we did not find a record, return a calculated monthly quota. + $numWorkdays = $this->getNumWorkdays($month, $year); + return $numWorkdays * $this->getWorkdayHours(); } - + + // getMany - returns an array of quotas for a given year for team. private function getMany($year){ - $teamId = $this->usersTeamId; + $teamId = $this->team_id; $sql = "SELECT month, quota FROM tt_monthly_quotas WHERE year = $year AND team_id = $teamId"; $result = array(); $res = $this->db->query($sql); @@ -83,78 +104,25 @@ class MonthlyQuota { } while ($val = $res->fetchRow()) { - $result[$val["month"]] = $val["quota"]; - // $result[] = $val; + $result[$val['month']] = $val['quota']; } return $result; } - //The function returns the no. of business days between two dates and it skips the holidays - private function getWorkingDays($startDate, $endDate, $holidays) { - // do strtotime calculations just once - $endDate = strtotime($endDate); - $startDate = strtotime($startDate); - - //The total number of days between the two dates. We compute the no. of seconds and divide it to 60*60*24 - //We add one to inlude both dates in the interval. - $days = ($endDate - $startDate) / 86400 + 1; - - $noOfFullWeeks = floor($days / 7); - $noOfRemainingDays = fmod($days, 7); - - //It will return 1 if it's Monday,.. ,7 for Sunday - $firstDayofWeek = date("N", $startDate); - $lastDayofWeek = date("N", $endDate); - - //---->The two can be equal in leap years when february has 29 days, the equal sign is added here - //In the first case the whole interval is within a week, in the second case the interval falls in two weeks. - if ($firstDayofWeek <= $lastDayofWeek) { - if ($firstDayofWeek <= 6 && 6 <= $lastDayofWeek) { - $noOfRemainingDays--; - } - - if ($firstDayofWeek <= 7 && 7 <= $lastDayofWeek) { - $noOfRemainingDays--; - } - } - else { - // (edit by Tokes to fix an edge case where the start day was a Sunday - // and the end day was NOT a Saturday) + // getNumWorkdays returns a number of work days in a given month. + private function getNumWorkdays($month, $year) { - // the day of the week for start is later than the day of the week for end - if ($firstDayofWeek == 7) { - // if the start date is a Sunday, then we definitely subtract 1 day - $noOfRemainingDays--; + $daysInMonth = cal_days_in_month(CAL_GREGORIAN, $month, $year); // Number of calendar days in month. - if ($lastDayofWeek == 6) { - // if the end date is a Saturday, then we subtract another day - $noOfRemainingDays--; - } - } - else { - // the start date was a Saturday (or earlier), and the end date was (Mon..Fri) - // so we skip an entire weekend and subtract 2 days - $noOfRemainingDays -= 2; - } + $workdaysInMonth = 0; + // Iterate through all. + for ($i = 1; $i <= $daysInMonth; $i++) { + $date = "$year-$month-$i"; + if (!ttTimeHelper::isWeekend($date) && !ttTimeHelper::isHoliday($date)) { + $workdaysInMonth++; } - - //T he no. of business days is: (number of weeks between the two dates) * (5 working days) + the remainder - // ---->february in none leap years gave a remainder of 0 but still calculated weekends between first and last day, this is one way to fix it - $workingDays = $noOfFullWeeks * 5; - if ($noOfRemainingDays > 0 ) { - $workingDays += $noOfRemainingDays; - } - - // We subtract the holidays - foreach($holidays as $holiday){ - $timeStamp = strtotime($holiday); - // If the holiday doesn't fall in weekend - // TODO: add handling for countries where they move non working day to first working day if holiday is on weekends - if ($startDate <= $timeStamp && $timeStamp <= $endDate && date("N", $timeStamp) != 6 && date("N", $timeStamp ) != 7) - $workingDays--; - } - - return $workingDays; + } + return $workdaysInMonth; } -} \ No newline at end of file +}