Inspection of "Display the role and department names on the pendi..." - BurningFlipside/VolunteerSystem - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 032ee0...c833e7 )

by Patrick

created 2020-02-25 21:48 UTC

Status

Braces +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,29 +1,29 @@
 block discarded – undo
 <?php
-function VolunteerAutoload($classname)
-{
+function VolunteerAutoload($classname)
+{
     $classname = str_replace('/', '\\', $classname);
     $classname = ltrim($classname, '\\');
     $filename  = '';
     $namespace = '';
-    if($lastNsPos = strrpos($classname, '\\'))
-    {
+    if($lastNsPos = strrpos($classname, '\\'))
+    {
         $namespace = substr($classname, 0, $lastNsPos);
         $classname = substr($classname, $lastNsPos + 1);
         $filename  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
     }
     $filename = __DIR__.DIRECTORY_SEPARATOR.$filename.'class.'.$classname.'.php';
-    if(is_readable($filename))
-    {
+    if(is_readable($filename))
+    {
         require $filename;
     }
 }
 
-if(version_compare(PHP_VERSION, '5.3.0', '>='))
-{
+if(version_compare(PHP_VERSION, '5.3.0', '>='))
+{
     spl_autoload_register('VolunteerAutoload', true, true);
-}
-else
-{
+}
+else
+{
     spl_autoload_register('VolunteerAutoload');
 }
 /* vim: set tabstop=4 shiftwidth=4 expandtab: */

Please login to merge, or discard this patch.

app/Schedules/class.SimplePDF.php 2 patches

Indentation +57 added lines, -57 removed lines patch added patch discarded remove patch

@@ -28,62 +28,62 @@
 block discarded – undo
 
     protected function createPDFBody()
     {
-	    $html = '<body>';
-	    $html .= '<style type="text/css">table {border-collapse: collapse;} table, th, td {border: 1px solid black;}</style>';
-	    $html .= '<h1 style="text-align: center;">'.$this->deptName.' Shift Schedule</h1>';
-	    //Group shifts by day...
-	    $days = array();
-	    $shifts = $this->shifts;
-	    $count = count($shifts);
-	    for($i = 0; $i < $count; $i++)
-	    {
-		    $start = new \DateTime($shifts[$i]['startTime']);
-		    $end = new \DateTime($shifts[$i]['endTime']);
-		    $shifts[$i]['startTime'] = $start;
-		    $shifts[$i]['endTime'] = $end;
-		    $dateStr = $start->format('l (n/j/Y)');
-		    $timeStr = $start->format('g:i A').' till '.$end->format('g:i A');
-		    if(strlen($shifts[$i]['name']) > 0)
-		    {
-			    $timeStr .= ' - <i>'.$shifts[$i]['name'].'</i>';
-		    }
-		    if(!isset($days[$dateStr]))
-		    {
-			    $days[$dateStr] = array();
-		    }
-		    if(!isset($days[$dateStr][$timeStr]))
-		    {
-			    $days[$dateStr][$timeStr] = array();
-		    }
-		    array_push($days[$dateStr][$timeStr], $shifts[$i]);
-	    }
-	    uksort($days, array($this, 'daySort'));
-	    foreach($days as $dateStr=>$day)
-	    {
-		    $html .= '<h2>'.$dateStr.'</h2>';
-		    uksort($day, array($this, 'groupSort'));
-		    foreach($day as $shiftStr=>$shifts)
-		    {
-			    usort($shifts, array($this, 'shiftSort'));
-			    $html .= '<h3>'.$shiftStr.'</h3>';
-			    $html .= '<table width="100%"><tr><th style="width: 20%">Role</th><th>Volunteer Name</th><th>Volunteer Camp</th></tr>';
-			    foreach($shifts as $shift)
-			    {
-				    $shift = new \VolunteerShift(false, $shift);
-				    $participant = $shift->participantObj;
-				    if($participant !== false)
-				    { 
-					    $html .= '<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td>'.$participant->getDisplayName('paperName').'</td><td>'.$participant->campName.'</td></tr>';
-				    }
-				    else
-				    {
-					    $html .= '<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td></td><td></td></tr>';
-				    }
-			    }
-			    $html .= '</table>';
-		    }
-	    }
-	    $html .= '</body>';
-	    $this->setPDFFromHTML($html);
+        $html = '<body>';
+        $html .= '<style type="text/css">table {border-collapse: collapse;} table, th, td {border: 1px solid black;}</style>';
+        $html .= '<h1 style="text-align: center;">'.$this->deptName.' Shift Schedule</h1>';
+        //Group shifts by day...
+        $days = array();
+        $shifts = $this->shifts;
+        $count = count($shifts);
+        for($i = 0; $i < $count; $i++)
+        {
+            $start = new \DateTime($shifts[$i]['startTime']);
+            $end = new \DateTime($shifts[$i]['endTime']);
+            $shifts[$i]['startTime'] = $start;
+            $shifts[$i]['endTime'] = $end;
+            $dateStr = $start->format('l (n/j/Y)');
+            $timeStr = $start->format('g:i A').' till '.$end->format('g:i A');
+            if(strlen($shifts[$i]['name']) > 0)
+            {
+                $timeStr .= ' - <i>'.$shifts[$i]['name'].'</i>';
+            }
+            if(!isset($days[$dateStr]))
+            {
+                $days[$dateStr] = array();
+            }
+            if(!isset($days[$dateStr][$timeStr]))
+            {
+                $days[$dateStr][$timeStr] = array();
+            }
+            array_push($days[$dateStr][$timeStr], $shifts[$i]);
+        }
+        uksort($days, array($this, 'daySort'));
+        foreach($days as $dateStr=>$day)
+        {
+            $html .= '<h2>'.$dateStr.'</h2>';
+            uksort($day, array($this, 'groupSort'));
+            foreach($day as $shiftStr=>$shifts)
+            {
+                usort($shifts, array($this, 'shiftSort'));
+                $html .= '<h3>'.$shiftStr.'</h3>';
+                $html .= '<table width="100%"><tr><th style="width: 20%">Role</th><th>Volunteer Name</th><th>Volunteer Camp</th></tr>';
+                foreach($shifts as $shift)
+                {
+                    $shift = new \VolunteerShift(false, $shift);
+                    $participant = $shift->participantObj;
+                    if($participant !== false)
+                    { 
+                        $html .= '<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td>'.$participant->getDisplayName('paperName').'</td><td>'.$participant->campName.'</td></tr>';
+                    }
+                    else
+                    {
+                        $html .= '<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td></td><td></td></tr>';
+                    }
+                }
+                $html .= '</table>';
+            }
+        }
+        $html .= '</body>';
+        $this->setPDFFromHTML($html);
     }
 } 

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
 				    $shift = new \VolunteerShift(false, $shift);
 				    $participant = $shift->participantObj;
 				    if($participant !== false)
-				    { 
+				    {
 					    $html .= '<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td>'.$participant->getDisplayName('paperName').'</td><td>'.$participant->campName.'</td></tr>';
 				    }
 				    else

Please login to merge, or discard this patch.

app/Schedules/class.GridSchedule.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -232,7 +232,7 @@
 block discarded – undo
         while($shift)
         {
             $timeDiff = $originalStartTime->diff($shift['startTime']);
-            $hoursFromStart = ($timeDiff->d * 24)+$timeDiff->h;
+            $hoursFromStart = ($timeDiff->d * 24) + $timeDiff->h;
             $rowForShift = $this->getRowForShift($shift['roleID'], $rows, $hoursFromStart + 2, $sheat);
             $this->createShiftCell($sheat, $hoursFromStart + 2, $rowForShift, $shift);
             $shift = array_shift($shifts);

Please login to merge, or discard this patch.

groupSignup.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -49,7 +49,7 @@
 block discarded – undo
 $page->body .= '<div class="row"><h3>Filled Shifts</h3></div><div class="row"><table class="table"><tr><th>Role</th><th>Participant</th></tr>';
 foreach($filled as $shift)
 {
-  $page->body .= '<tr><td>'.$shift->role->display_name.'</td><td>'.$shift->webParticipantName.'</td></tr>';
+    $page->body .= '<tr><td>'.$shift->role->display_name.'</td><td>'.$shift->webParticipantName.'</td></tr>';
 }
 $page->body .= '</table></div>';
 $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>';

Please login to merge, or discard this patch.

api/v1/class.ShiftAPI.php 1 patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -53,13 +53,13 @@  discard block
 block discarded – undo
         }
         if(!isset($obj['departmentID']))
         {
-             return false;
+                return false;
         }
         if(isset($obj['unbounded']) && $obj['unbounded'])
         {
             if(!isset($obj['minShifts']) || $obj['minShifts'] === 0 || $obj['minShifts'] === '')
             {
-                 $obj['minShifts'] = '1';
+                    $obj['minShifts'] = '1';
             }
         }
         return $this->isUserDepartmentLead($obj['departmentID'], $this->user);
@@ -152,8 +152,8 @@  discard block
 block discarded – undo
             $ret = $dataTable->update($filter, $entArray[$i]);
             if($ret === false)
             {
-               $myRet = false;
-               array_push($errors, $array[$i]);
+                $myRet = false;
+                array_push($errors, $array[$i]);
             }
         }
         if($myRet)
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
         $entity = $this->processShift($entity, $request);
         if(isset($entity['minShifts']) && $entity['minShifts'] > 0)
         {
-          $shift->makeCopy($dataTable);
+            $shift->makeCopy($dataTable);
         }
         if(isset($entity['overlap']) && $entity['overlap'])
         {
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
         $entity['signupTime'] = '';
         if(isset($entity['needEEApproval']))
         {
-          unset($entity['needEEApproval']);
+            unset($entity['needEEApproval']);
         }
         return $response->withJSON($dataTable->update($filter, $entity));
     }
@@ -567,7 +567,7 @@  discard block
 block discarded – undo
         $entity['status'] = 'unfilled';
         if(isset($entity['needEEApproval']))
         {
-          unset($entity['needEEApproval']);
+            unset($entity['needEEApproval']);
         }
         $ret = $dataTable->update($filter, $entity);
         if($ret)
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
         $entity['status'] = 'unfilled';
         if(isset($entity['needEEApproval']))
         {
-          unset($entity['needEEApproval']);
+            unset($entity['needEEApproval']);
         }
         return $response->withJSON($dataTable->update($filter, $entity));
     }

Please login to merge, or discard this 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

		@@ -232,7 +232,7 @@
		block discarded – undo
232	232	while($shift)
233	233	{
234	234	$timeDiff = $originalStartTime->diff($shift['startTime']);
235		- $hoursFromStart = ($timeDiff->d * 24)+$timeDiff->h;
	235	+ $hoursFromStart = ($timeDiff->d * 24) + $timeDiff->h;
236	236	$rowForShift = $this->getRowForShift($shift['roleID'], $rows, $hoursFromStart + 2, $sheat);
237	237	$this->createShiftCell($sheat, $hoursFromStart + 2, $rowForShift, $shift);
238	238	$shift = array_shift($shifts);

		@@ -53,13 +53,13 @@ discard block
		block discarded – undo
53	53	}
54	54	if(!isset($obj['departmentID']))
55	55	{
56		- return false;
	56	+ return false;
57	57	}
58	58	if(isset($obj['unbounded']) && $obj['unbounded'])
59	59	{
60	60	if(!isset($obj['minShifts']) \|\| $obj['minShifts'] === 0 \|\| $obj['minShifts'] === '')
61	61	{
62		- $obj['minShifts'] = '1';
	62	+ $obj['minShifts'] = '1';
63	63	}
64	64	}
65	65	return $this->isUserDepartmentLead($obj['departmentID'], $this->user);
		@@ -152,8 +152,8 @@ discard block
		block discarded – undo
152	152	$ret = $dataTable->update($filter, $entArray[$i]);
153	153	if($ret === false)
154	154	{
155		- $myRet = false;
156		- array_push($errors, $array[$i]);
	155	+ $myRet = false;
	156	+ array_push($errors, $array[$i]);
157	157	}
158	158	}
159	159	if($myRet)
		@@ -264,7 +264,7 @@ discard block
		block discarded – undo
264	264	$entity = $this->processShift($entity, $request);
265	265	if(isset($entity['minShifts']) && $entity['minShifts'] > 0)
266	266	{
267		- $shift->makeCopy($dataTable);
	267	+ $shift->makeCopy($dataTable);
268	268	}
269	269	if(isset($entity['overlap']) && $entity['overlap'])
270	270	{
		@@ -331,7 +331,7 @@ discard block
		block discarded – undo
331	331	$entity['signupTime'] = '';
332	332	if(isset($entity['needEEApproval']))
333	333	{
334		- unset($entity['needEEApproval']);
	334	+ unset($entity['needEEApproval']);
335	335	}
336	336	return $response->withJSON($dataTable->update($filter, $entity));
337	337	}
		@@ -567,7 +567,7 @@ discard block
		block discarded – undo
567	567	$entity['status'] = 'unfilled';
568	568	if(isset($entity['needEEApproval']))
569	569	{
570		- unset($entity['needEEApproval']);
	570	+ unset($entity['needEEApproval']);
571	571	}
572	572	$ret = $dataTable->update($filter, $entity);
573	573	if($ret)
		@@ -598,7 +598,7 @@ discard block
		block discarded – undo
598	598	$entity['status'] = 'unfilled';
599	599	if(isset($entity['needEEApproval']))
600	600	{
601		- unset($entity['needEEApproval']);
	601	+ unset($entity['needEEApproval']);
602	602	}
603	603	return $response->withJSON($dataTable->update($filter, $entity));
604	604	}

		@@ -1,29 +1,29 @@
		block discarded – undo
1	1	<?php
2		-function VolunteerAutoload($classname)
3		-{
	2	+function VolunteerAutoload($classname)
	3	+{
4	4	$classname = str_replace('/', '\\', $classname);
5	5	$classname = ltrim($classname, '\\');
6	6	$filename = '';
7	7	$namespace = '';
8		- if($lastNsPos = strrpos($classname, '\\'))
9		- {
	8	+ if($lastNsPos = strrpos($classname, '\\'))
	9	+ {
10	10	$namespace = substr($classname, 0, $lastNsPos);
11	11	$classname = substr($classname, $lastNsPos + 1);
12	12	$filename = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
13	13	}
14	14	$filename = __DIR__.DIRECTORY_SEPARATOR.$filename.'class.'.$classname.'.php';
15		- if(is_readable($filename))
16		- {
	15	+ if(is_readable($filename))
	16	+ {
17	17	require $filename;
18	18	}
19	19	}
20	20
21		-if(version_compare(PHP_VERSION, '5.3.0', '>='))
22		-{
	21	+if(version_compare(PHP_VERSION, '5.3.0', '>='))
	22	+{
23	23	spl_autoload_register('VolunteerAutoload', true, true);
24		-}
25		-else
26		-{
	24	+}
	25	+else
	26	+{
27	27	spl_autoload_register('VolunteerAutoload');
28	28	}
29	29	/* vim: set tabstop=4 shiftwidth=4 expandtab: */

		@@ -28,62 +28,62 @@
		block discarded – undo
28	28
29	29	protected function createPDFBody()
30	30	{
31		- $html = '<body>';
32		- $html .= '<style type="text/css">table {border-collapse: collapse;} table, th, td {border: 1px solid black;}</style>';
33		- $html .= '<h1 style="text-align: center;">'.$this->deptName.' Shift Schedule</h1>';
34		- //Group shifts by day...
35		- $days = array();
36		- $shifts = $this->shifts;
37		- $count = count($shifts);
38		- for($i = 0; $i < $count; $i++)
39		- {
40		- $start = new \DateTime($shifts[$i]['startTime']);
41		- $end = new \DateTime($shifts[$i]['endTime']);
42		- $shifts[$i]['startTime'] = $start;
43		- $shifts[$i]['endTime'] = $end;
44		- $dateStr = $start->format('l (n/j/Y)');
45		- $timeStr = $start->format('g:i A').' till '.$end->format('g:i A');
46		- if(strlen($shifts[$i]['name']) > 0)
47		- {
48		- $timeStr .= ' - <i>'.$shifts[$i]['name'].'</i>';
49		- }
50		- if(!isset($days[$dateStr]))
51		- {
52		- $days[$dateStr] = array();
53		- }
54		- if(!isset($days[$dateStr][$timeStr]))
55		- {
56		- $days[$dateStr][$timeStr] = array();
57		- }
58		- array_push($days[$dateStr][$timeStr], $shifts[$i]);
59		- }
60		- uksort($days, array($this, 'daySort'));
61		- foreach($days as $dateStr=>$day)
62		- {
63		- $html .= '<h2>'.$dateStr.'</h2>';
64		- uksort($day, array($this, 'groupSort'));
65		- foreach($day as $shiftStr=>$shifts)
66		- {
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>';
70		- foreach($shifts as $shift)
71		- {
72		- $shift = new \VolunteerShift(false, $shift);
73		- $participant = $shift->participantObj;
74		- if($participant !== false)
75		- {
76		- $html .= '<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td>'.$participant->getDisplayName('paperName').'</td><td>'.$participant->campName.'</td></tr>';
77		- }
78		- else
79		- {
80		- $html .= '<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td></td><td></td></tr>';
81		- }
82		- }
83		- $html .= '</table>';
84		- }
85		- }
86		- $html .= '</body>';
87		- $this->setPDFFromHTML($html);
	31	+ $html = '<body>';
	32	+ $html .= '<style type="text/css">table {border-collapse: collapse;} table, th, td {border: 1px solid black;}</style>';
	33	+ $html .= '<h1 style="text-align: center;">'.$this->deptName.' Shift Schedule</h1>';
	34	+ //Group shifts by day...
	35	+ $days = array();
	36	+ $shifts = $this->shifts;
	37	+ $count = count($shifts);
	38	+ for($i = 0; $i < $count; $i++)
	39	+ {
	40	+ $start = new \DateTime($shifts[$i]['startTime']);
	41	+ $end = new \DateTime($shifts[$i]['endTime']);
	42	+ $shifts[$i]['startTime'] = $start;
	43	+ $shifts[$i]['endTime'] = $end;
	44	+ $dateStr = $start->format('l (n/j/Y)');
	45	+ $timeStr = $start->format('g:i A').' till '.$end->format('g:i A');
	46	+ if(strlen($shifts[$i]['name']) > 0)
	47	+ {
	48	+ $timeStr .= ' - <i>'.$shifts[$i]['name'].'</i>';
	49	+ }
	50	+ if(!isset($days[$dateStr]))
	51	+ {
	52	+ $days[$dateStr] = array();
	53	+ }
	54	+ if(!isset($days[$dateStr][$timeStr]))
	55	+ {
	56	+ $days[$dateStr][$timeStr] = array();
	57	+ }
	58	+ array_push($days[$dateStr][$timeStr], $shifts[$i]);
	59	+ }
	60	+ uksort($days, array($this, 'daySort'));
	61	+ foreach($days as $dateStr=>$day)
	62	+ {
	63	+ $html .= '<h2>'.$dateStr.'</h2>';
	64	+ uksort($day, array($this, 'groupSort'));
	65	+ foreach($day as $shiftStr=>$shifts)
	66	+ {
	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>';
	70	+ foreach($shifts as $shift)
	71	+ {
	72	+ $shift = new \VolunteerShift(false, $shift);
	73	+ $participant = $shift->participantObj;
	74	+ if($participant !== false)
	75	+ {
	76	+ $html .= '<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td>'.$participant->getDisplayName('paperName').'</td><td>'.$participant->campName.'</td></tr>';
	77	+ }
	78	+ else
	79	+ {
	80	+ $html .= '<tr><td>'.$this->getRoleNameFromID($shift->roleID).'</td><td></td><td></td></tr>';
	81	+ }
	82	+ }
	83	+ $html .= '</table>';
	84	+ }
	85	+ }
	86	+ $html .= '</body>';
	87	+ $this->setPDFFromHTML($html);
88	88	}
89	89	}

		@@ -49,7 +49,7 @@
		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>';

BurningFlipside / VolunteerSystem

Push — master ( 032ee0...c833e7 )

Status

Category

Braces +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +57 added lines, -57 removed lines patch added patch discarded remove patch

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch