Changeset 2258787

Timestamp:

03/11/2020 08:10:33 AM (6 years ago)

Author:

hitcode

Message:

4.5.9

Location:

shiftcontroller/trunk

Files:

• hc3/_wordpress/abstract/plugin.php (modified) (1 diff)
• hc3/_wordpress/ui/element/input/richtextarea.php (modified) (1 diff)
• hc3/assets/js/hc2.js (modified) (3 diffs)
• readme.txt (modified) (2 diffs)
• sh4/app/boot.php (modified) (1 diff)
• sh4/calendars/boot.php (modified) (1 diff)
• sh4/calendars/html/admin/controller/new.php (modified) (1 diff)
• sh4/calendars/html/admin/controller/shifttypes.php (modified) (2 diffs)
• sh4/calendars/html/admin/view/index.php (modified) (3 diffs)
• sh4/calendars/html/admin/view/shifttypes.php (modified) (2 diffs)
• sh4/calendars/permissions.php (modified) (2 diffs)
• sh4/new/view/calendar.php (modified) (3 diffs)
• sh4/new/view/employee.php (modified) (4 diffs)
• sh4/schedule/html/view/index.php (modified) (5 diffs)
• sh4/shifts/view/employee.php (modified) (2 diffs)
• sh4/shifttypes/boot.php (modified) (1 diff)
• sh4/shifttypes/html/admin/controller/settings.php (modified) (1 diff)
• sh4/shifttypes/html/admin/view/new.php (modified) (1 diff)
• sh4/shifttypes/html/admin/view/settings.php (modified) (2 diffs)
• shiftcontroller4.php (modified) (2 diffs)

shiftcontroller/trunk/hc3/_wordpress/abstract/plugin.php

@@ -71 +71 @@
         $lang = $settings->get('lang');
 
+    // Polylang plugin
         if( function_exists('pll_current_language') ){
             $lang = pll_current_language( 'locale' );

shiftcontroller/trunk/hc3/_wordpress/ui/element/input/richtextarea.php

@@ -57 +57 @@
 
         $out = ob_get_clean();
+
+        if( strlen($this->label) ){
+            $out = $this->htmlFactory->makeLabelled( $this->label, $out, $this->htmlId() );
+        }
+
         return $out;
     }

shiftcontroller/trunk/hc3/assets/js/hc2.js

@@ -131 +131 @@
         // parse default value
         var this_value = $hidden.val();
-
+        self.default_duration = 5 * 60;
         self.input_value = [];
 
@@ -138 +138 @@
             for( var jj = 0; jj < this_times.length; jj++ ){
                 self.input_value.push( parseInt(this_times[jj]) );
+            }
+
+            if( 2 == this_times.length ){
+                self.default_duration = parseInt(this_times[1]) - parseInt(this_times[0]);
             }
         }
@@ -207 +211 @@
 
             var current_end = self.input_value[1] ? self.input_value[1] : $input_end.val();
+            current_end = start + self.default_duration;
             current_end = parseInt( current_end );
 

shiftcontroller/trunk/readme.txt

@@ -5 +5 @@
 Stable tag: trunk
 Requires at least: 4.1
-Tested up to: 5.3
+Tested up to: 5.4
 Requires PHP: 5.3
 
@@ -60 +60 @@
 
 == Changelog ==
+
+= 4.5.9 =
+* Added label for textarea custom field in the admin area.
+* When creating a shift or assigning new or another employee, unavailable employees are displayed below available ones.
+* Added a setting for default shift duration.
+* In the admin calendars list view we added the quantity of notifications and permission options enabled for each calendar.
+* The schedule view remembers last filtered calendars and employees.
 
 = 4.5.8 =

shiftcontroller/trunk/sh4/app/boot.php

@@ -28 +28 @@
             ->init( 'datetime_max_time', 24*60*60 )
             ->init( 'datetime_step', 5*60 )
-
-            ->init( 'shifttypes_nobreak', FALSE )
 
             ->init( 'datetime_hide_schedule_reports', 0 )

shiftcontroller/trunk/sh4/calendars/boot.php

@@ -46 +46 @@
             ->register( 'post:admin/calendars/{id}/shifttypes', array('SH4_Calendars_Html_Admin_Controller_ShiftTypes', 'execute') )
 
+            ->register( 'get:admin/calendars/{id}/shifttypes/{new}', array('SH4_Calendars_Html_Admin_View_ShiftTypes', 'render') )
+            ->register( 'post:admin/calendars/{id}/shifttypes/{new}', array('SH4_Calendars_Html_Admin_Controller_ShiftTypes', 'execute') )
+
             ->register( 'get:admin/calendars/{id}/prm', array('SH4_Calendars_Html_Admin_View_Permissions', 'render') )
             ->register( 'post:admin/calendars/{id}/prm', array('SH4_Calendars_Html_Admin_Controller_Permissions', 'execute') )

shiftcontroller/trunk/sh4/calendars/html/admin/controller/new.php

@@ -22 +22 @@
         $newId = $this->command->create( $title, $color, $description, $type );
 
-        $to = 'admin/calendars/' . $newId . '/shifttypes';
+        $to = 'admin/calendars/' . $newId . '/shifttypes/new';
         $return = array( $to, array('__New Calendar Added__') );
         return $return;

shiftcontroller/trunk/sh4/calendars/html/admin/controller/shifttypes.php

@@ -22 +22 @@
     }
 
-    public function execute( $calendarId )
+    public function execute( $calendarId, $new = FALSE )
     {
         $calendar = $this->calendarsQuery->findById( $calendarId );
@@ -51 +51 @@
         }
 
-        $return = array( 'admin/calendars', '__Calendar Updated__' );
+        if( $new ){
+            $to = 'admin/calendars/' . $calendarId . '/prm';
+        }
+        else {
+            $to = 'admin/calendars';
+        }
+
+        $return = array( $to, array('__Calendar Updated__') );
+
         return $return;
     }

shiftcontroller/trunk/sh4/calendars/html/admin/view/index.php

@@ -14 +14 @@
         SH4_Calendars_Query $calendarsQuery,
         SH4_Calendars_Presenter $calendarsPresenter,
+        SH4_Calendars_Permissions $calendarsPermissions,
+
+        SH4_Notifications_Service $notificationsService,
 
         SH4_Employees_Query $employees
@@ -28 +31 @@
         $this->calendarsQuery = $hooks->wrap( $calendarsQuery );
         $this->calendarsPresenter = $hooks->wrap( $calendarsPresenter );
+        $this->calendarsPermissions = $hooks->wrap( $calendarsPermissions );
 
         $this->employees = $hooks->wrap($employees);
+        $this->notificationsService = $hooks->wrap( $notificationsService );
 
         $this->self = $hooks->wrap($this);
@@ -238 +243 @@
             );
 
-        $return['notifications'] = array( 'admin/notifications/' . $id, '__Notifications__');
-        $return['permissions'] = array( 'admin/calendars/' . $id . '/prm', '__Permissions__');
+        $allNotifications = $this->notificationsService->findAll();
+        $allNotifications = array_keys( $allNotifications );
+        $notificationsCount = 0;
+        foreach( $allNotifications as $notificationId ){
+            if( $this->notificationsService->isOn($model, $notificationId) ){
+                $notificationsCount++;
+            }
+        }
+        $label = '__Notifications__' . ' [' . $notificationsCount . ']';
+
+        $return['notifications'] = array( 'admin/notifications/' . $id, $label );
+
+        $allPermissionsOptions = $this->calendarsPermissions->categorizedOptions();
+        $thisPermissionsOptions = $this->calendarsPermissions->getAll( $model );
+
+        $permissionCounts = array();
+        foreach( $allPermissionsOptions as $group => $perms ){
+            // $permissionCounts[ $group ] = array( 0, count($perms) );
+            $permissionCounts[ $group ] = 0;
+        }
+
+        foreach( $thisPermissionsOptions as $k => $v ){
+            if( ! $v ){
+                continue;
+            }
+
+            $ka = explode( '_', $k );
+            $group = $ka[0];
+
+            if( ! isset($allPermissionsOptions[$group]) ){
+                continue;
+            }
+
+            if( ! in_array($k, $allPermissionsOptions[$group]) ){
+                continue;
+            }
+
+            $permissionCounts[ $group ]++;
+        }
+        $permissionCountsView = join( '/', $permissionCounts );
+
+        $label = '__Permissions__' . ' [' . $permissionCountsView . ']';
+        $return['permissions'] = array( 'admin/calendars/' . $id . '/prm', $label);
 
         if( $model->isArchived() ){

shiftcontroller/trunk/sh4/calendars/html/admin/view/shifttypes.php

@@ -29 +29 @@
     }
 
-    public function render( $id )
+    public function render( $id, $new = FALSE )
     {
         $model = $this->calendarsQuery->findById($id);
@@ -74 +74 @@
         $out = $this->ui->makeList( array($out, $buttons) );
 
-        $out = $this->ui->makeForm(
-            'admin/calendars/' . $id . '/shifttypes',
-            $out
-            );
+        $to = $new ? 'admin/calendars/' . $id . '/shifttypes/new' : 'admin/calendars/' . $id . '/shifttypes';
+        $out = $this->ui->makeForm( $to, $out );
 
         $this->layout

shiftcontroller/trunk/sh4/calendars/permissions.php

@@ -5 +5 @@
     public function get( SH4_Calendars_Model $calendar, $permissionId );
     public function getAll( SH4_Calendars_Model $calendar );
+    public function options();
+    public function categorizedOptions();
 }
 
@@ -35 +37 @@
             }
         }
+    }
+
+    public function categorizedOptions()
+    {
+        $ret = array( 'employee' => array(), 'employee2' => array(), 'visitor' => array() );
+
+        $options = $this->self->options();
+        foreach( $options as $o ){
+            $label = array_shift( $o );
+            $employeeOption = array_shift( $o );
+            $visitorOption = array_shift( $o );
+            $employee2Option = array_shift( $o );
+            // list( $label, $employeeOption, $visitorOption ) = $o;
+
+            if( $employeeOption ){
+                $ret['employee'][] = $employeeOption[0];
+            }
+            if( $visitorOption ){
+                $ret['visitor'][] = $visitorOption[0];
+            }
+            if( $employee2Option ){
+                $ret['employee2'][] = $employee2Option[0];
+            }
+        }
+
+        return $ret;
     }
 

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

@@ -18 +18 @@
         HC3_Hooks $hooks,
 
+        HC3_Settings $settings,
         HC3_Request $request,
         HC3_Ui $ui,
@@ -36 +37 @@
         $this->layout = $layout;
         $this->common = $hooks->wrap($common);
+        $this->settings = $hooks->wrap($settings);
 
         $this->appQuery = $hooks->wrap( $appQuery );
@@ -274 +276 @@
             $to = 'new/customtime/' . $calendarId;
             $to = array( $to, $params );
-            $thisForm = $this->ui->makeForm(
-                $to,
-                $this->ui->makeList()
-                    // ->add( $this->ui->makeInputTimeRange( 'time', '__Time__' ) )
-                    ->add( $this->ui->makeInputTimeRange( 'time', NULL ) )
-                    ->add(
-                        $this->ui->makeCollapseCheckbox(
-                            'break_on',
-                            '__Lunch Break__' . '?',
-                            $this->ui->makeInputTimeRange( 'break', NULL)
-                            )
-                        )
-                    ->add( $this->ui->makeInputSubmit( '__Continue__')->tag('secondary') )
-                );
+
+            $thisFormInputs = array();
+
+            $value = array();
+            $minTime = $this->settings->get('datetime_min_time');
+            $defaultDuration = $this->settings->get('shifttypes_default_duration');
+            if( (NULL !== $minTime) && (NULL !== $defaultDuration) ){
+                $value = array( $minTime, $minTime + $defaultDuration );
+            }
+            $thisFormInputs[] = $this->ui->makeInputTimeRange( 'time', NULL, $value );
+
+            $noBreak = $this->settings->get( 'shifttypes_nobreak' );
+            if( ! $noBreak ){
+                $thisFormInputs[] = $this->ui->makeCollapseCheckbox(
+                    'break_on',
+                    '__Lunch Break__' . '?',
+                    $this->ui->makeInputTimeRange( 'break', NULL)
+                    );
+            }
+
+            $thisFormInputs[] = $this->ui->makeInputSubmit( '__Continue__')->tag('secondary');
+
+            $thisFormInputs = $this->ui->makeList( $thisFormInputs );
+
+            $thisForm = $this->ui->makeForm( $to, $thisFormInputs );
 
             $thisForm = $this->ui->makeBlock( $thisForm )

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

@@ -128 +128 @@
 
         $employeesView = array();
+        $employeesWithConflictsView = array();
 
         foreach( $employees as $employee ){
@@ -287 +288 @@
             }
 
-            $employeesView[] = $thisView;
+            if( $withConflicts ){
+                $employeesWithConflictsView[] = $thisView;
+            }
+            else {
+                $employeesView[] = $thisView;
+            }
         }
 
@@ -298 +304 @@
 
         $employeesView = $this->ui->makeList( array($toggleAll, $employeesView) );
-
-        $out = array( $employeesView );
-
-        $btn = $this->self->buttons( $calendarId, $shiftTypeId );
-        $btn = $this->ui->makeListInline( $btn );
-
-    // open shift
-        // $inputs = $this->common->inputs( $calendarId, $shiftTypeId, $employeeId );
-        // $out = array_merge( $out, $inputs );
-
-        $out[] = $btn;
-
-        $out = $this->ui->makeList( $out )->gutter(3);
 
         $js = <<<EOT
@@ -331 +324 @@
 EOT;
 
-        $out = $this->ui->makeCollection( array($js, $out) );
-        $out = $this->ui->makeBlock( $out )
+        $employeesView = $this->ui->makeCollection( array($js, $employeesView) );
+        $employeesView = $this->ui->makeBlock( $employeesView )
             ->addAttr( 'class', 'sh4-new-employee-container' )
             ;
+
+        $out = array();
+        $out[] = $employeesView;
+
+        if( $employeesWithConflictsView ){
+            $employeesWithConflictsView = $this->ui->makeGrid( $employeesWithConflictsView, 4 );
+            $employeesWithConflictsView = $this->ui->makeCollapse( '__Unavailable Employees__', $employeesWithConflictsView );
+            $out[] = $employeesWithConflictsView;
+        }
+
+        $btn = $this->self->buttons( $calendarId, $shiftTypeId );
+        $btn = $this->ui->makeListInline( $btn );
+
+    // open shift
+        // $inputs = $this->common->inputs( $calendarId, $shiftTypeId, $employeeId );
+        // $out = array_merge( $out, $inputs );
+
+        $out[] = $btn;
+
+        $out = $this->ui->makeList( $out )->gutter(3);
+
+
 
         $to = 'new/employee';

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

@@ -104 +104 @@
 
         $employee = array( $meEmployeeId );
-        $calendar = array();
+
+        $calendar = $this->session->getUserdata('scheduleViewCalendar');
+        if( ! $calendar ){
+            $calendar = array();
+        }
+
         $hideui = array( 
             'filter-employee',
@@ -153 +158 @@
             ->setUserdata( 'scheduleViewType', $params['type'] )
             ->setUserdata( 'scheduleViewGroupby', $params['groupby'] )
+            // ->setUserdata( 'scheduleViewEmployee', $params['employee'] )
+            ->setUserdata( 'scheduleViewCalendar', $params['calendar'] )
             ;
 
@@ -427 +434 @@
         }
 
-        $employee = array();
-        $calendar = array();
+        $employee = $this->session->getUserdata('scheduleViewEmployee');
+        if( ! $employee ){
+            $employee = array();
+        }
+
+        $calendar = $this->session->getUserdata('scheduleViewCalendar');
+        if( ! $calendar ){
+            $calendar = array();
+        }
+
         $hideui = array();
 
@@ -442 +457 @@
 
         $params = $this->request->getParams();
-
         $params = array_merge( $defaultParams, $params );
 
@@ -462 +476 @@
             ->setUserdata( 'scheduleViewType', $params['type'] )
             ->setUserdata( 'scheduleViewGroupby', $params['groupby'] )
+            ->setUserdata( 'scheduleViewEmployee', $params['employee'] )
+            ->setUserdata( 'scheduleViewCalendar', $params['calendar'] )
             ;
 

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

@@ -87 +87 @@
 
         $employeesView = array();
+        $employeesWithConflictsView = array();
 
         foreach( $employees as $employee ){
@@ -223 +224 @@
             }
 
-            $employeesView[] = $thisView;
-        }
-
-        if( $employeesView ){
+            if( $withConflicts ){
+                $employeesWithConflictsView[] = $thisView;
+            }
+            else {
+                $employeesView[] = $thisView;
+            }
+        }
+
+        if( $employeesView OR $employeesWithConflictsView ){
+
             $out = $this->ui->makeGrid();
             foreach( $employeesView as $ev ){
                 $out->add( $ev, 3, 12 );
+            }
+
+            if( $employeesWithConflictsView ){
+                $out = array( $out );
+
+                $employeesWithConflictsView = $this->ui->makeGrid( $employeesWithConflictsView, 4 );
+                $employeesWithConflictsView = $this->ui->makeCollapse( '__Unavailable Employees__', $employeesWithConflictsView );
+                $out[] = $employeesWithConflictsView;
+
+                $out = $this->ui->makeList( $out )->gutter(2);
             }
         }

shiftcontroller/trunk/sh4/shifttypes/boot.php

@@ -13 +13 @@
         $settings
             ->init( 'shifttypes_show_title', 1 )
+            ->init( 'shifttypes_default_duration', 4*60*60 )
+            ->init( 'shifttypes_nobreak', FALSE )
             ;
 

shiftcontroller/trunk/sh4/shifttypes/html/admin/controller/settings.php

@@ -14 +14 @@
     public function execute()
     {
-        $take = array( 'shifttypes_show_title', 'shifttypes_nobreak' );
+        $take = array( 'shifttypes_show_title', 'shifttypes_nobreak', 'shifttypes_default_duration' );
 
         foreach( $take as $k ){

shiftcontroller/trunk/sh4/shifttypes/html/admin/view/new.php

@@ -46 +46 @@
         $inputs = array();
         $inputs[] = $this->ui->makeInputText( 'title', '__Title__' )->bold();
-        $inputs[] = $this->ui->makeInputTimeRange( 'time', '__Time__' );
+
+        $value = array();
+        $minTime = $this->settings->get('datetime_min_time');
+        $defaultDuration = $this->settings->get('shifttypes_default_duration');
+        if( (NULL !== $minTime) && (NULL !== $defaultDuration) ){
+            $value = array( $minTime, $minTime + $defaultDuration );
+        }
+        $inputs[] = $this->ui->makeInputTimeRange( 'time', '__Time__', $value );
 
         $noBreak = $this->settings->get( 'shifttypes_nobreak' );

shiftcontroller/trunk/sh4/shifttypes/html/admin/view/settings.php

@@ -23 +23 @@
     public function render()
     {
-        $pnames = array( 'shifttypes_show_title', 'shifttypes_nobreak' );
+        $pnames = array( 'shifttypes_show_title', 'shifttypes_nobreak', 'shifttypes_default_duration' );
         foreach( $pnames as $pname ){
             $values[$pname] = $this->settings->get($pname);
@@ -41 +41 @@
             1,
             $values['shifttypes_nobreak']
+            );
+
+        $options = range( 1, 24, 1 );
+        $defaultDurationOptions = array();
+        foreach( $options as $e ){
+            $defaultDurationOptions[ $e*60*60 ] = $e;
+        }
+        $inputs[] = $this->ui->makeInputSelect(
+            'shifttypes_default_duration',
+            '__Default Shift Duration__' . ' (' . '__Hours__' . ')',
+            $defaultDurationOptions,
+            $values['shifttypes_default_duration']
             );
 

shiftcontroller/trunk/shiftcontroller4.php

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