Completed
Push — master ( 26f5cc...f5ee23 )
by Patrick
01:47
created
groupSignup.php 2 patches
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
 
10 10
 if(!isset($_GET['id']))
11 11
 {
12
-  $page->body .= 'Error! Missing Group ID. You must have followed a bad link!';
13
-  $page->printPage();
14
-  return;
12
+    $page->body .= 'Error! Missing Group ID. You must have followed a bad link!';
13
+    $page->printPage();
14
+    return;
15 15
 }
16 16
 
17 17
 $groupID = $_GET['id'];
@@ -20,9 +20,9 @@  discard block
 block discarded – undo
20 20
 $shifts = $dataTable->read($filter);
21 21
 if(empty($shifts))
22 22
 {
23
-  $page->body .= 'Error! Could not locate shifts. You must have followed an old link!';
24
-  $page->printPage();
25
-  return;
23
+    $page->body .= 'Error! Could not locate shifts. You must have followed an old link!';
24
+    $page->printPage();
25
+    return;
26 26
 }
27 27
 
28 28
 $filled = array();
@@ -32,35 +32,35 @@  discard block
 block discarded – undo
32 32
 $count = count($shifts);
33 33
 for($i = 0; $i < $count; $i++)
34 34
 {
35
-  $shifts[$i] = new \VolunteerShift(false, $shifts[$i]);
36
-  if($shifts[$i]->status === 'filled' || $shifts[$i]->status === 'pending')
37
-  {
38
-      array_push($filled, $shifts[$i]);
39
-      if($page->user && $shifts[$i]->participant === $page->user->uid)
40
-      {
41
-          $alreadySignedUp = true;
42
-      }
43
-  }
44
-  else
45
-  {
46
-      array_push($available, $shifts[$i]);
47
-  }
35
+    $shifts[$i] = new \VolunteerShift(false, $shifts[$i]);
36
+    if($shifts[$i]->status === 'filled' || $shifts[$i]->status === 'pending')
37
+    {
38
+        array_push($filled, $shifts[$i]);
39
+        if($page->user && $shifts[$i]->participant === $page->user->uid)
40
+        {
41
+            $alreadySignedUp = true;
42
+        }
43
+    }
44
+    else
45
+    {
46
+        array_push($available, $shifts[$i]);
47
+    }
48 48
 }
49 49
 $page->body .= '<div class="row"><h3>Filled Shifts</h3></div><div class="row"><table class="table"><tr><th>Role</th><th>Participant</th></tr>';
50 50
 foreach($filled as $shift)
51 51
 {
52
-  $page->body.= '<tr><td>'.$shift->role->display_name.'</td><td>'.$shift->webParticipantName.'</td></tr>';
52
+    $page->body.= '<tr><td>'.$shift->role->display_name.'</td><td>'.$shift->webParticipantName.'</td></tr>';
53 53
 }
54 54
 $page->body .= '</table></div>';
55 55
 $page->body .= '<div class="row"><h3>Unfilled Shifts</h3></div><div class="row"><table class="table"><tr><th>Role</th><th>Sign Up</th></tr>';
56 56
 foreach($available as $shift)
57 57
 {
58
-  $cell = '<i>You already have a shift!</i>';
59
-  if($alreadySignedUp === false)
60
-  {
58
+    $cell = '<i>You already have a shift!</i>';
59
+    if($alreadySignedUp === false)
60
+    {
61 61
     $cell = '<button type="button" class="btn btn-primary" onClick="signUp(\''.$shift->_id.'\');">Sign Up</button>';
62
-  } 
63
-  $page->body.= '<tr><td>'.$shift->role->display_name.'</td><td>'.$cell.'</td></tr>';
62
+    } 
63
+    $page->body.= '<tr><td>'.$shift->role->display_name.'</td><td>'.$cell.'</td></tr>';
64 64
 }
65 65
 $page->body .= '</table></div>';
66 66
 $page->printPage();
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 $page->body .= '<div class="row"><h3>Filled Shifts</h3></div><div class="row"><table class="table"><tr><th>Role</th><th>Participant</th></tr>';
50 50
 foreach($filled as $shift)
51 51
 {
52
-  $page->body.= '<tr><td>'.$shift->role->display_name.'</td><td>'.$shift->webParticipantName.'</td></tr>';
52
+  $page->body .= '<tr><td>'.$shift->role->display_name.'</td><td>'.$shift->webParticipantName.'</td></tr>';
53 53
 }
54 54
 $page->body .= '</table></div>';
55 55
 $page->body .= '<div class="row"><h3>Unfilled Shifts</h3></div><div class="row"><table class="table"><tr><th>Role</th><th>Sign Up</th></tr>';
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
   {
61 61
     $cell = '<button type="button" class="btn btn-primary" onClick="signUp(\''.$shift->_id.'\');">Sign Up</button>';
62 62
   } 
63
-  $page->body.= '<tr><td>'.$shift->role->display_name.'</td><td>'.$cell.'</td></tr>';
63
+  $page->body .= '<tr><td>'.$shift->role->display_name.'</td><td>'.$cell.'</td></tr>';
64 64
 }
65 65
 $page->body .= '</table></div>';
66 66
 $page->printPage();
Please login to merge, or discard this patch.
app/class.VolunteerShift.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@
 block discarded – undo
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)
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -177,6 +177,9 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
app/Schedules/class.SimplePDF.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 } 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.