@@ -113,7 +113,7 @@ |
||
| 113 | 113 | |
| 114 | 114 | public function isFilled() |
| 115 | 115 | { |
| 116 | - return isset($this->dbData['status']) && ($this->dbData['status'] === 'pending' || $this->dbData['status'] === 'filled' || $this->dbData['status'] === 'groupPending'); |
|
| 116 | + return isset($this->dbData['status']) && ($this->dbData['status'] === 'pending' || $this->dbData['status'] === 'filled' || $this->dbData['status'] === 'groupPending'); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | public function findOverlaps($uid, $shortCircuit = false) |
@@ -177,6 +177,9 @@ |
||
| 177 | 177 | return $res; |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | + /** |
|
| 181 | + * @param Data\DataTable $dataTable |
|
| 182 | + */ |
|
| 180 | 183 | public function makeCopy($dataTable) |
| 181 | 184 | { |
| 182 | 185 | $tmp = $this->dbData; |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | $timeStr = $start->format('g:i A').' till '.$end->format('g:i A'); |
| 46 | 46 | if(strlen($shifts[$i]['name']) > 0) |
| 47 | 47 | { |
| 48 | - $timeStr .=' - <i>'.$shifts[$i]['name'].'</i>'; |
|
| 48 | + $timeStr .= ' - <i>'.$shifts[$i]['name'].'</i>'; |
|
| 49 | 49 | } |
| 50 | 50 | if(!isset($days[$dateStr])) |
| 51 | 51 | { |
@@ -60,30 +60,30 @@ discard block |
||
| 60 | 60 | uksort($days, array($this, 'daySort')); |
| 61 | 61 | foreach($days as $dateStr=>$day) |
| 62 | 62 | { |
| 63 | - $html .='<h2>'.$dateStr.'</h2>'; |
|
| 63 | + $html .= '<h2>'.$dateStr.'</h2>'; |
|
| 64 | 64 | uksort($day, array($this, 'groupSort')); |
| 65 | 65 | foreach($day as $shiftStr=>$shifts) |
| 66 | 66 | { |
| 67 | 67 | usort($shifts, array($this, 'shiftSort')); |
| 68 | - $html .='<h3>'.$shiftStr.'</h3>'; |
|
| 69 | - $html .='<table width="100%"><tr><th style="width: 20%">Role</th><th>Volunteer Name</th><th>Volunteer Camp</th></tr>'; |
|
| 68 | + $html .= '<h3>'.$shiftStr.'</h3>'; |
|
| 69 | + $html .= '<table width="100%"><tr><th style="width: 20%">Role</th><th>Volunteer Name</th><th>Volunteer Camp</th></tr>'; |
|
| 70 | 70 | foreach($shifts as $shift) |
| 71 | 71 | { |
| 72 | 72 | $shift = new \VolunteerShift(false, $shift); |
| 73 | 73 | $participant = $shift->participantObj; |
| 74 | 74 | if($participant !== false) |
| 75 | 75 | { |
| 76 | - $html .='<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td>'.$participant->getDisplayName('paperName').'</td><td>'.$participant->campName.'</td></tr>'; |
|
| 76 | + $html .= '<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td>'.$participant->getDisplayName('paperName').'</td><td>'.$participant->campName.'</td></tr>'; |
|
| 77 | 77 | } |
| 78 | 78 | else |
| 79 | 79 | { |
| 80 | - $html .='<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td></td><td></td></tr>'; |
|
| 80 | + $html .= '<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td></td><td></td></tr>'; |
|
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | - $html .='</table>'; |
|
| 83 | + $html .= '</table>'; |
|
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | - $html .='</body>'; |
|
| 86 | + $html .= '</body>'; |
|
| 87 | 87 | $this->setPDFFromHTML($html); |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | $shift = new \VolunteerShift(false, $shift); |
| 73 | 73 | $participant = $shift->participantObj; |
| 74 | 74 | if($participant !== false) |
| 75 | - { |
|
| 75 | + { |
|
| 76 | 76 | $html .='<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td>'.$participant->getDisplayName('paperName').'</td><td>'.$participant->campName.'</td></tr>'; |
| 77 | 77 | } |
| 78 | 78 | else |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | $this->isLead = $this->user->isInGroupNamed('Leads'); |
| 37 | 37 | if($this->isLead) |
| 38 | 38 | { |
| 39 | - $this->is_admin = true; |
|
| 39 | + $this->is_admin = true; |
|
| 40 | 40 | } |
| 41 | 41 | else |
| 42 | 42 | { |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | $uid = $this->user->uid; |
| 45 | 45 | $email = $this->user->mail; |
| 46 | 46 | $filter = new \Data\Filter("others eq $uid or others eq $email"); |
| 47 | - $dataTable = DataSetFactory::getDataTableByNames('fvs','departments'); |
|
| 47 | + $dataTable = DataSetFactory::getDataTableByNames('fvs', 'departments'); |
|
| 48 | 48 | $depts = $dataTable->read($filter); |
| 49 | 49 | $this->isLead = !empty($depts); |
| 50 | 50 | $this->is_admin = true; |
@@ -44,15 +44,15 @@ |
||
| 44 | 44 | $start = $this->shift->startTime->format('r'); |
| 45 | 45 | $end = $this->shift->endTime->format('r'); |
| 46 | 46 | $vars = array( |
| 47 | - '{$firstName}' => $firstName, |
|
| 48 | - '{$lastName}' => $lastName, |
|
| 49 | - '{$paperName}' => $paperName, |
|
| 50 | - '{$webName}' => $webName, |
|
| 51 | - '{$department}' => $department, |
|
| 52 | - '{$role}' => $role, |
|
| 53 | - '{$event}' => $event, |
|
| 54 | - '{$start}' => $start, |
|
| 55 | - '{$end}' => $end |
|
| 47 | + '{$firstName}' => $firstName, |
|
| 48 | + '{$lastName}' => $lastName, |
|
| 49 | + '{$paperName}' => $paperName, |
|
| 50 | + '{$webName}' => $webName, |
|
| 51 | + '{$department}' => $department, |
|
| 52 | + '{$role}' => $role, |
|
| 53 | + '{$event}' => $event, |
|
| 54 | + '{$start}' => $start, |
|
| 55 | + '{$end}' => $end |
|
| 56 | 56 | ); |
| 57 | 57 | if(strpos($this->text, '{$newStart}') !== false || strpos($this->text, '{$newEnd}') !== false) |
| 58 | 58 | { |
@@ -76,7 +76,7 @@ |
||
| 76 | 76 | $end = strpos($rawText, "</script>"); |
| 77 | 77 | if($index === 0) |
| 78 | 78 | { |
| 79 | - $rawText = substr($rawText, $end+9); |
|
| 79 | + $rawText = substr($rawText, $end + 9); |
|
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | 82 | return strtr(strip_tags($rawText), $vars); |