Merge branch 'master' into supervisorReview

# Conflicts:
#	application/models/reviewModel.php

application/controllers/reportsController.php

@@ -235,6 +235,7 @@ class reportsController extends Staple_Controller
         $date->setTime(0,0,0);
 
         $year = $date->format('Y');
+
         $this->view->year = $year;
 
         $nextYear = $date->modify('+1 year')->format('Y');
@@ -256,7 +257,6 @@ class reportsController extends Staple_Controller
         $date->setTime(0,0,0);
 
         $newDate = new DateTime();
-
         switch($month)
         {
             case 1:
@@ -271,6 +271,7 @@ class reportsController extends Staple_Controller
         $date2 = new DateTime();
         $date2->setDate($year,$month,25);
         $date2->setTime(24,00,00);
+
         $interval = date_diff($newDate,$date2);
 
         $span = $interval->days;
@@ -278,6 +279,11 @@ class reportsController extends Staple_Controller
 
         $this->view->date = $date->format("F Y");
 
+        $date = new dateTime();
+        $date->setDate($year, $month, 25);
+        $this->view->currentDate = $date->format('Y-m-d');
+        $this->view->previousDate = $date->modify('-1 month +1 day')->format('Y-m-d');
+
         $reports = new reportModel($year, $month);
         $this->view->report = $reports->payPeriodTotals($year, $month);
     }
@@ -364,6 +370,11 @@ class reportsController extends Staple_Controller
         $date->modify("+$days days");
         $this->view->endDate = $date->format("F jS Y");
 
+        $date = new dateTime();
+        $date->setDate($year, $month, 25);
+        $this->view->currentDate = $date->format('Y-m-d');
+        $this->view->previousDate = $date->modify('-1 month +1 day')->format('Y-m-d');
+
         $codes = new codeModel();
         $this->view->codes = $codes->allCodes();
 
@@ -418,21 +429,25 @@ class reportsController extends Staple_Controller
     {
         if ($year == null)
         {
-            $date = new DateTime('first day of this month');
+            $date = new DateTime();
+
             if($date->format('d') >= 26)
             {
                 $date->modify('+1 month');
             }
+
             $year = $date->format('Y');
         }
 
         if ($month == null)
         {
-            $date = new DateTime('first day of this month');
+            $date = new DateTime();
+
             if($date->format('d') >= 26)
             {
                 $date->modify('+1 month');
             }
+
             $month = $date->format('m');
         }
 
@@ -441,7 +456,6 @@ class reportsController extends Staple_Controller
         $date->setTime(0,0,0);
 
         $this->view->year = $date->format('Y');
-
         $this->view->date = $date->format("F Y");
 
         $date->modify('+1 year');
@@ -466,6 +480,11 @@ class reportsController extends Staple_Controller
         $this->view->accountLevel = $this->authLevel;
 
         $date = new DateTime();
+        if($date->format('d') >= 26)
+        {
+            $date->modify('+1 month');
+        }
+
         $date->setDate($year, $month, 1);
         $this->view->monthName = $date->format('F');
 
@@ -479,7 +498,7 @@ class reportsController extends Staple_Controller
                 $data = $printInactiveTimeSheetForm->exportFormData();
 
                 $this->layout->addScriptBlock("
-                    window.open('".$this->_link(array("reports","printpreview",$year,$month,$data['account']))."');
+                    window.open('".$this->_link(array("reports","inactive","printpreview",$year,$month,$data['account']))."');
                     ");
                 $this->view->printTimeSheetForm = $printInactiveTimeSheetForm;
             }

application/controllers/timesheetController.php

@@ -283,28 +283,18 @@ class timesheetController extends Staple_Controller
                     $data = $form->exportFormData();
 
                     //Check if dates are within the current pay period.
-                    $startMonth = date('m',strtotime('last month'));
+                    $date = new DateTime();
 
-                    if($startMonth == 1)
-                    {
-                        $startYear = date('Y',strtotime('last year'));
-                    }
-                    else
+                    if($date->format('d') > 25)
                     {
-                        $startYear = date('Y');
+                        $date->modify('+1 month');
                     }
-
-                    $date = new DateTime();
-                    $endMonth = $date->modify('+1 month')->format('m');
-                    $endYear = $date->format('Y');
-
-                    $startDate= strtotime($startMonth.'/26/'.$startYear);
-                    $endDate = strtotime($endMonth.'/25/'.$endYear);
-
+                    $maxDate = $date->setDate($date->format('Y'),$date->format('m'),25)->setTime(23,59,59)->getTimestamp();
+                    $minDate = $date->modify('-1 month +1 day')->setTime(0,0,0)->getTimestamp();
                     $userDate = strtotime($data['date']);
 
                     //Date is within pay period
-                    if($userDate >= $startDate && $userDate <= $endDate)
+                    if($userDate >= $minDate && $userDate <= $maxDate)
                     {
                         //Create a new entry object and set properties
                         $entry = new timeEntryModel();

application/forms/editTimeForm.php

@@ -28,7 +28,8 @@ class editTimeForm extends Staple_Form
 
         $lessTime = new Staple_Form_FoundationSelectElement('lessTime','Less Time');
         $lessTime->setRequired()
-            ->addOptionsArray(array("0"=>"None","60"=>"1 Hour","30"=>"30 Minutes","15"=>"15 Minutes"));
+            ->addOptionsArray(array("0"=>"None","60"=>"1 Hour","30"=>"30 Minutes"))
+            ->addValidator(new Staple_Form_Validate_InArray(array('0','60','30')));
 
         $timeCodes = new codeModel();
         $code = new Staple_Form_FoundationSelectElement('code','Code');

application/forms/insertTimeForm.php

@@ -66,8 +66,8 @@ class insertTimeForm extends Staple_Form
 
         $lessTime = new Staple_Form_FoundationSelectElement('lessTime','Less Time');
         $lessTime->setRequired()
-            ->addOptionsArray(array("0"=>"None","60"=>"1 Hour","30"=>"30 Minutes","15"=>"15 Minutes"))
-            ->addValidator(new Staple_Form_Validate_InArray(array('0','60','30','15')));
+            ->addOptionsArray(array("0"=>"None","60"=>"1 Hour","30"=>"30 Minutes"))
+            ->addValidator(new Staple_Form_Validate_InArray(array('0','60','30')));
 
         $timeCodes = new codeModel();
         $code = new Staple_Form_FoundationSelectElement('code','Code');

application/models/reportModel.php

@@ -314,9 +314,11 @@ class reportModel extends Staple_Model
         $date->setTime(0,0,0);
         $date->setDate($year,$month,26);
         $date->modify('-1 month');
+
         $startDate = $date->format('U');
         $date->modify('+1 month -1 day');
         $date->setTime(23,59,59);
+
         $endDate = $date->format('U');
 
         foreach($accounts as $account)

application/models/timesheetModel.php

@@ -28,6 +28,8 @@
 
 		private $totals;
 
+		private $review;
+
 		/**
 		 * @return string
 		 */
@@ -300,7 +302,21 @@
 			$this->userId = $userId;
 		}
 
+		/**
+		 * @return mixed
+		 */
+		public function getReview()
+		{
+			return $this->review;
+		}
 
+		/**
+		 * @param mixed $review
+		 */
+		public function setReview($review)
+		{
+			$this->review = $review;
+		}
 
 		function __construct($year, $month, $uid = null)
 		{

application/views/reports/index.phtml

@@ -167,12 +167,6 @@
                 if(count($timesheet) > 0)
                 {
                 echo "</table>";
-                echo "
-                    <div class='row'>
-                        <div class='small-12 columns text-right'>";
-
-                    echo"</div>
-                    </div>";
 
                 echo "<div class=\"row\">";
                 echo "<div class=\"small-6 medium-4 large-3 columns\">";
@@ -213,6 +207,12 @@
 
                 echo"</div>";
                 echo "</div>";
+                    echo "
+                    <div class='row'>
+                        <div class='small-12 columns text-center'>";
+                    echo "<a class='button radius' href=\"\">Mark as reviewed</a>";
+                    echo"</div>
+                    </div>";
 
                 }
                 else

application/views/reports/payperiod.phtml

@@ -66,8 +66,12 @@
                         <th style="width:150px;"></th>
                         <?php
 
+                            $previousDate = explode("-",$this->previousDate);
+
                             $date = new DateTime();
-                            $date->setDate($this->year,$this->previousMonth,26);
+                            $date->setDate($previousDate[0],$previousDate[1],$previousDate[2]);
+
+                            $date->setTime(0,0,0);
 
                             for($i=1;$i<=$this->span;$i++)
                             {
@@ -79,6 +83,7 @@
                                 {
                                     echo "<th style='border-bottom:1px solid #ccc;'>".$date->format('D')."<br>".$date->format('n')."/".$date->format('j')."</th>";
                                 }
+
                                 $date->modify('+1 day');
                             }
                         ?>