jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Añadido lenguaje a los roles. Orden por grupos

Browse Source
This commit is contained in:
Jaime Jiménez
2023-05-02 14:32:27 +02:00
parent 1116d8c435
commit b21686c78a
7 changed files with 276 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Controllers/Activity.php
View File

@ -41,7 +41,7 @@ class Activity extends BaseController
SUM( IF( browser LIKE "%Safari%", 1, 0 ) ) AS safari,
SUM( IF( browser LIKE "%Internet Explorer%", 1, 0 ) ) AS ie,
SUM( IF( browser LIKE "%Edge%", 1, 0 ) ) AS edge,
SUM( IF( browser LIKE "%Opera%", 1, 0 ) ) AS opera')->where('activity.user',$session->get('token'))->first();
SUM( IF( browser LIKE "%Opera%", 1, 0 ) ) AS opera')->where('auth_activity.user',$session->get('token'))->first();
$data['all'] = "";
echo view(getenv('theme.path').'main/header');
echo view(getenv('theme.path').'form/activity/index',$data);

22
ci4/app/Controllers/Ajax.php
View File

@ -231,41 +231,41 @@ class Ajax extends ResourceController
//Total number of records without filtering
if($session->get('dashboard')=='admin' && !empty($all)){
$totalRecords = $this->activity_model->select('id_activity')
->join('user','user.token = activity.user')
->join('auth_user','auth_user.token = auth_activity.user')
->countAllResults();
}else{
$totalRecords = $this->activity_model->select('id_activity')
->join('user','user.token = activity.user')
->where('activity.user',$session->get('token'))
->join('auth_user','auth_user.token = auth_activity.user')
->where('auth_activity.user',$session->get('token'))
->countAllResults();
}
//Total number of records with filtering
if($session->get('dashboard')=='admin' && !empty($all)){
$totalRecordwithFilter = $this->activity_model->select('id_activity')
->join('user','user.token = activity.user')
->join('auth_user','auth_user.token = auth_activity.user')
->orLike('first_name', $searchValue)
->countAllResults();
}else{
$totalRecordwithFilter = $this->activity_model->select('id_activity')
->join('user','user.token = activity.user')
->join('auth_user','auth_user.token = auth_activity.user')
->orLike('first_name', $searchValue)
->where('activity.user',$session->get('token'))
->where('auth_activity.user',$session->get('token'))
->countAllResults();
}
//Fetch records
if($session->get('dashboard')=='admin' && !empty($all)){
$records = $this->activity_model->select('activity.*,concat(first_name, " (",email, ")") AS name')
->join('user','user.token = activity.user')
$records = $this->activity_model->select('auth_activity.*,concat(first_name, " (",email, ")") AS name')
->join('auth_user','auth_user.token = auth_activity.user')
->orLike('first_name', $searchValue)
->orderBy($columnName,$columnSortOrder)
->findAll($rowperpage, $start);
}else{
$records = $this->activity_model->select('activity.*,concat(first_name, " (",email, ")") AS name')
->join('user','user.token = activity.user')
$records = $this->activity_model->select('auth_activity.*,concat(first_name, " (",email, ")") AS name')
->join('auth_user','auth_user.token = auth_activity.user')
->orLike('first_name', $searchValue)
->where('activity.user',$session->get('token'))
->where('auth_activity.user',$session->get('token'))
->orderBy($columnName,$columnSortOrder)
->findAll($rowperpage, $start);
}

2
ci4/app/Controllers/Produccion/Pedido.php → ci4/app/Controllers/Produccion/Pedidoproduccion.php
View File

@ -4,7 +4,7 @@ namespace App\Controllers\Produccion;
use App\Controllers\BaseController;
class Pedido extends BaseController
class Pedidoproduccion extends BaseController
{
function __construct()
{