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

Merge branch 'main' into 'dev/vuexy'

Browse Source 
# Conflicts:
#   ci4/app/Controllers/Home.php
#   ci4/app/Controllers/Test.php
This commit is contained in:
Ignacio Martinez Navajas
2023-05-10 10:56:57 +00:00
parent 95d79d1dc5 fc0d7e0298
commit aa87d0325f
51 changed files with 2172 additions and 916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ci4/app/Controllers/Home.php
View File

@ -3,7 +3,7 @@
namespace App\Controllers;
use App\Models\ActivityModel;
use App\Models\UserModel;
use App\Models\Usuarios\UserModel;
class Home extends BaseController
{
@ -18,6 +18,7 @@ class Home extends BaseController
public function index()
{
/*
$session = session();
$id_user = $session->get('id_user');
$name = $session->get('first_name');
@ -77,8 +78,8 @@ class Home extends BaseController
for ($i = 1; $i <= 12; $i++) {
$notFound = true;
foreach ($return_char_bar_geral as $item){
if($i == intval($item['month'])){
array_push($year,intval($item['total']));
if($i == intval($item->month)){
array_push($year,intval($item->total));
$notFound = false;
break;
}
@ -92,8 +93,8 @@ class Home extends BaseController
for ($i = 1; $i <= 12; $i++) {
$notFound = true;
foreach ($return_char_bar_enabled as $item){
if($i == intval($item['month'])){
array_push($year,intval($item['total']));
if($i == intval($item->month)){
array_push($year,intval($item->total));
$notFound = false;
break;
}
@ -107,8 +108,8 @@ class Home extends BaseController
for ($i = 1; $i <= 12; $i++) {
$notFound = true;
foreach ($return_char_bar_disabled as $item){
if($i == intval($item['month'])){
array_push($year,intval($item['total']));
if($i == intval($item->month)){
array_push($year,intval($item->total));
$notFound = false;
break;
}
@ -131,7 +132,7 @@ class Home extends BaseController
->findAll(30);
echo view(getenv('theme.path').'main/header');
echo view(getenv('theme.path').'form/dashboard/admin',$data);
//echo view(getenv('theme.path').'form/dashboard/admin',$data);
echo view(getenv('theme.path').'main/footer');
break;
@ -147,12 +148,12 @@ class Home extends BaseController
];
echo view(getenv('theme.path').'main/header');
echo view(getenv('theme.path').'form/dashboard/user',$data);
//echo view(getenv('theme.path').'form/dashboard/user',$data);
echo view(getenv('theme.path').'main/footer');
break;
default:
echo view(getenv('theme.path').'main/header');
echo view(getenv('theme.path').'form/dashboard/index');
//echo view(getenv('theme.path').'form/dashboard/index');
echo view(getenv('theme.path').'main/footer');
endswitch;
*/