Changeset 3371547
- Timestamp:
- 10/02/2025 06:10:45 AM (5 months ago)
- Location:
- shiftcontroller/trunk
- Files:
-
- 10 edited
-
hc3/assets/js/hc2.js (modified) (2 diffs)
-
hc3/ui/element/input/timerange.php (modified) (1 diff)
-
readme.txt (modified) (3 diffs)
-
sh4/conf/html/admin/view/datetime.php (modified) (1 diff)
-
sh4/schedule/html/view/common.php (modified) (2 diffs)
-
sh4/schedule/html/view/controloptions.php (modified) (1 diff)
-
sh4/schedule/html/view/download.php (modified) (1 diff)
-
sh4/schedule/html/view/fourweeks.php (modified) (2 diffs)
-
sh4/schedule/html/view/index.php (modified) (2 diffs)
-
shiftcontroller4.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
shiftcontroller/trunk/hc3/assets/js/hc2.js
r2950361 r3371547 146 146 else { 147 147 var time_format = $el.data('time-format'); 148 var time_unit = 5* 60;148 var time_unit = 1 * 60; 149 149 var end_day = 24 * 60 * 60; 150 150 var start_from = 0; … … 181 181 this.render = function() 182 182 { 183 var time_unit = 5* 60;183 var time_unit = 1 * 60; 184 184 var end_day = 24 * 60 * 60; 185 185 var time_format = $el.data('time-format'); -
shiftcontroller/trunk/hc3/ui/element/input/timerange.php
r2918574 r3371547 46 46 'time-format' => $this->timeFormatOptions, 47 47 ); 48 48 49 foreach( $data_atts as $k => $v ){ 49 50 $out->addAttr('data-' . $k, htmlentities(json_encode($v))); -
shiftcontroller/trunk/readme.txt
r3338389 r3371547 3 3 Tags: shift, employee, staff, rota, volunteer 4 4 License: GPLv2 or later 5 Stable tag: 4.9.8 75 Stable tag: 4.9.88 6 6 Requires at least: 4.1 7 7 Tested up to: 6.8 … … 67 67 == Changelog == 68 68 69 = 4.9.88 = 70 * Added a 1 minute Time Increment option for the date and time settings. 71 69 72 = 4.9.87 = 70 73 * Added an option to download report as CSV file from the schedule view. The report entries are grouped according to the current "group by" setting of the schedule (employee, calendar or none). The report includes the number of shifts/time off and total hours. The salary column is included if the salary add-on is enabled. The link to download the report is in More, Download report. … … 74 77 75 78 = 4.9.85 = 76 * Added 't' parameter for the schedule view to allow filtering shifts that start and at the specified times.79 * Added 't' parameter for the schedule view to allow filtering shifts that start and end at the specified times. 77 80 78 81 = 4.9.84 = -
shiftcontroller/trunk/sh4/conf/html/admin/view/datetime.php
r3286386 r3371547 125 125 ); 126 126 127 $stepOptions = array( 5*60 => 5, 10*60 => 10, 15*60 => 15, 20*60 => 20, 30*60 => 30, 60*60 => 60 );127 $stepOptions = array( 1*60 => 1, 5*60 => 5, 10*60 => 10, 15*60 => 15, 20*60 => 20, 30*60 => 30, 60*60 => 60 ); 128 128 $moreInputs2[] = $this->ui->makeInputSelect( 129 129 'datetime_step', -
shiftcontroller/trunk/sh4/schedule/html/view/common.php
r3317743 r3371547 870 870 871 871 $calendar = $shift->getCalendar(); 872 // if( ! array_key_exists($calendar->getId(), $calendars) ){873 // unset( $return[$id] );874 // continue;875 // }876 872 if( $calendarFilter && (! in_array($calendar->getId(), $calendarFilter)) ){ 877 873 unset( $return[$id] ); … … 880 876 881 877 $employee = $shift->getEmployee(); 882 // if( ! array_key_exists($employee->getId(), $employees) ){883 // unset( $return[$id] );884 // continue;885 // }886 887 878 $employeeId = $employee->getId(); 888 879 -
shiftcontroller/trunk/sh4/schedule/html/view/controloptions.php
r3338389 r3371547 255 255 ; 256 256 $toSelectView[] = $eView; 257 258 // if( 0 == $e->getId() ){259 // $thisParams = $toParams;260 // $thisParams['employee'][] = $assignedShiftEmployee->getId();261 262 // $label = $assignedShiftEmployee->getTitle();263 // $eView = $this->ui->makeAhref( array($slug, $thisParams), $label )264 // ->tag('tab-link')265 // ;266 // $toSelectView[] = $eView;267 // }268 257 } 269 258 -
shiftcontroller/trunk/sh4/schedule/html/view/download.php
r3338389 r3371547 132 132 133 133 $out = join("\n", $out); 134 // echo $out;135 // exit;136 134 137 135 $fileName = 'report-' . $d1 . '-' . $d2; -
shiftcontroller/trunk/sh4/schedule/html/view/fourweeks.php
r3267653 r3371547 134 134 135 135 $this->t->setDateDb( $startDate ); 136 // $monthMatrix = $this->t->getMonthMatrix( $disabledWeekdays );137 136 $monthMatrix = $this->t->getWeeksMatrix( $this->nWeeks, $disabledWeekdays ); 138 137 $rows = array(); … … 767 766 $comboId = 0 . '-' . $id; 768 767 if( isset($this->allCombos[$comboId]) ){ 769 /*770 $label = '+';771 772 $to = 'new';773 $toParams = array(774 'date' => $date,775 'employee' => $id,776 );777 $to = array( $to, $toParams );778 779 $link = $this->ui->makeAhref( $to, $label )780 ->tag('tab-link')781 ->tag('align', 'center')782 ->addAttr('title', '__Add New__')783 ;784 785 if( $today > $date ){786 $link->tag('muted', 3);787 }788 */789 768 if( $today > $date ){ 790 769 $link = str_replace( array('{EID}', '{DATE}'), array($id, $date), $linkTemplateShiftMuted ); -
shiftcontroller/trunk/sh4/schedule/html/view/index.php
r3317743 r3371547 188 188 ; 189 189 190 // $scheduleLink2 = HC3_Session::instance()191 // ->getUserdata( 'scheduleLink' )192 // ;193 // $to = $this->uri->makeUrl( $scheduleLink2 );194 // echo "TO = '$to'<br>";195 // exit;196 197 190 $type = $params['type']; 198 191 $groupby = $params['groupby']; … … 320 313 if( defined('WPINC') && (! is_admin()) ){ 321 314 $tos = $this->self->toplinks(); 322 // $tos = array(323 // array( 'admin', '__Administration__' ),324 // array( 'user/profile', '__Profile__' ),325 // );326 315 327 316 $headerLinks = array(); -
shiftcontroller/trunk/shiftcontroller4.php
r3338389 r3371547 4 4 * Plugin URI: https://www.shiftcontroller.com/ 5 5 * Description: Staff scheduling plugin 6 * Version: 4.9.8 76 * Version: 4.9.88 7 7 * Author: plainware.com 8 8 * Author URI: https://www.shiftcontroller.com/ … … 11 11 */ 12 12 13 define( 'SH4_VERSION', 498 7);13 define( 'SH4_VERSION', 4988 ); 14 14 15 15 if (! defined('ABSPATH')) exit; // Exit if accessed directly
Note: See TracChangeset
for help on using the changeset viewer.