Changeset 2149207

Timestamp:

09/01/2019 04:47:27 PM (6 years ago)

Author:

hitcode

Message:

4.4.6

Location:

shiftcontroller/trunk

Files:

• hc3/ui/filter.php (modified) (1 diff)
• readme.txt (modified) (1 diff)
• sh4/calendars/html/admin/view/edit.php (modified) (1 diff)
• sh4/calendars/html/admin/view/new.php (modified) (1 diff)
• sh4/calendars/presenter.php (modified) (1 diff)
• sh4/new/controller/confirm.php (modified) (1 diff)
• sh4/new/view/calendar.php (modified) (3 diffs)
• sh4/new/view/confirm.php (modified) (1 diff)
• sh4/schedule/assets/js/calendar.js (modified) (1 diff)
• sh4/schedule/html/view/day.php (modified) (2 diffs)
• sh4/schedule/html/view/month.php (modified) (2 diffs)
• sh4/schedule/html/view/week.php (modified) (2 diffs)
• sh4/shifts/view/zoom.php (modified) (1 diff)
• shiftcontroller4.php (modified) (2 diffs)

shiftcontroller/trunk/hc3/ui/filter.php

@@ -90 +90 @@
 
     // restore tags
-            foreach( $tags as $tag => $param ){
-                $element->tag( $tag, $param );
-            }
+            // foreach( $tags as $tag => $param ){
+                // if( is_object($element) ){
+                    // $element->tag( $tag, $param );
+                // }
+            // }
         }
 

shiftcontroller/trunk/readme.txt

@@ -60 +60 @@
 
 == Changelog ==
+
+= 4.4.6 =
+* Changed calendar description field to a wysiwyg editor. Also WordPress shortcodes are now processed in this field. 
+* A small change when creating multiple shifts: for example if there are 2 new shifts for 1 Sep and 1 Oct, after submit you return back to 1 Sep calendar, rather jumping forward to 1 Oct.
+* BUG: Attempted to fix a fatal error in print view in some configurations.
 
 = 4.4.5 =

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

@@ -66 +66 @@
         $inputs[] = $idView;
         $inputs[] = $this->ui->makeInputText( 'title', '__Title__', $model->getTitle() )->bold();
-        $inputs[] = $this->ui->makeInputTextarea( 'description', '__Description__', $model->getDescription() );
+        $inputs[] = $this->ui->makeInputRichTextarea( 'description', '__Description__', $model->getDescription() )->setRows(6);
 
         $typeOptions = array(

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

@@ -56 +56 @@
         $inputs = array();
         $inputs[] = $this->ui->makeInputText( 'title', '__Title__' )->bold();
-        $inputs[] = $this->ui->makeInputTextarea( 'description', '__Description__' );
+        $inputs[] = $this->ui->makeInputRichTextarea( 'description', '__Description__' )->setRows(6);
 
         $typeOptions = array(

shiftcontroller/trunk/sh4/calendars/presenter.php

@@ -5 +5 @@
     {
         $this->ui = $ui;
+    }
+
+    public function presentDescription( SH4_Calendars_Model $calendar )
+    {
+        $return = $calendar->getDescription();
+
+        if( defined('WPINC') ){
+            $return = do_shortcode( $return );
+        }
+
+        return $return;
     }
 

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

@@ -166 +166 @@
             $scheduleLink = array( 'schedule', array() );
         }
-        $scheduleLink[1]['start'] = $date;
 
+        $returnToDate = $dates[0];
+        $scheduleLink[1]['start'] = $returnToDate;
 
         $return = array( $scheduleLink, '__New Created__' . ' [' . count($ids) . ']' );

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

@@ -26 +26 @@
         SH4_App_Query $appQuery,
         SH4_New_Query $newQuery,
+        SH4_Calendars_Presenter $calendarsPresenter,
 
         SH4_ShiftTypes_Presenter $shiftTypesPresenter
@@ -38 +39 @@
         $this->appQuery = $hooks->wrap( $appQuery );
         $this->newQuery = $hooks->wrap( $newQuery );
+        $this->calendarsPresenter = $hooks->wrap( $calendarsPresenter );
         $this->shiftTypesPresenter = $hooks->wrap( $shiftTypesPresenter );
 
@@ -162 +164 @@
                 ->tag('font-size', 4)
                 ;
-            $description = $e->getDescription();
+
+            $description = $this->calendarsPresenter->presentDescription( $e );
             if( strlen($description) ){
                 $thisLabel = $this->ui->makeList( array($thisLabel, $description) )

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

@@ -160 +160 @@
         $out = array();
         $calendarView = $this->calendarsPresenter->presentTitle( $calendar );
-        $description = $calendar->getDescription();
+
+        $description = $this->calendarsPresenter->presentDescription( $calendar );
         if( strlen($description) ){
             $calendarView = $this->ui->makeList( array($calendarView, $description) )

shiftcontroller/trunk/sh4/schedule/assets/js/calendar.js

@@ -71 +71 @@
         }
 
+    // kind of trick, if it doesn't contain our 'hca=' part then skip
+        if( ! href.includes('hca=') ){
+            return true;
+        }
+
         var $waiter = $details;
         hc2_set_loader( $waiter );
 
         href = hc2MakeAjaxHref( href );
-
 
         jQuery.ajax({

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

@@ -217 +217 @@
             // $calendarView = $this->calendarsPresenter->presentTitle( $calendar );
             $calendarView = $calendar->getTitle();
+
+            $description = $calendar->getDescription();
+            $description = htmlspecialchars( $description );
+
+            $calendarView = $this->ui->makeSpan( $calendarView )
+                // ->tag('font-size', 4)
+                ->addAttr( 'title', $description )
+                ;
+
             $viewCalendars[ $calendarId ] = $calendarView;
         }
@@ -390 +399 @@
         foreach( $employees as $employee ){
             $label = $employee->getTitle();
+
+            $description = $employee->getDescription();
+            $description = htmlspecialchars( $description );
+
             $label = $this->ui->makeSpan( $label )
                 ->tag('font-size', 4)
+                ->addAttr( 'title', $description )
                 ;
             $viewEmployees[ $employee->getId() ] = $label;

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

@@ -237 +237 @@
             // $label = $this->calendarsPresenter->presentTitle( $calendar );
             $label = $calendar->getTitle();
+
+            $description = $calendar->getDescription();
+            $description = htmlspecialchars( $description );
+
+            $label = $this->ui->makeSpan( $label )
+                // ->tag('font-size', 4)
+                ->addAttr( 'title', $description )
+                ;
+
             $viewCalendars[ $calendar->getId() ] = $label;
         }
@@ -465 +474 @@
         foreach( $employees as $employee ){
             $label = $employee->getTitle();
+
+            $description = $employee->getDescription();
+            $description = htmlspecialchars( $description );
+
             $label = $this->ui->makeSpan( $label )
                 ->tag('font-size', 4)
+                ->addAttr( 'title', $description )
                 ;
             $viewEmployees[ $employee->getId() ] = $label;

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

@@ -267 +267 @@
             // $calendarView = $this->calendarsPresenter->presentTitle( $calendar );
             $calendarView = $calendar->getTitle();
+
+            $description = $calendar->getDescription();
+            $description = htmlspecialchars( $description );
+
+            $calendarView = $this->ui->makeSpan( $calendarView )
+                // ->tag('font-size', 4)
+                ->addAttr( 'title', $description )
+                ;
+
             $view_calendars[ $calendarId ] = $calendarView;
         }
@@ -503 +512 @@
         $view_employees = array();
         foreach( $employees as $employee ){
+            $description = $employee->getDescription();
+            $description = htmlspecialchars( $description );
+
             $label = $employee->getTitle();
             $label = $this->ui->makeSpan( $label )
                 ->tag('font-size', 4)
-                ;
+                ->addAttr( 'title', $description )
+                ;
+
             $view_employees[ $employee->getId() ] = $label;
         }

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

@@ -176 +176 @@
             ->tag('font-size', 4)
             ;
-        $calendarDescription = $calendar->getDescription();
+
+        // $calendarDescription = $calendar->getDescription();
+        $calendarDescription = $this->calendarsPresenter->presentDescription( $calendar );
         if( strlen($calendarDescription) ){
             $thisView = $this->ui->makeList( array($thisView, $calendarDescription) )

shiftcontroller/trunk/shiftcontroller4.php

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