Continuing to work on a way for a user to submit for opened dates for a pervious pay period.

application/controllers/indexController.php

@@ -6,7 +6,6 @@ class indexController extends Staple_Controller
 
 	public function _start()
 	{
-		$auth = Staple_Auth::get();
 		$user = new userModel();
 		$this->authLevel = $user->getAuthLevel();
 		$this->userId = $user->getId();
@@ -29,6 +28,13 @@ class indexController extends Staple_Controller
 		$report = new weeklyReportModel();
 
 		$this->view->week = $report->getWeekWorked($this->userId, $week, $year);
+
+		$overRide = new unlockModel();
+		$test = $overRide->rangeDates($this->userId);
+
+		echo "<pre>";
+		print_r($test);
+		echo "</pre>";
 	}
 }
 ?>

application/controllers/reportsController.php

@@ -8,21 +8,18 @@ class reportsController extends Staple_Controller
     {
         $auth = Staple_Auth::get();
         $this->authLevel = $auth->getAuthLevel();
-        if($this->authLevel < 500)
-        {
-            header("location:".$this->_link(array('index','index'))."");
+        if ($this->authLevel < 500) {
+            header("location:" . $this->_link(array('index', 'index')) . "");
         }
     }
 
     public function index($year = null, $month = null)
     {
-        if($year == null)
-        {
+        if ($year == null) {
             $year = date('Y');
         }
 
-        if($month == null)
-        {
+        if ($month == null) {
             $month = date('m');
         }
 
@@ -35,33 +32,92 @@ class reportsController extends Staple_Controller
         //Weekly report form
         $form = new weeklyReportForm();
 
-        if($form->wasSubmitted())
-        {
+        if ($form->wasSubmitted()) {
             $form->addData($_POST);
-            if($form->validate())
-            {
+            if ($form->validate()) {
                 $data = $form->exportFormData();
                 $report = new weeklyReportModel();
-                $this->view->report = $report->timeWorked($data['account'],$data['year']);
+                $this->view->report = $report->timeWorked($data['account'], $data['year']);
 
                 $account = new userModel();
                 $this->view->account = $account->userInfo($data['account']);
 
                 $this->view->year = $data['year'];
-            }
-            else
-            {
+            } else {
                 $this->view->form = $form;
             }
+        } else {
+            $this->view->form = $form;
+        }
+    }
+
+    public function unlock()
+    {
+        $auth = Staple_Auth::get();
+        $this->authLevel = $auth->getAuthLevel();
+        if ($this->authLevel < 900)
+        {
+            header("location:" . $this->_link(array('index', 'index')) . "");
         }
         else
         {
-            $this->view->form = $form;
+            $rangeForm = new rangeUnlockForm();
+
+            if ($rangeForm->wasSubmitted()) {
+                $rangeForm->addData($_POST);
+                if ($rangeForm->validate()) {
+                    $data = $rangeForm->exportFormData();
+                    $unlock = new unlockModel();
+                    $unlock->setStartTime($data['startDate']);
+                    $unlock->setEndTime($data['endDate']);
+                    $unlock->setUserId($data['account']);
+                    $unlock->save();
+                    $this->view->rangeForm = new rangeUnlockForm();
+                } else {
+                    $this->view->rangeForm = $rangeForm;
+                }
+            } else {
+                $this->view->rangeForm = $rangeForm;
+            }
+
+            $singleForm = new singleUnlockForm();
+            if ($singleForm->wasSubmitted()) {
+                $singleForm->addData($_POST);
+                if ($singleForm->validate()) {
+                    $data = $singleForm->exportFormData();
+                } else {
+                    $this->view->singleForm = $singleForm;
+                }
+            } else {
+                $this->view->singleForm = $singleForm;
+            }
+
+            $year = date('Y');
+            $month = date('m');
+
+            $timesheets = new reportModel($year, $month);
+
+            $this->view->accounts = $timesheets;
         }
     }
 
-    public function unlock()
+    public function unlockid($id)
     {
+        $auth = Staple_Auth::get();
+        $this->authLevel = $auth->getAuthLevel();
+        if ($this->authLevel < 900)
+        {
+            header("location:" . $this->_link(array('index', 'index')) . "");
+        }
+        else
+        {
+            $unlock = new unlockModel();
 
+            if ($unlock->unlock($id)) {
+                $this->view->message = "<i class='fa fa-check'></i> Time entry unlocked.";
+            } else {
+                $this->view->message = "<i class='fa fa-close'></i> ERROR: Unable to unlock your own time entries.";
+            }
+        }
     }
 }

application/forms/layouts/insertFormLayout.phtml

@@ -84,7 +84,13 @@
     $(document).ready(function() {
 
         $(function() {
-            $( "#date" ).datepicker({numberOfMonths:2, minDate: "<?php echo $minDate ?>", maxDate: "<?php echo $maxDate ?>" });
+            $( "#date" ).datepicker({
+                numberOfMonths:2,
+                minDate: "<?php echo $minDate ?>",
+                maxDate: "<?php echo $maxDate ?>",
+                showWeek: true,
+                showButtonPanel: true
+            });
         });
 
         $('#entryToggle').click(function()

application/forms/rangeUnlockForm.php

@@ -0,0 +1,69 @@
+<?php
+
+class rangeUnlockForm extends Staple_Form
+{
+    public function _start()
+    {
+        //$this->setLayout('insertFormLayout');
+
+        $this->setName('rangeUnlockForm')
+            ->setAction($this->link(array('reports','unlock')));
+
+        $startDate = new Staple_Form_FoundationTextElement('startDate','Start Date');
+        $startDate->setRequired()
+            ->addValidator(new Staple_Form_Validate_Date())
+            ->addAttrib('placeholder','mm/dd/yyyy');
+
+        $endDate = new Staple_Form_FoundationTextElement('endDate','End Date');
+        $endDate->setRequired()
+            ->addValidator(new Staple_Form_Validate_Date())
+            ->addAttrib('placeholder','mm/dd/yyyy');
+
+        $account = new Staple_Form_FoundationSelectElement('account','Account');
+        $account->setRequired()
+            ->addOption('','Select an account')
+            ->addOptionsArray($this->accounts())
+            ->addValidator(new Staple_Form_Validate_InArray($this->accounts(1)));
+
+        $submit = new Staple_Form_FoundationSubmitElement('submit','Submit');
+        $submit->addClass('button expand radius');
+
+        $this->addField($account, $startDate, $endDate, $submit);
+    }
+
+    public function accounts($ids = null)
+    {
+        $user = new userModel();
+        $id = $user->getId();
+        $authLevel = $user->getAuthLevel();
+
+        $accounts = new userModel();
+        $users = $accounts->listAll();
+        $data = array();
+        if($ids == null)
+        {
+            foreach($users as $user)
+            {
+                if($user['supervisorId'] == $id)
+                {
+                    $data[$user['id']] = $user['lastName'].", ".$user['firstName']." (". $user['type'] .")";
+                }
+                elseif($authLevel >= 900)
+                {
+                    $data[$user['id']] = $user['lastName'].", ".$user['firstName']." (". $user['type'] .")";
+                }
+            }
+        }
+        else
+        {
+            foreach($users as $user)
+            {
+                $data[] = $user['id'];
+            }
+        }
+
+        return $data;
+    }
+}
+
+?>

application/forms/singleUnlockForm.php

@@ -0,0 +1,69 @@
+<?php
+
+class singleUnlockForm extends Staple_Form
+{
+    public function _start()
+    {
+        //$this->setLayout('insertFormLayout');
+
+        $this->setName('singleUnlockForm')
+            ->setAction($this->link(array('reports','unlock')));
+
+        $startDate = new Staple_Form_FoundationTextElement('startDate','Start Date');
+        $startDate->setRequired()
+            ->addValidator(new Staple_Form_Validate_Date())
+            ->addAttrib('placeholder','mm/dd/yyyy');
+
+        $endDate = new Staple_Form_FoundationTextElement('endDate','End Date');
+        $endDate->setRequired()
+            ->addValidator(new Staple_Form_Validate_Date())
+            ->addAttrib('placeholder','mm/dd/yyyy');
+
+        $account = new Staple_Form_FoundationSelectElement('account','Account');
+        $account->setRequired()
+            ->addOption('','Select an account')
+            ->addOptionsArray($this->accounts())
+            ->addValidator(new Staple_Form_Validate_InArray($this->accounts(1)));
+
+        $submit = new Staple_Form_FoundationSubmitElement('submit','Submit');
+        $submit->addClass('button expand radius');
+
+        $this->addField($account, $startDate, $endDate, $submit);
+    }
+
+    public function accounts($ids = null)
+    {
+        $user = new userModel();
+        $id = $user->getId();
+        $authLevel = $user->getAuthLevel();
+
+        $accounts = new userModel();
+        $users = $accounts->listAll();
+        $data = array();
+        if($ids == null)
+        {
+            foreach($users as $user)
+            {
+                if($user['supervisorId'] == $id)
+                {
+                    $data[$user['id']] = $user['lastName'].", ".$user['firstName']." (". $user['type'] .")";
+                }
+                elseif($authLevel >= 900)
+                {
+                    $data[$user['id']] = $user['lastName'].", ".$user['firstName']." (". $user['type'] .")";
+                }
+            }
+        }
+        else
+        {
+            foreach($users as $user)
+            {
+                $data[] = $user['id'];
+            }
+        }
+
+        return $data;
+    }
+}
+
+?>

application/layouts/main.phtml

@@ -53,20 +53,22 @@
                         ";
                     }
 
-                    //Administrative Accounts
-                    if($user->getAuthLevel() >= 900)
-                    {
-                        echo "
-                            <li><a href=\"".$this->link(array('accounts')) ."\"><i class=\"fa fa-users\"></i> Accounts</a></li>
-                            <li><a href=\"".$this->link(array('audit')) ."\" ><i class=\"fa fa-list-alt\" ></i > Audit Log</a ></li >
-                        ";
-                    }
-
                     ?>
                 </ul>
 
                 <!-- Right Nav Section -->
                 <ul class="right">
+                    <?php
+                        //Administrative Accounts
+                        if($user->getAuthLevel() >= 900)
+                        {
+                            echo "
+                            <li><a href=\"".$this->link(array('accounts')) ."\"><i class=\"fa fa-users\"></i> Accounts</a></li>
+                            <li><a href=\"".$this->link(array('audit')) ."\" ><i class=\"fa fa-list-alt\" ></i > Audit Log</a ></li >
+                            <li><a href=\"".$this->link(array('reports','unlock'))."\"><i class=\"fa fa-unlock\"></i> Time Unlock</a></li>
+                            ";
+                        }
+                    ?>
                     <li><a href="<?php echo $this->link(array('account','logout')) ?>"><i class="fa fa-close"></i> Logout</a></li>
                 </ul>
             </section>

application/models/reportModel.php

@@ -89,7 +89,7 @@ class reportModel extends Staple_Model
 
         while($result = $query->fetch_assoc())
         {
-            $data[] = $this->calculateEntry($result['id']);
+            $data[$result['id']] = $this->calculateEntry($result['id']);
         }
         return $data;
     }

application/models/timesheetModel.php

@@ -381,7 +381,7 @@
 			}
 		}
 
-		/* TODO depricate
+		/* TODO deprecate
 		function payPeriodCalculatedTotals($startDate, $endDate)
 		{
 			//Get user ID from Auth

application/models/unlockModel.php

@@ -9,6 +9,7 @@ class unlockModel extends Staple_Model
     private $startTime;
     private $endTime;
     private $userId;
+    private $rangeDates;
 
     /**
      * @return mixed
@@ -31,7 +32,10 @@ class unlockModel extends Staple_Model
      */
     public function getStartTime()
     {
-        return $this->startTime;
+        $date = new DateTime();
+        $date->setTimestamp($this->startTime);
+        $startTime = $date->format('m/d/Y');
+        return $startTime;
     }
 
     /**
@@ -39,7 +43,7 @@ class unlockModel extends Staple_Model
      */
     public function setStartTime($startTime)
     {
-        $this->startTime = $startTime;
+        $this->startTime = strtotime($startTime);
     }
 
     /**
@@ -47,7 +51,10 @@ class unlockModel extends Staple_Model
      */
     public function getEndTime()
     {
-        return $this->endTime;
+        $date = new DateTime();
+        $date->setTimestamp($this->endTime);
+        $endTime = $date->format('m/d/Y');
+        return $endTime;
     }
 
     /**
@@ -55,7 +62,7 @@ class unlockModel extends Staple_Model
      */
     public function setEndTime($endTime)
     {
-        $this->endTime = $endTime;
+        $this->endTime = strtotime($endTime);
     }
 
     /**
@@ -74,6 +81,23 @@ class unlockModel extends Staple_Model
         $this->userId = $userId;
     }
 
+    /**
+    * @return mixed
+    */
+    public function getRangeDates()
+    {
+        return $this->rangeDates;
+    }
+
+    /**
+     * @param mixed $rangeDates
+     */
+
+    public function setRangeDates($rangeDates)
+    {
+        $this->rangeDates = $rangeDates;
+    }
+
     function __construct()
     {
         $this->db = Staple_DB::get();
@@ -95,6 +119,117 @@ class unlockModel extends Staple_Model
             $this->setEndTime($result['startTime']);
         }
     }
+
+    function save()
+    {
+        if(isset($this->startTime) && !isset($this->id))
+        {
+            $sql = "
+                INSERT INTO overrideDates (startTime, endTime, userId) VALUES ('".$this->db->real_escape_string($this->startTime)."','".$this->db->real_escape_string($this->endTime)."','".$this->db->real_escape_string($this->userId)."')
+            ";
+
+            if($this->db->query($sql))
+            {
+                $audit = new auditModel();
+                $audit->setUserId($this->userId);
+                $audit->setAction('Range unlock');
+                $audit->setItem($this->username." unlocked dates from ".$this->getStartTime()." to ".$this->getEndTime());
+                $audit->save();
+
+                return True;
+            }
+        }
+    }
+
+    function unlock($id)
+    {
+       //get userid
+        $sql = "
+            SELECT userId FROM timeEntries WHERE id = '".$this->db->real_escape_string($id)."';
+        ";
+
+        if($this->db->query($sql)->num_rows > 0)
+        {
+            $query = $this->db->query($sql);
+            $result = $query->fetch_assoc();
+            $userId = $result['userId'];
+
+            $user = new userModel();
+            $user = $user->userInfo($userId);
+            $userId = $user['id'];
+            $batchId = $user['batchId'];
+
+            //Check if it's for the same user.
+            $currentUser = new userModel();
+            if($currentUser->getId() != $userId)
+            {
+                $sql = "
+                UPDATE timeEntries SET batchId = '".$this->db->real_escape_string($batchId)."' WHERE id = '".$this->db->real_escape_string($id)."'
+                ";
+
+                if($this->db->query($sql))
+                {
+                    $audit = new auditModel();
+                    $audit->setUserId($userId);
+                    $audit->setAction('Single unlock');
+                    $audit->setItem($this->username." unlocked time entry ". $id);
+                    $audit->save();
+
+                    return true;
+                }
+            }
+
+        }
+    }
+
+    function rangeDates($uid)
+    {
+        $sql = "
+            SELECT * FROM overrideDates WHERE userId = '".$this->db->real_escape_string($uid)."'
+        ";
+
+        if($this->db->query($sql)->num_rows > 0)
+        {
+            $query = $this->db->query($sql);
+
+            $rangeDays = array();
+            $groups = array();
+            $i=0;
+            while($result = $query->fetch_assoc())
+            {
+                $date = new DateTime();
+                $date->setTimestamp($result['startTime']);
+
+                $date2 = new DateTime();
+                $date2->setTimestamp($result['endTime']);
+
+                $interval = $date->diff($date2);
+                $days = $interval->days;
+                $groups[$i]['days'] = $days;
+                $groups[$i]['startTime'] = $result['startTime'];
+                $groups[$i]['endTime'] = $result['endTime'];
+                $i++;
+            }
+
+            $total=0;
+            foreach($groups as $group)
+            {
+                $total += $group['days'];
+            }
+
+            foreach($groups as $group)
+            {
+                for($i=1;$i<=$total;$i++)
+                {
+                    $rangeDays[$i]['startTime'] = $group['startTime'] + (86400 * $i);
+                    $rangeDays[$i]['endTime'] = $group['startTime'] + (86400 * $i) + 86400;
+                    $rangeDays[$i]['formattedStart'] = date('Y-m-d D', $group['startTime'] + (86400 * $i));
+                    $rangeDays[$i]['formattedEnd'] = date('Y-m-d D', $group['startTime'] + (86400 * $i) + 86400);
+                }
+            }
+            return $rangeDays;
+        }
+    }
 }
 
 ?>

application/models/weeklyReportModel.php

@@ -77,7 +77,7 @@ class weeklyReportModel extends Staple_Model
         $ret['start']['year'] = $dto->format('Y');
 
         //Week End
-        $dto->modify('+5 days')->setTime(23,59,59);
+        $dto->modify('+6 days')->setTime(23,59,59);
         $ret['end']['unix'] = $dto->format('U');
         $ret['end']['formatted'] = $dto->format('Y-m-d');
         $ret['end']['dayName'] = $dto->format('l');

application/views/audit/index.phtml

@@ -49,9 +49,9 @@
                 <thead>
                 <tr>
                     <th>Time Stamp</th>
-                    <th>Account</th>
+                    <th>Account Effected</th>
                     <th>Action</th>
-                    <th>Item</th>
+                    <th>Details</th>
                 </tr>
                 </thead>
                 <tbody>

application/views/reports/index.phtml

@@ -7,7 +7,7 @@
     <div class="row">
         <div class="small-6 columns">
             <ul class="button-group radius left">
-                <li><a class="button small" href="<?php echo $this->link(array('reports','weekly')) ?>">Week Report</a></li>
+                <li><a class="button small" href="<?php echo $this->link(array('reports','weekly')) ?>"><i class="fa fa-file"></i> Week Report</a></li>
             </ul>
         </div>
         <div class="small-6 columns">

application/views/reports/unlock.phtml

@@ -0,0 +1,135 @@
+<div class="section">
+    <div class="row">
+        <div class="small-12 columns">
+            <h1><i class="fa fa-unlock"></i> Time Unlock</h1>
+        </div>
+    </div>
+    <div class="row">
+        <div class="small-12 columns">
+            <ul class="tabs" data-tab>
+                <li class="tab-title active"><a href="#panel1"><i class="fa fa-square"></i> Single Unlock</a></li>
+                <li class="tab-title"><a href="#panel2"><i class="fa fa-th"></i> Range Unlock</a></li>
+            </ul>
+            <div class="tabs-content">
+                <div class="content active" id="panel1">
+                    <div class="small-12 columns">
+                        <p>Unlocks a single validated time entry.</p>
+                        <p>This is useful in a situation when an employee has accidentally validated a time entry and it is inaccurate.</p>
+                        <hr>
+                    </div>
+                    <div class="small-12 columns">
+                        <?php
+                            if(count($this->accounts->timesheets) > 0)
+                            {
+                                foreach($this->accounts->timesheets as $account=>$timesheet)
+                                {
+                                    if(count($timesheet) > 0)
+                                    {
+                                        $validatedTotal = 0;
+                                        foreach($timesheet as $entry)
+                                        {
+                                            if($entry['validated'] == 1)
+                                            {
+                                                $validatedTotal++;
+                                            }
+                                        }
+
+                                        echo "<h3 class='timeTitle'>$account <i class='fa fa-chevron-down right'></i></h3>";
+                                        echo "<div class='wrapper hide'>";
+                                        if($validatedTotal > 0)
+                                        {
+                                            echo "
+                                                <table width='100%'>
+                                                    <tr>
+                                                           <th>Date</th>
+                                                           <th>Start Time</th>
+                                                           <th>End Time</th>
+                                                           <th>Code</th>
+                                                           <th>Action</th>
+                                                    </tr>
+                                            ";
+
+                                            foreach($timesheet as $id=>$entry)
+                                            {
+                                                if($entry['validated'] == 1)
+                                                {
+                                                    echo "
+                                                    <tr>
+                                                        <td>".$entry['date']."</td>
+                                                        <td>".date("g:i A",$entry['inTime'])."</td>
+                                                        <td>".date("g:i A",$entry['outTime'])."</td>
+                                                        <td>".$entry['code']."</td>
+                                                        <td><a href=\"".$this->link(array('reports','unlockid',$id))."\"><i class='fa fa-unlock-alt'></i> Unlock</td>
+                                                    </tr>
+                                                    ";
+                                                }
+                                            }
+                                        }
+                                        else
+                                        {
+                                            echo "<div class='text-center'>No validated time submitted for this pay period.</div>";
+                                        }
+                                        echo "</table></div> <!-- end wrapper -->";
+                                    }
+                                }
+                            }
+                        ?>
+                    </div>
+                </div>
+                <div class="content" id="panel2">
+                    <div class="small-12 medium-6 columns">
+                        <p>Unlocks a range of dates for a user to submit new time entries.</p>
+                        <p>This is useful in a situation when an employee needs to have previous pay period dates unlocked for submission.</p>
+                        <p>
+                            <b>Note:</b> This <b>will not</b> unlock validated time entries.
+                        </p>
+                    </div>
+                    <div class="small-12 medium-6 columns">
+                        <?php echo $this->rangeForm ?>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    $(function() {
+        $( "#startDate" ).datepicker({
+            numberOfMonths: 2,
+            showWeek: true,
+            showButtonPanel: true,
+            onClose: function( selectedDate ) {
+                $( "#endDate" ).datepicker( "option", "minDate", selectedDate );
+            }
+        });
+        $( "#endDate" ).datepicker({
+            numberOfMonths: 2,
+            showWeek: true,
+            showButtonPanel: true,
+            onClose: function( selectedDate ) {
+                $( "#startDate" ).datepicker( "option", "maxDate", selectedDate );
+            }
+        });
+
+        $(".timeTitle").click(function() {
+            $(this).next(".wrapper").slideToggle("slow");
+            $(this).find("i").toggleClass("fa-chevron-up fa-chevron-down")
+            return false;
+        });
+
+        $("#hideAll").click(function() {
+            $(".wrapper").slideUp();
+            $(".timeTitle").find("i").removeClass("fa-chevron-up")
+            $(".timeTitle").find("i").addClass("fa-chevron-down")
+            return false;
+        });
+
+        $("#showAll").click(function() {
+            $(".wrapper").slideDown();
+            $(".timeTitle").find("i").removeClass("fa-chevron-down")
+            $(".timeTitle").find("i").addClass("fa-chevron-up")
+            return false;
+        });
+    });
+</script>

application/views/reports/unlockid.phtml

@@ -0,0 +1,18 @@
+<div class="section">
+    <div class="row">
+        <div class="small-12 columns">
+            <h1><i class="fa fa-unlock"></i> Time Unlock</h1>
+        </div>
+    </div>
+    <div class="row">
+        <div class="small-12 columns text-center">
+            <div class="panel">
+            <?php echo $this->message ?>
+            </div>
+        </div>
+        <div class="small-12 columns text-center">
+            <a class="button secondary" href="<?php echo $this->link(array('reports','unlock')) ?>">Back</a>
+        </div>
+    </div>
+</div>
+

public/timetrackerStyle/scss/_settings.scss

@@ -1466,19 +1466,31 @@ $primary-color: #315476;
 // 31. Tabs
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
+.tabs {
+  border:1px #eaeaea solid;
+  background-color:$secondary-color;
+}
+
+.tabs-content {
+  border-color:#eaeaea;
+  border-style:solid;
+  border-width:0px 1px 1px 1px;
+}
+
 // $include-html-tabs-classes: $include-html-classes;
 
 // $tabs-navigation-padding: rem-calc(16);
-// $tabs-navigation-bg-color: $silver;
-// $tabs-navigation-active-bg-color: $white;
+$tabs-navigation-bg-color: $secondary-color;
+$tabs-navigation-active-bg-color: #fff;
 // $tabs-navigation-hover-bg-color: scale-color($tabs-navigation-bg-color, $lightness: -6%);
 // $tabs-navigation-font-color: $jet;
-// $tabs-navigation-active-font-color: $tabs-navigation-font-color;
+ //$tabs-navigation-active-font-color: #fff;
 // $tabs-navigation-font-size: rem-calc(16);
 // $tabs-navigation-font-family: $body-font-family;
 
 // $tabs-content-margin-bottom: rem-calc(24);
 // $tabs-content-padding: ($column-gutter/2);
+  $tabs-content-padding:10px;
 
 // $tabs-vertical-navigation-margin-bottom: 1.25rem;