@@ -4,13 +4,13 @@ |
||
| 4 | 4 | { |
| 5 | 5 | /** |
| 6 | 6 | * Construct the repository class name based on |
| 7 | - * the method name called, search in the |
|
| 8 | - * given namespaces for the class and |
|
| 9 | - * return an instance. |
|
| 10 | - * |
|
| 11 | - * @param string $name the called method name |
|
| 12 | - * @param array $arguments the method arguments |
|
| 13 | - * @return object |
|
| 14 | - */ |
|
| 7 | + * the method name called, search in the |
|
| 8 | + * given namespaces for the class and |
|
| 9 | + * return an instance. |
|
| 10 | + * |
|
| 11 | + * @param string $name the called method name |
|
| 12 | + * @param array $arguments the method arguments |
|
| 13 | + * @return object |
|
| 14 | + */ |
|
| 15 | 15 | public function __call($name, $arguments); |
| 16 | 16 | } |
| 17 | 17 | \ No newline at end of file |
@@ -22,15 +22,15 @@ |
||
| 22 | 22 | "); |
| 23 | 23 | |
| 24 | 24 | DB::table('reports')->insert( |
| 25 | - [ |
|
| 26 | - [ |
|
| 25 | + [ |
|
| 26 | + [ |
|
| 27 | 27 | 'report_name' => 'admin_count', |
| 28 | 28 | 'view_name' => 'admin_count', |
| 29 | 29 | 'created_at' => \DB::raw('NOW()'), |
| 30 | 30 | 'updated_at' => \DB::raw('NOW()') |
| 31 | - ] |
|
| 32 | - ] |
|
| 33 | - ); |
|
| 31 | + ] |
|
| 32 | + ] |
|
| 33 | + ); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | /** |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | $table->string('view_name',100); |
| 19 | 19 | $table->softDeletes(); |
| 20 | 20 | $table->timestamps(); |
| 21 | - }); |
|
| 21 | + }); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | /** |
@@ -7,10 +7,10 @@ |
||
| 7 | 7 | |
| 8 | 8 | class PermissionsController extends BaseApiController |
| 9 | 9 | { |
| 10 | - /** |
|
| 11 | - * The name of the model that is used by the base api controller |
|
| 12 | - * to preform actions like (add, edit ... etc). |
|
| 13 | - * @var string |
|
| 14 | - */ |
|
| 15 | - protected $model = 'permissions'; |
|
| 10 | + /** |
|
| 11 | + * The name of the model that is used by the base api controller |
|
| 12 | + * to preform actions like (add, edit ... etc). |
|
| 13 | + * @var string |
|
| 14 | + */ |
|
| 15 | + protected $model = 'permissions'; |
|
| 16 | 16 | } |
@@ -5,32 +5,32 @@ |
||
| 5 | 5 | |
| 6 | 6 | class Report extends Model{ |
| 7 | 7 | |
| 8 | - use SoftDeletes; |
|
| 8 | + use SoftDeletes; |
|
| 9 | 9 | protected $table = 'reports'; |
| 10 | 10 | protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
| 11 | 11 | protected $hidden = ['deleted_at']; |
| 12 | 12 | protected $guarded = ['id']; |
| 13 | 13 | protected $fillable = ['report_name', 'view_name']; |
| 14 | - public $searchable = ['report_name', 'view_name']; |
|
| 14 | + public $searchable = ['report_name', 'view_name']; |
|
| 15 | 15 | |
| 16 | 16 | public function getCreatedAtAttribute($value) |
| 17 | - { |
|
| 18 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 19 | - } |
|
| 17 | + { |
|
| 18 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | - public function getUpdatedAtAttribute($value) |
|
| 22 | - { |
|
| 23 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 24 | - } |
|
| 21 | + public function getUpdatedAtAttribute($value) |
|
| 22 | + { |
|
| 23 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 24 | + } |
|
| 25 | 25 | |
| 26 | - public function getDeletedAtAttribute($value) |
|
| 27 | - { |
|
| 28 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 29 | - } |
|
| 26 | + public function getDeletedAtAttribute($value) |
|
| 27 | + { |
|
| 28 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - public static function boot() |
|
| 32 | - { |
|
| 33 | - parent::boot(); |
|
| 34 | - parent::observe(\App::make('App\Modules\V1\Reporting\ModelObservers\ReprotObserver')); |
|
| 35 | - } |
|
| 31 | + public static function boot() |
|
| 32 | + { |
|
| 33 | + parent::boot(); |
|
| 34 | + parent::observe(\App::make('App\Modules\V1\Reporting\ModelObservers\ReprotObserver')); |
|
| 35 | + } |
|
| 36 | 36 | } |
@@ -5,42 +5,42 @@ |
||
| 5 | 5 | |
| 6 | 6 | class AclGroup extends Model{ |
| 7 | 7 | |
| 8 | - use SoftDeletes; |
|
| 9 | - protected $table = 'groups'; |
|
| 10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | - protected $hidden = ['deleted_at']; |
|
| 12 | - protected $guarded = ['id']; |
|
| 13 | - protected $fillable = ['name']; |
|
| 14 | - public $searchable = ['name']; |
|
| 15 | - |
|
| 16 | - public function getCreatedAtAttribute($value) |
|
| 17 | - { |
|
| 18 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 19 | - } |
|
| 20 | - |
|
| 21 | - public function getUpdatedAtAttribute($value) |
|
| 22 | - { |
|
| 23 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 24 | - } |
|
| 25 | - |
|
| 26 | - public function getDeletedAtAttribute($value) |
|
| 27 | - { |
|
| 28 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 29 | - } |
|
| 30 | - |
|
| 31 | - public function users() |
|
| 32 | - { |
|
| 33 | - return $this->belongsToMany('\App\Modules\V1\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 34 | - } |
|
| 35 | - |
|
| 36 | - public function permissions() |
|
| 37 | - { |
|
| 38 | - return $this->belongsToMany('\App\Modules\V1\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 39 | - } |
|
| 40 | - |
|
| 41 | - public static function boot() |
|
| 42 | - { |
|
| 43 | - parent::boot(); |
|
| 44 | - parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclGroupObserver')); |
|
| 45 | - } |
|
| 8 | + use SoftDeletes; |
|
| 9 | + protected $table = 'groups'; |
|
| 10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | + protected $hidden = ['deleted_at']; |
|
| 12 | + protected $guarded = ['id']; |
|
| 13 | + protected $fillable = ['name']; |
|
| 14 | + public $searchable = ['name']; |
|
| 15 | + |
|
| 16 | + public function getCreatedAtAttribute($value) |
|
| 17 | + { |
|
| 18 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 19 | + } |
|
| 20 | + |
|
| 21 | + public function getUpdatedAtAttribute($value) |
|
| 22 | + { |
|
| 23 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 24 | + } |
|
| 25 | + |
|
| 26 | + public function getDeletedAtAttribute($value) |
|
| 27 | + { |
|
| 28 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 29 | + } |
|
| 30 | + |
|
| 31 | + public function users() |
|
| 32 | + { |
|
| 33 | + return $this->belongsToMany('\App\Modules\V1\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 34 | + } |
|
| 35 | + |
|
| 36 | + public function permissions() |
|
| 37 | + { |
|
| 38 | + return $this->belongsToMany('\App\Modules\V1\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 39 | + } |
|
| 40 | + |
|
| 41 | + public static function boot() |
|
| 42 | + { |
|
| 43 | + parent::boot(); |
|
| 44 | + parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclGroupObserver')); |
|
| 45 | + } |
|
| 46 | 46 | } |
@@ -5,37 +5,37 @@ |
||
| 5 | 5 | |
| 6 | 6 | class AclPermission extends Model { |
| 7 | 7 | |
| 8 | - use SoftDeletes; |
|
| 9 | - protected $table = 'permissions'; |
|
| 10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | - protected $hidden = ['deleted_at']; |
|
| 12 | - protected $guarded = ['id']; |
|
| 13 | - protected $fillable = ['name', 'model']; |
|
| 14 | - public $searchable = ['name', 'model']; |
|
| 8 | + use SoftDeletes; |
|
| 9 | + protected $table = 'permissions'; |
|
| 10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | + protected $hidden = ['deleted_at']; |
|
| 12 | + protected $guarded = ['id']; |
|
| 13 | + protected $fillable = ['name', 'model']; |
|
| 14 | + public $searchable = ['name', 'model']; |
|
| 15 | 15 | |
| 16 | - public function getCreatedAtAttribute($value) |
|
| 17 | - { |
|
| 18 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 19 | - } |
|
| 16 | + public function getCreatedAtAttribute($value) |
|
| 17 | + { |
|
| 18 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | - public function getUpdatedAtAttribute($value) |
|
| 22 | - { |
|
| 23 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 24 | - } |
|
| 21 | + public function getUpdatedAtAttribute($value) |
|
| 22 | + { |
|
| 23 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 24 | + } |
|
| 25 | 25 | |
| 26 | - public function getDeletedAtAttribute($value) |
|
| 27 | - { |
|
| 28 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 29 | - } |
|
| 26 | + public function getDeletedAtAttribute($value) |
|
| 27 | + { |
|
| 28 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - public function groups() |
|
| 32 | - { |
|
| 33 | - return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 34 | - } |
|
| 31 | + public function groups() |
|
| 32 | + { |
|
| 33 | + return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - public static function boot() |
|
| 37 | - { |
|
| 38 | - parent::boot(); |
|
| 39 | - parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclPermissionObserver')); |
|
| 40 | - } |
|
| 36 | + public static function boot() |
|
| 37 | + { |
|
| 38 | + parent::boot(); |
|
| 39 | + parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclPermissionObserver')); |
|
| 40 | + } |
|
| 41 | 41 | } |
@@ -38,8 +38,7 @@ discard block |
||
| 38 | 38 | if ( ! $report) |
| 39 | 39 | { |
| 40 | 40 | \ErrorHandler::notFound('report'); |
| 41 | - } |
|
| 42 | - else if ( ! \Core::users()->can($report->view_name, 'reports')) |
|
| 41 | + } else if ( ! \Core::users()->can($report->view_name, 'reports')) |
|
| 43 | 42 | { |
| 44 | 43 | \ErrorHandler::noPermissions(); |
| 45 | 44 | } |
@@ -60,8 +59,7 @@ discard block |
||
| 60 | 59 | if ($perPage) |
| 61 | 60 | { |
| 62 | 61 | return $report->paginate($perPage); |
| 63 | - } |
|
| 64 | - else |
|
| 62 | + } else |
|
| 65 | 63 | { |
| 66 | 64 | return $report->get(); |
| 67 | 65 | } |
@@ -4,66 +4,66 @@ |
||
| 4 | 4 | |
| 5 | 5 | class ReportRepository extends AbstractRepository |
| 6 | 6 | { |
| 7 | - /** |
|
| 8 | - * Return the model full namespace. |
|
| 9 | - * |
|
| 10 | - * @return string |
|
| 11 | - */ |
|
| 12 | - protected function getModel() |
|
| 13 | - { |
|
| 14 | - return 'App\Modules\V1\Reporting\Report'; |
|
| 15 | - } |
|
| 7 | + /** |
|
| 8 | + * Return the model full namespace. |
|
| 9 | + * |
|
| 10 | + * @return string |
|
| 11 | + */ |
|
| 12 | + protected function getModel() |
|
| 13 | + { |
|
| 14 | + return 'App\Modules\V1\Reporting\Report'; |
|
| 15 | + } |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * Render the given report db view based on the given |
|
| 19 | - * condition. |
|
| 20 | - * |
|
| 21 | - * @param string $reportName |
|
| 22 | - * @param array $conditions array of conditions |
|
| 23 | - * @param integer $perPage |
|
| 24 | - * @param array $relations |
|
| 25 | - * @return object |
|
| 26 | - */ |
|
| 27 | - public function getReport($reportName, $conditions = false, $perPage = 0, $relations = []) |
|
| 28 | - { |
|
| 29 | - /** |
|
| 30 | - * Fetch the report from db. |
|
| 31 | - */ |
|
| 32 | - $reportConditions = $this->constructConditions(['report_name' => $reportName], $this->model); |
|
| 33 | - $report = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($reportConditions['conditionString'], $reportConditions['conditionValues'])->first(); |
|
| 17 | + /** |
|
| 18 | + * Render the given report db view based on the given |
|
| 19 | + * condition. |
|
| 20 | + * |
|
| 21 | + * @param string $reportName |
|
| 22 | + * @param array $conditions array of conditions |
|
| 23 | + * @param integer $perPage |
|
| 24 | + * @param array $relations |
|
| 25 | + * @return object |
|
| 26 | + */ |
|
| 27 | + public function getReport($reportName, $conditions = false, $perPage = 0, $relations = []) |
|
| 28 | + { |
|
| 29 | + /** |
|
| 30 | + * Fetch the report from db. |
|
| 31 | + */ |
|
| 32 | + $reportConditions = $this->constructConditions(['report_name' => $reportName], $this->model); |
|
| 33 | + $report = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($reportConditions['conditionString'], $reportConditions['conditionValues'])->first(); |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Check report existance and permission. |
|
| 37 | - */ |
|
| 38 | - if ( ! $report) |
|
| 39 | - { |
|
| 40 | - \ErrorHandler::notFound('report'); |
|
| 41 | - } |
|
| 42 | - else if ( ! \Core::users()->can($report->view_name, 'reports')) |
|
| 43 | - { |
|
| 44 | - \ErrorHandler::noPermissions(); |
|
| 45 | - } |
|
| 35 | + /** |
|
| 36 | + * Check report existance and permission. |
|
| 37 | + */ |
|
| 38 | + if ( ! $report) |
|
| 39 | + { |
|
| 40 | + \ErrorHandler::notFound('report'); |
|
| 41 | + } |
|
| 42 | + else if ( ! \Core::users()->can($report->view_name, 'reports')) |
|
| 43 | + { |
|
| 44 | + \ErrorHandler::noPermissions(); |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * Fetch data from the report based on the given conditions. |
|
| 49 | - */ |
|
| 50 | - $report = \DB::table($report->view_name); |
|
| 51 | - unset($conditions['page']); |
|
| 52 | - if (count($conditions)) |
|
| 53 | - { |
|
| 54 | - $conditions = $this->constructConditions($conditions, $this->model); |
|
| 55 | - $report->whereRaw($conditions['conditionString'], $conditions['conditionValues']); |
|
| 56 | - } |
|
| 57 | - /** |
|
| 58 | - * Paginate or all data. |
|
| 59 | - */ |
|
| 60 | - if ($perPage) |
|
| 61 | - { |
|
| 62 | - return $report->paginate($perPage); |
|
| 63 | - } |
|
| 64 | - else |
|
| 65 | - { |
|
| 66 | - return $report->get(); |
|
| 67 | - } |
|
| 68 | - } |
|
| 47 | + /** |
|
| 48 | + * Fetch data from the report based on the given conditions. |
|
| 49 | + */ |
|
| 50 | + $report = \DB::table($report->view_name); |
|
| 51 | + unset($conditions['page']); |
|
| 52 | + if (count($conditions)) |
|
| 53 | + { |
|
| 54 | + $conditions = $this->constructConditions($conditions, $this->model); |
|
| 55 | + $report->whereRaw($conditions['conditionString'], $conditions['conditionValues']); |
|
| 56 | + } |
|
| 57 | + /** |
|
| 58 | + * Paginate or all data. |
|
| 59 | + */ |
|
| 60 | + if ($perPage) |
|
| 61 | + { |
|
| 62 | + return $report->paginate($perPage); |
|
| 63 | + } |
|
| 64 | + else |
|
| 65 | + { |
|
| 66 | + return $report->get(); |
|
| 67 | + } |
|
| 68 | + } |
|
| 69 | 69 | } |
@@ -6,27 +6,27 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ApiSkeletonServiceProvider extends ServiceProvider |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Perform post-registration booting of services. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function boot() |
|
| 15 | - { |
|
| 16 | - $this->publishes([ |
|
| 17 | - __DIR__.'/Modules' => app_path('Modules'), |
|
| 18 | - __DIR__.'/Modules/V1/Acl/emails' => base_path('resources/views/auth/emails'), |
|
| 19 | - __DIR__.'/lang' => base_path('resources/lang'), |
|
| 20 | - ]); |
|
| 21 | - } |
|
| 9 | + /** |
|
| 10 | + * Perform post-registration booting of services. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function boot() |
|
| 15 | + { |
|
| 16 | + $this->publishes([ |
|
| 17 | + __DIR__.'/Modules' => app_path('Modules'), |
|
| 18 | + __DIR__.'/Modules/V1/Acl/emails' => base_path('resources/views/auth/emails'), |
|
| 19 | + __DIR__.'/lang' => base_path('resources/lang'), |
|
| 20 | + ]); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Register any package services. |
|
| 25 | - * |
|
| 26 | - * @return void |
|
| 27 | - */ |
|
| 28 | - public function register() |
|
| 29 | - { |
|
| 30 | - // |
|
| 31 | - } |
|
| 23 | + /** |
|
| 24 | + * Register any package services. |
|
| 25 | + * |
|
| 26 | + * @return void |
|
| 27 | + */ |
|
| 28 | + public function register() |
|
| 29 | + { |
|
| 30 | + // |
|
| 31 | + } |
|
| 32 | 32 | } |
| 33 | 33 | \ No newline at end of file |