wip #5682 @2

diff --git a/app/Fields/CubedesignersTeamMember.php b/app/Fields/CubedesignersTeamMember.php
index 0e4a5e616c5072abb3c551f928e5a9c7977bfd5c..d27164c011a0230f7624ecdabcc56a749cd2aee8 100644 (file)
--- a/app/Fields/CubedesignersTeamMember.php
+++ b/app/Fields/CubedesignersTeamMember.php
@@ -4,5 +4,9 @@ namespace App\Fields;
 
 class CubedesignersTeamMember extends User
 {
-    protected $_optionsmodel = \App\Models\CubedesignersTeamMember::class;
+    public function _postSetAttributes()
+    {
+        parent::_postSetAttributes();
+        $this->setAttribute('optionsmodel_scope', 'team');
+    }
 }

diff --git a/app/Models/CubedesignersTeamMember.php b/app/Models/CubedesignersTeamMember.php
deleted file mode 100644 (file)
index fdf20b9..0000000
--- a/app/Models/CubedesignersTeamMember.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Cubist\Backpack\Magic\MagicObserver;
-use Illuminate\Database\Eloquent\Builder;
-
-class CubedesignersTeamMember extends User
-{
-    public static function booted()
-    {
-        parent::booted();
-
-//        static::addGlobalScope('team_member', function (Builder $builder) {
-//            $builder->where('company', 7);
-//            $builder->orderBy('enabled', 'ASC');
-//            $builder->orderBy('id', 'ASC');
-//
-//        });
-
-        static::observe(new MagicObserver);
-    }
-
-}

diff --git a/app/Models/TeamLeave.php b/app/Models/TeamLeave.php
index a0faa3641733055e5d083bb6f8d3905c8d278734..6fbe65b32691868df07ca7a8ea1115f63a9becf0 100644 (file)
--- a/app/Models/TeamLeave.php
+++ b/app/Models/TeamLeave.php
@@ -22,7 +22,7 @@ class TeamLeave extends ToolboxHRModel
 
     static $_permissionBase = 'team-leave';
 
-    protected $_operations = [ICSOperation::class];
+    protected $_operations = [ICSOperation::class,];
 
     protected $_enableClone = false;
     protected $_enableDeletion = true;
@@ -59,8 +59,15 @@ class TeamLeave extends ToolboxHRModel
         $this->addField('public', Checkbox::class, __('Public'), ['column' => true, 'default' => true, 'hint' => __('Si activé, apparaît dans le planning des vacances'), 'can' => self::$_permissionBase . ':admin']);
         $this->addField('recorded_month', Date::class, __('Comptabilisé'), ['column' => true, 'column_format' => 'YYYY-MM', 'can' => self::$_permissionBase . ':admin']);
         $this->addField('comment', Text::class, __('Commentaire'), ['column' => true, 'can' => self::$_permissionBase . ':admin']);
+
+        if(can(''))
+        $this->addFilter('compta', 'simple', 'À comptabiliser', function ($value, $crud) {
+            $crud->addClause('whereNull', 'recorded_month');
+            $crud->addClause('where', 'worker', '>=', 4);
+        });
     }
 
+
     public function addWidgets()
     {
         Widgets::teamWidgets();

diff --git a/app/Models/User.php b/app/Models/User.php
index 6accf046afe39d38069d7223d0935e15e4966849..82e0f59000ef419871c9ae82dcebe0eb02b05307 100644 (file)
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -5,5 +5,10 @@ namespace App\Models;
 class User extends \Cubedesigners\UserDatabase\Models\User
 {
   //  protected $_syncDbSchema = false;
-
+    public function scopeTeam($query)
+    {
+        $query->where('company', 7);
+        $query->orderBy('enabled', 'ASC');
+        $query->orderBy('id', 'ASC');
+    }
 }