Changeset 2178321

Timestamp:

10/23/2019 09:55:27 AM (6 years ago)

Author:

hitcode

Message:

4.5.1

Location:

shiftcontroller/trunk

Files:

• readme.txt (modified) (1 diff)
• sh4/calendars/permissions.php (modified) (1 diff)
• sh4/new/acl.php (modified) (1 diff)
• sh4/new/view/confirm.php (modified) (6 diffs)
• sh4/schedule/html/view/day.php (modified) (1 diff)
• sh4/schedule/html/view/month.php (modified) (1 diff)
• sh4/schedule/html/view/week.php (modified) (1 diff)
• sh4/shifts/controller/time.php (modified) (3 diffs)
• sh4/shifts/view/widget.php (modified) (4 diffs)
• shiftcontroller4.php (modified) (2 diffs)

shiftcontroller/trunk/readme.txt

@@ -60 +60 @@
 
 == Changelog ==
+
+= 4.5.1 =
+* Group multiple open shifts for the same time in the schedule view.
+* New setting if employees are allowed to create shifts for themselves with conflicts (overlapping existing shifts).
+* BUG: compatibility issue - the date picker might have failed to work with some front end themes.
 
 = 4.5.0 =

shiftcontroller/trunk/sh4/calendars/permissions.php

@@ -62 +62 @@
             '__Create Own Draft Shifts__',
             array( 'employee_create_own_draft', 0 ),
+            NULL
+            );
+
+        $return[] = array(
+            '__Create Own Shifts With Conflicts__',
+            array( 'employee_create_own_conflicts', 0 ),
             NULL
             );

shiftcontroller/trunk/sh4/new/acl.php

@@ -116 +116 @@
                 $return = TRUE;
             }
+        }
+
+        if( $return ){
+            // check if can create shifts with conflicts
+            // if( ! $this->calendarsPermissions->get($thisCalendar, 'employee_create_own_conflicts') ){
+                // $return = FALSE;
+            // }
         }
 

shiftcontroller/trunk/sh4/new/view/confirm.php

@@ -5 +5 @@
         HC3_Hooks $hooks,
 
+        HC3_Auth $auth,
+        HC3_IPermission $permission,
+        SH4_Shifts_Conflicts $conflicts,
+
         HC3_Request $request,
         HC3_Ui $ui,
@@ -12 +16 @@
         SH4_New_View_Common $common,
 
-        SH4_Shifts_Conflicts $conflicts,
         SH4_Shifts_Availability $availability,
 
@@ -22 +25 @@
         SH4_Calendars_Presenter $calendarsPresenter,
         SH4_ShiftTypes_Presenter $shiftTypesPresenter,
+
+        SH4_Calendars_Permissions $calendarsPermissions,
 
         SH4_App_Query $appQuery,
@@ -31 +36 @@
         $this->self = $hooks->wrap( $this );
 
+        $this->auth = $hooks->wrap( $auth );
+        $this->permission = $hooks->wrap( $permission );
         $this->request = $request;
         $this->ui = $ui;
@@ -36 +43 @@
         $this->common = $hooks->wrap($common);
 
+        $this->calendarsPermissions = $hooks->wrap( $calendarsPermissions );
         $this->t = $t;
 
@@ -347 +355 @@
         $out = array( $out );
 
-        $btn = $this->self->buttons( $calendarId, $shiftTypeId, $dateString, $employeeString );
-        $btn = $this->ui->makeListInline( $btn );
+// employee_create_own_conflicts
+        $showButtons = TRUE;
+
+        if( $withConflicts ){
+            $isManager = FALSE;
+
+            $currentUser = $this->auth->getCurrentUser();
+            if( $currentUser ){
+                if( $this->permission->isAdmin($currentUser) ){
+                    $isManager = TRUE;
+                }
+                else {
+                    $calendarsAsManager = $this->appQuery->findCalendarsManagedByUser( $currentUser );
+                    if( isset($calendarsAsManager[$calendarId]) ){
+                        $isManager = TRUE;
+                    }
+                }
+            }
+
+            if( ! $isManager ){
+                if( ! $this->calendarsPermissions->get($calendar, 'employee_create_own_conflicts') ){
+                    $showButtons = FALSE;
+                }
+            }
+        }
+
+        if( $showButtons ){
+            $btn = $this->self->buttons( $calendarId, $shiftTypeId, $dateString, $employeeString );
+            $btn = $this->ui->makeListInline( $btn );
+        }
+        else {
+            $btn = '__You cannot create new shifts with conflicts.__';
+        }
 
     // open shift

shiftcontroller/trunk/sh4/schedule/html/view/day.php

@@ -570 +570 @@
         $grid->setRange( $dayStart, $dayEnd );
 
+    // groups?
+        $groups = array();
+        $groupedShifts = array();
+        reset( $shifts );
         foreach( $shifts as $shift ){
-            $thisView = $this->widget->render( $shift, $iknow, $hori, $noZoom );
+            if( ! $shift->isOpen() ){
+                continue;
+            }
+
+            $groupId = array();
+            $groupId[] = $shift->getStart();
+            $groupId[] = $shift->getEnd();
+            $groupId[] = $shift->isPublished() ? 1 : 0;
+
+            $groupId = join( '-', $groupId );
+            if( ! isset($groups[$groupId]) ){
+                $groups[ $groupId ] = $shift->getId();
+                $groupedShifts[ $shift->getId() ] = array( $shift->getId() );
+            }
+            else {
+                $mainShiftId = $groups[ $groupId ];
+                $groupedShifts[ $mainShiftId ][] = $shift->getId();
+                $groupedShifts[ $shift->getId() ] = 0;
+            }
+        }
+
+        reset( $shifts );
+        foreach( $shifts as $shift ){
+            $id = $shift->getId();
+            if( isset($groupedShifts[$id]) && (! $groupedShifts[$id]) ){
+                continue;
+            }
+
+            $groupedQty = NULL;
+            if( isset($groupedShifts[$id]) && (count($groupedShifts[$id]) > 1) ){
+                $groupedQty = count($groupedShifts[$id]);
+            }
+
+            $thisView = $this->widget->render( $shift, $iknow, $hori, $noZoom, $groupedQty );
             $shiftId = $shift->getId();
 

shiftcontroller/trunk/sh4/schedule/html/view/month.php

@@ -698 +698 @@
         }
 
+    // groups?
+        $groups = array();
+        $groupedShifts = array();
+        reset( $shifts );
+        foreach( $shifts as $shift ){
+            if( ! $shift->isOpen() ){
+                continue;
+            }
+
+            $groupId = array();
+            $groupId[] = $shift->getStart();
+            $groupId[] = $shift->getEnd();
+            $groupId[] = $shift->isPublished() ? 1 : 0;
+
+            $groupId = join( '-', $groupId );
+            if( ! isset($groups[$groupId]) ){
+                $groups[ $groupId ] = $shift->getId();
+                $groupedShifts[ $shift->getId() ] = array( $shift->getId() );
+            }
+            else {
+                $mainShiftId = $groups[ $groupId ];
+                $groupedShifts[ $mainShiftId ][] = $shift->getId();
+                $groupedShifts[ $shift->getId() ] = 0;
+            }
+        }
+
         $return = array();
+        reset( $shifts );
         foreach( $shifts as $shift ){
             $id = $shift->getId();
-            $thisView = $this->widget->renderCompact( $shift, $iknow );
+
+            if( isset($groupedShifts[$id]) && (! $groupedShifts[$id]) ){
+                continue;
+            }
+
+            $groupedQty = NULL;
+            if( isset($groupedShifts[$id]) && (count($groupedShifts[$id]) > 1) ){
+                $groupedQty = count($groupedShifts[$id]);
+            }
+
+            $thisView = $this->widget->renderCompact( $shift, $iknow, $groupedQty );
 
             if( ! $noZoom ){

shiftcontroller/trunk/sh4/schedule/html/view/week.php

@@ -746 +746 @@
         }
 
+    // groups?
+        $groups = array();
+        $groupedShifts = array();
+        reset( $shifts );
+        foreach( $shifts as $shift ){
+            if( ! $shift->isOpen() ){
+                continue;
+            }
+
+            $groupId = array();
+            $groupId[] = $shift->getStart();
+            $groupId[] = $shift->getEnd();
+            $groupId[] = $shift->isPublished() ? 1 : 0;
+
+            $groupId = join( '-', $groupId );
+            if( ! isset($groups[$groupId]) ){
+                $groups[ $groupId ] = $shift->getId();
+                $groupedShifts[ $shift->getId() ] = array( $shift->getId() );
+            }
+            else {
+                $mainShiftId = $groups[ $groupId ];
+                $groupedShifts[ $mainShiftId ][] = $shift->getId();
+                $groupedShifts[ $shift->getId() ] = 0;
+            }
+        }
+
         $hori = FALSE;
         $return = array();
+        reset( $shifts );
         foreach( $shifts as $shift ){
             $id = $shift->getId();
-            $thisView = $this->widget->render( $shift, $iknow, $hori, $noZoom );
+
+            if( isset($groupedShifts[$id]) && (! $groupedShifts[$id]) ){
+                continue;
+            }
+
+            $groupedQty = NULL;
+            if( isset($groupedShifts[$id]) && (count($groupedShifts[$id]) > 1) ){
+                $groupedQty = count($groupedShifts[$id]);
+            }
+
+            $thisView = $this->widget->render( $shift, $iknow, $hori, $noZoom, $groupedQty );
 
             $menu = array();

shiftcontroller/trunk/sh4/shifts/controller/time.php

@@ -7 +7 @@
         HC3_Session $session,
         HC3_Time $t,
+
+        SH4_Shifts_Conflicts $conflicts,
+        HC3_Auth $auth,
+        HC3_IPermission $permission,
+        SH4_App_Query $appQuery,
+        SH4_Calendars_Permissions $calendarsPermissions,
 
         SH4_Shifts_Query $query,
@@ -20 +26 @@
         $this->command = $hooks->wrap($command);
         $this->employees = $hooks->wrap($employees);
+
+        $this->auth = $hooks->wrap( $auth );
+        $this->permission = $hooks->wrap( $permission );
+        $this->conflicts = $hooks->wrap($conflicts);
+        $this->appQuery = $hooks->wrap( $appQuery );
+        $this->calendarsPermissions = $hooks->wrap( $calendarsPermissions );
     }
 
@@ -60 +72 @@
         }
 
-        $this->command->reschedule( $shift, $start, $end, $startBreak, $endBreak );
+// check if it creates a conflict
+        $calendar = $shift->getCalendar();
+        $calendarId = $calendar->getId();
 
-        $msg = '__Shift Rescheduled__';
+        $testModel = new SH4_Shifts_Model( NULL, $calendar, $start, $end, $shift->getEmployee(), $startBreak, $endBreak );
+        $conflicts = $this->conflicts->get( $testModel );
+
+        $allowed = TRUE;
+        if( $conflicts ){
+            $isManager = FALSE;
+
+            $currentUser = $this->auth->getCurrentUser();
+            if( $currentUser ){
+                if( $this->permission->isAdmin($currentUser) ){
+                    $isManager = TRUE;
+                }
+                else {
+                    $calendarsAsManager = $this->appQuery->findCalendarsManagedByUser( $currentUser );
+                    if( isset($calendarsAsManager[$calendarId]) ){
+                        $isManager = TRUE;
+                    }
+                }
+            }
+
+            if( ! $isManager ){
+                if( ! $this->calendarsPermissions->get($calendar, 'employee_create_own_conflicts') ){
+                    $allowed = FALSE;
+                }
+            }
+        }
 
         $to = 'schedule';
 
-        $return = array( $to, $msg );
+        if( $allowed ){
+            $this->command->reschedule( $shift, $start, $end, $startBreak, $endBreak );
+            $msg = '__Shift Rescheduled__';
+            $return = array( $to, $msg );
+        }
+        else {
+            $msg = '__You cannot create new shifts with conflicts.__';
+            $return = array( $to, $msg, TRUE );
+        }
+
         return $return;
     }

shiftcontroller/trunk/sh4/shifts/view/widget.php

@@ -157 +157 @@
     }
 
-    public function render( SH4_Shifts_Model $model, $iknow = array(), $hori = FALSE, $noLink = FALSE )
+    public function render( SH4_Shifts_Model $model, $iknow = array(), $hori = FALSE, $noLink = FALSE, $groupedQty = NULL )
     {
         $out = $this->self->prepare( $model, $iknow );
-        $return = $this->self->renderPrepared( $model, $out, $iknow, $hori, $noLink );
+        $return = $this->self->renderPrepared( $model, $out, $iknow, $hori, $noLink, $groupedQty );
         return $return;
     }
 
-    public function renderCompact( SH4_Shifts_Model $model, $iknow = array() )
+    public function renderCompact( SH4_Shifts_Model $model, $iknow = array(), $groupedQty = NULL )
     {
         $id = $model->getId();
@@ -205 +205 @@
         }
 
+        if( NULL !== $groupedQty ){
+            $label = $groupedQty . 'x';
+        }
+
         $out = $this->ui->makeBlock( $label )
             ->padding(1)
@@ -280 +284 @@
     }
 
-    public function renderPrepared( SH4_Shifts_Model $model, $out, $iknow = array(), $hori = FALSE, $noLink = FALSE )
+    public function renderPrepared( SH4_Shifts_Model $model, $out, $iknow = array(), $hori = FALSE, $noLink = FALSE, $groupedQty = NULL )
     {
         $id = $model->getId();
@@ -330 +334 @@
         $keys = array_keys($out);
         $firstKey = array_shift($keys);
+
+        if( NULL !== $groupedQty ){
+            $out[$firstKey] = $groupedQty . ' x ' . $out[$firstKey];
+        }
 
     // LINK

shiftcontroller/trunk/shiftcontroller4.php

@@ -4 +4 @@
  * Plugin URI: http://www.shiftcontroller.com/
  * Description: Staff scheduling plugin
- * Version: 4.5.0
+ * Version: 4.5.1
  * Author: hitcode.com
  * Author URI: http://www.shiftcontroller.com/
@@ -11 +11 @@
 */
 
-define( 'SH4_VERSION', 450 );
+define( 'SH4_VERSION', 451 );
 
 if (! defined('ABSPATH')) exit; // Exit if accessed directly