Changeset 2217010

Timestamp:

12/23/2019 02:24:55 PM (6 years ago)

Author:

hitcode

Message:

4.5.6

Location:

shiftcontroller/trunk

Files:

• readme.txt (modified) (1 diff)
• sh4/calendars/html/admin/view/permissions.php (modified) (4 diffs)
• sh4/calendars/permissions.php (modified) (4 diffs)
• sh4/schedule/html/view/common.php (modified) (3 diffs)
• sh4/shifts/acl.php (modified) (2 diffs)
• shiftcontroller4.php (modified) (2 diffs)

shiftcontroller/trunk/readme.txt

@@ -60 +60 @@
 
 == Changelog ==
+
+= 4.5.6 =
+* Added a permission settings per each calendar if to allow employees from other calendars see shifts in this calendar. It configures the feature added in version 4.5.5.
+* BUG: Custom fields were not saved when repeating a shift for multiple days (Pro Version).
 
 = 4.5.5 =

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

@@ -29 +29 @@
         $options = array();
         foreach( $permissionsOptions as $o ){
-            list( $label, $employeeOption, $visitorOption ) = $o;
+            $label = array_shift( $o );
+            $employeeOption = array_shift( $o );
+            $visitorOption = array_shift( $o );
+            $employee2Option = array_shift( $o );
+            // list( $label, $employeeOption, $visitorOption ) = $o;
 
             $option = array();
@@ -35 +39 @@
             $option[] = $employeeOption ? $employeeOption[0] : NULL;
             $option[] = $visitorOption ? $visitorOption[0] : NULL;
+            $option[] = $employee2Option ? $employee2Option[0] : NULL;
 
             $options[] = $option;
@@ -41 +46 @@
         $header = array(
             'action'    => NULL,
-            'employee'  => '__Employee__',
-            'visitor'   => '__Visitor__',
+            'employee'  => '<div class="hc-align-center">' . '__Calendar Employees__' . '</div>',
+            'employee2' => '<div class="hc-align-center">' . '__Other Employees__' . '</div>',
+            'visitor'   => '<div class="hc-align-center">' . '__Visitor__' . '</div>',
             );
 
         $rows = array();
         foreach( $options as $k => $conf ){
-            list( $label, $kEmployee, $kVisitor ) = $conf;
+            list( $label, $kEmployee, $kVisitor, $kEmployee2 ) = $conf;
 
             $row = array(
@@ -53 +59 @@
                 'employee'  => $kEmployee ? $this->ui->makeInputCheckbox( $kEmployee, NULL, 1, $this->cp->get($calendar, $kEmployee) ) : NULL,
                 'visitor'   => $kVisitor ? $this->ui->makeInputCheckbox( $kVisitor, NULL, 1, $this->cp->get($calendar, $kVisitor) ) : NULL,
+                'employee2' => $kEmployee2 ? $this->ui->makeInputCheckbox( $kEmployee2, NULL, 1, $this->cp->get($calendar, $kEmployee2) ) : NULL,
                 );
+
+            $keys = array_keys( $row );
+            foreach( $keys as $kk ){
+                if( 'action' === $kk ) continue;
+                if( isset($row[$kk]) ){
+                    $row[$kk] = '<label class="hc-block hc-align-center">' . $row[$kk] . '</label>';
+                }
+            }
+
             $rows[] = $row;
         }

shiftcontroller/trunk/sh4/calendars/permissions.php

@@ -74 +74 @@
             '__View Others Published Shifts__',
             array( 'employee_view_others_publish', 1 ),
-            array( 'visitor_view_others_publish', 1 )
+            array( 'visitor_view_others_publish', 1 ),
+            array( 'employee2_view_others_publish', 1 )
             );
 
@@ -80 +81 @@
             '__View Others Draft Shifts__',
             array( 'employee_view_others_draft', 0 ),
-            array( 'visitor_view_others_draft', 0 )
+            array( 'visitor_view_others_draft', 0 ),
+            array( 'employee2_view_others_draft', 0 )
             );
 
@@ -86 +88 @@
             '__View Open Published Shifts__',
             array( 'employee_view_open_publish', 1 ),
-            array( 'visitor_view_open_publish', 0 )
+            array( 'visitor_view_open_publish', 0 ),
+            array( 'employee2_view_open_publish', 0 )
             );
 
@@ -92 +95 @@
             '__View Open Draft Shifts__',
             array( 'employee_view_open_draft', 0 ),
-            array( 'visitor_view_open_draft', 0 )
+            array( 'visitor_view_open_draft', 0 ),
+            array( 'employee2_view_open_draft', 0 )
             );
 

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

@@ -193 +193 @@
         // is other employee
             if( $meEmployeeId != $shiftEmployeeId ){
-
-                if( ! isset($meEmployeeCalendars[$shiftCalendarId]) ){
-                    unset( $return[$id] );
-                    continue;
-                }
-
-                if( $shift->isOpen() ){
-                    $permName = $shift->isPublished() ? 'employee_view_open_publish' : 'employee_view_open_draft';
-                }
+            // calendar employees
+                if( isset($meEmployeeCalendars[$shiftCalendarId]) ){
+                    if( $shift->isOpen() ){
+                        $permName = $shift->isPublished() ? 'employee_view_open_publish' : 'employee_view_open_draft';
+                    }
+                    else {
+                        $permName = $shift->isPublished() ? 'employee_view_others_publish' : 'employee_view_others_draft';
+                    }
+                }
+            // other employees
                 else {
-                    $permName = $shift->isPublished() ? 'employee_view_others_publish' : 'employee_view_others_draft';
+                    if( $shift->isOpen() ){
+                        $permName = $shift->isPublished() ? 'employee2_view_open_publish' : 'employee2_view_open_draft';
+                    }
+                    else {
+                        $permName = $shift->isPublished() ? 'employee2_view_others_publish' : 'employee2_view_others_draft';
+                    }
                 }
 
@@ -210 +216 @@
                     unset( $return[$id] );
                 }
+
                 continue;
             }
@@ -349 +356 @@
 
             if( $currentUserId ){
-                if( ! isset($calendarsForEmployee[$currentUserId]) ){
-                    continue;
-                }
-                $permNames[] = 'employee_view_others_publish';
-                $permNames[] = 'employee_view_others_draft';
+                // if( ! isset($calendarsForEmployee[$currentUserId]) ){
+                    // continue;
+                // }
+
+                if( isset($calendarsForEmployee[$currentUserId]) ){
+                    $permNames[] = 'employee_view_others_publish';
+                    $permNames[] = 'employee_view_others_draft';
+                }
+                else {
+                    $permNames[] = 'employee2_view_others_publish';
+                    $permNames[] = 'employee2_view_others_draft';
+                }
             }
 

shiftcontroller/trunk/sh4/shifts/acl.php

@@ -316 +316 @@
 
         $employeeCalendars = $this->appQuery->findCalendarsForEmployee( $meEmployee );
-        if( ! isset($employeeCalendars[$calendarId]) ){
-            return $return;
-        }
+        // if( ! isset($employeeCalendars[$calendarId]) ){
+            // return $return;
+        // }
 
         $shiftEmployee = $shift->getEmployee();
@@ -330 +330 @@
         }
 
-        if( $shift->isOpen() ){
-            $permName = $shift->isPublished() ? 'employee_view_open_publish' : 'employee_view_open_draft';
+        if( isset($employeeCalendars[$calendarId]) ){
+            if( $shift->isOpen() ){
+                $permName = $shift->isPublished() ? 'employee_view_open_publish' : 'employee_view_open_draft';
+            }
+            else {
+                $permName = $shift->isPublished() ? 'employee_view_others_publish' : 'employee_view_others_draft';
+            }
         }
         else {
-            $permName = $shift->isPublished() ? 'employee_view_others_publish' : 'employee_view_others_draft';
+            if( $shift->isOpen() ){
+                $permName = $shift->isPublished() ? 'employee2_view_open_publish' : 'employee2_view_open_draft';
+            }
+            else {
+                $permName = $shift->isPublished() ? 'employee2_view_others_publish' : 'employee2_view_others_draft';
+            }
         }
         $perm = $this->calendarsPermissions->get( $calendar, $permName );

shiftcontroller/trunk/shiftcontroller4.php

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